fix withdrawals exception check

ethereum · Jun 22, 2023 · 8b2e229 · 8b2e229
1 parent fda25d5
commit 8b2e229
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 22 deletions.
diff --git a/BlockchainTests/InvalidBlocks/bc4895-withdrawals/withdrawalsAddressBounds.json b/BlockchainTests/InvalidBlocks/bc4895-withdrawals/withdrawalsAddressBounds.json
@@ -2,13 +2,13 @@
     "withdrawalsAddressBounds_Shanghai" : {
         "_info" : {
             "comment" : "Test vectors BSHB0007, BSHB0008, BSHB0009",
-            "filling-rpc-server" : "evm version 1.11.7-unstable-8f373227-20230427",
-            "filling-tool-version" : "retesteth-0.3.1-shanghai+commit.d344e7fb.Linux.g++",
-            "generatedTestHash" : "f96d7045ec7db5e1c3fe0af88b52fb2663b2b7d4af698a3af4055c6f9f56b9fc",
-            "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
+            "filling-rpc-server" : "evm version 1.12.1-unstable-8c288b52-20230620",
+            "filling-tool-version" : "retesteth-0.3.1-shanghai+commit.e53a43f2.Linux.g++",
+            "generatedTestHash" : "5de85cbc44fdb5f0fa4938d383e7023f649592837b45d518cec01fb5921b49fa",
+            "lllcversion" : "Version: 0.5.14-develop.2023.5.21+commit.a096d7a9.mod.Linux.g++",
             "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++",
             "source" : "src/BlockchainTestsFiller/InvalidBlocks/bc4895-withdrawals/withdrawalsAddressBoundsFiller.json",
-            "sourceHash" : "eba5eaea435a804332e115e5472c30b087a02a381d5e712c836f203855d7c5dd"
+            "sourceHash" : "eec1da8669e4b981a50c5d1d44712e32abe2fc957911687de31c0b0b9b5cd534"
         },
         "blocks" : [
             {
@@ -51,21 +51,21 @@
             {
                 "blocknumber" : "2",
                 "chainname" : "default",
-                "expectException" : "INPUT_UNMARSHAL_SIZE_ERROR",
+                "expectException" : "INPUT_UNMARSHAL_ADDRESS_ERROR",
                 "hasBigInt" : "true",
                 "rlp" : "0xf90239f90219a064b42c196d08783db3721e3da14073bfe54a75fd5d128d9d0884066550502e11a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c064e9b6bceb66861d53004fd9cb742623a20499ca8f4058a945f281d7b08fd0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008002887fffffffffffffff80820b8642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b42188000000000000000008a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421c0c0dad98080934f5374fce5edbc8e2a8697c15331677e6ebf0b822710"
             },
             {
                 "blocknumber" : "2",
                 "chainname" : "default",
-                "expectException" : "INPUT_UNMARSHAL_SIZE_ERROR",
+                "expectException" : "INPUT_UNMARSHAL_ADDRESS_ERROR",
                 "hasBigInt" : "true",
                 "rlp" : "0xf9023bf90219a064b42c196d08783db3721e3da14073bfe54a75fd5d128d9d0884066550502e11a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c064e9b6bceb66861d53004fd9cb742623a20499ca8f4058a945f281d7b08fd0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008002887fffffffffffffff80820b8642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b42188000000000000000008a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421c0c0dcdb80809500c94f5374fce5edbc8e2a8697c15331677e6ebf0b822710"
             },
             {
                 "blocknumber" : "2",
                 "chainname" : "default",
-                "expectException" : "INPUT_UNMARSHAL_SIZE_ERROR",
+                "expectException" : "INPUT_UNMARSHAL_ADDRESS_ERROR",
                 "hasBigInt" : "true",
                 "rlp" : "0xf9024cf90219a064b42c196d08783db3721e3da14073bfe54a75fd5d128d9d0884066550502e11a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c064e9b6bceb66861d53004fd9cb742623a20499ca8f4058a945f281d7b08fd0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008002887fffffffffffffff80820b8642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b42188000000000000000008a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421c0c0edec8080a656e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421112233445566822710"
             }

diff --git a/BlockchainTests/InvalidBlocks/bc4895-withdrawals/withdrawalsAmountBounds.json b/BlockchainTests/InvalidBlocks/bc4895-withdrawals/withdrawalsAmountBounds.json
@@ -2,13 +2,13 @@
     "withdrawalsAmountBounds_Shanghai" : {
         "_info" : {
             "comment" : "Test vectors BSHB0010, BSHB0011",
-            "filling-rpc-server" : "evm version 1.11.7-unstable-8f373227-20230427",
-            "filling-tool-version" : "retesteth-0.3.1-shanghai+commit.d344e7fb.Linux.g++",
-            "generatedTestHash" : "fa420729bf55bd8290c2502098377300a4ef12b6189f268651a5ded5a5ac1c2b",
-            "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
+            "filling-rpc-server" : "evm version 1.12.1-unstable-8c288b52-20230620",
+            "filling-tool-version" : "retesteth-0.3.1-shanghai+commit.e53a43f2.Linux.g++",
+            "generatedTestHash" : "aebb2ed48cae84d54877839d4193e25438e7a687ac1fcb2e701970a96f0d3e4d",
+            "lllcversion" : "Version: 0.5.14-develop.2023.5.21+commit.a096d7a9.mod.Linux.g++",
             "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++",
             "source" : "src/BlockchainTestsFiller/InvalidBlocks/bc4895-withdrawals/withdrawalsAmountBoundsFiller.json",
-            "sourceHash" : "9baf0148087e8a0cf462b696a7b403e842cec1ad5971983cc27bf1d5f5521758"
+            "sourceHash" : "f4be4077e77713d4871147709f0f26c2679dac6c1ba5bd1fbc67c3772e6652b8"
         },
         "blocks" : [
             {
@@ -51,20 +51,20 @@
             {
                 "blocknumber" : "2",
                 "chainname" : "default",
-                "expectException" : "INPUT_UNMARSHAL_SIZE_ERROR",
+                "expectException" : "INPUT_UNMARSHAL_ERROR",
                 "hasBigInt" : "true",
                 "rlp" : "0xf9025ef90219a08f3ab3485569f2bbab3015ea25a3217093d46ad8627407b1f22915aa9fbecb7ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0046119afb1ab36aaa8f66088677ed96cd62762f6d3e65642898e189fbe702d51a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008002887fffffffffffffff80820b8642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b42188000000000000000008a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421c0c0f83ef83c808094c94f5374fce5edbc8e2a8697c15331677e6ebf0ba456e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b42111223344"
             },
             {
                 "blocknumber" : "2",
                 "chainname" : "default",
-                "expectException" : "INPUT_UNMARSHAL_SIZE_ERROR",
+                "expectException" : "INPUT_UNMARSHAL_ERROR",
                 "rlp" : "0xf9024cf90219a08f3ab3485569f2bbab3015ea25a3217093d46ad8627407b1f22915aa9fbecb7ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0046119afb1ab36aaa8f66088677ed96cd62762f6d3e65642898e189fbe702d51a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008002887fffffffffffffff80820b8642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b42188000000000000000008a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421c0c0edec808094c94f5374fce5edbc8e2a8697c15331677e6ebf0b94c94f5374fce5edbc8e2a8697c15331677e6ebf0b"
             },
             {
                 "blocknumber" : "2",
                 "chainname" : "default",
-                "expectException" : "INPUT_UNMARSHAL_SIZE_ERROR",
+                "expectException" : "INPUT_UNMARSHAL_ERROR",
                 "rlp" : "0xf90241f90219a08f3ab3485569f2bbab3015ea25a3217093d46ad8627407b1f22915aa9fbecb7ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0046119afb1ab36aaa8f66088677ed96cd62762f6d3e65642898e189fbe702d51a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008002887fffffffffffffff80820b8642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b42188000000000000000008a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421c0c0e2e1808094c94f5374fce5edbc8e2a8697c15331677e6ebf0b89010000000000000000"
             },
             {

diff --git a/...lockchainTestsFiller/InvalidBlocks/bc4895-withdrawals/withdrawalsAddressBoundsFiller.json b/...lockchainTestsFiller/InvalidBlocks/bc4895-withdrawals/withdrawalsAddressBoundsFiller.json
@@ -54,7 +54,7 @@
                     "number" : "2"
                 },
                 "expectException" : {
-                    ">=Shanghai" : "INPUT_UNMARSHAL_SIZE_ERROR"
+                    ">=Shanghai" : "INPUT_UNMARSHAL_ADDRESS_ERROR"
                 },
                 "transactions" : [],
                 "uncleHeaders" : [],
@@ -75,7 +75,7 @@
                     "number" : "2"
                 },
                 "expectException" : {
-                    ">=Shanghai" : "INPUT_UNMARSHAL_SIZE_ERROR"
+                    ">=Shanghai" : "INPUT_UNMARSHAL_ADDRESS_ERROR"
                 },
                 "transactions" : [],
                 "uncleHeaders" : [],
@@ -96,7 +96,7 @@
                     "number" : "2"
                 },
                 "expectException" : {
-                    ">=Shanghai" : "INPUT_UNMARSHAL_SIZE_ERROR"
+                    ">=Shanghai" : "INPUT_UNMARSHAL_ADDRESS_ERROR"
                 },
                 "transactions" : [],
                 "uncleHeaders" : [],

diff --git a/...BlockchainTestsFiller/InvalidBlocks/bc4895-withdrawals/withdrawalsAmountBoundsFiller.json b/...BlockchainTestsFiller/InvalidBlocks/bc4895-withdrawals/withdrawalsAmountBoundsFiller.json
@@ -54,7 +54,7 @@
                     "number" : "2"
                 },
                 "expectException" : {
-                    ">=Shanghai" : "INPUT_UNMARSHAL_SIZE_ERROR"
+                    ">=Shanghai" : "INPUT_UNMARSHAL_ERROR"
                 },
                 "transactions" : [],
                 "uncleHeaders" : [],
@@ -75,7 +75,7 @@
                     "number" : "2"
                 },
                 "expectException" : {
-                    ">=Shanghai" : "INPUT_UNMARSHAL_SIZE_ERROR"
+                    ">=Shanghai" : "INPUT_UNMARSHAL_ERROR"
                 },
                 "transactions" : [],
                 "uncleHeaders" : [],
@@ -96,7 +96,7 @@
                     "number" : "2"
                 },
                 "expectException" : {
-                    ">=Shanghai" : "INPUT_UNMARSHAL_SIZE_ERROR"
+                    ">=Shanghai" : "INPUT_UNMARSHAL_ERROR"
                 },
                 "transactions" : [],
                 "uncleHeaders" : [],