diff --git a/BlockchainTests/GeneralStateTests/EIPTests/stEIP3860/create2InitCodeSizeLimit.json b/BlockchainTests/GeneralStateTests/EIPTests/stEIP3860/create2InitCodeSizeLimit.json
index 4e2498536f9..93a1c838c07 100644
--- a/BlockchainTests/GeneralStateTests/EIPTests/stEIP3860/create2InitCodeSizeLimit.json
+++ b/BlockchainTests/GeneralStateTests/EIPTests/stEIP3860/create2InitCodeSizeLimit.json
@@ -3,7 +3,7 @@
         "_info" : {
             "comment" : "",
             "filling-rpc-server" : "evm version 1.11.0-unstable-9fcb9bb0",
-            "filling-tool-version" : "retesteth-0.2.3-postmerge+commit.38dea47d.Linux.g++",
+            "filling-tool-version" : "retesteth-0.2.3-postmerge+commit.1b11d3f7.Linux.g++",
             "generatedTestHash" : "cae10a0fa83314c0db95e919f901f4e9061dd7f8f1685109346a4862d92a7f2a",
             "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
             "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++",
@@ -135,8 +135,8 @@
         "_info" : {
             "comment" : "",
             "filling-rpc-server" : "evm version 1.11.0-unstable-9fcb9bb0",
-            "filling-tool-version" : "retesteth-0.2.3-postmerge+commit.38dea47d.Linux.g++",
-            "generatedTestHash" : "0bd8e6976e24f346b96e7d693e5f8dad0d042765dbb95e6b88fac7dfbb7d1e53",
+            "filling-tool-version" : "retesteth-0.2.3-postmerge+commit.1b11d3f7.Linux.g++",
+            "generatedTestHash" : "7c0d383a5bdc0d5edf833ae61d28ebdd2d74ccffe1399571b62941d0e90919cf",
             "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
             "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/EIPTests/stEIP3860/create2InitCodeSizeLimitFiller.yml",
@@ -180,6 +180,8 @@
                     }
                 ],
                 "uncleHeaders" : [
+                ],
+                "withdrawals" : [
                 ]
             }
         ],
@@ -269,7 +271,7 @@
         "_info" : {
             "comment" : "",
             "filling-rpc-server" : "evm version 1.11.0-unstable-9fcb9bb0",
-            "filling-tool-version" : "retesteth-0.2.3-postmerge+commit.38dea47d.Linux.g++",
+            "filling-tool-version" : "retesteth-0.2.3-postmerge+commit.1b11d3f7.Linux.g++",
             "generatedTestHash" : "353f0878190fe43262773951f19f48f357ab5dac225335ed4453042ad36fd3cd",
             "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
             "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++",
@@ -401,8 +403,8 @@
         "_info" : {
             "comment" : "",
             "filling-rpc-server" : "evm version 1.11.0-unstable-9fcb9bb0",
-            "filling-tool-version" : "retesteth-0.2.3-postmerge+commit.38dea47d.Linux.g++",
-            "generatedTestHash" : "8af213f3cc41c201c3e84f04e9f66389658781c5021963576a7d4771f6a4d22b",
+            "filling-tool-version" : "retesteth-0.2.3-postmerge+commit.1b11d3f7.Linux.g++",
+            "generatedTestHash" : "5c2e4451fc6463210e9a22616b6c6803b6f3d40a9a54a0d6fc11c9cf3eeedbb3",
             "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
             "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/EIPTests/stEIP3860/create2InitCodeSizeLimitFiller.yml",
@@ -446,6 +448,8 @@
                     }
                 ],
                 "uncleHeaders" : [
+                ],
+                "withdrawals" : [
                 ]
             }
         ],
