Added transaction exceptions

ethereum · Jun 5, 2021 · fa0ab11 · fa0ab11
1 parent 36e0c2c
commit fa0ab11
Show file tree

Hide file tree

Showing 8 changed files with 285 additions and 37 deletions.
diff --git a/BlockchainTests/ValidBlocks/bcEIP1559/baseFee.json b/BlockchainTests/ValidBlocks/bcEIP1559/baseFee.json
@@ -2,11 +2,11 @@
     "baseFee_London" : {
         "_info" : {
             "comment" : "",
-            "filling-rpc-server" : "evm version 1.10.4-unstable-2cde4726-20210531",
-            "filling-tool-version" : "retesteth-0.1.1-eip1559+commit.7e1bde54.Linux.g++",
-            "lllcversion" : "Version: 0.5.14-develop.2021.5.31+commit.401d5358.Linux.g++",
+            "filling-rpc-server" : "evm version 1.10.4-unstable-950d99c2-20210602",
+            "filling-tool-version" : "retesteth-0.1.1-eip1559+commit.49f91fa6.Linux.g++",
+            "lllcversion" : "Version: 0.5.14-develop.2021.6.5+commit.401d5358.Linux.g++",
             "source" : "src/BlockchainTestsFiller/ValidBlocks/bcEIP1559/baseFeeFiller.yml",
-            "sourceHash" : "ebccd29da1ea151bb84af8777d1bcabe6c133aba0ff864c2d9c2fdf6f2eb2b95"
+            "sourceHash" : "cd707b850e9bd8f11d112d72a6dbc210ab243f990d5c972ea1e05a710a32c270"
         },
         "sealEngine" : "NoProof",
         "network" : "London",
@@ -269,6 +269,25 @@
                         ]
                     }
                 ],
+                "transactionSequence" : [
+                    {
+                        "rawBytes" : "0x02f86b01058203e88203e885e8d4a5100094cccccccccccccccccccccccccccccccccccccccc80820301c001a008d743ccaa2c67d085065924d301b748c9a3f89917e4941fd55ce891c789e1bea0191746ac2a588583a530c99c21b3b53ee4a8e2b93fbe064d4fce966e1766a54c",
+                        "valid" : "true"
+                    },
+                    {
+                        "rawBytes" : "0x02f86c0106830186a08203e885e8d4a5100094cccccccccccccccccccccccccccccccccccccccd80820302c001a044f337ee2f6e119ce72aefea96bad8321b823f6055a313b5896734a29808060ba056c0a10807b80372dde88a5a0d17f8659790022ff2a512492be7f20bcec9ebe1",
+                        "valid" : "false",
+                        "exception" : "TR_TipGtFeeCap"
+                    },
+                    {
+                        "rawBytes" : "0x02f8690106648203e885e8d4a5100094ccccccccccccccccccccccccccccccccccccccce80820303c001a04ae1b4044c435390aec763fbb9d0c0e30818e28d9d1a9b61ec702b55c66306a6a04f1dca655bd6535ece671d61fa7aa126978afbd133f70f373a113bbe724b4e5b",
+                        "valid" : "true"
+                    },
+                    {
+                        "rawBytes" : "0x02f86d0107830186a0830186a085e8d4a5100094cccccccccccccccccccccccccccccccccccccccd80820304c080a01046a4e77b2a8dd37621b58a22c77eee94229055e2223a02c2c6cbaf4701a621a03fbd58196ea621480a4e6c9fb1f53d3ec4e012147ed451ecdc5aca265b04f728",
+                        "valid" : "true"
+                    }
+                ],
                 "rlp" : "0xf90357f90200a0bbecb467eba51fc662a8b137b8b7d7a1168a8f7fd2f2d02a91399802db71f8f0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794ba5e000000000000000000000000000000000000a0408868a823524770e3df45d376f97e475a29193bf1deca8e9137c7dfe793d54aa07e5e956c853fbbe684694ce61cd77cdf12c992b20489bb145271ab297e6e2583a0f42d43454db7c51eadf004bd9e43522c4894f02c602b709cd45e67597c622f2eb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000388016345785d8a000083053c42820f6e42a0000000000000000000000000000000000000000000000000000000000000000088000000000000000082029ff90150b86e02f86b01058203e88203e885e8d4a5100094cccccccccccccccccccccccccccccccccccccccc80820301c001a008d743ccaa2c67d085065924d301b748c9a3f89917e4941fd55ce891c789e1bea0191746ac2a588583a530c99c21b3b53ee4a8e2b93fbe064d4fce966e1766a54cb86c02f8690106648203e885e8d4a5100094ccccccccccccccccccccccccccccccccccccccce80820303c001a04ae1b4044c435390aec763fbb9d0c0e30818e28d9d1a9b61ec702b55c66306a6a04f1dca655bd6535ece671d61fa7aa126978afbd133f70f373a113bbe724b4e5bb87002f86d0107830186a0830186a085e8d4a5100094cccccccccccccccccccccccccccccccccccccccd80820304c080a01046a4e77b2a8dd37621b58a22c77eee94229055e2223a02c2c6cbaf4701a621a03fbd58196ea621480a4e6c9fb1f53d3ec4e012147ed451ecdc5aca265b04f728c0"
             },
             {
@@ -345,6 +364,25 @@
                         ]
                     }
                 ],
