Skip to content

Commit a0d9a84

Browse files
authored
eth2: bump (#3840)
* fix submodule not pointing to master branch (needs CI check) * add new quic deps * bump to 25.11.0 candidate * align other libs * INTERVALS_PER_SLOT removed
1 parent ced9451 commit a0d9a84

16 files changed

+26
-22
lines changed

.gitmodules

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,3 +230,11 @@
230230
path = vendor/nim-mcl
231231
url = https://github.com/status-im/nim-mcl
232232
branch = main
233+
[submodule "vendor/nim-ngtcp2"]
234+
path = vendor/nim-ngtcp2
235+
url = https://github.com/vacp2p/nim-ngtcp2
236+
branch = main
237+
[submodule "vendor/nim-quic"]
238+
path = vendor/nim-quic
239+
url = https://github.com/vacp2p/nim-quic
240+
branch = main

portal/bridge/beacon/portal_beacon_bridge.nim

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -393,9 +393,9 @@ proc runBeacon*(config: PortalBridgeConf) {.raises: [CatchableError].} =
393393
# And/or look into possibly using eth/v1/events for
394394
# light_client_finality_update and light_client_optimistic_update if that
395395
# is something that works.
396-
397-
# Or basically `lightClientOptimisticUpdateSlotOffset`
398-
await sleepAsync(cfg.timeParams.SLOT_DURATION div INTERVALS_PER_SLOT)
396+
await sleepAsync(
397+
nanoseconds(lightClientOptimisticUpdateSlotOffset(cfg.timeParams).nanoseconds)
398+
)
399399

400400
lastOptimisticUpdateSlot = (
401401
await gossipLCOptimisticUpdate(restClient, portalRpcClient, cfg, forkDigests)

portal/tests/beacon_network_tests/test_beacon_historical_roots.nim

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Nimbus
2-
# Copyright (c) 2023-2024 Status Research & Development GmbH
2+
# Copyright (c) 2023-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
@@ -13,8 +13,7 @@ import
1313
unittest2,
1414
beacon_chain/spec/forks,
1515
# Test helpers
16-
beacon_chain /../ tests/testblockutil,
17-
beacon_chain /../ tests/mocking/mock_genesis,
16+
beacon_chain /../ tests/[testblockutil, teststateutil],
1817
beacon_chain /../ tests/consensus_spec/fixtures_utils,
1918
../../network/beacon/beacon_chain_historical_roots
2019

portal/tests/beacon_network_tests/test_beacon_historical_summaries.nim

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ import
1313
unittest2,
1414
beacon_chain/spec/forks,
1515
# Test helpers
16-
beacon_chain /../ tests/testblockutil,
17-
beacon_chain /../ tests/mocking/mock_genesis,
16+
beacon_chain /../ tests/[testblockutil, teststateutil],
1817
beacon_chain /../ tests/consensus_spec/fixtures_utils,
1918
../../network/beacon/beacon_chain_historical_summaries
2019

portal/tests/beacon_network_tests/test_beacon_network.nim

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ import
1111
eth/p2p/discoveryv5/protocol as discv5_protocol,
1212
beacon_chain/spec/forks,
1313
# Test helpers
14-
beacon_chain /../ tests/testblockutil,
15-
beacon_chain /../ tests/mocking/mock_genesis,
14+
beacon_chain /../ tests/[testblockutil, teststateutil],
1615
beacon_chain /../ tests/consensus_spec/fixtures_utils,
1716
../../network/wire/portal_protocol,
1817
../../network/beacon/

portal/tests/eth_history_tests/test_block_proof_historical_roots.nim

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ import
1313
unittest2,
1414
beacon_chain/spec/forks,
1515
# Mock helpers
16-
beacon_chain /../ tests/testblockutil,
17-
beacon_chain /../ tests/mocking/mock_genesis,
16+
beacon_chain /../ tests/[testblockutil, teststateutil],
1817
../../eth_history/block_proofs/block_proof_historical_roots
1918

2019
# Test suite for the chain of proofs BlockProofHistoricalRoots:

portal/tests/eth_history_tests/test_block_proof_historical_summaries.nim

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ import
1313
unittest2,
1414
beacon_chain/spec/forks,
1515
# Mock helpers
16-
beacon_chain /../ tests/testblockutil,
17-
beacon_chain /../ tests/mocking/mock_genesis,
16+
beacon_chain /../ tests/[testblockutil, teststateutil],
1817
../../eth_history/block_proofs/block_proof_historical_summaries
1918

2019
# Test suite for the chain of proofs BlockProofHistoricalSummaries:

portal/tests/eth_history_tests/test_block_proof_historical_summaries_deneb.nim

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ import
1313
unittest2,
1414
beacon_chain/spec/forks,
1515
# Mock helpers
16-
beacon_chain /../ tests/testblockutil,
17-
beacon_chain /../ tests/mocking/mock_genesis,
16+
beacon_chain /../ tests/[testblockutil, teststateutil],
1817
../../eth_history/block_proofs/block_proof_historical_summaries
1918

2019
# Test suite for the chain of proofs BlockProofHistoricalSummariesDeneb:

0 commit comments

Comments
 (0)