diff --git a/DifficultyTests/dfArrowGlacier/difficultyArrowGlacier.json b/DifficultyTests/dfArrowGlacier/difficultyArrowGlacier.json
index e4bcbf5232a..884239e4409 100644
--- a/DifficultyTests/dfArrowGlacier/difficultyArrowGlacier.json
+++ b/DifficultyTests/dfArrowGlacier/difficultyArrowGlacier.json
@@ -2,10 +2,11 @@
     "difficultyArrowGlacier" : {
         "_info" : {
             "comment" : "Difficulty ArrowGlacier Combination Check: 100k steps, starting from block pushback number (10,700,000) for ArrowGlacier",
-            "filling-rpc-server" : "evm version 1.10.12-unstable-d82908d1",
-            "filling-tool-version" : "retesteth-0.2.0-memory+commit.5cc77f6f.Linux.g++",
+            "filling-rpc-server" : "evm version 1.11.4-unstable-564db9a9-20230310",
+            "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.324bcf39.Linux.g++",
             "generatedTestHash" : "9be0e53be72b67343e8a8d56c7abd2dea62a1690b90e0db637d577c05d54e9cb",
-            "lllcversion" : "Version: 0.5.14-develop.2021.10.5+commit.401d5358.Linux.g++",
+            "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
+            "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++",
             "source" : "src/DifficultyTestsFiller/dfArrowGlacier/difficultyArrowGlacierFiller.json",
             "sourceHash" : "90439155d5ec7fda92b39dd870ce5ccfa6bf52a4e23b70a00d7160b69ae91c08"
         },
diff --git a/DifficultyTests/dfArrowGlacier/difficultyArrowGlacierForkBlock.json b/DifficultyTests/dfArrowGlacier/difficultyArrowGlacierForkBlock.json
index 5c84db59322..c48034ea0de 100644
--- a/DifficultyTests/dfArrowGlacier/difficultyArrowGlacierForkBlock.json
+++ b/DifficultyTests/dfArrowGlacier/difficultyArrowGlacierForkBlock.json
@@ -2,10 +2,11 @@
     "difficultyArrowGlacierForkBlock" : {
         "_info" : {
             "comment" : "ArrowGlacier Difficulty Combination Check at Fork Block (13,773,000): Difficulty range start uses current mainnet difficulty, range end uses approximate value with constant 13 second block, 5% uncle rate",
-            "filling-rpc-server" : "evm version 1.10.12-unstable-d82908d1",
-            "filling-tool-version" : "retesteth-0.2.0-memory+commit.5cc77f6f.Linux.g++",
+            "filling-rpc-server" : "evm version 1.11.4-unstable-564db9a9-20230310",
+            "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.324bcf39.Linux.g++",
             "generatedTestHash" : "b0f086fc9285a6c0a6b8eba7acbc25f533d5e4ca17dcc799cf81b5e52998d15b",
-            "lllcversion" : "Version: 0.5.14-develop.2021.10.5+commit.401d5358.Linux.g++",
+            "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
+            "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++",
             "source" : "src/DifficultyTestsFiller/dfArrowGlacier/difficultyArrowGlacierForkBlockFiller.json",
             "sourceHash" : "1e4f7ab614ff0e1bbff73a06f887bc986049a2958266c4778e4cb2324aa4cb2e"
         },
diff --git a/DifficultyTests/dfArrowGlacier/difficultyArrowGlacierMinus1.json b/DifficultyTests/dfArrowGlacier/difficultyArrowGlacierMinus1.json
index 4844ce12014..ac27fb744c2 100644
--- a/DifficultyTests/dfArrowGlacier/difficultyArrowGlacierMinus1.json
+++ b/DifficultyTests/dfArrowGlacier/difficultyArrowGlacierMinus1.json
@@ -2,10 +2,11 @@
     "difficultyArrowGlacierMinus1" : {
         "_info" : {
             "comment" : "Difficulty ArrowGlacier Combination Check: 100k steps, starting from block pushback number minus 1 (10,699,699) for ArrowGlacier",
-            "filling-rpc-server" : "evm version 1.10.12-unstable-d82908d1",
-            "filling-tool-version" : "retesteth-0.2.0-memory+commit.5cc77f6f.Linux.g++",
+            "filling-rpc-server" : "evm version 1.11.4-unstable-564db9a9-20230310",
+            "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.324bcf39.Linux.g++",
             "generatedTestHash" : "6fb84391542e229e0dcebad33a75490604b5a511eb0b38aadd8dc9f799fbac76",
-            "lllcversion" : "Version: 0.5.14-develop.2021.10.5+commit.401d5358.Linux.g++",
+            "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
+            "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++",
             "source" : "src/DifficultyTestsFiller/dfArrowGlacier/difficultyArrowGlacierMinus1Filler.json",
             "sourceHash" : "2e1cce8d0f8490b014a2cefd7bf5cae0df292010c084666e68037c589783da32"
         },
diff --git a/DifficultyTests/dfArrowGlacier/difficultyArrowGlacierTimeDiff1.json b/DifficultyTests/dfArrowGlacier/difficultyArrowGlacierTimeDiff1.json
index f47b712c5ba..f3b2ddb38e5 100644
--- a/DifficultyTests/dfArrowGlacier/difficultyArrowGlacierTimeDiff1.json
+++ b/DifficultyTests/dfArrowGlacier/difficultyArrowGlacierTimeDiff1.json
@@ -2,10 +2,11 @@
     "difficultyArrowGlacierTimeDiff1" : {
         "_info" : {
             "comment" : "Difficulty ArrowGlacier Timestamp Difference Combination Check 1: Timestamp differences of 8, 17, 26, ... 908",
-            "filling-rpc-server" : "evm version 1.10.12-unstable-d82908d1",
-            "filling-tool-version" : "retesteth-0.2.0-memory+commit.5cc77f6f.Linux.g++",
+            "filling-rpc-server" : "evm version 1.11.4-unstable-564db9a9-20230310",
+            "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.324bcf39.Linux.g++",
             "generatedTestHash" : "1a8994f2d4bc2fb16a7ae71131bfd0826c1e7f15153f6be16180b58d139d716b",
-            "lllcversion" : "Version: 0.5.14-develop.2021.10.5+commit.401d5358.Linux.g++",
+            "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
+            "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++",
             "source" : "src/DifficultyTestsFiller/dfArrowGlacier/difficultyArrowGlacierTimeDiff1Filler.json",
             "sourceHash" : "84bb305d0e977e6f8462e9df8eae2ff63f9d2130371f146962368b077735801d"
         },
diff --git a/DifficultyTests/dfArrowGlacier/difficultyArrowGlacierTimeDiff2.json b/DifficultyTests/dfArrowGlacier/difficultyArrowGlacierTimeDiff2.json
index 294b838c51d..60e5692e521 100644
--- a/DifficultyTests/dfArrowGlacier/difficultyArrowGlacierTimeDiff2.json
+++ b/DifficultyTests/dfArrowGlacier/difficultyArrowGlacierTimeDiff2.json
@@ -2,10 +2,11 @@
     "difficultyArrowGlacierTimeDiff1" : {
         "_info" : {
             "comment" : "Difficulty ArrowGlacier Timestamp Difference Combination Check 2: Timestamp differences of 9, 18, 27, ... 909",
-            "filling-rpc-server" : "evm version 1.10.12-unstable-d82908d1",
-            "filling-tool-version" : "retesteth-0.2.0-memory+commit.5cc77f6f.Linux.g++",
+            "filling-rpc-server" : "evm version 1.11.4-unstable-564db9a9-20230310",
+            "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.324bcf39.Linux.g++",
             "generatedTestHash" : "2acd221f999e483ccf36126aba654211613e07c1c86f213d243d3083c5d0d5e1",
-            "lllcversion" : "Version: 0.5.14-develop.2021.10.5+commit.401d5358.Linux.g++",
+            "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
+            "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++",
             "source" : "src/DifficultyTestsFiller/dfArrowGlacier/difficultyArrowGlacierTimeDiff2Filler.json",
             "sourceHash" : "eb0b44e2836a31be6f06fcbbbcb6117b47bb715ea67e2bdf9cd82f1109833a18"
         },
diff --git a/DifficultyTests/dfByzantium/difficultyByzantium.json b/DifficultyTests/dfByzantium/difficultyByzantium.json
index 640d1509919..c0352bf2335 100644
--- a/DifficultyTests/dfByzantium/difficultyByzantium.json
+++ b/DifficultyTests/dfByzantium/difficultyByzantium.json
@@ -2,10 +2,11 @@
     "difficultyByzantium" : {
         "_info" : {
             "comment" : "",
-            "filling-rpc-server" : "evm version 1.10.12-unstable-9129ae9f",
-            "filling-tool-version" : "retesteth-0.2.0-memory+commit.b843ab63.Linux.g++",
+            "filling-rpc-server" : "evm version 1.11.4-unstable-564db9a9-20230310",
+            "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.324bcf39.Linux.g++",
             "generatedTestHash" : "d8ddff51493b71958694c958621a6180f2bb4cf19eab941950bb3befb89877c3",
-            "lllcversion" : "Version: 0.5.14-develop.2021.10.5+commit.401d5358.Linux.g++",
+            "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
+            "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++",
             "source" : "src/DifficultyTestsFiller/dfByzantium/difficultyByzantiumCopier.json",
             "sourceHash" : "6dd4eb2d47172b84bcf3b88fa0d7f3f4adc56cf23f3ab04925ca4971f014d7b5"
         },
diff --git a/DifficultyTests/dfConstantinople/difficultyConstantinople.json b/DifficultyTests/dfConstantinople/difficultyConstantinople.json
index ad3392b2d09..9092067bf3d 100644
--- a/DifficultyTests/dfConstantinople/difficultyConstantinople.json
+++ b/DifficultyTests/dfConstantinople/difficultyConstantinople.json
@@ -2,10 +2,11 @@
     "difficultyConstantinople" : {
         "_info" : {
             "comment" : "",
-            "filling-rpc-server" : "evm version 1.10.12-unstable-9129ae9f",
-            "filling-tool-version" : "retesteth-0.2.0-memory+commit.b843ab63.Linux.g++",
+            "filling-rpc-server" : "evm version 1.11.4-unstable-564db9a9-20230310",
+            "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.324bcf39.Linux.g++",
             "generatedTestHash" : "9d3795371c0f005815f76261783170be8addde2166513973255d0d0499c0f35c",
-            "lllcversion" : "Version: 0.5.14-develop.2021.10.5+commit.401d5358.Linux.g++",
+            "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
+            "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++",
             "source" : "src/DifficultyTestsFiller/dfConstantinople/difficultyConstantinopleCopier.json",
             "sourceHash" : "35a33723a7e373fb477fbe9d8468f06f522ee8fad70d93e480914135be55723a"
         },
diff --git a/DifficultyTests/dfEIP2384/difficultyEIP2384.json b/DifficultyTests/dfEIP2384/difficultyEIP2384.json
index 7834020cba8..4a46a9bc8cb 100644
--- a/DifficultyTests/dfEIP2384/difficultyEIP2384.json
+++ b/DifficultyTests/dfEIP2384/difficultyEIP2384.json
@@ -2,10 +2,11 @@
     "difficultyEIP2384" : {
         "_info" : {
             "comment" : "",
-            "filling-rpc-server" : "evm version 1.10.12-unstable-9129ae9f",
-            "filling-tool-version" : "retesteth-0.2.0-memory+commit.b843ab63.Linux.g++",
+            "filling-rpc-server" : "evm version 1.11.4-unstable-564db9a9-20230310",
+            "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.324bcf39.Linux.g++",
             "generatedTestHash" : "3f755407aa5dbd07e898362999a8ddb05b1d743073a50b27e671ff61914a211a",
-            "lllcversion" : "Version: 0.5.14-develop.2021.10.5+commit.401d5358.Linux.g++",
+            "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
+            "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++",
             "source" : "src/DifficultyTestsFiller/dfEIP2384/difficultyEIP2384Copier.json",
             "sourceHash" : "460a1ad40ba1aae5449f54b1fb29ac0b846d6b7a3eb87e240a9af780d06fc397"
         },
diff --git a/DifficultyTests/dfEIP2384/difficultyEIP2384_random.json b/DifficultyTests/dfEIP2384/difficultyEIP2384_random.json
index 3194e9371da..0b5ac4632e3 100644
--- a/DifficultyTests/dfEIP2384/difficultyEIP2384_random.json
+++ b/DifficultyTests/dfEIP2384/difficultyEIP2384_random.json
@@ -2,10 +2,11 @@
     "difficultyEIP2384_random" : {
         "_info" : {
             "comment" : "",
-            "filling-rpc-server" : "evm version 1.10.12-unstable-9129ae9f",
-            "filling-tool-version" : "retesteth-0.2.0-memory+commit.b843ab63.Linux.g++",
+            "filling-rpc-server" : "evm version 1.11.4-unstable-564db9a9-20230310",
+            "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.324bcf39.Linux.g++",
             "generatedTestHash" : "35bb1449d22107688bcde43e5754a7409858c71609482a6101624a1b1bc49f8a",
-            "lllcversion" : "Version: 0.5.14-develop.2021.10.5+commit.401d5358.Linux.g++",
+            "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
+            "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++",
             "source" : "src/DifficultyTestsFiller/dfEIP2384/difficultyEIP2384_randomCopier.json",
             "sourceHash" : "55c8175714560be869dcf73e77605582c59eba348940bfb35f87dc4f56fc4b74"
         },
diff --git a/DifficultyTests/dfEIP2384/difficultyEIP2384_random_to20M.json b/DifficultyTests/dfEIP2384/difficultyEIP2384_random_to20M.json
index 2abdd54519c..376fb99f715 100644
--- a/DifficultyTests/dfEIP2384/difficultyEIP2384_random_to20M.json
+++ b/DifficultyTests/dfEIP2384/difficultyEIP2384_random_to20M.json
@@ -2,10 +2,11 @@
     "difficultyEIP2384_random_to20M" : {
         "_info" : {
             "comment" : "",
-            "filling-rpc-server" : "evm version 1.10.12-unstable-9129ae9f",
-            "filling-tool-version" : "retesteth-0.2.0-memory+commit.b843ab63.Linux.g++",
+            "filling-rpc-server" : "evm version 1.11.4-unstable-564db9a9-20230310",
+            "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.324bcf39.Linux.g++",
             "generatedTestHash" : "40a8f0e36e752fbc9b4bcc76bfd9e0a2b577fe5e3dcf34acc40162d42c2707da",
-            "lllcversion" : "Version: 0.5.14-develop.2021.10.5+commit.401d5358.Linux.g++",
+            "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
+            "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++",
             "source" : "src/DifficultyTestsFiller/dfEIP2384/difficultyEIP2384_random_to20MCopier.json",
             "sourceHash" : "e366beb973b9256c737a4b58a98b449166e2b97fde0bcba2c4a1864ce245264a"
         },
diff --git a/DifficultyTests/dfFrontier/difficultyFrontier.json b/DifficultyTests/dfFrontier/difficultyFrontier.json
index a0c8523f676..8874da51c02 100644
--- a/DifficultyTests/dfFrontier/difficultyFrontier.json
+++ b/DifficultyTests/dfFrontier/difficultyFrontier.json
@@ -2,10 +2,11 @@
     "difficultyFrontier" : {
         "_info" : {
             "comment" : "",
-            "filling-rpc-server" : "evm version 1.10.12-unstable-9129ae9f",
-            "filling-tool-version" : "retesteth-0.2.0-memory+commit.b843ab63.Linux.g++",
+            "filling-rpc-server" : "evm version 1.11.4-unstable-564db9a9-20230310",
+            "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.324bcf39.Linux.g++",
             "generatedTestHash" : "1ea8659e16715f21dec8691c19de99db81ede6229b53c3d24e36409ca29df1bb",
-            "lllcversion" : "Version: 0.5.14-develop.2021.10.5+commit.401d5358.Linux.g++",
+            "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
+            "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++",
             "source" : "src/DifficultyTestsFiller/dfFrontier/difficultyFrontierCopier.json",
             "sourceHash" : "737b9dd3421b72d4e2a730ddf3a0161ba05dc5bc276ec5c0f9e4a108d8807511"
         },
diff --git a/DifficultyTests/dfGrayGlacier/difficultyGrayGlacier.json b/DifficultyTests/dfGrayGlacier/difficultyGrayGlacier.json
index 22b06203243..355c6552da5 100644
--- a/DifficultyTests/dfGrayGlacier/difficultyGrayGlacier.json
+++ b/DifficultyTests/dfGrayGlacier/difficultyGrayGlacier.json
@@ -2,11 +2,11 @@
     "difficultyGrayGlacier" : {
         "_info" : {
             "comment" : "Difficulty Gray Glacier Combination Check: 100k steps, starting from block pushback number (11,400,000) for GrayGlacier",
-            "filling-rpc-server" : "evm version 1.10.19-unstable-f07a8fd1",
-            "filling-tool-version" : "retesteth-0.2.2-testinfo+commit.e0f83c2b.Linux.g++",
+            "filling-rpc-server" : "evm version 1.11.4-unstable-564db9a9-20230310",
+            "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.324bcf39.Linux.g++",
             "generatedTestHash" : "691f09114144d987889ae7fd747f358ccf9766478f232246fb25273840ed95f2",
-            "lllcversion" : "Version: 0.5.14-develop.2021.10.5+commit.401d5358.Linux.g++",
-            "solidity" : "Version: 0.8.5+commit.a4f2e591.Linux.g++",
+            "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
+            "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++",
             "source" : "src/DifficultyTestsFiller/dfGrayGlacier/difficultyGrayGlacierFiller.json",
             "sourceHash" : "493ab516d345632cf72946c55940fbb369f434a7d3e897245926c08ec8a456ed"
         },
diff --git a/DifficultyTests/dfGrayGlacier/difficultyGrayGlacierForkBlock.json b/DifficultyTests/dfGrayGlacier/difficultyGrayGlacierForkBlock.json
index e55732d1a2e..378b52d2f9e 100644
--- a/DifficultyTests/dfGrayGlacier/difficultyGrayGlacierForkBlock.json
+++ b/DifficultyTests/dfGrayGlacier/difficultyGrayGlacierForkBlock.json
@@ -2,11 +2,11 @@
     "difficultyGrayGlacierForkBlock" : {
         "_info" : {
             "comment" : "Gray Glacier Difficulty Combination Check at Fork Block (15,050,000): Difficulty range start uses current mainnet difficulty, range end uses approximate value with constant 13 second block, 5% uncle rate",
-            "filling-rpc-server" : "evm version 1.10.19-unstable-f07a8fd1",
-            "filling-tool-version" : "retesteth-0.2.2-testinfo+commit.e0f83c2b.Linux.g++",
+            "filling-rpc-server" : "evm version 1.11.4-unstable-564db9a9-20230310",
+            "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.324bcf39.Linux.g++",
             "generatedTestHash" : "4c9afb216a2d78cf6e287645413d4e0bff17968b947d653f7c7ae83339a33477",
-            "lllcversion" : "Version: 0.5.14-develop.2021.10.5+commit.401d5358.Linux.g++",
-            "solidity" : "Version: 0.8.5+commit.a4f2e591.Linux.g++",
+            "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
+            "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++",
             "source" : "src/DifficultyTestsFiller/dfGrayGlacier/difficultyGrayGlacierForkBlockFiller.json",
             "sourceHash" : "886321973bb3b16c5c4653213d21e021bbe53d2c66f11279d3360c58f5ae842b"
         },
diff --git a/DifficultyTests/dfGrayGlacier/difficultyGrayGlacierMinus1.json b/DifficultyTests/dfGrayGlacier/difficultyGrayGlacierMinus1.json
index dddd6d93035..8e3754c85a5 100644
--- a/DifficultyTests/dfGrayGlacier/difficultyGrayGlacierMinus1.json
+++ b/DifficultyTests/dfGrayGlacier/difficultyGrayGlacierMinus1.json
@@ -2,11 +2,11 @@
     "difficultyGrayGlacierMinus1" : {
         "_info" : {
             "comment" : "Difficulty Gray Glacier Combination Check: 100k steps, starting from block pushback number minus 1 (11,399,999) for Gray Glacier",
-            "filling-rpc-server" : "evm version 1.10.19-unstable-f07a8fd1",
-            "filling-tool-version" : "retesteth-0.2.2-testinfo+commit.e0f83c2b.Linux.g++",
+            "filling-rpc-server" : "evm version 1.11.4-unstable-564db9a9-20230310",
+            "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.324bcf39.Linux.g++",
             "generatedTestHash" : "77b21143bcebcfd4375bb5b9c8e0c46cafdc5f4a917955d95d6ed54456c3225f",
-            "lllcversion" : "Version: 0.5.14-develop.2021.10.5+commit.401d5358.Linux.g++",
-            "solidity" : "Version: 0.8.5+commit.a4f2e591.Linux.g++",
+            "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
+            "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++",
             "source" : "src/DifficultyTestsFiller/dfGrayGlacier/difficultyGrayGlacierMinus1Filler.json",
             "sourceHash" : "b61c92a1866b7c30c9e2e1aa2ace6b2f18d1ab9e62662bfe83b663f8ef67c39d"
         },
diff --git a/DifficultyTests/dfGrayGlacier/difficultyGrayGlacierTimeDiff1.json b/DifficultyTests/dfGrayGlacier/difficultyGrayGlacierTimeDiff1.json
index 5f1e5eac656..9f34cd9eda9 100644
--- a/DifficultyTests/dfGrayGlacier/difficultyGrayGlacierTimeDiff1.json
+++ b/DifficultyTests/dfGrayGlacier/difficultyGrayGlacierTimeDiff1.json
@@ -2,11 +2,11 @@
     "difficultyGrayGlacierTimeDiff1" : {
         "_info" : {
             "comment" : "Difficulty Gray Glacier Timestamp Difference Combination Check 1: Timestamp differences of 8, 17, 26, ... 908",
-            "filling-rpc-server" : "evm version 1.10.19-unstable-f07a8fd1",
-            "filling-tool-version" : "retesteth-0.2.2-testinfo+commit.e0f83c2b.Linux.g++",
+            "filling-rpc-server" : "evm version 1.11.4-unstable-564db9a9-20230310",
+            "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.324bcf39.Linux.g++",
             "generatedTestHash" : "9c0031cbd92f105cb66bb1121ed433a8b5f0a34c4e66a66530d9b28c340cc38b",
-            "lllcversion" : "Version: 0.5.14-develop.2021.10.5+commit.401d5358.Linux.g++",
-            "solidity" : "Version: 0.8.5+commit.a4f2e591.Linux.g++",
+            "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
+            "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++",
             "source" : "src/DifficultyTestsFiller/dfGrayGlacier/difficultyGrayGlacierTimeDiff1Filler.json",
             "sourceHash" : "9e0a805e0eef23d78244c9b8a58314bed72e3a9d600a217b3bda77b30657e818"
         },
diff --git a/DifficultyTests/dfGrayGlacier/difficultyGrayGlacierTimeDiff2.json b/DifficultyTests/dfGrayGlacier/difficultyGrayGlacierTimeDiff2.json
index 1bbc3b77157..c02526766d1 100644
--- a/DifficultyTests/dfGrayGlacier/difficultyGrayGlacierTimeDiff2.json
+++ b/DifficultyTests/dfGrayGlacier/difficultyGrayGlacierTimeDiff2.json
@@ -2,11 +2,11 @@
     "difficultyGrayGlacierTimeDiff1" : {
         "_info" : {
             "comment" : "Difficulty Gray Glacier Timestamp Difference Combination Check 2: Timestamp differences of 9, 18, 27, ... 909",
-            "filling-rpc-server" : "evm version 1.10.19-unstable-f07a8fd1",
-            "filling-tool-version" : "retesteth-0.2.2-testinfo+commit.e0f83c2b.Linux.g++",
+            "filling-rpc-server" : "evm version 1.11.4-unstable-564db9a9-20230310",
+            "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.324bcf39.Linux.g++",
             "generatedTestHash" : "7c39d0f06d30d0eb6fdbf954535c70949976b442e22f05b2a6fc994abf3c5a35",
-            "lllcversion" : "Version: 0.5.14-develop.2021.10.5+commit.401d5358.Linux.g++",
-            "solidity" : "Version: 0.8.5+commit.a4f2e591.Linux.g++",
+            "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
+            "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++",
             "source" : "src/DifficultyTestsFiller/dfGrayGlacier/difficultyGrayGlacierTimeDiff2Filler.json",
             "sourceHash" : "57f5cb840717d90004d58930576d212e268902399b56a328e701a4d0b4580f05"
         },
diff --git a/DifficultyTests/dfHomestead/difficultyHomestead.json b/DifficultyTests/dfHomestead/difficultyHomestead.json
index ec82e035b5c..0812469fdfb 100644
--- a/DifficultyTests/dfHomestead/difficultyHomestead.json
+++ b/DifficultyTests/dfHomestead/difficultyHomestead.json
@@ -2,10 +2,11 @@
     "difficultyHomestead" : {
         "_info" : {
             "comment" : "",
-            "filling-rpc-server" : "evm version 1.10.12-unstable-9129ae9f",
-            "filling-tool-version" : "retesteth-0.2.0-memory+commit.b843ab63.Linux.g++",
+            "filling-rpc-server" : "evm version 1.11.4-unstable-564db9a9-20230310",
+            "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.324bcf39.Linux.g++",
             "generatedTestHash" : "9791a1c9cd39d5a00f7771e5145357b68b8eed7587b064cb55d13b1203e1561b",
-            "lllcversion" : "Version: 0.5.14-develop.2021.10.5+commit.401d5358.Linux.g++",
+            "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
+            "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++",
             "source" : "src/DifficultyTestsFiller/dfHomestead/difficultyHomesteadCopier.json",
             "sourceHash" : "c8c8c51bee8f4538bf3a272b23bc14c89f91c6d7b496d946be9d0756f9aed150"
         },