status-im
/
nimbus-eth2
mirror of https://github.com/status-im/nimbus-eth2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix getForkedBlock to read EIP4844 and Capella blocks (#4450) 

* fix getForkedBlock to read EIP4844 and Capella blocks

* update geth develop URLs
This commit is contained in:
tersec 2022-12-30 21:59:21 +00:00 committed by GitHub
parent d854317646
commit 121c66ad3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
beacon_chain/consensus_object_pools/blockchain_dag.nim
View File

@ -211,7 +211,14 @@ proc getForkedBlock*(db: BeaconChainDB, root: Eth2Digest):
Opt[ForkedTrustedSignedBeaconBlock] = Opt[ForkedTrustedSignedBeaconBlock] =
# When we only have a digest, we don't know which fork it's from so we try # When we only have a digest, we don't know which fork it's from so we try
# them one by one - this should be used sparingly # them one by one - this should be used sparingly
if (let blck = db.getBlock(root, bellatrix.TrustedSignedBeaconBlock); static: doAssert high(BeaconBlockFork) == BeaconBlockFork.EIP4844
if (let blck = db.getBlock(root, eip4844.TrustedSignedBeaconBlock);
blck.isSome()):
ok(ForkedTrustedSignedBeaconBlock.init(blck.get()))
elif (let blck = db.getBlock(root, capella.TrustedSignedBeaconBlock);
blck.isSome()):
ok(ForkedTrustedSignedBeaconBlock.init(blck.get()))
elif (let blck = db.getBlock(root, bellatrix.TrustedSignedBeaconBlock);
blck.isSome()): blck.isSome()):
ok(ForkedTrustedSignedBeaconBlock.init(blck.get())) ok(ForkedTrustedSignedBeaconBlock.init(blck.get()))
elif (let blck = db.getBlock(root, altair.TrustedSignedBeaconBlock); elif (let blck = db.getBlock(root, altair.TrustedSignedBeaconBlock);

8
scripts/launch_local_testnet.sh
View File

@ -450,12 +450,12 @@ fi
download_geth() { download_geth() {
GETH_VERSION="1.11.0-unstable-262bd38f" GETH_VERSION="1.11.0-unstable-b818e73e"
# https://geth.ethereum.org/downloads/ # https://geth.ethereum.org/downloads/
# "https://gethstore.blob.core.windows.net/builds/geth-linux-amd64-1.11.0-unstable-262bd38f.tar.gz" # "https://gethstore.blob.core.windows.net/builds/geth-linux-amd64-1.11.0-unstable-b818e73e.tar.gz"
# "https://gethstore.blob.core.windows.net/builds/geth-darwin-amd64-1.11.0-unstable-262bd38f.tar.gz" # "https://gethstore.blob.core.windows.net/builds/geth-darwin-amd64-1.11.0-unstable-b818e73e.tar.gz"
# "https://gethstore.blob.core.windows.net/builds/geth-windows-amd64-1.11.0-unstable-262bd38f.zip" # "https://gethstore.blob.core.windows.net/builds/geth-windows-amd64-1.11.0-unstable-b818e73e.zip"
GETH_URL="https://gethstore.blob.core.windows.net/builds/" GETH_URL="https://gethstore.blob.core.windows.net/builds/"