+                "transactionSequence" : [
+                    {
+                        "rawBytes" : "0x02f86b01088203e88203e885e8d4a5100094cccccccccccccccccccccccccccccccccccccccc80820401c080a0aacf4ad2118e809a8d309a87bff3bb92db49d6cfde2180912d24d2f72156539fa06268e000640f73eb6ce702e237e612ca3c7c8ed4e4052a63fa6d53bfaf8725c5",
+                        "valid" : "true"
+                    },
+                    {
+                        "rawBytes" : "0x02f86c0109830186a08203e885e8d4a5100094cccccccccccccccccccccccccccccccccccccccd80820402c001a09579e56e8b317edfe346bfd0176a564f24bdf63a6cd28b1bc69421588a9225f5a05066ea139a6c1c8b2b6e9b4364ac2ef759ee7daf55f3c3be1c543f03e278616e",
+                        "valid" : "false",
+                        "exception" : "TR_TipGtFeeCap"
+                    },
+                    {
+                        "rawBytes" : "0x02f8690109648203e885e8d4a5100094ccccccccccccccccccccccccccccccccccccccce80820403c001a0fee2cfe257b54e017f53ea047487754c90ff90acef614babf32093e158037088a02e36fb3a80b4a809a7eeba576ae617dccdc1d6f5aad824a14788f9925b59448f",
+                        "valid" : "true"
+                    },
+                    {
+                        "rawBytes" : "0x02f86d010a830186a0830186a085e8d4a5100094cccccccccccccccccccccccccccccccccccccccd80820404c001a0b14848fdbfd23a99c61688a9e6d4e2e7a592755415fe5b9c60d84b03d9f90b7fa041f6573fa1f3ee133c8ab99e207ff1e7d04bd245d70de87ae7fdaaa4b4a9c771",
+                        "valid" : "true"
+                    }
+                ],
                 "rlp" : "0xf90357f90200a0a406da14c6efc659274488a592ef3ed55738047ceee610fbfa4dff1c52f149c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794ba5e000000000000000000000000000000000000a02175eed13f198e774ed43abd7f5c912eae7c15ebd7422ff09de138f97ab77328a0b67753341df7013fab632ff70ba77581dae515164a05bff6187af692a133c0eca0f42d43454db7c51eadf004bd9e43522c4894f02c602b709cd45e67597c622f2eb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000488016345785d8a000083053c4282135642a0000000000000000000000000000000000000000000000000000000000000000088000000000000000082024cf90150b86e02f86b01088203e88203e885e8d4a5100094cccccccccccccccccccccccccccccccccccccccc80820401c080a0aacf4ad2118e809a8d309a87bff3bb92db49d6cfde2180912d24d2f72156539fa06268e000640f73eb6ce702e237e612ca3c7c8ed4e4052a63fa6d53bfaf8725c5b86c02f8690109648203e885e8d4a5100094ccccccccccccccccccccccccccccccccccccccce80820403c001a0fee2cfe257b54e017f53ea047487754c90ff90acef614babf32093e158037088a02e36fb3a80b4a809a7eeba576ae617dccdc1d6f5aad824a14788f9925b59448fb87002f86d010a830186a0830186a085e8d4a5100094cccccccccccccccccccccccccccccccccccccccd80820404c001a0b14848fdbfd23a99c61688a9e6d4e2e7a592755415fe5b9c60d84b03d9f90b7fa041f6573fa1f3ee133c8ab99e207ff1e7d04bd245d70de87ae7fdaaa4b4a9c771c0"
             }
         ],

diff --git a/BlockchainTests/ValidBlocks/bcEIP1559/checkGasLimit.json b/BlockchainTests/ValidBlocks/bcEIP1559/checkGasLimit.json
@@ -2,11 +2,11 @@
     "checkGasLimit_London" : {
         "_info" : {
             "comment" : "",
-            "filling-rpc-server" : "evm version 1.10.4-unstable-966ee3ae-20210528",
-            "filling-tool-version" : "retesteth-0.1.1-eip1559+commit.658fc3a8.Linux.g++",
-            "lllcversion" : "Version: 0.5.14-develop.2021.5.18+commit.14c9d5de.mod.Linux.g++",
+            "filling-rpc-server" : "evm version 1.10.4-unstable-950d99c2-20210602",
+            "filling-tool-version" : "retesteth-0.1.1-eip1559+commit.49f91fa6.Linux.g++",
+            "lllcversion" : "Version: 0.5.14-develop.2021.6.5+commit.401d5358.Linux.g++",
             "source" : "src/BlockchainTestsFiller/ValidBlocks/bcEIP1559/checkGasLimitFiller.yml",
-            "sourceHash" : "378e5399bddc9e4619fd363150b97b0e061bdf8de93e0b62a8320b37c340e229"
+            "sourceHash" : "c1294bb950ae894a465579f8f4060de13bca51499ef8c072398ca5c5fbf6b328"
         },
         "sealEngine" : "NoProof",
         "network" : "London",
@@ -128,6 +128,25 @@
                         ]
                     }
                 ],
+                "transactionSequence" : [
+                    {
+                        "rawBytes" : "0x02f865010180820fa0830f42419411111111111111111111111111111111111111118080c080a043087a850cc494ab090d65ded98bb4425198c86ed4e2317676465af4f030cdb3a05191ea88a54a3f816b8e7775539097fb0b50eff8e9e5126cdc25acbfc2bd1f9f",
+                        "valid" : "true"
+                    },
+                    {
+                        "rawBytes" : "0x02f865010280820fa0830f42409411111111111111111111111111111111111111118080c001a0f1118772e6bd8cd520cb900a85c5edaa21aa64ae08b685e58f9922ebfe4ae2ada01020d198f21fb908329cee20201a3218eb4ff4edba10365c800622844c9fb8b1",
+                        "valid" : "true"
+                    },
+                    {
+                        "rawBytes" : "0x02f865010380820fa0830f42409411111111111111111111111111111111111111118080c080a0ecff94bd8c8ade821b487a324cd513b923b6a3d19ee320697216366b581f5f34a042da5ca3ad4cef5f44cf1c0ddb0b7739ad9821094156abe1eb48c5c094f39b9f",
+                        "valid" : "true"
+                    },
+                    {
+                        "rawBytes" : "0x02f865010480820fa0830f42409411111111111111111111111111111111111111118080c080a0f5d713b7a001e67c5e317411566beec8c87a1f225fe352a1db90448b6c0cfa83a00186eb438aef9f775ec56bc2871ff085951e427b1c23e946f862f9e10dbf86d0",
+                        "valid" : "false",
+                        "exception" : "TR_GasLimitReached"
+                    }
+                ],
                 "rlp" : "0xf9033ef901f9a0c2dccdf8275c46de0ff1fbd00cd3f1abd1bd724f471a18c6bfb46a769d86e184a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0db42e8d7fe10642d3051c6c918d77c8bd13d90b8ef44813230b803aa0f0554d2a0ebbd8c6d04c68ffbfbe2d45c1e9731c447bd5d816c888af2fb047d15d3c6a0bea06973241be4824e292c81bd716082962e438630e6b26863ad0c67bd92e04e95b4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d0900832dc6c182079e42a0000000000000000000000000000000000000000000000000000000000000000088000000000000000001f9013eb86802f865010180820fa0830f42419411111111111111111111111111111111111111118080c080a043087a850cc494ab090d65ded98bb4425198c86ed4e2317676465af4f030cdb3a05191ea88a54a3f816b8e7775539097fb0b50eff8e9e5126cdc25acbfc2bd1f9fb86802f865010280820fa0830f42409411111111111111111111111111111111111111118080c001a0f1118772e6bd8cd520cb900a85c5edaa21aa64ae08b685e58f9922ebfe4ae2ada01020d198f21fb908329cee20201a3218eb4ff4edba10365c800622844c9fb8b1b86802f865010380820fa0830f42409411111111111111111111111111111111111111118080c080a0ecff94bd8c8ade821b487a324cd513b923b6a3d19ee320697216366b581f5f34a042da5ca3ad4cef5f44cf1c0ddb0b7739ad9821094156abe1eb48c5c094f39b9fc0"
             },
             {
@@ -292,6 +311,13 @@
                 },
                 "transactions" : [
                 ],
+                "transactionSequence" : [
+                    {
+                        "rawBytes" : "0x02f865010980820fa0833d09019411111111111111111111111111111111111111118080c001a0142f3fab1abc9c5f3b6b0507f919339f5df169e91b3f2bb2f5eb56560ddb4c5da02fa9327570ac11a21c9120acd12d06710ab2cf7a8a7dbef093a085833719367c",
+                        "valid" : "false",
+                        "exception" : "TR_GasLimitReached"
+                    }
+                ],
                 "rlp" : "0xf901fbf901f6a0574dd0921539d8ef7eb35e33eb10995d83200408d2542bd11941086ba283da95a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a758f17a8b251cdf063950356ed251b550044b578efe11231bde51339d1fe63a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000004833d09008082135642a0000000000000000000000000000000000000000000000000000000000000000088000000000000000004c0c0"
             }
         ],