diff --git a/internal/ethapi/api_test.go b/internal/ethapi/api_test.go index 181ff9634f..6cc8433c18 100644 --- a/internal/ethapi/api_test.go +++ b/internal/ethapi/api_test.go @@ -29,6 +29,10 @@ import ( "testing" "time" + "github.com/holiman/uint256" + "github.com/stretchr/testify/require" + "golang.org/x/exp/slices" + "github.com/scroll-tech/go-ethereum" "github.com/scroll-tech/go-ethereum/accounts" "github.com/scroll-tech/go-ethereum/common" @@ -48,9 +52,6 @@ import ( "github.com/scroll-tech/go-ethereum/internal/blocktest" "github.com/scroll-tech/go-ethereum/params" "github.com/scroll-tech/go-ethereum/rpc" - "github.com/holiman/uint256" - "github.com/stretchr/testify/require" - "golang.org/x/exp/slices" ) func testTransactionMarshal(t *testing.T, tests []txData, config *params.ChainConfig) { @@ -142,8 +143,7 @@ func allTransactionTypes(addr common.Address, config *params.ChainConfig) []txDa "chainId": "0x539", "v": "0xa96", "r": "0xbc85e96592b95f7160825d837abb407f009df9ebe8f1b9158a4b8dd093377f75", - "s": "0x1b55ea3af5574c536967b039ba6999ef6c89cf22fc04bcb296e0e8b0b9b576f5", - "sender":"0x0000000000000000000000000000000000000000" + "s": "0x1b55ea3af5574c536967b039ba6999ef6c89cf22fc04bcb296e0e8b0b9b576f5" }`, }, { Tx: &types.LegacyTx{ @@ -173,8 +173,7 @@ func allTransactionTypes(addr common.Address, config *params.ChainConfig) []txDa "chainId": "0x539", "v": "0xa96", "r": "0x9dc28b267b6ad4e4af6fe9289668f9305c2eb7a3241567860699e478af06835a", - "s": "0xa0b51a071aa9bed2cd70aedea859779dff039e3630ea38497d95202e9b1fec7", - "sender":"0x0000000000000000000000000000000000000000" + "s": "0xa0b51a071aa9bed2cd70aedea859779dff039e3630ea38497d95202e9b1fec7" }`, }, { @@ -189,7 +188,7 @@ func allTransactionTypes(addr common.Address, config *params.ChainConfig) []txDa AccessList: types.AccessList{ types.AccessTuple{ Address: common.Address{0x2}, - StorageKeys: []common.Hash{types.EmptyRootHash}, + StorageKeys: []common.Hash{types.EmptyLegacyTrieRootHash}, }, }, V: big.NewInt(32), @@ -221,8 +220,7 @@ func allTransactionTypes(addr common.Address, config *params.ChainConfig) []txDa "v": "0x0", "r": "0xf372ad499239ae11d91d34c559ffc5dab4daffc0069e03afcabdcdf231a0c16b", "s": "0x28573161d1f9472fa0fd4752533609e72f06414f7ab5588699a7141f65d2abf", - "yParity": "0x0", - "sender":"0x0000000000000000000000000000000000000000" + "yParity": "0x0" }`, }, { Tx: &types.AccessListTx{ @@ -236,7 +234,7 @@ func allTransactionTypes(addr common.Address, config *params.ChainConfig) []txDa AccessList: types.AccessList{ types.AccessTuple{ Address: common.Address{0x2}, - StorageKeys: []common.Hash{types.EmptyRootHash}, + StorageKeys: []common.Hash{types.EmptyLegacyTrieRootHash}, }, }, V: big.NewInt(32), @@ -268,8 +266,7 @@ func allTransactionTypes(addr common.Address, config *params.ChainConfig) []txDa "v": "0x1", "r": "0x542981b5130d4613897fbab144796cb36d3cb3d7807d47d9c7f89ca7745b085c", "s": "0x7425b9dd6c5deaa42e4ede35d0c4570c4624f68c28d812c10d806ffdf86ce63", - "yParity": "0x1", - "sender":"0x0000000000000000000000000000000000000000" + "yParity": "0x1" }`, }, { Tx: &types.DynamicFeeTx{ @@ -284,7 +281,7 @@ func allTransactionTypes(addr common.Address, config *params.ChainConfig) []txDa AccessList: types.AccessList{ types.AccessTuple{ Address: common.Address{0x2}, - StorageKeys: []common.Hash{types.EmptyRootHash}, + StorageKeys: []common.Hash{types.EmptyLegacyTrieRootHash}, }, }, V: big.NewInt(32), @@ -318,8 +315,7 @@ func allTransactionTypes(addr common.Address, config *params.ChainConfig) []txDa "v": "0x1", "r": "0x3b167e05418a8932cd53d7578711fe1a76b9b96c48642402bb94978b7a107e80", "s": "0x22f98a332d15ea2cc80386c1ebaa31b0afebfa79ebc7d039a1e0074418301fef", - "yParity": "0x1", - "sender":"0x0000000000000000000000000000000000000000" + "yParity": "0x1" }`, }, { Tx: &types.DynamicFeeTx{ @@ -356,8 +352,7 @@ func allTransactionTypes(addr common.Address, config *params.ChainConfig) []txDa "v": "0x0", "r": "0x6446b8a682db7e619fc6b4f6d1f708f6a17351a41c7fbd63665f469bc78b41b9", "s": "0x7626abc15834f391a117c63450047309dbf84c5ce3e8e609b607062641e2de43", - "yParity": "0x0", - "sender":"0x0000000000000000000000000000000000000000" + "yParity": "0x0" }`, }, } @@ -403,8 +398,7 @@ func allBlobTxs(addr common.Address, config *params.ChainConfig) []txData { "v": "0x0", "r": "0x618be8908e0e5320f8f3b48042a079fe5a335ebd4ed1422a7d2207cd45d872bc", "s": "0x27b2bc6c80e849a8e8b764d4549d8c2efac3441e73cf37054eb0a9b9f8e89b27", - "yParity": "0x0", - "sender":"0x0000000000000000000000000000000000000000" + "yParity": "0x0" }`, }, } @@ -1038,8 +1032,7 @@ func TestRPCMarshalBlock(t *testing.T) { "v": "0x0", "r": "0x0", "s": "0x0", - "yParity": "0x0", - "sender": "0x0000000000000000000000000000000000000000" + "yParity": "0x0" }, { "blockHash": "0x9b73c83b25d0faf7eab854e3684c7e394336d6e135625aafa5c183f27baa8fee", @@ -1057,8 +1050,7 @@ func TestRPCMarshalBlock(t *testing.T) { "chainId": "0x7fffffffffffffee", "v": "0x0", "r": "0x0", - "s": "0x0", - "sender": "0x0000000000000000000000000000000000000000" + "s": "0x0" }, { "blockHash": "0x9b73c83b25d0faf7eab854e3684c7e394336d6e135625aafa5c183f27baa8fee", @@ -1078,8 +1070,7 @@ func TestRPCMarshalBlock(t *testing.T) { "v": "0x0", "r": "0x0", "s": "0x0", - "yParity": "0x0", - "sender": "0x0000000000000000000000000000000000000000" + "yParity": "0x0" }, { "blockHash": "0x9b73c83b25d0faf7eab854e3684c7e394336d6e135625aafa5c183f27baa8fee", @@ -1097,8 +1088,7 @@ func TestRPCMarshalBlock(t *testing.T) { "chainId": "0x7fffffffffffffee", "v": "0x0", "r": "0x0", - "s": "0x0", - "sender": "0x0000000000000000000000000000000000000000" + "s": "0x0" } ], "transactionsRoot": "0x661a9febcfa8f1890af549b874faf9fa274aede26ef489d9db0b25daa569450e", diff --git a/internal/ethapi/testdata/eth_getBlockByHash-hash-1.json b/internal/ethapi/testdata/eth_getBlockByHash-hash-1.json index 4c2393b90b..0ecc5bedfd 100644 --- a/internal/ethapi/testdata/eth_getBlockByHash-hash-1.json +++ b/internal/ethapi/testdata/eth_getBlockByHash-hash-1.json @@ -1,25 +1,25 @@ { - "baseFeePerGas": "0x342770c0", + "baseFeePerGas": "0x2e71a60", "difficulty": "0x20000", "extraData": "0x", "gasLimit": "0x47e7c4", "gasUsed": "0x5208", - "hash": "0xcc3b85e906fca96a8337bd17a80a0ae26519c77b2a1e47c59911aebc02a801db", + "hash": "0xb5469f2afe2acae0e3d0855bf31399d8da5811e90afaa56b6b08c3fa85611315", "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "miner": "0x0000000000000000000000000000000000000000", "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "nonce": "0x0000000000000000", "number": "0x1", - "parentHash": "0x6df968f862b75ade64e8dbdd7b28f035580feef62939fb9cbc7cc24e821246c5", + "parentHash": "0x7eb1a948dc351182c8d9b9ca04e43148aace8c00f82b14d697077a22846d2f67", "receiptsRoot": "0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2", "sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", "size": "0x26a", - "stateRoot": "0x1cdafb4045e1cf2b93b5eea1b2425998a9be80c4719265dba102c50bbcb6ece4", + "stateRoot": "0x145d1f94f1dcc134266117a2beba8ea39f3e6c25fe09d44f9b7b0c10b5f2c2b2", "timestamp": "0xa", "totalDifficulty": "0x1", "transactions": [ - "0x644a31c354391520d00e95b9affbbb010fc79ac268144ab8e28207f4cf51097e" + "0xb22fd9cdd3f44c55fdce1e0753fade4090a0dfd029d255da88b25141eb58c6e3" ], - "transactionsRoot": "0xca0ebcce920d2cdfbf9e1dbe90ed3441a1a576f344bd80e60508da814916f4e7", + "transactionsRoot": "0x73b35538093858d281f70d71f702b4ee76e2a1dbae53d2fbf4e3c21698f07626", "uncles": [] } \ No newline at end of file diff --git a/internal/ethapi/testdata/eth_getBlockByHash-hash-genesis.json b/internal/ethapi/testdata/eth_getBlockByHash-hash-genesis.json index 6810490348..8bfd8b3a0a 100644 --- a/internal/ethapi/testdata/eth_getBlockByHash-hash-genesis.json +++ b/internal/ethapi/testdata/eth_getBlockByHash-hash-genesis.json @@ -1,10 +1,10 @@ { - "baseFeePerGas": "0x3b9aca00", + "baseFeePerGas": "0x2e71a60", "difficulty": "0x20000", "extraData": "0x", "gasLimit": "0x47e7c4", "gasUsed": "0x0", - "hash": "0x6df968f862b75ade64e8dbdd7b28f035580feef62939fb9cbc7cc24e821246c5", + "hash": "0x7eb1a948dc351182c8d9b9ca04e43148aace8c00f82b14d697077a22846d2f67", "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "miner": "0x0000000000000000000000000000000000000000", "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", @@ -14,7 +14,7 @@ "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", "size": "0x200", - "stateRoot": "0x346d06cdc42cc55d09a235e919de127dde75ba911f8b5d31130935e462e296f0", + "stateRoot": "0x082c8b8684c242b2f13d991533367f52c0024ef49b6e7d15a1a1a3f3faa93227", "timestamp": "0x0", "totalDifficulty": "0x1", "transactions": [], diff --git a/internal/ethapi/testdata/eth_getBlockByHash-hash-latest-1-fullTx.json b/internal/ethapi/testdata/eth_getBlockByHash-hash-latest-1-fullTx.json index 241ca92afe..e4c3225aa0 100644 --- a/internal/ethapi/testdata/eth_getBlockByHash-hash-latest-1-fullTx.json +++ b/internal/ethapi/testdata/eth_getBlockByHash-hash-latest-1-fullTx.json @@ -1,30 +1,30 @@ { - "baseFeePerGas": "0x121a9cca", + "baseFeePerGas": "0x2e71a60", "difficulty": "0x20000", "extraData": "0x", "gasLimit": "0x47e7c4", "gasUsed": "0x5208", - "hash": "0x8497ace989616d5495ab931f644ea6990dddf7148999bde6bb2ab4b4c7240320", + "hash": "0x8e58c69ae16572b785726edbd05bfbda063e9e5bbfefe724eca56a9fa0431731", "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "miner": "0x0000000000000000000000000000000000000000", "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "nonce": "0x0000000000000000", "number": "0x9", - "parentHash": "0x092f6de1438bfcdd6718afa64cf12a13b658cb8a332b730855e3da2885aee687", + "parentHash": "0x34899cddc9e4ef6fe6f57a7cc511d15f80dafd34b8109c4600552f17099628e2", "receiptsRoot": "0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2", "sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", "size": "0x26a", - "stateRoot": "0x1abc7ad1941fa76fd04eaed1a0658384df02b47feb0561890645296e6579bec8", + "stateRoot": "0x11e89e016a9ef9d0ccc1daad969477fa35c7c43cf88a70febc9b3f2222b937c7", "timestamp": "0x5a", "totalDifficulty": "0x1", "transactions": [ { - "blockHash": "0x8497ace989616d5495ab931f644ea6990dddf7148999bde6bb2ab4b4c7240320", + "blockHash": "0x8e58c69ae16572b785726edbd05bfbda063e9e5bbfefe724eca56a9fa0431731", "blockNumber": "0x9", "from": "0x703c4b2bd70c169f5717101caee543299fc946c7", "gas": "0x5208", - "gasPrice": "0x121a9cca", - "hash": "0xecd155a61a5734b3efab75924e3ae34026c7c4133d8c2a46122bd03d7d199725", + "gasPrice": "0x2e71a60", + "hash": "0x5a84375f68021e81d15f3fe65107bfbc064fffba7c60da05aeb9a6724aaec655", "input": "0x", "nonce": "0x8", "to": "0x0d3ab14bbad3d99f4203bd7a11acb94882050e7e", @@ -32,11 +32,10 @@ "value": "0x3e8", "type": "0x0", "v": "0x1b", - "r": "0xc6028b8e983d62fa8542f8a7633fb23cc941be2c897134352d95a7d9b19feafd", - "s": "0xeb6adcaaae3bed489c6cce4435f9db05d23a52820c78bd350e31eec65ed809d", - "sender": "0x0000000000000000000000000000000000000000" + "r": "0xc953c8ecb2eceabda8911f7fac7d0d608857f5409f8b7bf7c75a138de694ceae", + "s": "0x5fc199de62916d0da56fbc7803a45e55578ea74d41051fb910e0268fcb4fe71a" } ], - "transactionsRoot": "0x0767ed8359337dc6a8fdc77fe52db611bed1be87aac73c4556b1bf1dd3d190a5", + "transactionsRoot": "0xde9592b9a3fcb4614c9917b382ef41d54ab0a9af84a82a5d76f703ee5c42bd8d", "uncles": [] } \ No newline at end of file diff --git a/internal/ethapi/testdata/eth_getBlockByHash-hash-latest.json b/internal/ethapi/testdata/eth_getBlockByHash-hash-latest.json index 80442928e5..de397fd68b 100644 --- a/internal/ethapi/testdata/eth_getBlockByHash-hash-latest.json +++ b/internal/ethapi/testdata/eth_getBlockByHash-hash-latest.json @@ -1,25 +1,25 @@ { - "baseFeePerGas": "0xfdc7303", + "baseFeePerGas": "0x2e71a60", "difficulty": "0x20000", "extraData": "0x", "gasLimit": "0x47e7c4", "gasUsed": "0x5208", - "hash": "0x58e8791382f392175cea88e173190ea86e36367acf0f95eb56d2ceb1f650b030", + "hash": "0x091baf62354dd5d9d953d6175c8e263c8ac09cccae6fd10d0184a00bce42c7ee", "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "miner": "0x0000000000000000000000000000000000000000", "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "nonce": "0x0000000000000000", "number": "0xa", - "parentHash": "0x8497ace989616d5495ab931f644ea6990dddf7148999bde6bb2ab4b4c7240320", + "parentHash": "0x8e58c69ae16572b785726edbd05bfbda063e9e5bbfefe724eca56a9fa0431731", "receiptsRoot": "0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2", "sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", "size": "0x26a", - "stateRoot": "0xe7adf5abb2eb6302c2af9b8bd1c309b1d28eda30d2b7ba01b151e48b88bd2163", + "stateRoot": "0x2829985271ffab81ac572dd5207b3f93b716a1b00172b9aa0003a6efbdd2538c", "timestamp": "0x64", "totalDifficulty": "0x1", "transactions": [ - "0x3ee4094ca1e0b07a66dd616a057e081e53144ca7e9685a126fd4dda9ca042644" + "0xf686710609c75e74fe2da8f71c82c28b3613798832a56e9da8743ed77a5894e5" ], - "transactionsRoot": "0xb0893d21a4a44dc26a962a6e91abae66df87fb61ac9c60e936aee89c76331445", + "transactionsRoot": "0x03d794d1a9b8f725ed2029f36aaeb04e9cffdd4725f05075703d55beb28f92a8", "uncles": [] } \ No newline at end of file diff --git a/internal/ethapi/testdata/eth_getBlockByNumber-number-0.json b/internal/ethapi/testdata/eth_getBlockByNumber-number-0.json index 6810490348..8bfd8b3a0a 100644 --- a/internal/ethapi/testdata/eth_getBlockByNumber-number-0.json +++ b/internal/ethapi/testdata/eth_getBlockByNumber-number-0.json @@ -1,10 +1,10 @@ { - "baseFeePerGas": "0x3b9aca00", + "baseFeePerGas": "0x2e71a60", "difficulty": "0x20000", "extraData": "0x", "gasLimit": "0x47e7c4", "gasUsed": "0x0", - "hash": "0x6df968f862b75ade64e8dbdd7b28f035580feef62939fb9cbc7cc24e821246c5", + "hash": "0x7eb1a948dc351182c8d9b9ca04e43148aace8c00f82b14d697077a22846d2f67", "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "miner": "0x0000000000000000000000000000000000000000", "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", @@ -14,7 +14,7 @@ "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", "size": "0x200", - "stateRoot": "0x346d06cdc42cc55d09a235e919de127dde75ba911f8b5d31130935e462e296f0", + "stateRoot": "0x082c8b8684c242b2f13d991533367f52c0024ef49b6e7d15a1a1a3f3faa93227", "timestamp": "0x0", "totalDifficulty": "0x1", "transactions": [], diff --git a/internal/ethapi/testdata/eth_getBlockByNumber-number-1.json b/internal/ethapi/testdata/eth_getBlockByNumber-number-1.json index 4c2393b90b..0ecc5bedfd 100644 --- a/internal/ethapi/testdata/eth_getBlockByNumber-number-1.json +++ b/internal/ethapi/testdata/eth_getBlockByNumber-number-1.json @@ -1,25 +1,25 @@ { - "baseFeePerGas": "0x342770c0", + "baseFeePerGas": "0x2e71a60", "difficulty": "0x20000", "extraData": "0x", "gasLimit": "0x47e7c4", "gasUsed": "0x5208", - "hash": "0xcc3b85e906fca96a8337bd17a80a0ae26519c77b2a1e47c59911aebc02a801db", + "hash": "0xb5469f2afe2acae0e3d0855bf31399d8da5811e90afaa56b6b08c3fa85611315", "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "miner": "0x0000000000000000000000000000000000000000", "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "nonce": "0x0000000000000000", "number": "0x1", - "parentHash": "0x6df968f862b75ade64e8dbdd7b28f035580feef62939fb9cbc7cc24e821246c5", + "parentHash": "0x7eb1a948dc351182c8d9b9ca04e43148aace8c00f82b14d697077a22846d2f67", "receiptsRoot": "0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2", "sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", "size": "0x26a", - "stateRoot": "0x1cdafb4045e1cf2b93b5eea1b2425998a9be80c4719265dba102c50bbcb6ece4", + "stateRoot": "0x145d1f94f1dcc134266117a2beba8ea39f3e6c25fe09d44f9b7b0c10b5f2c2b2", "timestamp": "0xa", "totalDifficulty": "0x1", "transactions": [ - "0x644a31c354391520d00e95b9affbbb010fc79ac268144ab8e28207f4cf51097e" + "0xb22fd9cdd3f44c55fdce1e0753fade4090a0dfd029d255da88b25141eb58c6e3" ], - "transactionsRoot": "0xca0ebcce920d2cdfbf9e1dbe90ed3441a1a576f344bd80e60508da814916f4e7", + "transactionsRoot": "0x73b35538093858d281f70d71f702b4ee76e2a1dbae53d2fbf4e3c21698f07626", "uncles": [] } \ No newline at end of file diff --git a/internal/ethapi/testdata/eth_getBlockByNumber-number-latest-1.json b/internal/ethapi/testdata/eth_getBlockByNumber-number-latest-1.json index 241ca92afe..e4c3225aa0 100644 --- a/internal/ethapi/testdata/eth_getBlockByNumber-number-latest-1.json +++ b/internal/ethapi/testdata/eth_getBlockByNumber-number-latest-1.json @@ -1,30 +1,30 @@ { - "baseFeePerGas": "0x121a9cca", + "baseFeePerGas": "0x2e71a60", "difficulty": "0x20000", "extraData": "0x", "gasLimit": "0x47e7c4", "gasUsed": "0x5208", - "hash": "0x8497ace989616d5495ab931f644ea6990dddf7148999bde6bb2ab4b4c7240320", + "hash": "0x8e58c69ae16572b785726edbd05bfbda063e9e5bbfefe724eca56a9fa0431731", "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "miner": "0x0000000000000000000000000000000000000000", "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "nonce": "0x0000000000000000", "number": "0x9", - "parentHash": "0x092f6de1438bfcdd6718afa64cf12a13b658cb8a332b730855e3da2885aee687", + "parentHash": "0x34899cddc9e4ef6fe6f57a7cc511d15f80dafd34b8109c4600552f17099628e2", "receiptsRoot": "0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2", "sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", "size": "0x26a", - "stateRoot": "0x1abc7ad1941fa76fd04eaed1a0658384df02b47feb0561890645296e6579bec8", + "stateRoot": "0x11e89e016a9ef9d0ccc1daad969477fa35c7c43cf88a70febc9b3f2222b937c7", "timestamp": "0x5a", "totalDifficulty": "0x1", "transactions": [ { - "blockHash": "0x8497ace989616d5495ab931f644ea6990dddf7148999bde6bb2ab4b4c7240320", + "blockHash": "0x8e58c69ae16572b785726edbd05bfbda063e9e5bbfefe724eca56a9fa0431731", "blockNumber": "0x9", "from": "0x703c4b2bd70c169f5717101caee543299fc946c7", "gas": "0x5208", - "gasPrice": "0x121a9cca", - "hash": "0xecd155a61a5734b3efab75924e3ae34026c7c4133d8c2a46122bd03d7d199725", + "gasPrice": "0x2e71a60", + "hash": "0x5a84375f68021e81d15f3fe65107bfbc064fffba7c60da05aeb9a6724aaec655", "input": "0x", "nonce": "0x8", "to": "0x0d3ab14bbad3d99f4203bd7a11acb94882050e7e", @@ -32,11 +32,10 @@ "value": "0x3e8", "type": "0x0", "v": "0x1b", - "r": "0xc6028b8e983d62fa8542f8a7633fb23cc941be2c897134352d95a7d9b19feafd", - "s": "0xeb6adcaaae3bed489c6cce4435f9db05d23a52820c78bd350e31eec65ed809d", - "sender": "0x0000000000000000000000000000000000000000" + "r": "0xc953c8ecb2eceabda8911f7fac7d0d608857f5409f8b7bf7c75a138de694ceae", + "s": "0x5fc199de62916d0da56fbc7803a45e55578ea74d41051fb910e0268fcb4fe71a" } ], - "transactionsRoot": "0x0767ed8359337dc6a8fdc77fe52db611bed1be87aac73c4556b1bf1dd3d190a5", + "transactionsRoot": "0xde9592b9a3fcb4614c9917b382ef41d54ab0a9af84a82a5d76f703ee5c42bd8d", "uncles": [] } \ No newline at end of file diff --git a/internal/ethapi/testdata/eth_getBlockByNumber-tag-latest.json b/internal/ethapi/testdata/eth_getBlockByNumber-tag-latest.json index 80442928e5..de397fd68b 100644 --- a/internal/ethapi/testdata/eth_getBlockByNumber-tag-latest.json +++ b/internal/ethapi/testdata/eth_getBlockByNumber-tag-latest.json @@ -1,25 +1,25 @@ { - "baseFeePerGas": "0xfdc7303", + "baseFeePerGas": "0x2e71a60", "difficulty": "0x20000", "extraData": "0x", "gasLimit": "0x47e7c4", "gasUsed": "0x5208", - "hash": "0x58e8791382f392175cea88e173190ea86e36367acf0f95eb56d2ceb1f650b030", + "hash": "0x091baf62354dd5d9d953d6175c8e263c8ac09cccae6fd10d0184a00bce42c7ee", "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "miner": "0x0000000000000000000000000000000000000000", "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "nonce": "0x0000000000000000", "number": "0xa", - "parentHash": "0x8497ace989616d5495ab931f644ea6990dddf7148999bde6bb2ab4b4c7240320", + "parentHash": "0x8e58c69ae16572b785726edbd05bfbda063e9e5bbfefe724eca56a9fa0431731", "receiptsRoot": "0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2", "sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", "size": "0x26a", - "stateRoot": "0xe7adf5abb2eb6302c2af9b8bd1c309b1d28eda30d2b7ba01b151e48b88bd2163", + "stateRoot": "0x2829985271ffab81ac572dd5207b3f93b716a1b00172b9aa0003a6efbdd2538c", "timestamp": "0x64", "totalDifficulty": "0x1", "transactions": [ - "0x3ee4094ca1e0b07a66dd616a057e081e53144ca7e9685a126fd4dda9ca042644" + "0xf686710609c75e74fe2da8f71c82c28b3613798832a56e9da8743ed77a5894e5" ], - "transactionsRoot": "0xb0893d21a4a44dc26a962a6e91abae66df87fb61ac9c60e936aee89c76331445", + "transactionsRoot": "0x03d794d1a9b8f725ed2029f36aaeb04e9cffdd4725f05075703d55beb28f92a8", "uncles": [] } \ No newline at end of file diff --git a/internal/ethapi/testdata/eth_getBlockByNumber-tag-pending-fullTx.json b/internal/ethapi/testdata/eth_getBlockByNumber-tag-pending-fullTx.json index b42900f0d9..1d524d6ece 100644 --- a/internal/ethapi/testdata/eth_getBlockByNumber-tag-pending-fullTx.json +++ b/internal/ethapi/testdata/eth_getBlockByNumber-tag-pending-fullTx.json @@ -33,8 +33,7 @@ "chainId": "0x7fffffffffffffee", "v": "0x0", "r": "0x0", - "s": "0x0", - "sender": "0x0000000000000000000000000000000000000000" + "s": "0x0" } ], "transactionsRoot": "0x98d9f6dd0aa479c0fb448f2627e9f1964aca699fccab8f6e95861547a4699e37", diff --git a/internal/ethapi/testdata/eth_getBlockReceipts-block-with-blob-tx.json b/internal/ethapi/testdata/eth_getBlockReceipts-block-with-blob-tx.json index 28eaac9d50..5a7516df0e 100644 --- a/internal/ethapi/testdata/eth_getBlockReceipts-block-with-blob-tx.json +++ b/internal/ethapi/testdata/eth_getBlockReceipts-block-with-blob-tx.json @@ -2,11 +2,11 @@ { "blobGasPrice": "0x1", "blobGasUsed": "0x20000", - "blockHash": "0xb39a867bef2962b3e7af21d9a8a8c018c1de5c27be56341261857e24b96b263e", + "blockHash": "0x6a6489630bae7c5d3131293d198bab4caa455fde8560791eeaafc6d0c8491034", "blockNumber": "0x6", "contractAddress": null, "cumulativeGasUsed": "0x5208", - "effectiveGasPrice": "0x1b09d63b", + "effectiveGasPrice": "0x2e71a61", "from": "0x703c4b2bd70c169f5717101caee543299fc946c7", "gasUsed": "0x5208", "l1Fee": "0x0", @@ -14,7 +14,7 @@ "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "status": "0x1", "to": "0x0d3ab14bbad3d99f4203bd7a11acb94882050e7e", - "transactionHash": "0xb51ee3d2a89ba5d5623c73133c8d7a6ba9fb41194c17f4302c21b30994a1180f", + "transactionHash": "0xaae2f17039f2caff6587de71cca9372aea24b8f946c1685de5d61bb077b8355c", "transactionIndex": "0x0", "type": "0x3" } diff --git a/internal/ethapi/testdata/eth_getBlockReceipts-block-with-contract-create-tx.json b/internal/ethapi/testdata/eth_getBlockReceipts-block-with-contract-create-tx.json index 2e32d35ecd..6c245322f1 100644 --- a/internal/ethapi/testdata/eth_getBlockReceipts-block-with-contract-create-tx.json +++ b/internal/ethapi/testdata/eth_getBlockReceipts-block-with-contract-create-tx.json @@ -1,10 +1,10 @@ [ { - "blockHash": "0x7afe7ea18e15ea1bf0b10ae924e42a8e01023c4b1f3c8058c45723a1e56b8868", + "blockHash": "0x98419f15cbbc420d2f3991def137c5354b83a851a4744a045dda57f2203a49a6", "blockNumber": "0x2", "contractAddress": "0xae9bea628c4ce503dcfd7e305cab4e29e7476592", "cumulativeGasUsed": "0xcf50", - "effectiveGasPrice": "0x2db16291", + "effectiveGasPrice": "0x2e71a60", "from": "0x703c4b2bd70c169f5717101caee543299fc946c7", "gasUsed": "0xcf50", "l1Fee": "0x0", @@ -12,7 +12,7 @@ "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "status": "0x1", "to": null, - "transactionHash": "0x340e58cda5086495010b571fe25067fecc9954dc4ee3cedece00691fa3f5904a", + "transactionHash": "0x4129e783e25f6a342cc9da14975b00b07de846015a372b185ba3fc4a306fc248", "transactionIndex": "0x0", "type": "0x0" } diff --git a/internal/ethapi/testdata/eth_getBlockReceipts-block-with-dynamic-fee-tx.json b/internal/ethapi/testdata/eth_getBlockReceipts-block-with-dynamic-fee-tx.json index 5317535703..0013ace9fe 100644 --- a/internal/ethapi/testdata/eth_getBlockReceipts-block-with-dynamic-fee-tx.json +++ b/internal/ethapi/testdata/eth_getBlockReceipts-block-with-dynamic-fee-tx.json @@ -1,10 +1,10 @@ [ { - "blockHash": "0xb2d0c9e52757eee01da7c6a6da6de23a4548c036c97f4f113c5e05d9daf17e1a", + "blockHash": "0x702cbcd24c900c74f547400c23ad262d10315873334359c5bc9e1c2fc8a8b564", "blockNumber": "0x4", "contractAddress": null, "cumulativeGasUsed": "0x538d", - "effectiveGasPrice": "0x2325c42f", + "effectiveGasPrice": "0x2e71c54", "from": "0x703c4b2bd70c169f5717101caee543299fc946c7", "gasUsed": "0x538d", "l1Fee": "0x0", @@ -12,7 +12,7 @@ "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "status": "0x0", "to": "0x0000000000000000000000000000000000031ec7", - "transactionHash": "0xdcde2574628c9d7dff22b9afa19f235959a924ceec65a9df903a517ae91f5c84", + "transactionHash": "0x0506942e3f9292d04ad09714e061cabe0eddb9a9d7dc3e8d4204a23e6653b229", "transactionIndex": "0x0", "type": "0x2" } diff --git a/internal/ethapi/testdata/eth_getBlockReceipts-block-with-legacy-contract-call-tx.json b/internal/ethapi/testdata/eth_getBlockReceipts-block-with-legacy-contract-call-tx.json index a163d72ead..7362f36269 100644 --- a/internal/ethapi/testdata/eth_getBlockReceipts-block-with-legacy-contract-call-tx.json +++ b/internal/ethapi/testdata/eth_getBlockReceipts-block-with-legacy-contract-call-tx.json @@ -1,10 +1,10 @@ [ { - "blockHash": "0xd62e01634cdf11c2b2a854453deccbc7b5b4f6df1c717b932ade30f47db68512", + "blockHash": "0x51d22a0817803e48db1b61d28ff0e72f14d8d37a008e212faf30561337ca4df2", "blockNumber": "0x3", "contractAddress": null, "cumulativeGasUsed": "0x5e28", - "effectiveGasPrice": "0x281c2585", + "effectiveGasPrice": "0x2e71a60", "from": "0x703c4b2bd70c169f5717101caee543299fc946c7", "gasUsed": "0x5e28", "l1Fee": "0x0", @@ -18,9 +18,9 @@ ], "data": "0x000000000000000000000000000000000000000000000000000000000000000d", "blockNumber": "0x3", - "transactionHash": "0xeaf3921cbf03ba45bad4e6ab807b196ce3b2a0b5bacc355b6272fa96b11b4287", + "transactionHash": "0xf5da6ee7aff86897a57c59eb87b9655cad58f16187c8205099831bf6a2c83539", "transactionIndex": "0x0", - "blockHash": "0xd62e01634cdf11c2b2a854453deccbc7b5b4f6df1c717b932ade30f47db68512", + "blockHash": "0x51d22a0817803e48db1b61d28ff0e72f14d8d37a008e212faf30561337ca4df2", "logIndex": "0x0", "removed": false } @@ -28,7 +28,7 @@ "logsBloom": "0x00000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000800000000000000008000000000000000000000000000000000020000000080000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000400000000002000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000", "status": "0x1", "to": "0x0000000000000000000000000000000000031ec7", - "transactionHash": "0xeaf3921cbf03ba45bad4e6ab807b196ce3b2a0b5bacc355b6272fa96b11b4287", + "transactionHash": "0xf5da6ee7aff86897a57c59eb87b9655cad58f16187c8205099831bf6a2c83539", "transactionIndex": "0x0", "type": "0x0" } diff --git a/internal/ethapi/testdata/eth_getBlockReceipts-block-with-legacy-transfer-tx.json b/internal/ethapi/testdata/eth_getBlockReceipts-block-with-legacy-transfer-tx.json index 379aa958d6..ae76c2cc40 100644 --- a/internal/ethapi/testdata/eth_getBlockReceipts-block-with-legacy-transfer-tx.json +++ b/internal/ethapi/testdata/eth_getBlockReceipts-block-with-legacy-transfer-tx.json @@ -1,10 +1,10 @@ [ { - "blockHash": "0x34044cfcfe129574966dc82cee6ec504c869d50ec2bd4a16eb330b04a277bcab", + "blockHash": "0x78d7694102439fb4cf00ac7d2e7e0e040de3184cb7d294e61e4aea80a39941f1", "blockNumber": "0x1", "contractAddress": null, "cumulativeGasUsed": "0x5208", - "effectiveGasPrice": "0x342770c0", + "effectiveGasPrice": "0x2e71a60", "from": "0x703c4b2bd70c169f5717101caee543299fc946c7", "gasUsed": "0x5208", "l1Fee": "0x0", @@ -12,7 +12,7 @@ "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "status": "0x1", "to": "0x0d3ab14bbad3d99f4203bd7a11acb94882050e7e", - "transactionHash": "0x644a31c354391520d00e95b9affbbb010fc79ac268144ab8e28207f4cf51097e", + "transactionHash": "0xb22fd9cdd3f44c55fdce1e0753fade4090a0dfd029d255da88b25141eb58c6e3", "transactionIndex": "0x0", "type": "0x0" } diff --git a/internal/ethapi/testdata/eth_getBlockReceipts-tag-latest.json b/internal/ethapi/testdata/eth_getBlockReceipts-tag-latest.json index 28eaac9d50..5a7516df0e 100644 --- a/internal/ethapi/testdata/eth_getBlockReceipts-tag-latest.json +++ b/internal/ethapi/testdata/eth_getBlockReceipts-tag-latest.json @@ -2,11 +2,11 @@ { "blobGasPrice": "0x1", "blobGasUsed": "0x20000", - "blockHash": "0xb39a867bef2962b3e7af21d9a8a8c018c1de5c27be56341261857e24b96b263e", + "blockHash": "0x6a6489630bae7c5d3131293d198bab4caa455fde8560791eeaafc6d0c8491034", "blockNumber": "0x6", "contractAddress": null, "cumulativeGasUsed": "0x5208", - "effectiveGasPrice": "0x1b09d63b", + "effectiveGasPrice": "0x2e71a61", "from": "0x703c4b2bd70c169f5717101caee543299fc946c7", "gasUsed": "0x5208", "l1Fee": "0x0", @@ -14,7 +14,7 @@ "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "status": "0x1", "to": "0x0d3ab14bbad3d99f4203bd7a11acb94882050e7e", - "transactionHash": "0xb51ee3d2a89ba5d5623c73133c8d7a6ba9fb41194c17f4302c21b30994a1180f", + "transactionHash": "0xaae2f17039f2caff6587de71cca9372aea24b8f946c1685de5d61bb077b8355c", "transactionIndex": "0x0", "type": "0x3" } diff --git a/internal/ethapi/testdata/eth_getHeaderByHash-hash-0.json b/internal/ethapi/testdata/eth_getHeaderByHash-hash-0.json index 1a5b1c6588..f593235579 100644 --- a/internal/ethapi/testdata/eth_getHeaderByHash-hash-0.json +++ b/internal/ethapi/testdata/eth_getHeaderByHash-hash-0.json @@ -1,10 +1,10 @@ { - "baseFeePerGas": "0x3b9aca00", + "baseFeePerGas": "0x2e71a60", "difficulty": "0x20000", "extraData": "0x", "gasLimit": "0x47e7c4", "gasUsed": "0x0", - "hash": "0x6df968f862b75ade64e8dbdd7b28f035580feef62939fb9cbc7cc24e821246c5", + "hash": "0x7eb1a948dc351182c8d9b9ca04e43148aace8c00f82b14d697077a22846d2f67", "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "miner": "0x0000000000000000000000000000000000000000", "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", @@ -13,7 +13,7 @@ "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", - "stateRoot": "0x346d06cdc42cc55d09a235e919de127dde75ba911f8b5d31130935e462e296f0", + "stateRoot": "0x082c8b8684c242b2f13d991533367f52c0024ef49b6e7d15a1a1a3f3faa93227", "timestamp": "0x0", "totalDifficulty": "0x1", "transactionsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421" diff --git a/internal/ethapi/testdata/eth_getHeaderByHash-hash-1.json b/internal/ethapi/testdata/eth_getHeaderByHash-hash-1.json index 7144cc2c29..b225315ee2 100644 --- a/internal/ethapi/testdata/eth_getHeaderByHash-hash-1.json +++ b/internal/ethapi/testdata/eth_getHeaderByHash-hash-1.json @@ -1,20 +1,20 @@ { - "baseFeePerGas": "0x342770c0", + "baseFeePerGas": "0x2e71a60", "difficulty": "0x20000", "extraData": "0x", "gasLimit": "0x47e7c4", "gasUsed": "0x5208", - "hash": "0xcc3b85e906fca96a8337bd17a80a0ae26519c77b2a1e47c59911aebc02a801db", + "hash": "0xb5469f2afe2acae0e3d0855bf31399d8da5811e90afaa56b6b08c3fa85611315", "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "miner": "0x0000000000000000000000000000000000000000", "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "nonce": "0x0000000000000000", "number": "0x1", - "parentHash": "0x6df968f862b75ade64e8dbdd7b28f035580feef62939fb9cbc7cc24e821246c5", + "parentHash": "0x7eb1a948dc351182c8d9b9ca04e43148aace8c00f82b14d697077a22846d2f67", "receiptsRoot": "0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2", "sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", - "stateRoot": "0x1cdafb4045e1cf2b93b5eea1b2425998a9be80c4719265dba102c50bbcb6ece4", + "stateRoot": "0x145d1f94f1dcc134266117a2beba8ea39f3e6c25fe09d44f9b7b0c10b5f2c2b2", "timestamp": "0xa", "totalDifficulty": "0x1", - "transactionsRoot": "0xca0ebcce920d2cdfbf9e1dbe90ed3441a1a576f344bd80e60508da814916f4e7" + "transactionsRoot": "0x73b35538093858d281f70d71f702b4ee76e2a1dbae53d2fbf4e3c21698f07626" } \ No newline at end of file diff --git a/internal/ethapi/testdata/eth_getHeaderByHash-hash-latest-1.json b/internal/ethapi/testdata/eth_getHeaderByHash-hash-latest-1.json index 68b3a0850b..825ab4a819 100644 --- a/internal/ethapi/testdata/eth_getHeaderByHash-hash-latest-1.json +++ b/internal/ethapi/testdata/eth_getHeaderByHash-hash-latest-1.json @@ -1,20 +1,20 @@ { - "baseFeePerGas": "0x121a9cca", + "baseFeePerGas": "0x2e71a60", "difficulty": "0x20000", "extraData": "0x", "gasLimit": "0x47e7c4", "gasUsed": "0x5208", - "hash": "0x8497ace989616d5495ab931f644ea6990dddf7148999bde6bb2ab4b4c7240320", + "hash": "0x8e58c69ae16572b785726edbd05bfbda063e9e5bbfefe724eca56a9fa0431731", "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "miner": "0x0000000000000000000000000000000000000000", "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "nonce": "0x0000000000000000", "number": "0x9", - "parentHash": "0x092f6de1438bfcdd6718afa64cf12a13b658cb8a332b730855e3da2885aee687", + "parentHash": "0x34899cddc9e4ef6fe6f57a7cc511d15f80dafd34b8109c4600552f17099628e2", "receiptsRoot": "0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2", "sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", - "stateRoot": "0x1abc7ad1941fa76fd04eaed1a0658384df02b47feb0561890645296e6579bec8", + "stateRoot": "0x11e89e016a9ef9d0ccc1daad969477fa35c7c43cf88a70febc9b3f2222b937c7", "timestamp": "0x5a", "totalDifficulty": "0x1", - "transactionsRoot": "0x0767ed8359337dc6a8fdc77fe52db611bed1be87aac73c4556b1bf1dd3d190a5" + "transactionsRoot": "0xde9592b9a3fcb4614c9917b382ef41d54ab0a9af84a82a5d76f703ee5c42bd8d" } \ No newline at end of file diff --git a/internal/ethapi/testdata/eth_getHeaderByHash-hash-latest.json b/internal/ethapi/testdata/eth_getHeaderByHash-hash-latest.json index cce8d31465..67c1322ba0 100644 --- a/internal/ethapi/testdata/eth_getHeaderByHash-hash-latest.json +++ b/internal/ethapi/testdata/eth_getHeaderByHash-hash-latest.json @@ -1,20 +1,20 @@ { - "baseFeePerGas": "0xfdc7303", + "baseFeePerGas": "0x2e71a60", "difficulty": "0x20000", "extraData": "0x", "gasLimit": "0x47e7c4", "gasUsed": "0x5208", - "hash": "0x58e8791382f392175cea88e173190ea86e36367acf0f95eb56d2ceb1f650b030", + "hash": "0x091baf62354dd5d9d953d6175c8e263c8ac09cccae6fd10d0184a00bce42c7ee", "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "miner": "0x0000000000000000000000000000000000000000", "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "nonce": "0x0000000000000000", "number": "0xa", - "parentHash": "0x8497ace989616d5495ab931f644ea6990dddf7148999bde6bb2ab4b4c7240320", + "parentHash": "0x8e58c69ae16572b785726edbd05bfbda063e9e5bbfefe724eca56a9fa0431731", "receiptsRoot": "0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2", "sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", - "stateRoot": "0xe7adf5abb2eb6302c2af9b8bd1c309b1d28eda30d2b7ba01b151e48b88bd2163", + "stateRoot": "0x2829985271ffab81ac572dd5207b3f93b716a1b00172b9aa0003a6efbdd2538c", "timestamp": "0x64", "totalDifficulty": "0x1", - "transactionsRoot": "0xb0893d21a4a44dc26a962a6e91abae66df87fb61ac9c60e936aee89c76331445" + "transactionsRoot": "0x03d794d1a9b8f725ed2029f36aaeb04e9cffdd4725f05075703d55beb28f92a8" } \ No newline at end of file diff --git a/internal/ethapi/testdata/eth_getHeaderByNumber-number-0.json b/internal/ethapi/testdata/eth_getHeaderByNumber-number-0.json index 1a5b1c6588..f593235579 100644 --- a/internal/ethapi/testdata/eth_getHeaderByNumber-number-0.json +++ b/internal/ethapi/testdata/eth_getHeaderByNumber-number-0.json @@ -1,10 +1,10 @@ { - "baseFeePerGas": "0x3b9aca00", + "baseFeePerGas": "0x2e71a60", "difficulty": "0x20000", "extraData": "0x", "gasLimit": "0x47e7c4", "gasUsed": "0x0", - "hash": "0x6df968f862b75ade64e8dbdd7b28f035580feef62939fb9cbc7cc24e821246c5", + "hash": "0x7eb1a948dc351182c8d9b9ca04e43148aace8c00f82b14d697077a22846d2f67", "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "miner": "0x0000000000000000000000000000000000000000", "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", @@ -13,7 +13,7 @@ "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", - "stateRoot": "0x346d06cdc42cc55d09a235e919de127dde75ba911f8b5d31130935e462e296f0", + "stateRoot": "0x082c8b8684c242b2f13d991533367f52c0024ef49b6e7d15a1a1a3f3faa93227", "timestamp": "0x0", "totalDifficulty": "0x1", "transactionsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421" diff --git a/internal/ethapi/testdata/eth_getHeaderByNumber-number-1.json b/internal/ethapi/testdata/eth_getHeaderByNumber-number-1.json index 7144cc2c29..b225315ee2 100644 --- a/internal/ethapi/testdata/eth_getHeaderByNumber-number-1.json +++ b/internal/ethapi/testdata/eth_getHeaderByNumber-number-1.json @@ -1,20 +1,20 @@ { - "baseFeePerGas": "0x342770c0", + "baseFeePerGas": "0x2e71a60", "difficulty": "0x20000", "extraData": "0x", "gasLimit": "0x47e7c4", "gasUsed": "0x5208", - "hash": "0xcc3b85e906fca96a8337bd17a80a0ae26519c77b2a1e47c59911aebc02a801db", + "hash": "0xb5469f2afe2acae0e3d0855bf31399d8da5811e90afaa56b6b08c3fa85611315", "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "miner": "0x0000000000000000000000000000000000000000", "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "nonce": "0x0000000000000000", "number": "0x1", - "parentHash": "0x6df968f862b75ade64e8dbdd7b28f035580feef62939fb9cbc7cc24e821246c5", + "parentHash": "0x7eb1a948dc351182c8d9b9ca04e43148aace8c00f82b14d697077a22846d2f67", "receiptsRoot": "0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2", "sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", - "stateRoot": "0x1cdafb4045e1cf2b93b5eea1b2425998a9be80c4719265dba102c50bbcb6ece4", + "stateRoot": "0x145d1f94f1dcc134266117a2beba8ea39f3e6c25fe09d44f9b7b0c10b5f2c2b2", "timestamp": "0xa", "totalDifficulty": "0x1", - "transactionsRoot": "0xca0ebcce920d2cdfbf9e1dbe90ed3441a1a576f344bd80e60508da814916f4e7" + "transactionsRoot": "0x73b35538093858d281f70d71f702b4ee76e2a1dbae53d2fbf4e3c21698f07626" } \ No newline at end of file diff --git a/internal/ethapi/testdata/eth_getHeaderByNumber-number-latest-1.json b/internal/ethapi/testdata/eth_getHeaderByNumber-number-latest-1.json index 68b3a0850b..825ab4a819 100644 --- a/internal/ethapi/testdata/eth_getHeaderByNumber-number-latest-1.json +++ b/internal/ethapi/testdata/eth_getHeaderByNumber-number-latest-1.json @@ -1,20 +1,20 @@ { - "baseFeePerGas": "0x121a9cca", + "baseFeePerGas": "0x2e71a60", "difficulty": "0x20000", "extraData": "0x", "gasLimit": "0x47e7c4", "gasUsed": "0x5208", - "hash": "0x8497ace989616d5495ab931f644ea6990dddf7148999bde6bb2ab4b4c7240320", + "hash": "0x8e58c69ae16572b785726edbd05bfbda063e9e5bbfefe724eca56a9fa0431731", "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "miner": "0x0000000000000000000000000000000000000000", "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "nonce": "0x0000000000000000", "number": "0x9", - "parentHash": "0x092f6de1438bfcdd6718afa64cf12a13b658cb8a332b730855e3da2885aee687", + "parentHash": "0x34899cddc9e4ef6fe6f57a7cc511d15f80dafd34b8109c4600552f17099628e2", "receiptsRoot": "0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2", "sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", - "stateRoot": "0x1abc7ad1941fa76fd04eaed1a0658384df02b47feb0561890645296e6579bec8", + "stateRoot": "0x11e89e016a9ef9d0ccc1daad969477fa35c7c43cf88a70febc9b3f2222b937c7", "timestamp": "0x5a", "totalDifficulty": "0x1", - "transactionsRoot": "0x0767ed8359337dc6a8fdc77fe52db611bed1be87aac73c4556b1bf1dd3d190a5" + "transactionsRoot": "0xde9592b9a3fcb4614c9917b382ef41d54ab0a9af84a82a5d76f703ee5c42bd8d" } \ No newline at end of file diff --git a/internal/ethapi/testdata/eth_getHeaderByNumber-tag-latest.json b/internal/ethapi/testdata/eth_getHeaderByNumber-tag-latest.json index cce8d31465..67c1322ba0 100644 --- a/internal/ethapi/testdata/eth_getHeaderByNumber-tag-latest.json +++ b/internal/ethapi/testdata/eth_getHeaderByNumber-tag-latest.json @@ -1,20 +1,20 @@ { - "baseFeePerGas": "0xfdc7303", + "baseFeePerGas": "0x2e71a60", "difficulty": "0x20000", "extraData": "0x", "gasLimit": "0x47e7c4", "gasUsed": "0x5208", - "hash": "0x58e8791382f392175cea88e173190ea86e36367acf0f95eb56d2ceb1f650b030", + "hash": "0x091baf62354dd5d9d953d6175c8e263c8ac09cccae6fd10d0184a00bce42c7ee", "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "miner": "0x0000000000000000000000000000000000000000", "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "nonce": "0x0000000000000000", "number": "0xa", - "parentHash": "0x8497ace989616d5495ab931f644ea6990dddf7148999bde6bb2ab4b4c7240320", + "parentHash": "0x8e58c69ae16572b785726edbd05bfbda063e9e5bbfefe724eca56a9fa0431731", "receiptsRoot": "0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2", "sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", - "stateRoot": "0xe7adf5abb2eb6302c2af9b8bd1c309b1d28eda30d2b7ba01b151e48b88bd2163", + "stateRoot": "0x2829985271ffab81ac572dd5207b3f93b716a1b00172b9aa0003a6efbdd2538c", "timestamp": "0x64", "totalDifficulty": "0x1", - "transactionsRoot": "0xb0893d21a4a44dc26a962a6e91abae66df87fb61ac9c60e936aee89c76331445" + "transactionsRoot": "0x03d794d1a9b8f725ed2029f36aaeb04e9cffdd4725f05075703d55beb28f92a8" } \ No newline at end of file diff --git a/internal/ethapi/testdata/eth_getTransactionReceipt-blob-tx.json b/internal/ethapi/testdata/eth_getTransactionReceipt-blob-tx.json index 77e39d5544..9152165891 100644 --- a/internal/ethapi/testdata/eth_getTransactionReceipt-blob-tx.json +++ b/internal/ethapi/testdata/eth_getTransactionReceipt-blob-tx.json @@ -1,11 +1,11 @@ { "blobGasPrice": "0x1", "blobGasUsed": "0x20000", - "blockHash": "0xb39a867bef2962b3e7af21d9a8a8c018c1de5c27be56341261857e24b96b263e", + "blockHash": "0x6a6489630bae7c5d3131293d198bab4caa455fde8560791eeaafc6d0c8491034", "blockNumber": "0x6", "contractAddress": null, "cumulativeGasUsed": "0x5208", - "effectiveGasPrice": "0x1b09d63b", + "effectiveGasPrice": "0x2e71a61", "from": "0x703c4b2bd70c169f5717101caee543299fc946c7", "gasUsed": "0x5208", "l1Fee": "0x0", @@ -13,7 +13,7 @@ "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "status": "0x1", "to": "0x0d3ab14bbad3d99f4203bd7a11acb94882050e7e", - "transactionHash": "0xb51ee3d2a89ba5d5623c73133c8d7a6ba9fb41194c17f4302c21b30994a1180f", + "transactionHash": "0xaae2f17039f2caff6587de71cca9372aea24b8f946c1685de5d61bb077b8355c", "transactionIndex": "0x0", "type": "0x3" } \ No newline at end of file diff --git a/internal/ethapi/testdata/eth_getTransactionReceipt-create-contract-tx.json b/internal/ethapi/testdata/eth_getTransactionReceipt-create-contract-tx.json index 1476a3450b..f1cb126dc9 100644 --- a/internal/ethapi/testdata/eth_getTransactionReceipt-create-contract-tx.json +++ b/internal/ethapi/testdata/eth_getTransactionReceipt-create-contract-tx.json @@ -1,9 +1,9 @@ { - "blockHash": "0x7afe7ea18e15ea1bf0b10ae924e42a8e01023c4b1f3c8058c45723a1e56b8868", + "blockHash": "0x98419f15cbbc420d2f3991def137c5354b83a851a4744a045dda57f2203a49a6", "blockNumber": "0x2", "contractAddress": "0xae9bea628c4ce503dcfd7e305cab4e29e7476592", "cumulativeGasUsed": "0xcf50", - "effectiveGasPrice": "0x2db16291", + "effectiveGasPrice": "0x2e71a60", "from": "0x703c4b2bd70c169f5717101caee543299fc946c7", "gasUsed": "0xcf50", "l1Fee": "0x0", @@ -11,7 +11,7 @@ "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "status": "0x1", "to": null, - "transactionHash": "0x340e58cda5086495010b571fe25067fecc9954dc4ee3cedece00691fa3f5904a", + "transactionHash": "0x4129e783e25f6a342cc9da14975b00b07de846015a372b185ba3fc4a306fc248", "transactionIndex": "0x0", "type": "0x0" } \ No newline at end of file diff --git a/internal/ethapi/testdata/eth_getTransactionReceipt-create-contract-with-access-list.json b/internal/ethapi/testdata/eth_getTransactionReceipt-create-contract-with-access-list.json index a8bdbc2e4a..e90b61c30b 100644 --- a/internal/ethapi/testdata/eth_getTransactionReceipt-create-contract-with-access-list.json +++ b/internal/ethapi/testdata/eth_getTransactionReceipt-create-contract-with-access-list.json @@ -1,9 +1,9 @@ { - "blockHash": "0xe1081b33b1e59d80de12700f8c123589b06d5629762a27d31919315e25265c9c", + "blockHash": "0xe56e92ed2e75a55bc67fdf942e4a3881bab280d0e81d59d583bc7ae7ab8589e6", "blockNumber": "0x5", "contractAddress": "0xfdaa97661a584d977b4d3abb5370766ff5b86a18", "cumulativeGasUsed": "0xe01c", - "effectiveGasPrice": "0x1ecb3fb4", + "effectiveGasPrice": "0x2e71a60", "from": "0x703c4b2bd70c169f5717101caee543299fc946c7", "gasUsed": "0xe01c", "l1Fee": "0x0", @@ -11,7 +11,7 @@ "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "status": "0x1", "to": null, - "transactionHash": "0xb5a1148819cfdfff9bfe70035524fec940eb735d89b76960b97751d01ae2a9f2", + "transactionHash": "0xf07702821910a020d8a6e9d185f4fb628c21aff7a2e0237a5a79e053737cc8bb", "transactionIndex": "0x0", "type": "0x1" } \ No newline at end of file diff --git a/internal/ethapi/testdata/eth_getTransactionReceipt-dynamic-tx-with-logs.json b/internal/ethapi/testdata/eth_getTransactionReceipt-dynamic-tx-with-logs.json index 602b4aa2b8..0331a403d3 100644 --- a/internal/ethapi/testdata/eth_getTransactionReceipt-dynamic-tx-with-logs.json +++ b/internal/ethapi/testdata/eth_getTransactionReceipt-dynamic-tx-with-logs.json @@ -1,9 +1,9 @@ { - "blockHash": "0xb2d0c9e52757eee01da7c6a6da6de23a4548c036c97f4f113c5e05d9daf17e1a", + "blockHash": "0x702cbcd24c900c74f547400c23ad262d10315873334359c5bc9e1c2fc8a8b564", "blockNumber": "0x4", "contractAddress": null, "cumulativeGasUsed": "0x538d", - "effectiveGasPrice": "0x2325c42f", + "effectiveGasPrice": "0x2e71c54", "from": "0x703c4b2bd70c169f5717101caee543299fc946c7", "gasUsed": "0x538d", "l1Fee": "0x0", @@ -11,7 +11,7 @@ "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "status": "0x0", "to": "0x0000000000000000000000000000000000031ec7", - "transactionHash": "0xdcde2574628c9d7dff22b9afa19f235959a924ceec65a9df903a517ae91f5c84", + "transactionHash": "0x0506942e3f9292d04ad09714e061cabe0eddb9a9d7dc3e8d4204a23e6653b229", "transactionIndex": "0x0", "type": "0x2" } \ No newline at end of file diff --git a/internal/ethapi/testdata/eth_getTransactionReceipt-normal-transfer-tx.json b/internal/ethapi/testdata/eth_getTransactionReceipt-normal-transfer-tx.json index 65a0661e00..1e843f26b8 100644 --- a/internal/ethapi/testdata/eth_getTransactionReceipt-normal-transfer-tx.json +++ b/internal/ethapi/testdata/eth_getTransactionReceipt-normal-transfer-tx.json @@ -1,9 +1,9 @@ { - "blockHash": "0x34044cfcfe129574966dc82cee6ec504c869d50ec2bd4a16eb330b04a277bcab", + "blockHash": "0x78d7694102439fb4cf00ac7d2e7e0e040de3184cb7d294e61e4aea80a39941f1", "blockNumber": "0x1", "contractAddress": null, "cumulativeGasUsed": "0x5208", - "effectiveGasPrice": "0x342770c0", + "effectiveGasPrice": "0x2e71a60", "from": "0x703c4b2bd70c169f5717101caee543299fc946c7", "gasUsed": "0x5208", "l1Fee": "0x0", @@ -11,7 +11,7 @@ "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "status": "0x1", "to": "0x0d3ab14bbad3d99f4203bd7a11acb94882050e7e", - "transactionHash": "0x644a31c354391520d00e95b9affbbb010fc79ac268144ab8e28207f4cf51097e", + "transactionHash": "0xb22fd9cdd3f44c55fdce1e0753fade4090a0dfd029d255da88b25141eb58c6e3", "transactionIndex": "0x0", "type": "0x0" } \ No newline at end of file diff --git a/internal/ethapi/testdata/eth_getTransactionReceipt-with-logs.json b/internal/ethapi/testdata/eth_getTransactionReceipt-with-logs.json index a5ab278da4..2d0a3f4707 100644 --- a/internal/ethapi/testdata/eth_getTransactionReceipt-with-logs.json +++ b/internal/ethapi/testdata/eth_getTransactionReceipt-with-logs.json @@ -1,9 +1,9 @@ { - "blockHash": "0xd62e01634cdf11c2b2a854453deccbc7b5b4f6df1c717b932ade30f47db68512", + "blockHash": "0x51d22a0817803e48db1b61d28ff0e72f14d8d37a008e212faf30561337ca4df2", "blockNumber": "0x3", "contractAddress": null, "cumulativeGasUsed": "0x5e28", - "effectiveGasPrice": "0x281c2585", + "effectiveGasPrice": "0x2e71a60", "from": "0x703c4b2bd70c169f5717101caee543299fc946c7", "gasUsed": "0x5e28", "l1Fee": "0x0", @@ -17,9 +17,9 @@ ], "data": "0x000000000000000000000000000000000000000000000000000000000000000d", "blockNumber": "0x3", - "transactionHash": "0xeaf3921cbf03ba45bad4e6ab807b196ce3b2a0b5bacc355b6272fa96b11b4287", + "transactionHash": "0xf5da6ee7aff86897a57c59eb87b9655cad58f16187c8205099831bf6a2c83539", "transactionIndex": "0x0", - "blockHash": "0xd62e01634cdf11c2b2a854453deccbc7b5b4f6df1c717b932ade30f47db68512", + "blockHash": "0x51d22a0817803e48db1b61d28ff0e72f14d8d37a008e212faf30561337ca4df2", "logIndex": "0x0", "removed": false } @@ -27,7 +27,7 @@ "logsBloom": "0x00000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000800000000000000008000000000000000000000000000000000020000000080000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000400000000002000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000", "status": "0x1", "to": "0x0000000000000000000000000000000000031ec7", - "transactionHash": "0xeaf3921cbf03ba45bad4e6ab807b196ce3b2a0b5bacc355b6272fa96b11b4287", + "transactionHash": "0xf5da6ee7aff86897a57c59eb87b9655cad58f16187c8205099831bf6a2c83539", "transactionIndex": "0x0", "type": "0x0" } \ No newline at end of file diff --git a/internal/ethapi/transaction_args_test.go b/internal/ethapi/transaction_args_test.go index 2c9974b89a..23247e10b0 100644 --- a/internal/ethapi/transaction_args_test.go +++ b/internal/ethapi/transaction_args_test.go @@ -138,14 +138,14 @@ func TestSetFeeDefaults(t *testing.T) { false, &TransactionArgs{MaxFeePerGas: maxFee}, nil, - errors.New("maxFeePerGas and maxPriorityFeePerGas are not valid before London is active"), + errors.New("maxFeePerGas and maxPriorityFeePerGas are not valid before Curie is active"), }, { "dynamic fee tx pre-London, priorityFee set", false, &TransactionArgs{MaxPriorityFeePerGas: fortytwo}, nil, - errors.New("maxFeePerGas and maxPriorityFeePerGas are not valid before London is active"), + errors.New("maxFeePerGas and maxPriorityFeePerGas are not valid before Curie is active"), }, { "dynamic fee tx, maxFee < priorityFee", @@ -229,6 +229,18 @@ func newBackendMock() *backendMock { BerlinBlock: big.NewInt(0), LondonBlock: big.NewInt(1000), } + config.ArchimedesBlock = config.LondonBlock + config.BernoulliBlock = config.LondonBlock + config.CurieBlock = config.LondonBlock + config.ShanghaiTime = nil + config.DarwinTime = nil + if config.LondonBlock != nil { + shanghaiTime := config.LondonBlock.Uint64() * 12 + config.ShanghaiTime = &shanghaiTime + darwinTime := config.LondonBlock.Uint64() * 12 + config.DarwinTime = &darwinTime + } + return &backendMock{ current: &types.Header{ Difficulty: big.NewInt(10000000000),