diff --git a/BlockchainTests/GeneralStateTests/EIPTests/stEIP3860/createInitCodeSizeLimit.json b/BlockchainTests/GeneralStateTests/EIPTests/stEIP3860/createInitCodeSizeLimit.json
index 368a94c54a8..f2d203aad4b 100644
--- a/BlockchainTests/GeneralStateTests/EIPTests/stEIP3860/createInitCodeSizeLimit.json
+++ b/BlockchainTests/GeneralStateTests/EIPTests/stEIP3860/createInitCodeSizeLimit.json
@@ -3,7 +3,7 @@
         "_info" : {
             "comment" : "",
             "filling-rpc-server" : "evm version 1.11.0-unstable-9fcb9bb0",
-            "filling-tool-version" : "retesteth-0.2.3-postmerge+commit.38dea47d.Linux.g++",
+            "filling-tool-version" : "retesteth-0.2.3-postmerge+commit.1b11d3f7.Linux.g++",
             "generatedTestHash" : "134d7c8b65ed2c13ef2bc7bff4cff0e410718ec6aae1e83a09e3de4bb2f6f1a3",
             "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
             "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++",
@@ -135,8 +135,8 @@
         "_info" : {
             "comment" : "",
             "filling-rpc-server" : "evm version 1.11.0-unstable-9fcb9bb0",
-            "filling-tool-version" : "retesteth-0.2.3-postmerge+commit.38dea47d.Linux.g++",
-            "generatedTestHash" : "badb003207259d0cd4f50406168d76493ad9bd69a68c25627b16be8c4056a9d7",
+            "filling-tool-version" : "retesteth-0.2.3-postmerge+commit.1b11d3f7.Linux.g++",
+            "generatedTestHash" : "fb83de0fb2d82fdda5a7f2087cf8a27512fa1c0d63152496e06c18082ef8bb6a",
             "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
             "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/EIPTests/stEIP3860/createInitCodeSizeLimitFiller.yml",
@@ -180,6 +180,8 @@
                     }
                 ],
                 "uncleHeaders" : [
+                ],
+                "withdrawals" : [
                 ]
             }
         ],
@@ -269,7 +271,7 @@
         "_info" : {
             "comment" : "",
             "filling-rpc-server" : "evm version 1.11.0-unstable-9fcb9bb0",
-            "filling-tool-version" : "retesteth-0.2.3-postmerge+commit.38dea47d.Linux.g++",
+            "filling-tool-version" : "retesteth-0.2.3-postmerge+commit.1b11d3f7.Linux.g++",
             "generatedTestHash" : "ed48aabab64956b5e64c6616ca8a2d848245e7a42b52472de2cf5b16bc54ea26",
             "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
             "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++",
@@ -401,8 +403,8 @@
         "_info" : {
             "comment" : "",
             "filling-rpc-server" : "evm version 1.11.0-unstable-9fcb9bb0",
-            "filling-tool-version" : "retesteth-0.2.3-postmerge+commit.38dea47d.Linux.g++",
-            "generatedTestHash" : "b05c0f2da958f0d4ff62952dd8a92ccf31a6d7c665e61f228a05443552a1ec17",
+            "filling-tool-version" : "retesteth-0.2.3-postmerge+commit.1b11d3f7.Linux.g++",
+            "generatedTestHash" : "b9e90c8c9a285a2d4412b1013621ad177e821366ff8e65a4d4f58dee67bf644e",
             "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
             "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/EIPTests/stEIP3860/createInitCodeSizeLimitFiller.yml",
@@ -446,6 +448,8 @@
                     }
                 ],
                 "uncleHeaders" : [
+                ],
+                "withdrawals" : [
                 ]
             }
         ],
diff --git a/BlockchainTests/GeneralStateTests/EIPTests/stEIP3860/creationTxInitCodeSizeLimit.json b/BlockchainTests/GeneralStateTests/EIPTests/stEIP3860/creationTxInitCodeSizeLimit.json
index bba72d10e0b..7ff4386b3cd 100644
--- a/BlockchainTests/GeneralStateTests/EIPTests/stEIP3860/creationTxInitCodeSizeLimit.json
+++ b/BlockchainTests/GeneralStateTests/EIPTests/stEIP3860/creationTxInitCodeSizeLimit.json
@@ -3,7 +3,7 @@
         "_info" : {
             "comment" : "",
             "filling-rpc-server" : "evm version 1.11.0-unstable-9fcb9bb0",
-            "filling-tool-version" : "retesteth-0.2.3-postmerge+commit.38dea47d.Linux.g++",
+            "filling-tool-version" : "retesteth-0.2.3-postmerge+commit.1b11d3f7.Linux.g++",
             "generatedTestHash" : "88be33c73764cd0bbdce79f28d94956714a7479b89bcac1051fe10ca8bdbb5b6",
             "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
             "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++",
@@ -103,8 +103,8 @@
         "_info" : {
             "comment" : "",
             "filling-rpc-server" : "evm version 1.11.0-unstable-9fcb9bb0",
-            "filling-tool-version" : "retesteth-0.2.3-postmerge+commit.38dea47d.Linux.g++",
-            "generatedTestHash" : "29fb380d3d7484a3f4ff6971c7b1de56dcbf6244902bf912bd1e29652097c692",
+            "filling-tool-version" : "retesteth-0.2.3-postmerge+commit.1b11d3f7.Linux.g++",
+            "generatedTestHash" : "364dd5d206cee4ed01de220718be7dbe867b88263c75569d959334cea655775c",
             "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
             "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/EIPTests/stEIP3860/creationTxInitCodeSizeLimitFiller.yml",
@@ -148,6 +148,8 @@
                     }
                 ],
                 "uncleHeaders" : [
+                ],
+                "withdrawals" : [
                 ]
             }
         ],
@@ -205,7 +207,7 @@
         "_info" : {
             "comment" : "",
             "filling-rpc-server" : "evm version 1.11.0-unstable-9fcb9bb0",
-            "filling-tool-version" : "retesteth-0.2.3-postmerge+commit.38dea47d.Linux.g++",
+            "filling-tool-version" : "retesteth-0.2.3-postmerge+commit.1b11d3f7.Linux.g++",
             "generatedTestHash" : "060f952b3a43df84bf36b5b4339600f9e49afbdf85bd83cd781de4a62a331840",
             "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
             "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++",
@@ -305,8 +307,8 @@
         "_info" : {
             "comment" : "",
             "filling-rpc-server" : "evm version 1.11.0-unstable-9fcb9bb0",
-            "filling-tool-version" : "retesteth-0.2.3-postmerge+commit.38dea47d.Linux.g++",
-            "generatedTestHash" : "33694bdcb409bb87df4251c8570ae6f8f6d559dfcc94a7e3762b0d774fb7b587",
+            "filling-tool-version" : "retesteth-0.2.3-postmerge+commit.1b11d3f7.Linux.g++",
+            "generatedTestHash" : "e6f07f24ebccf68c8ceb6d4ce955fc992651101b6cdcddee77a3ffa0c05a8146",
             "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
             "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/EIPTests/stEIP3860/creationTxInitCodeSizeLimitFiller.yml",
@@ -345,6 +347,8 @@
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
+                ],
+                "withdrawals" : [
                 ]
             }
         ],
diff --git a/BlockchainTests/TransitionTests/bcMergeToShanghai/shanghaiBeforeTransition.json b/BlockchainTests/TransitionTests/bcMergeToShanghai/shanghaiBeforeTransition.json
index dbfa39cb33a..412b6223dab 100644
--- a/BlockchainTests/TransitionTests/bcMergeToShanghai/shanghaiBeforeTransition.json
+++ b/BlockchainTests/TransitionTests/bcMergeToShanghai/shanghaiBeforeTransition.json
@@ -3,8 +3,8 @@
         "_info" : {
             "comment" : "test vectors: BSHA0001, BSHA0002, BSHA0003",
             "filling-rpc-server" : "evm version 1.11.0-unstable-9fcb9bb0",
-            "filling-tool-version" : "retesteth-0.2.3-postmerge+commit.38dea47d.Linux.g++",
-            "generatedTestHash" : "92bd50d7ce3fd2d750266f6268530ddf0399ff5fdc21c784fce3188a30257519",
+            "filling-tool-version" : "retesteth-0.2.3-postmerge+commit.1b11d3f7.Linux.g++",
+            "generatedTestHash" : "93ef5330bdf809fa7e7898afb02a7ae37d79de113b6f2ec6557e7433df730685",
             "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",
@@ -156,6 +156,8 @@
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
+                ],
+                "withdrawals" : [
                 ]
             },
             {