fix basefee in wt tests

ethereum · Jan 8, 2023 · 42cf6c4 · 42cf6c4
1 parent 5f77d13
commit 42cf6c4
Show file tree

Hide file tree

Showing 13 changed files with 81 additions and 81 deletions.
diff --git a/BlockchainTests/EIPTests/bc4895-withdrawals/amountIs0.json b/BlockchainTests/EIPTests/bc4895-withdrawals/amountIs0.json
@@ -3,8 +3,8 @@
         "_info" : {
             "comment" : "Test vectors BSHB0017",
             "filling-rpc-server" : "evm version 1.11.0-unstable-f7ab681b-20221221",
-            "filling-tool-version" : "retesteth-0.2.3-postmerge+commit.83939f74.Linux.g++",
-            "generatedTestHash" : "5418e80b7d10fa37a9be0d8d1ec8623bcbe5779a15979db61ff69b9ce6d9d6e1",
+            "filling-tool-version" : "retesteth-0.2.3-postmerge+commit.dcaa4066.Linux.g++",
+            "generatedTestHash" : "dfabc22c4db90b69736304ef3fe40d8bbd3a6c10fbcd99a35946c3e09fad4030",
             "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
             "solidity" : "Version: 0.8.5+commit.a4f2e591.Linux.g++",
             "source" : "src/BlockchainTestsFiller/EIPTests/bc4895-withdrawals/amountIs0Filler.json",
@@ -13,14 +13,14 @@
         "blocks" : [
             {
                 "blockHeader" : {
-                    "baseFeePerGas" : "0x0a",
+                    "baseFeePerGas" : "0x09",
                     "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                     "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x00",
                     "extraData" : "0x42",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x00",
-                    "hash" : "0x3bef9350f7c730c8f9e5697785149c4a939494848e26e0d4e516aff2f1fee9f9",
+                    "hash" : "0x8f3ab3485569f2bbab3015ea25a3217093d46ad8627407b1f22915aa9fbecb7b",
                     "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
@@ -34,7 +34,7 @@
                 },
                 "blocknumber" : "1",
                 "chainname" : "default",
-                "rlp" : "0xf90238f90219a0151934ad9b654c50197f37018ee5ee9bb922dec0a1b5e24a6d679cb111cdb107a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0046119afb1ab36aaa8f66088677ed96cd62762f6d3e65642898e189fbe702d51a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008001887fffffffffffffff8082079e42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b4218800000000000000000aa048a703da164234812273ea083e4ec3d09d028300cd325b46a6a75402e5a7ab95c0c0d9d8808094c94f5374fce5edbc8e2a8697c15331677e6ebf0b80",
+                "rlp" : "0xf90238f90219a0151934ad9b654c50197f37018ee5ee9bb922dec0a1b5e24a6d679cb111cdb107a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0046119afb1ab36aaa8f66088677ed96cd62762f6d3e65642898e189fbe702d51a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008001887fffffffffffffff8082079e42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b42188000000000000000009a048a703da164234812273ea083e4ec3d09d028300cd325b46a6a75402e5a7ab95c0c0d9d8808094c94f5374fce5edbc8e2a8697c15331677e6ebf0b80",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -70,7 +70,7 @@
             "withdrawalsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
         },
         "genesisRLP" : "0xf9021ff90219a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0046119afb1ab36aaa8f66088677ed96cd62762f6d3e65642898e189fbe702d51a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b4218800000000000000000aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421c0c0c0",
-        "lastblockhash" : "0x3bef9350f7c730c8f9e5697785149c4a939494848e26e0d4e516aff2f1fee9f9",
+        "lastblockhash" : "0x8f3ab3485569f2bbab3015ea25a3217093d46ad8627407b1f22915aa9fbecb7b",
         "network" : "Shanghai",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {

diff --git a/BlockchainTests/EIPTests/bc4895-withdrawals/amountIs0TouchAccount.json b/BlockchainTests/EIPTests/bc4895-withdrawals/amountIs0TouchAccount.json
@@ -3,8 +3,8 @@
         "_info" : {
             "comment" : "Test vectors BSHB0017",
             "filling-rpc-server" : "evm version 1.11.0-unstable-f7ab681b-20221221",
-            "filling-tool-version" : "retesteth-0.2.3-postmerge+commit.83939f74.Linux.g++",
-            "generatedTestHash" : "fb48af5c5f547bc5ecb19d27197f54d36a6e494357d35cebfc32e557822aad67",
+            "filling-tool-version" : "retesteth-0.2.3-postmerge+commit.dcaa4066.Linux.g++",
+            "generatedTestHash" : "30e1734e584f882ffb813356b2972a52a2d19efc600c9bbac4fb8b94cc98e07c",
             "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
             "solidity" : "Version: 0.8.5+commit.a4f2e591.Linux.g++",
             "source" : "src/BlockchainTestsFiller/EIPTests/bc4895-withdrawals/amountIs0TouchAccountFiller.json",
@@ -13,14 +13,14 @@
         "blocks" : [
             {
                 "blockHeader" : {
-                    "baseFeePerGas" : "0x0a",
+                    "baseFeePerGas" : "0x09",
                     "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                     "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x00",
                     "extraData" : "0x42",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x00",
-                    "hash" : "0xffe907212499b2a8f13fc73749224f914830763765e09607587b40ece08e41ed",
+                    "hash" : "0x1d03b6adf02f3c78dcd1f8a164eab82d39af920791bb8d23d367a7f5a2a2d1c8",
                     "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
@@ -34,7 +34,7 @@
                 },
                 "blocknumber" : "1",
                 "chainname" : "default",
-                "rlp" : "0xf90238f90219a0dfe96ee1b0225b92710f44fa8d5aceb68e3cef0238fe432b35f160ad12e4060ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0046119afb1ab36aaa8f66088677ed96cd62762f6d3e65642898e189fbe702d51a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008001887fffffffffffffff8082079e42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b4218800000000000000000aa048a703da164234812273ea083e4ec3d09d028300cd325b46a6a75402e5a7ab95c0c0d9d8808094c94f5374fce5edbc8e2a8697c15331677e6ebf0b80",
+                "rlp" : "0xf90238f90219a0dfe96ee1b0225b92710f44fa8d5aceb68e3cef0238fe432b35f160ad12e4060ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0046119afb1ab36aaa8f66088677ed96cd62762f6d3e65642898e189fbe702d51a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008001887fffffffffffffff8082079e42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b42188000000000000000009a048a703da164234812273ea083e4ec3d09d028300cd325b46a6a75402e5a7ab95c0c0d9d8808094c94f5374fce5edbc8e2a8697c15331677e6ebf0b80",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -70,7 +70,7 @@
             "withdrawalsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
         },
         "genesisRLP" : "0xf9021ff90219a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa071c4b6550ed66adf23e0253c5edfa40059a57f6b5f30ad25fec72bb4a63ccb9ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b4218800000000000000000aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421c0c0c0",
-        "lastblockhash" : "0xffe907212499b2a8f13fc73749224f914830763765e09607587b40ece08e41ed",
+        "lastblockhash" : "0x1d03b6adf02f3c78dcd1f8a164eab82d39af920791bb8d23d367a7f5a2a2d1c8",
         "network" : "Shanghai",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {

diff --git a/BlockchainTests/EIPTests/bc4895-withdrawals/amountIs0TouchAccountAndTransaction.json b/BlockchainTests/EIPTests/bc4895-withdrawals/amountIs0TouchAccountAndTransaction.json
@@ -3,8 +3,8 @@
         "_info" : {
             "comment" : "Test vectors BSHB0018",
             "filling-rpc-server" : "evm version 1.11.0-unstable-f7ab681b-20221221",
-            "filling-tool-version" : "retesteth-0.2.3-postmerge+commit.83939f74.Linux.g++",
-            "generatedTestHash" : "c48b576b4fc14d60da85a5d5f8196db514d65306fdb0b8f548910c738b9a69d6",
+            "filling-tool-version" : "retesteth-0.2.3-postmerge+commit.dcaa4066.Linux.g++",
+            "generatedTestHash" : "7f80c6b1890ae8e6fcdf71ac54401bde17a48eeff436b95d76815816f928599b",
             "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
             "solidity" : "Version: 0.8.5+commit.a4f2e591.Linux.g++",
             "source" : "src/BlockchainTestsFiller/EIPTests/bc4895-withdrawals/amountIs0TouchAccountAndTransactionFiller.json",
@@ -13,14 +13,14 @@
         "blocks" : [
             {
                 "blockHeader" : {
-                    "baseFeePerGas" : "0x0a",
+                    "baseFeePerGas" : "0x09",
                     "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                     "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x00",
                     "extraData" : "0x42",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5208",
-                    "hash" : "0xab918b221574c25f240f69d4e5d827f385448a7bb0dfc3a56286661f902c8ce4",
+                    "hash" : "0x96065915e0469c782ab24e82affb20ae67d61be6b7b8d390692cb2d67c70dcdf",
                     "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
@@ -34,7 +34,7 @@
                 },
                 "blocknumber" : "1",
                 "chainname" : "default",
-                "rlp" : "0xf9029df9021ba0dfe96ee1b0225b92710f44fa8d5aceb68e3cef0238fe432b35f160ad12e4060ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08fad40d2c27f51e29f5b90797afb797c066c3a6a9dc016861d99e8a4150490b2a0f1b606143e252d52c1c5cbf50f6e2cdb22d6283bf9c98015d68f76b8a2e3b9b9a0056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008001887fffffffffffffff82520882079e42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b4218800000000000000000aa048a703da164234812273ea083e4ec3d09d028300cd325b46a6a75402e5a7ab95f862f860802883061a8094c94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba05563cab9784e2a314a28e522e0ccb7a01d8bfc6b129205090976b4ae34e5b6b5a01b839079d995a57469928c87265f8aa0bc65d4ddee6df57437789a9cf66a2f80c0d9d8808094c94f5374fce5edbc8e2a8697c15331677e6ebf0b80",
+                "rlp" : "0xf9029df9021ba0dfe96ee1b0225b92710f44fa8d5aceb68e3cef0238fe432b35f160ad12e4060ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08fad40d2c27f51e29f5b90797afb797c066c3a6a9dc016861d99e8a4150490b2a0f1b606143e252d52c1c5cbf50f6e2cdb22d6283bf9c98015d68f76b8a2e3b9b9a0056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008001887fffffffffffffff82520882079e42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b42188000000000000000009a048a703da164234812273ea083e4ec3d09d028300cd325b46a6a75402e5a7ab95f862f860802883061a8094c94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba05563cab9784e2a314a28e522e0ccb7a01d8bfc6b129205090976b4ae34e5b6b5a01b839079d995a57469928c87265f8aa0bc65d4ddee6df57437789a9cf66a2f80c0d9d8808094c94f5374fce5edbc8e2a8697c15331677e6ebf0b80",
                 "transactions" : [
                     {
                         "data" : "0x",
@@ -82,7 +82,7 @@
             "withdrawalsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
         },
         "genesisRLP" : "0xf9021ff90219a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa071c4b6550ed66adf23e0253c5edfa40059a57f6b5f30ad25fec72bb4a63ccb9ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b4218800000000000000000aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421c0c0c0",
-        "lastblockhash" : "0xab918b221574c25f240f69d4e5d827f385448a7bb0dfc3a56286661f902c8ce4",
+        "lastblockhash" : "0x96065915e0469c782ab24e82affb20ae67d61be6b7b8d390692cb2d67c70dcdf",
         "network" : "Shanghai",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {