Merge block with withdrawals body

ethereum · Mar 23, 2023 · 9417754 · 9417754
1 parent d4a306d
commit 9417754
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 4 deletions.
diff --git a/BlockchainTests/TransitionTests/bcMergeToShanghai/shanghaiBeforeTransition.json b/BlockchainTests/TransitionTests/bcMergeToShanghai/shanghaiBeforeTransition.json
@@ -2,13 +2,13 @@
     "shanghaiBeforeTransition_MergeToShanghaiAtTime15k" : {
         "_info" : {
             "comment" : "test vectors: BSHA0001, BSHA0002, BSHA0003",
-            "filling-rpc-server" : "evm version 1.11.4-unstable-e14043db-20230308",
-            "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.fd2c0a83.Linux.g++",
-            "generatedTestHash" : "93ef5330bdf809fa7e7898afb02a7ae37d79de113b6f2ec6557e7433df730685",
+            "filling-rpc-server" : "evm version 1.11.5-unstable-5d23d21f-20230320",
+            "filling-tool-version" : "retesteth-0.3.1-shanghai+commit.4864ef35.Linux.g++",
+            "generatedTestHash" : "bb59f2e1cf5c728f3977bb7d24c6130d4dcaa169ec768fc5a1c7a02b214bd2bf",
             "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
             "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++",
             "source" : "src/BlockchainTestsFiller/TransitionTests/bcMergeToShanghai/shanghaiBeforeTransitionFiller.json",
-            "sourceHash" : "02c833b94a2318898d09fcc36d85d5776a29ef6a052e41628172d6029089aaef"
+            "sourceHash" : "2603c34a6018c617fa6652bc45aa57a61af92e3675b2620519ce170e924bff46"
         },
         "blocks" : [
             {
@@ -101,6 +101,12 @@
                 "expectException" : "ShanghaiBlockImportImpossible",
                 "rlp" : "0xf9021bf90215a00af8d517db86ab9290e9f9078c7505c9755b64dbdb03f8e4310ef9ab9d8714a6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a019fc38351a22fc05c8add29df0767dc26ab2635d0b4ed11caf7d7cb6fed2ea4da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080048401df5e70808236b042a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b4218800000000000000000da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421c0c0c0"
             },
+            {
+                "blocknumber" : "4",
+                "chainname" : "default",
+                "expectException" : "ShanghaiBlockImportImpossible",
+                "rlp" : "0xf90236f90215a00af8d517db86ab9290e9f9078c7505c9755b64dbdb03f8e4310ef9ab9d8714a6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a001fccfc7a5eb8da9b3baa3b70de7923527eb21cf39209544474e64626c4c17b3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080048401df5e70808236b042a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b4218800000000000000000da027f166f1d7c789251299535cb176ba34116e44894476a7886fe5d73d9be5c973c0c0dbda808094c94f5374fce5edbc8e2a8697c15331677e6ebf0b822710"
+            },
             {
                 "blockHeader" : {
                     "baseFeePerGas" : "0x0d",

diff --git a/...ockchainTestsFiller/TransitionTests/bcMergeToShanghai/shanghaiBeforeTransitionFiller.json b/...ockchainTestsFiller/TransitionTests/bcMergeToShanghai/shanghaiBeforeTransitionFiller.json
@@ -8,6 +8,10 @@
                                "//comment" : "Check that block 4 has withdrawals list attached to the body",
                                "rlp" : "0xf9021bf90215a00af8d517db86ab9290e9f9078c7505c9755b64dbdb03f8e4310ef9ab9d8714a6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a019fc38351a22fc05c8add29df0767dc26ab2635d0b4ed11caf7d7cb6fed2ea4da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080048401df5e70808236b042a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b4218800000000000000000da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421c0c0c0"
                             },
+                            {
+                               "//comment" : "Check that block 4a has withdrawals body and list attached to the body and correct state has as if Shanghai",
+                               "rlp" : "0xf90236f90215a00af8d517db86ab9290e9f9078c7505c9755b64dbdb03f8e4310ef9ab9d8714a6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a001fccfc7a5eb8da9b3baa3b70de7923527eb21cf39209544474e64626c4c17b3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080048401df5e70808236b042a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b4218800000000000000000da027f166f1d7c789251299535cb176ba34116e44894476a7886fe5d73d9be5c973c0c0dbda808094c94f5374fce5edbc8e2a8697c15331677e6ebf0b822710"
+                            },
                             {},{},
                             {
                                "//comment" : "Check that block 6a is Merge style and has no withdrawals list attached to the body",
@@ -95,6 +99,30 @@
         		"uncleHeaders" : [
                 ]
             },
+            {
+                "//comment" : "4a",
+                "blocknumber" : "4",
+                "blockHeader" : {
+                    "stateRoot" : "0x01fccfc7a5eb8da9b3baa3b70de7923527eb21cf39209544474e64626c4c17b3",
+                    "withdrawalsRoot" : "0x27f166f1d7c789251299535cb176ba34116e44894476a7886fe5d73d9be5c973"
+                },
+                "expectException" : {
+                    "//comment" : "TEST ID BSHA0001",
+                    "MergeToShanghaiAtTime15k" : "ShanghaiBlockImportImpossible"
+                },
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ],
+                "withdrawals" : [
+                    {
+                        "index": "0",
+                        "validatorIndex": "0",
+                        "address": "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "amount": "10000"
+                    }
+                ]
+            },
     	    {
 		        "blocknumber" : "4",
         		"transactions" : [