From 6fa45265bded81a868887de22c61c0ca81de6616 Mon Sep 17 00:00:00 2001 From: Martin Holst Swende Date: Wed, 20 Nov 2024 13:26:05 +0100 Subject: [PATCH] eth/tracers: post-rebase fixups --- core/blockchain.go | 2 +- core/genesis.go | 2 +- eth/catalyst/api.go | 19 ++++++++++--------- .../live/testdata/supply/omitted_fields.json | 18 +++++++++--------- .../live/testdata/supply/selfdestruct.json | 18 +++++++++--------- .../live/testdata/supply/withdrawals.json | 18 +++++++++--------- eth/tracers/live/testdata/supply_filler.go | 10 +++++----- tests/block_test_util.go | 10 +++++++--- 8 files changed, 51 insertions(+), 46 deletions(-) diff --git a/core/blockchain.go b/core/blockchain.go index 5e8b31d14f..c3da61b281 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -416,7 +416,7 @@ func NewBlockChain(db ethdb.Database, cacheConfig *CacheConfig, genesis *Genesis } if bc.logger != nil && bc.logger.OnGenesisBlock != nil { if block := bc.CurrentBlock(); block.Number.Uint64() == 0 { - alloc, err := GetGenesisState(bc.db, block.Hash()) + alloc, err := getGenesisState(bc.db, block.Hash()) if err != nil { return nil, fmt.Errorf("failed to get genesis state: %w", err) } diff --git a/core/genesis.go b/core/genesis.go index c2dba97879..eff92084eb 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -177,7 +177,7 @@ func flushAlloc(ga *types.GenesisAlloc, triedb *triedb.Database) (common.Hash, e return root, nil } -func GetGenesisState(db ethdb.Database, blockhash common.Hash) (alloc types.GenesisAlloc, err error) { +func getGenesisState(db ethdb.Database, blockhash common.Hash) (alloc types.GenesisAlloc, err error) { blob := rawdb.ReadGenesisStateSpec(db, blockhash) if len(blob) != 0 { if err := alloc.UnmarshalJSON(blob); err != nil { diff --git a/eth/catalyst/api.go b/eth/catalyst/api.go index e3e9332a5b..5fc98cd6ac 100644 --- a/eth/catalyst/api.go +++ b/eth/catalyst/api.go @@ -271,7 +271,7 @@ func (api *ConsensusAPI) ForkchoiceUpdatedWithWitnessV2(update engine.Forkchoice if params.BeaconRoot != nil { return engine.STATUS_INVALID, engine.InvalidPayloadAttributes.With(errors.New("unexpected beacon root")) } - switch api.eth.BlockChain().Config().LatestFork(params.Timestamp) { + switch api.eth.BlockChain().Config().LatestPostLondonFork(params.Timestamp) { case forks.Paris: if params.Withdrawals != nil { return engine.STATUS_INVALID, engine.InvalidPayloadAttributes.With(errors.New("withdrawals before shanghai")) @@ -297,7 +297,8 @@ func (api *ConsensusAPI) ForkchoiceUpdatedWithWitnessV3(update engine.Forkchoice if params.BeaconRoot == nil { return engine.STATUS_INVALID, engine.InvalidPayloadAttributes.With(errors.New("missing beacon root")) } - if api.eth.BlockChain().Config().LatestFork(params.Timestamp) != forks.Cancun && api.eth.BlockChain().Config().LatestFork(params.Timestamp) != forks.Prague { + if api.eth.BlockChain().Config().LatestPostLondonFork(params.Timestamp) != forks.Cancun && + api.eth.BlockChain().Config().LatestPostLondonFork(params.Timestamp) != forks.Prague { return engine.STATUS_INVALID, engine.UnsupportedFork.With(errors.New("forkchoiceUpdatedV3 must only be called for cancun payloads")) } } @@ -634,7 +635,7 @@ func (api *ConsensusAPI) NewPayloadV4(params engine.ExecutableData, versionedHas return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil executionRequests post-prague")) } - if api.eth.BlockChain().Config().LatestFork(params.Timestamp) != forks.Prague { + if api.eth.BlockChain().Config().LatestPostLondonFork(params.Timestamp) != forks.Prague { return engine.PayloadStatusV1{Status: engine.INVALID}, engine.UnsupportedFork.With(errors.New("newPayloadV4 must only be called for prague payloads")) } requests := convertRequests(executionRequests) @@ -656,7 +657,7 @@ func (api *ConsensusAPI) NewPayloadWithWitnessV2(params engine.ExecutableData) ( if api.eth.BlockChain().Config().IsCancun(api.eth.BlockChain().Config().LondonBlock, params.Timestamp) { return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("can't use newPayloadV2 post-cancun")) } - if api.eth.BlockChain().Config().LatestFork(params.Timestamp) == forks.Shanghai { + if api.eth.BlockChain().Config().LatestPostLondonFork(params.Timestamp) == forks.Shanghai { if params.Withdrawals == nil { return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil withdrawals post-shanghai")) } @@ -694,7 +695,7 @@ func (api *ConsensusAPI) NewPayloadWithWitnessV3(params engine.ExecutableData, v return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil beaconRoot post-cancun")) } - if api.eth.BlockChain().Config().LatestFork(params.Timestamp) != forks.Cancun { + if api.eth.BlockChain().Config().LatestPostLondonFork(params.Timestamp) != forks.Cancun { return engine.PayloadStatusV1{Status: engine.INVALID}, engine.UnsupportedFork.With(errors.New("newPayloadWithWitnessV3 must only be called for cancun payloads")) } return api.newPayload(params, versionedHashes, beaconRoot, nil, true) @@ -723,7 +724,7 @@ func (api *ConsensusAPI) NewPayloadWithWitnessV4(params engine.ExecutableData, v return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil executionRequests post-prague")) } - if api.eth.BlockChain().Config().LatestFork(params.Timestamp) != forks.Prague { + if api.eth.BlockChain().Config().LatestPostLondonFork(params.Timestamp) != forks.Prague { return engine.PayloadStatusV1{Status: engine.INVALID}, engine.UnsupportedFork.With(errors.New("newPayloadWithWitnessV4 must only be called for prague payloads")) } requests := convertRequests(executionRequests) @@ -745,7 +746,7 @@ func (api *ConsensusAPI) ExecuteStatelessPayloadV2(params engine.ExecutableData, if api.eth.BlockChain().Config().IsCancun(api.eth.BlockChain().Config().LondonBlock, params.Timestamp) { return engine.StatelessPayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("can't use newPayloadV2 post-cancun")) } - if api.eth.BlockChain().Config().LatestFork(params.Timestamp) == forks.Shanghai { + if api.eth.BlockChain().Config().LatestPostLondonFork(params.Timestamp) == forks.Shanghai { if params.Withdrawals == nil { return engine.StatelessPayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil withdrawals post-shanghai")) } @@ -783,7 +784,7 @@ func (api *ConsensusAPI) ExecuteStatelessPayloadV3(params engine.ExecutableData, return engine.StatelessPayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil beaconRoot post-cancun")) } - if api.eth.BlockChain().Config().LatestFork(params.Timestamp) != forks.Cancun { + if api.eth.BlockChain().Config().LatestPostLondonFork(params.Timestamp) != forks.Cancun { return engine.StatelessPayloadStatusV1{Status: engine.INVALID}, engine.UnsupportedFork.With(errors.New("executeStatelessPayloadV3 must only be called for cancun payloads")) } return api.executeStatelessPayload(params, versionedHashes, beaconRoot, nil, opaqueWitness) @@ -812,7 +813,7 @@ func (api *ConsensusAPI) ExecuteStatelessPayloadV4(params engine.ExecutableData, return engine.StatelessPayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil executionRequests post-prague")) } - if api.eth.BlockChain().Config().LatestFork(params.Timestamp) != forks.Prague { + if api.eth.BlockChain().Config().LatestPostLondonFork(params.Timestamp) != forks.Prague { return engine.StatelessPayloadStatusV1{Status: engine.INVALID}, engine.UnsupportedFork.With(errors.New("executeStatelessPayloadV4 must only be called for prague payloads")) } requests := convertRequests(executionRequests) diff --git a/eth/tracers/live/testdata/supply/omitted_fields.json b/eth/tracers/live/testdata/supply/omitted_fields.json index e5d4a81ab0..10c420bb37 100644 --- a/eth/tracers/live/testdata/supply/omitted_fields.json +++ b/eth/tracers/live/testdata/supply/omitted_fields.json @@ -12,12 +12,12 @@ "ExtraData": "0x", "GasLimit": "0x47e7c4", "GasUsed": "0x0", - "Hash": "0xe430cdf604a88b9d713d4f89fd100ddddf38c1cc6b049e3d5df563c7bfd320fc", + "Hash": "0x2aa3c443e44f958a52d9dc13a3748a23094892675bfedb362afbf6068248572b", "MixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "Nonce": "0x0000000000000000", "Number": "0x1", "ParentBeaconBlockRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", - "ParentHash": "0x52f276d96f0afaaf2c3cb358868bdc2779c4b0cb8de3e7e5302e247c0b66a703", + "ParentHash": "0xc02ee8ee5b54a40e43f0fa827d431e1bd4f217e941790dda10b2521d1925a20b", "ReceiptTrie": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "StateRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "Timestamp": "0xa", @@ -26,20 +26,20 @@ "WithdrawalsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421" }, "ExpectException": "", - "Rlp": "0xf9023ff90239a052f276d96f0afaaf2c3cb358868bdc2779c4b0cb8de3e7e5302e247c0b66a703a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940100000000000000000000000000000000000000a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080018347e7c4800a80a0000000000000000000000000000000000000000000000000000000000000000088000000000000000084342770c0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b4218080a00000000000000000000000000000000000000000000000000000000000000000c0c0c0", + "Rlp": "0xf90260f9025aa0c02ee8ee5b54a40e43f0fa827d431e1bd4f217e941790dda10b2521d1925a20ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940100000000000000000000000000000000000000a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080018347e7c4800a80a0000000000000000000000000000000000000000000000000000000000000000088000000000000000084342770c0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b4218080a00000000000000000000000000000000000000000000000000000000000000000a06036c41849da9c076ed79654d434017387a88fb833c2856b32e18218b3341c5fc0c0c0", "UncleHeaders": null } ], "expected": [ { "blockNumber": 0, - "hash": "0x52f276d96f0afaaf2c3cb358868bdc2779c4b0cb8de3e7e5302e247c0b66a703", + "hash": "0xc02ee8ee5b54a40e43f0fa827d431e1bd4f217e941790dda10b2521d1925a20b", "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000" }, { "blockNumber": 1, - "hash": "0xe430cdf604a88b9d713d4f89fd100ddddf38c1cc6b049e3d5df563c7bfd320fc", - "parentHash": "0x52f276d96f0afaaf2c3cb358868bdc2779c4b0cb8de3e7e5302e247c0b66a703" + "hash": "0x2aa3c443e44f958a52d9dc13a3748a23094892675bfedb362afbf6068248572b", + "parentHash": "0xc02ee8ee5b54a40e43f0fa827d431e1bd4f217e941790dda10b2521d1925a20b" } ], "genesisBlockHeader": { @@ -52,7 +52,7 @@ "ExtraData": "0x", "GasLimit": "0x47e7c4", "GasUsed": "0x0", - "Hash": "0x52f276d96f0afaaf2c3cb358868bdc2779c4b0cb8de3e7e5302e247c0b66a703", + "Hash": "0xc02ee8ee5b54a40e43f0fa827d431e1bd4f217e941790dda10b2521d1925a20b", "MixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "Nonce": "0x0000000000000000", "Number": "0x0", @@ -65,8 +65,8 @@ "UncleHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", "WithdrawalsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421" }, - "lastblockhash": "e430cdf604a88b9d713d4f89fd100ddddf38c1cc6b049e3d5df563c7bfd320fc", - "network": "Cancun", + "lastblockhash": "2aa3c443e44f958a52d9dc13a3748a23094892675bfedb362afbf6068248572b", + "network": "Prague", "postState": {}, "pre": {}, "sealEngine": "" diff --git a/eth/tracers/live/testdata/supply/selfdestruct.json b/eth/tracers/live/testdata/supply/selfdestruct.json index ae3dff06c0..28991a57b4 100644 --- a/eth/tracers/live/testdata/supply/selfdestruct.json +++ b/eth/tracers/live/testdata/supply/selfdestruct.json @@ -12,12 +12,12 @@ "ExtraData": "0x", "GasLimit": "0x47e7c4", "GasUsed": "0xf6d4", - "Hash": "0xd5a0d7e4b5fa687dd355938a24e34229db3c01cd2a999e5023369016371a98ac", + "Hash": "0x270b395b2ced6d19be0e61583285f5c33aa757f8bf8d1f5054eee932e2883eb2", "MixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "Nonce": "0x0000000000000000", "Number": "0x1", "ParentBeaconBlockRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", - "ParentHash": "0x16d2bb0b366d3963bf2d8d75cb4b3bc0f233047c948fa746cbd38ac82bf9cfe9", + "ParentHash": "0x9e597272c69b46903e5307d7f68a9026070d61e4e504fd2a96e41e4387466728", "ReceiptTrie": "0x6bd5a500652764abb50a6bfd441a2f52f9dc2a38644170adb7951804998e0176", "StateRoot": "0x90899467081bda450d3ef7a6fb0f0c37ddfefea28c810a38323af55f79122c50", "Timestamp": "0xa", @@ -26,7 +26,7 @@ "WithdrawalsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421" }, "ExpectException": "", - "Rlp": "0xf902aef9023ba016d2bb0b366d3963bf2d8d75cb4b3bc0f233047c948fa746cbd38ac82bf9cfe9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940100000000000000000000000000000000000000a090899467081bda450d3ef7a6fb0f0c37ddfefea28c810a38323af55f79122c50a08cfce1fa6bf3370d316650ab9ac77c2cfd69c9b3fd4e3def07b9e650769836e0a06bd5a500652764abb50a6bfd441a2f52f9dc2a38644170adb7951804998e0176b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080018347e7c482f6d40a80a0000000000000000000000000000000000000000000000000000000000000000088000000000000000084342770c0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b4218080a00000000000000000000000000000000000000000000000000000000000000000f86cf86a8085012a05f200830249f094111111111111111111111111111111111111111185012a05f2008026a03c8f16fd94b4c5e56c1c2ff249685a19b2afedb5d6529fc2950a79c3f9c8d599a01a7882a80e333850532a917631347435237f751c9f7a0b810aae8098f5a6225ec0c0", + "Rlp": "0xf902cff9025ca09e597272c69b46903e5307d7f68a9026070d61e4e504fd2a96e41e4387466728a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940100000000000000000000000000000000000000a090899467081bda450d3ef7a6fb0f0c37ddfefea28c810a38323af55f79122c50a08cfce1fa6bf3370d316650ab9ac77c2cfd69c9b3fd4e3def07b9e650769836e0a06bd5a500652764abb50a6bfd441a2f52f9dc2a38644170adb7951804998e0176b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080018347e7c482f6d40a80a0000000000000000000000000000000000000000000000000000000000000000088000000000000000084342770c0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b4218080a00000000000000000000000000000000000000000000000000000000000000000a06036c41849da9c076ed79654d434017387a88fb833c2856b32e18218b3341c5ff86cf86a8085012a05f200830249f094111111111111111111111111111111111111111185012a05f2008026a03c8f16fd94b4c5e56c1c2ff249685a19b2afedb5d6529fc2950a79c3f9c8d599a01a7882a80e333850532a917631347435237f751c9f7a0b810aae8098f5a6225ec0c0", "UncleHeaders": null } ], @@ -36,7 +36,7 @@ "genesisAlloc": "0x1bc16d674ec80000" }, "blockNumber": 0, - "hash": "0x16d2bb0b366d3963bf2d8d75cb4b3bc0f233047c948fa746cbd38ac82bf9cfe9", + "hash": "0x9e597272c69b46903e5307d7f68a9026070d61e4e504fd2a96e41e4387466728", "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000" }, { @@ -44,8 +44,8 @@ "1559": "0x32491701df00" }, "blockNumber": 1, - "hash": "0xd5a0d7e4b5fa687dd355938a24e34229db3c01cd2a999e5023369016371a98ac", - "parentHash": "0x16d2bb0b366d3963bf2d8d75cb4b3bc0f233047c948fa746cbd38ac82bf9cfe9" + "hash": "0x270b395b2ced6d19be0e61583285f5c33aa757f8bf8d1f5054eee932e2883eb2", + "parentHash": "0x9e597272c69b46903e5307d7f68a9026070d61e4e504fd2a96e41e4387466728" } ], "genesisBlockHeader": { @@ -58,7 +58,7 @@ "ExtraData": "0x", "GasLimit": "0x47e7c4", "GasUsed": "0x0", - "Hash": "0x16d2bb0b366d3963bf2d8d75cb4b3bc0f233047c948fa746cbd38ac82bf9cfe9", + "Hash": "0x9e597272c69b46903e5307d7f68a9026070d61e4e504fd2a96e41e4387466728", "MixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "Nonce": "0x0000000000000000", "Number": "0x0", @@ -71,8 +71,8 @@ "UncleHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", "WithdrawalsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421" }, - "lastblockhash": "d5a0d7e4b5fa687dd355938a24e34229db3c01cd2a999e5023369016371a98ac", - "network": "Cancun", + "lastblockhash": "270b395b2ced6d19be0e61583285f5c33aa757f8bf8d1f5054eee932e2883eb2", + "network": "Prague", "postState": { "0x0000000000000000000000000000000000000dad": { "balance": "0xde0b6b3a7640000" diff --git a/eth/tracers/live/testdata/supply/withdrawals.json b/eth/tracers/live/testdata/supply/withdrawals.json index c94bc64654..7759f8772b 100644 --- a/eth/tracers/live/testdata/supply/withdrawals.json +++ b/eth/tracers/live/testdata/supply/withdrawals.json @@ -12,12 +12,12 @@ "ExtraData": "0x", "GasLimit": "0x47e7c4", "GasUsed": "0x0", - "Hash": "0x273c5dc5beed8249b8103b9a168b1c693c17f371be39d675dec50120f4d93402", + "Hash": "0x917925a8c40111a353a4d27922a1668c9da7ca925c92c8d6109ef9a826c53487", "MixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "Nonce": "0x0000000000000000", "Number": "0x1", "ParentBeaconBlockRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", - "ParentHash": "0x52f276d96f0afaaf2c3cb358868bdc2779c4b0cb8de3e7e5302e247c0b66a703", + "ParentHash": "0xc02ee8ee5b54a40e43f0fa827d431e1bd4f217e941790dda10b2521d1925a20b", "ReceiptTrie": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "StateRoot": "0x6e2ae8cee635793fd04490934e7b7d8f727c74534c5a01e42051116e12ba6a1a", "Timestamp": "0xa", @@ -26,14 +26,14 @@ "WithdrawalsRoot": "0xad2dcd8b054415c239ed4cdfff00f865a00f28676fc12e33fec0ce91e4be10d6" }, "ExpectException": "", - "Rlp": "0xf9025af90239a052f276d96f0afaaf2c3cb358868bdc2779c4b0cb8de3e7e5302e247c0b66a703a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940100000000000000000000000000000000000000a06e2ae8cee635793fd04490934e7b7d8f727c74534c5a01e42051116e12ba6a1aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080018347e7c4800a80a0000000000000000000000000000000000000000000000000000000000000000088000000000000000084342770c0a0ad2dcd8b054415c239ed4cdfff00f865a00f28676fc12e33fec0ce91e4be10d68080a00000000000000000000000000000000000000000000000000000000000000000c0c0dbda802a94ee00000000000000000000000000000000000000820539", + "Rlp": "0xf9027bf9025aa0c02ee8ee5b54a40e43f0fa827d431e1bd4f217e941790dda10b2521d1925a20ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940100000000000000000000000000000000000000a06e2ae8cee635793fd04490934e7b7d8f727c74534c5a01e42051116e12ba6a1aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080018347e7c4800a80a0000000000000000000000000000000000000000000000000000000000000000088000000000000000084342770c0a0ad2dcd8b054415c239ed4cdfff00f865a00f28676fc12e33fec0ce91e4be10d68080a00000000000000000000000000000000000000000000000000000000000000000a06036c41849da9c076ed79654d434017387a88fb833c2856b32e18218b3341c5fc0c0dbda802a94ee00000000000000000000000000000000000000820539", "UncleHeaders": null } ], "expected": [ { "blockNumber": 0, - "hash": "0x52f276d96f0afaaf2c3cb358868bdc2779c4b0cb8de3e7e5302e247c0b66a703", + "hash": "0xc02ee8ee5b54a40e43f0fa827d431e1bd4f217e941790dda10b2521d1925a20b", "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000" }, { @@ -41,8 +41,8 @@ "withdrawals": "0x1374b68fa00" }, "blockNumber": 1, - "hash": "0x273c5dc5beed8249b8103b9a168b1c693c17f371be39d675dec50120f4d93402", - "parentHash": "0x52f276d96f0afaaf2c3cb358868bdc2779c4b0cb8de3e7e5302e247c0b66a703" + "hash": "0x917925a8c40111a353a4d27922a1668c9da7ca925c92c8d6109ef9a826c53487", + "parentHash": "0xc02ee8ee5b54a40e43f0fa827d431e1bd4f217e941790dda10b2521d1925a20b" } ], "genesisBlockHeader": { @@ -55,7 +55,7 @@ "ExtraData": "0x", "GasLimit": "0x47e7c4", "GasUsed": "0x0", - "Hash": "0x52f276d96f0afaaf2c3cb358868bdc2779c4b0cb8de3e7e5302e247c0b66a703", + "Hash": "0xc02ee8ee5b54a40e43f0fa827d431e1bd4f217e941790dda10b2521d1925a20b", "MixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "Nonce": "0x0000000000000000", "Number": "0x0", @@ -68,8 +68,8 @@ "UncleHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", "WithdrawalsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421" }, - "lastblockhash": "273c5dc5beed8249b8103b9a168b1c693c17f371be39d675dec50120f4d93402", - "network": "Cancun", + "lastblockhash": "917925a8c40111a353a4d27922a1668c9da7ca925c92c8d6109ef9a826c53487", + "network": "Prague", "postState": {}, "pre": {}, "sealEngine": "" diff --git a/eth/tracers/live/testdata/supply_filler.go b/eth/tracers/live/testdata/supply_filler.go index 8a7f21bc1b..22d2e6a6ce 100644 --- a/eth/tracers/live/testdata/supply_filler.go +++ b/eth/tracers/live/testdata/supply_filler.go @@ -120,12 +120,12 @@ func fillSupplyOmittedFields(path string) error { } expected = []supplyInfo{{ Number: 0, - Hash: common.HexToHash("0x52f276d96f0afaaf2c3cb358868bdc2779c4b0cb8de3e7e5302e247c0b66a703"), + Hash: common.HexToHash("0xc02ee8ee5b54a40e43f0fa827d431e1bd4f217e941790dda10b2521d1925a20b"), ParentHash: common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000000"), }, { Number: 1, - Hash: common.HexToHash("0xe430cdf604a88b9d713d4f89fd100ddddf38c1cc6b049e3d5df563c7bfd320fc"), - ParentHash: common.HexToHash("0x52f276d96f0afaaf2c3cb358868bdc2779c4b0cb8de3e7e5302e247c0b66a703"), + Hash: common.HexToHash("0x2aa3c443e44f958a52d9dc13a3748a23094892675bfedb362afbf6068248572b"), + ParentHash: common.HexToHash("0xc02ee8ee5b54a40e43f0fa827d431e1bd4f217e941790dda10b2521d1925a20b"), }} ) gspec.Config.TerminalTotalDifficulty = big.NewInt(0) @@ -289,7 +289,7 @@ func fillSupplyWithdrawals(path string) error { head = chain.CurrentBlock() expected = []supplyInfo{{ Number: 0, - Hash: common.HexToHash("0x52f276d96f0afaaf2c3cb358868bdc2779c4b0cb8de3e7e5302e247c0b66a703"), + Hash: common.HexToHash("0xc02ee8ee5b54a40e43f0fa827d431e1bd4f217e941790dda10b2521d1925a20b"), ParentHash: common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000000"), }, { Issuance: &supplyInfoIssuance{ @@ -459,7 +459,7 @@ func fillSupplySelfdestruct(path string) error { GenesisAlloc: (*hexutil.Big)(new(big.Int).Mul(big.NewInt(2), big.NewInt(params.Ether))), }, Number: 0, - Hash: common.HexToHash("0x16d2bb0b366d3963bf2d8d75cb4b3bc0f233047c948fa746cbd38ac82bf9cfe9"), + Hash: common.HexToHash("0x9e597272c69b46903e5307d7f68a9026070d61e4e504fd2a96e41e4387466728"), ParentHash: common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000000"), }, { Burn: &supplyInfoBurn{ diff --git a/tests/block_test_util.go b/tests/block_test_util.go index 946651264e..f62babddbe 100644 --- a/tests/block_test_util.go +++ b/tests/block_test_util.go @@ -80,9 +80,13 @@ func FromChain(db ethdb.Database, chain *core.BlockChain, post *types.GenesisAll } blocks[i-1] = btBlock } - alloc, err := core.GetGenesisState(db, chain.Genesis().Hash()) - if err != nil { - return bt, fmt.Errorf("failed to get genesis alloc: %v", err) + allocData := rawdb.ReadGenesisStateSpec(db, chain.Genesis().Hash()) + if len(allocData) == 0 { + return bt, fmt.Errorf("alloc data missing") + } + var alloc types.GenesisAlloc + if err := alloc.UnmarshalJSON(allocData); err != nil { + return bt, fmt.Errorf("failed to read genesis alloc: %v", err) } if post == nil { post = &types.GenesisAlloc{}