status-im/nimbus-eth1
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth1.git synced 2025-02-24 09:48:24 +00:00
Code Issues Projects Releases Wiki Activity

Bump nimbus-eth2 and fix beacon LC related changes (#1473)

Browse Source 
* Bump nimbus-eth2 and fix beacon LC related changes

* Disable local_testnet test in CI
Latest version is no longer compatible with the old nightlies that are being downloaded for the test
This commit is contained in:
Kim De Mey 2023-02-26 16:44:05 +01:00 committed by GitHub
parent 155652360a
commit b64135b830
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.github/workflows/ci.yml vendored
View File

@ -255,11 +255,11 @@ jobs:
# hide CI failures # hide CI failures
env CC=gcc GOARCH=${GOARCH} CXX=g++ CGO_ENABLED=1 make ${DEFAULT_MAKE_FLAGS} test || true env CC=gcc GOARCH=${GOARCH} CXX=g++ CGO_ENABLED=1 make ${DEFAULT_MAKE_FLAGS} test || true
else else
pushd vendor/nimbus-eth2 # pushd vendor/nimbus-eth2
env NIMBUSEL_BINARY=../../build/nimbus NIMBUSEL_GENESIS=scripts/nimbusel_genesis.json \ # env NIMBUSEL_BINARY=../../build/nimbus NIMBUSEL_GENESIS=scripts/nimbusel_genesis.json \
./scripts/launch_local_testnet.sh --nodes=3 --stop-at-epoch=7 \ # ./scripts/launch_local_testnet.sh --nodes=3 --stop-at-epoch=7 \
--disable-htop --reuse-binaries --run-nimbus-el --dl-eth2 --verbose --kill-old-processes # --disable-htop --reuse-binaries --run-nimbus-el --dl-eth2 --verbose --kill-old-processes
popd # popd
env CC=gcc GOARCH=${GOARCH} CXX=g++ CGO_ENABLED=1 make ${DEFAULT_MAKE_FLAGS} test env CC=gcc GOARCH=${GOARCH} CXX=g++ CGO_ENABLED=1 make ${DEFAULT_MAKE_FLAGS} test
fi fi
@ -271,10 +271,10 @@ jobs:
make ${DEFAULT_MAKE_FLAGS} make ${DEFAULT_MAKE_FLAGS}
build/nimbus --help build/nimbus --help
# "-static" option will not work for osx unless static system libraries are provided # "-static" option will not work for osx unless static system libraries are provided
pushd vendor/nimbus-eth2 # pushd vendor/nimbus-eth2
env NIMBUSEL_BINARY=../../build/nimbus NIMBUSEL_GENESIS=scripts/nimbusel_genesis.json \ # env NIMBUSEL_BINARY=../../build/nimbus NIMBUSEL_GENESIS=scripts/nimbusel_genesis.json \
./scripts/launch_local_testnet.sh --nodes=3 --stop-at-epoch=7 \ # ./scripts/launch_local_testnet.sh --nodes=3 --stop-at-epoch=7 \
--disable-htop --reuse-binaries --run-nimbus-el --dl-eth2 --verbose --kill-old-processes # --disable-htop --reuse-binaries --run-nimbus-el --dl-eth2 --verbose --kill-old-processes
popd # popd
make ${DEFAULT_MAKE_FLAGS} test make ${DEFAULT_MAKE_FLAGS} test

4
fluffy/tools/bridge/beacon_chain_bridge.nim
View File

@ -211,7 +211,7 @@ proc run(config: BeaconBridgeConf) {.raises: [CatchableError].} =
wallSlot = getBeaconTime().slotOrZero wallSlot = getBeaconTime().slotOrZero
withBlck(signedBlock): withBlck(signedBlock):
when stateFork >= BeaconStateFork.Bellatrix: when stateFork >= ConsensusFork.Bellatrix:
if blck.message.is_execution_block: if blck.message.is_execution_block:
template payload(): auto = blck.message.body.execution_payload template payload(): auto = blck.message.body.execution_payload
@ -325,7 +325,7 @@ proc run(config: BeaconBridgeConf) {.raises: [CatchableError].} =
targetGossipState = getTargetGossipState( targetGossipState = getTargetGossipState(
slot.epoch, cfg.ALTAIR_FORK_EPOCH, cfg.BELLATRIX_FORK_EPOCH, slot.epoch, cfg.ALTAIR_FORK_EPOCH, cfg.BELLATRIX_FORK_EPOCH,
cfg.CAPELLA_FORK_EPOCH, cfg.EIP4844_FORK_EPOCH, isBehind) cfg.CAPELLA_FORK_EPOCH, cfg.DENEB_FORK_EPOCH, isBehind)
template currentGossipState(): auto = blocksGossipState template currentGossipState(): auto = blocksGossipState
if currentGossipState == targetGossipState: if currentGossipState == targetGossipState:

4
nimbus_verified_proxy/nimbus_verified_proxy.nim
View File

@ -107,7 +107,7 @@ proc run(config: VerifiedProxyConf) {.raises: [CatchableError].} =
opt = signedBlock.toBlockId(), opt = signedBlock.toBlockId(),
wallSlot = getBeaconTime().slotOrZero wallSlot = getBeaconTime().slotOrZero
withBlck(signedBlock): withBlck(signedBlock):
when stateFork >= BeaconStateFork.Bellatrix: when stateFork >= ConsensusFork.Bellatrix:
if blck.message.is_execution_block: if blck.message.is_execution_block:
template payload(): auto = blck.message.body.execution_payload template payload(): auto = blck.message.body.execution_payload
blockCache.add(asExecutionData(payload.asEngineExecutionPayload())) blockCache.add(asExecutionData(payload.asEngineExecutionPayload()))
@ -183,7 +183,7 @@ proc run(config: VerifiedProxyConf) {.raises: [CatchableError].} =
targetGossipState = getTargetGossipState( targetGossipState = getTargetGossipState(
slot.epoch, cfg.ALTAIR_FORK_EPOCH, cfg.BELLATRIX_FORK_EPOCH, slot.epoch, cfg.ALTAIR_FORK_EPOCH, cfg.BELLATRIX_FORK_EPOCH,
cfg.CAPELLA_FORK_EPOCH, cfg.EIP4844_FORK_EPOCH, isBehind) cfg.CAPELLA_FORK_EPOCH, cfg.DENEB_FORK_EPOCH, isBehind)
template currentGossipState(): auto = blocksGossipState template currentGossipState(): auto = blocksGossipState
if currentGossipState == targetGossipState: if currentGossipState == targetGossipState:

2
vendor/nimbus-eth2 vendored

@ -1 +1 @@
Subproject commit 968e27bc971edb753d16bbb7e52cfc3b47ba99e9 Subproject commit cdca07908b489a7445aa10d2776f21dd9f8ba264