fix blockchain test vectors for Shanghai

ethereum · Feb 28, 2023 · af695aa · af695aa
1 parent f06217a
commit af695aa
Show file tree

Hide file tree

Showing 46 changed files with 115 additions and 125 deletions.
diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcEIP1559/badUnclesFiller.yml b/src/BlockchainTestsFiller/InvalidBlocks/bcEIP1559/badUnclesFiller.yml
@@ -59,7 +59,8 @@ badUncles:
         gasLimit: 10230000
     expectException:
       'London': InvalidGasLimit2
-      '>=Merge': 3675PreMerge1559BlockRejected
+      'Merge': 3675PreMerge1559BlockRejected
+      '>=Shanghai': PostMergeUncleHashIsNotEmpty
 
   # Excessively high gasLimit in uncle
   - transactions: []
@@ -69,7 +70,8 @@ badUncles:
         gasLimit: 10250000
     expectException:
       'London': InvalidGasLimit2
-      '>=Merge': 3675PreMerge1559BlockRejected
+      'Merge': 3675PreMerge1559BlockRejected
+      '>=Shanghai': PostMergeUncleHashIsNotEmpty
 
 
   # Acceptable gasLimit (same as the previous one)
@@ -81,7 +83,8 @@ badUncles:
       - populateFromBlock: 1
         gasLimit: 10240000
     expectException:
-      '>=Merge': 3675PreMerge1559BlockRejected
+      'Merge': 3675PreMerge1559BlockRejected
+      '>=Shanghai': PostMergeUncleHashIsNotEmpty
 
 
   # Acceptable gasLimit (almost too low)
@@ -93,7 +96,8 @@ badUncles:
       - populateFromBlock: 1
         gasLimit: 10230001
     expectException:
-      '>=Merge': 3675PreMerge1559BlockRejected
+      'Merge': 3675PreMerge1559BlockRejected
+      '>=Shanghai': PostMergeUncleHashIsNotEmpty
 
 
   # Acceptable gasLimit (almost too high)
@@ -105,7 +109,8 @@ badUncles:
       - populateFromBlock: 1
         gasLimit: 10249999
     expectException:
-      '>=Merge': 3675PreMerge1559BlockRejected
+      'Merge': 3675PreMerge1559BlockRejected
+      '>=Shanghai': PostMergeUncleHashIsNotEmpty
 
   # Wrong baseFee
   - transactions: []
@@ -115,7 +120,8 @@ badUncles:
         baseFeePerGas: 670
     expectException:
       'London': 1559BlockImportImpossible_BaseFeeWrong
-      '>=Merge': 3675PreMerge1559BlockRejected
+      'Merge': 3675PreMerge1559BlockRejected
+      '>=Shanghai': PostMergeUncleHashIsNotEmpty
 
   # Wrong baseFee
   - transactions: []
@@ -125,7 +131,8 @@ badUncles:
         baseFeePerGas: 672
     expectException:
       'London': 1559BlockImportImpossible_BaseFeeWrong
-      '>=Merge': 3675PreMerge1559BlockRejected
+      'Merge': 3675PreMerge1559BlockRejected
+      '>=Shanghai': PostMergeUncleHashIsNotEmpty
 
 
   # Correct baseFee
@@ -146,7 +153,8 @@ badUncles:
       - populateFromBlock: 2
         baseFeePerGas: 671
     expectException:
-      '>=Merge': 3675PreMerge1559BlockRejected
+      'Merge': 3675PreMerge1559BlockRejected
+      '>=Shanghai': PostMergeUncleHashIsNotEmpty
 
 
 

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcEIP3675/timestampPerBlockFiller.yml b/src/BlockchainTestsFiller/InvalidBlocks/bcEIP3675/timestampPerBlockFiller.yml
@@ -133,7 +133,7 @@ timestampPerBlock:
 
   expect:
   - network:
-    - "Merge"
+    - ">=Merge"
     result:
       # Timestamps for each block mined.
       0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC:

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcExpectSection/result_MergeEnvConvertionFiller.json b/src/BlockchainTestsFiller/InvalidBlocks/bcExpectSection/result_MergeEnvConvertionFiller.json
@@ -68,7 +68,7 @@
                                 "blockHeader" : {
                                     "difficulty" : "0x00",
                                     "mixHash" : "0x00001f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                                    "baseFeePerGas" : "0x11",
+                                    "baseFeePerGas" : "0x0f",
                                     "withdrawalsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
                                 }
                             }

diff --git a/...ockchainTestsFiller/InvalidBlocks/bcExpectSection/result_ShanghaiEnvConvertionFiller.json b/...ockchainTestsFiller/InvalidBlocks/bcExpectSection/result_ShanghaiEnvConvertionFiller.json
@@ -68,7 +68,7 @@
                                 "blockHeader" : {
                                     "difficulty" : "0x00",
                                     "mixHash" : "0x00001f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                                    "baseFeePerGas" : "0x11",
+                                    "baseFeePerGas" : "0x0f",
                                     "withdrawalsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
                                 }
                             }

diff --git a/...lockchainTestsFiller/InvalidBlocks/bcExpectSection/result_eip1559EnvConvertionFiller.json b/...lockchainTestsFiller/InvalidBlocks/bcExpectSection/result_eip1559EnvConvertionFiller.json
@@ -68,7 +68,7 @@
                                 "blockHeader" : {
                                     "difficulty" : "0x00",
                                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000020000",
-                                    "baseFeePerGas" : "0x10",
+                                    "baseFeePerGas" : "0x0e",
                                     "withdrawalsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
                                 }
                             }

diff --git a/...BlockchainTestsFiller/InvalidBlocks/bcExpectSection/result_legacyEnvConvertionFiller.json b/...BlockchainTestsFiller/InvalidBlocks/bcExpectSection/result_legacyEnvConvertionFiller.json
@@ -68,7 +68,7 @@
                                 "blockHeader" : {
                                     "difficulty" : "0x00",
                                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000020000",
-                                    "baseFeePerGas" : "0x10",
+                                    "baseFeePerGas" : "0x0e",
                                     "withdrawalsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
                                 }
                             }

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/wrongDifficultyFiller.json b/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/wrongDifficultyFiller.json
@@ -51,7 +51,8 @@
                     "Istanbul" : "InvalidDifficulty",
                     "Berlin" : "InvalidDifficulty",
                     "London" : "InvalidDifficulty",
-                    ">=Merge" : "3675PreMerge1559BlockRejected"
+                    "Merge" : "3675PreMerge1559BlockRejected",
+                    ">=Shanghai" : "PostMergeDifficultyIsNot0"
                 },
                 "transactions" : [
                     {

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/wrongUncleHashFiller.json b/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/wrongUncleHashFiller.json
@@ -51,7 +51,8 @@
                     "Istanbul" : "InvalidUnclesHash",
                     "Berlin" : "InvalidUnclesHash",
                     "London" : "InvalidUnclesHash",
-                    ">=Merge" : "3675PreMerge1559BlockRejected"
+                    "Merge" : "3675PreMerge1559BlockRejected",
+                    ">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
                 },
                 "transactions" : [
                     {

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/correctFiller.json b/src/BlockchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/correctFiller.json
@@ -100,7 +100,8 @@
                     }
                 },
                 "expectException" : {
-                    ">=Merge" : "3675PreMerge1559BlockRejected"
+                    "Merge" : "3675PreMerge1559BlockRejected",
+                    ">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
                 },
                 "transactions" : [
                     {

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/diffTooHighFiller.json b/src/BlockchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/diffTooHighFiller.json
@@ -81,7 +81,8 @@
                     "Istanbul" : "InvalidDifficulty",
                     "Berlin" : "InvalidDifficulty",
                     "London" : "InvalidDifficulty",
-                    ">=Merge" : "3675PreMerge1559BlockRejected"
+                    "Merge" : "3675PreMerge1559BlockRejected",
+                    ">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
                 },
         		"transactions" : [
                     {

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/diffTooLow2Filler.json b/src/BlockchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/diffTooLow2Filler.json
@@ -78,7 +78,8 @@
                     "Istanbul" : "InvalidDifficulty",
                     "Berlin" : "InvalidDifficulty",
                     "London" : "InvalidDifficulty",
-                    ">=Merge" : "3675PreMerge1559BlockRejected"
+                    "Merge" : "3675PreMerge1559BlockRejected",
+                    ">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
                 },
                 "transactions" : [
                     {

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/diffTooLowFiller.json b/src/BlockchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/diffTooLowFiller.json
@@ -78,7 +78,8 @@
                     "Istanbul" : "InvalidDifficulty",
                     "Berlin" : "InvalidDifficulty",
                     "London" : "InvalidDifficulty",
-                    ">=Merge" : "3675PreMerge1559BlockRejected"
+                    "Merge" : "3675PreMerge1559BlockRejected",
+                    ">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
                 },
                 "transactions" : [
                     {

diff --git a/...ckchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/gasLimitLTGasUsageUncleFiller.json b/...ckchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/gasLimitLTGasUsageUncleFiller.json
@@ -81,7 +81,8 @@
                     "Istanbul" : "TooMuchGasUsed",
                     "Berlin" : "TooMuchGasUsed",
                     "London" : "TooMuchGasUsed",
-                    ">=Merge" : "3675PreMerge1559BlockRejected"
+                    "Merge" : "3675PreMerge1559BlockRejected",
+                    ">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
                 },
                 "transactions" : [
                     {

diff --git a/...chainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/gasLimitTooHighExactBoundFiller.json b/...chainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/gasLimitTooHighExactBoundFiller.json
@@ -78,7 +78,8 @@
                     "Istanbul" : "InvalidGasLimit2",
                     "Berlin" : "InvalidGasLimit2",
                     "London" : "InvalidGasLimit2",
-                    ">=Merge" : "3675PreMerge1559BlockRejected"
+                    "Merge" : "3675PreMerge1559BlockRejected",
+                    ">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
                 },
                 "transactions" : [
                     {

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/gasLimitTooHighFiller.json b/src/BlockchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/gasLimitTooHighFiller.json
@@ -78,7 +78,8 @@
                     "Istanbul" : "InvalidGasLimit2",
                     "Berlin" : "InvalidGasLimit2",
                     "London" : "InvalidGasLimit2",
-                    ">=Merge" : "3675PreMerge1559BlockRejected"
+                    "Merge" : "3675PreMerge1559BlockRejected",
+                    ">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
                 },
                 "transactions" : [
                     {

diff --git a/...chainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/gasLimitTooLowExactBound2Filler.json b/...chainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/gasLimitTooLowExactBound2Filler.json
@@ -78,7 +78,8 @@
                     "Istanbul" : "InvalidGasLimit2",
                     "Berlin" : "InvalidGasLimit2",
                     "London" : "InvalidGasLimit2",
-                    ">=Merge" : "3675PreMerge1559BlockRejected"
+                    "Merge" : "3675PreMerge1559BlockRejected",
+                    ">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
                 },
                 "transactions" : [
                     {

diff --git a/...kchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/gasLimitTooLowExactBoundFiller.json b/...kchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/gasLimitTooLowExactBoundFiller.json
@@ -81,7 +81,8 @@
                     "Istanbul" : "InvalidGasLimit2",
                     "Berlin" : "InvalidGasLimit2",
                     "London" : "InvalidGasLimit2",
-                    ">=Merge" : "3675PreMerge1559BlockRejected"
+                    "Merge" : "3675PreMerge1559BlockRejected",
+                    ">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
                 },
                 "blockHeader" : {
                     "stateRoot" : "0x97f6417d2209a00290a009ee15e307a3e77fac623c7d301580c661c0ec2f1f5a"

diff --git a/...TestsFiller/InvalidBlocks/bcUncleHeaderValidity/gasLimitTooLowExactBoundLondonFiller.json b/...TestsFiller/InvalidBlocks/bcUncleHeaderValidity/gasLimitTooLowExactBoundLondonFiller.json
@@ -81,7 +81,8 @@
                     "Istanbul" : "InvalidGasLimit2",
                     "Berlin" : "InvalidGasLimit2",
                     "London" : "InvalidGasLimit2",
-                    ">=Merge" : "3675PreMerge1559BlockRejected"
+                    "Merge" : "3675PreMerge1559BlockRejected",
+                    ">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
                 },
                 "transactions" : [
                     {

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/gasLimitTooLowFiller.json b/src/BlockchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/gasLimitTooLowFiller.json
@@ -78,7 +78,8 @@
                     "Istanbul" : "InvalidGasLimit2",
                     "Berlin" : "InvalidGasLimit2",
                     "London" : "InvalidGasLimit2",
-                    ">=Merge" : "3675PreMerge1559BlockRejected"
+                    "Merge" : "3675PreMerge1559BlockRejected",
+                    ">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
                 },
                 "transactions" : [
                     {

diff --git a/...lockchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/incorrectUncleNumber0Filler.json b/...lockchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/incorrectUncleNumber0Filler.json
@@ -75,7 +75,8 @@
                     "Istanbul" : "InvalidNumber",
                     "Berlin" : "InvalidNumber",
                     "London" : "InvalidNumber",
-                    ">=Merge" : "3675PreMerge1559BlockRejected"
+                    "Merge" : "3675PreMerge1559BlockRejected",
+                    ">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
                 },
                 "transactions" : [
                     {

diff --git a/...lockchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/incorrectUncleNumber1Filler.json b/...lockchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/incorrectUncleNumber1Filler.json
@@ -75,7 +75,8 @@
                     "Istanbul" : "InvalidNumber",
                     "Berlin" : "InvalidNumber",
                     "London" : "InvalidNumber",
-                    ">=Merge" : "3675PreMerge1559BlockRejected"
+                    "Merge" : "3675PreMerge1559BlockRejected",
+                    ">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
                 },
                 "transactions" : [
                     {

diff --git a/...ckchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/incorrectUncleNumber500Filler.json b/...ckchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/incorrectUncleNumber500Filler.json
@@ -75,7 +75,8 @@
                     "Istanbul" : "InvalidNumber",
                     "Berlin" : "InvalidNumber",
                     "London" : "InvalidNumber",
-                    ">=Merge" : "3675PreMerge1559BlockRejected"
+                    "Merge" : "3675PreMerge1559BlockRejected",
+                    ">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
                 },
                 "transactions" : [
                     {

diff --git a/...kchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/incorrectUncleTimestamp2Filler.json b/...kchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/incorrectUncleTimestamp2Filler.json
@@ -75,7 +75,8 @@
                     "Istanbul" : "InvalidStateRoot",
                     "Berlin" : "InvalidStateRoot",
                     "London" : "InvalidStateRoot",
-                    ">=Merge" : "3675PreMerge1559BlockRejected"
+                    "Merge" : "3675PreMerge1559BlockRejected",
+                    ">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
                 },
                 "transactions" : [
                     {

diff --git a/...kchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/incorrectUncleTimestamp3Filler.json b/...kchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/incorrectUncleTimestamp3Filler.json
@@ -75,7 +75,8 @@
                     "Istanbul" : "InvalidDifficulty",
                     "Berlin" : "InvalidDifficulty",
                     "London" : "InvalidDifficulty",
-                    ">=Merge" : "3675PreMerge1559BlockRejected"
+                    "Merge" : "3675PreMerge1559BlockRejected",
+                    ">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
                 },
                 "transactions" : [
                     {

diff --git a/...kchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/incorrectUncleTimestamp4Filler.json b/...kchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/incorrectUncleTimestamp4Filler.json
@@ -97,7 +97,8 @@
                     }
                 },
                 "expectException" : {
-                    ">=Merge" : "3675PreMerge1559BlockRejected"
+                    "Merge" : "3675PreMerge1559BlockRejected",
+                    ">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
                 },
                 "transactions" : [
                     {

diff --git a/...kchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/incorrectUncleTimestamp5Filler.json b/...kchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/incorrectUncleTimestamp5Filler.json
@@ -97,7 +97,8 @@
                     }
                 },
                 "expectException" : {
-                    ">=Merge" : "3675PreMerge1559BlockRejected"
+                    "Merge" : "3675PreMerge1559BlockRejected",
+                    ">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
                 },
                 "transactions" : [
                     {

diff --git a/...ckchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/incorrectUncleTimestampFiller.json b/...ckchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/incorrectUncleTimestampFiller.json
@@ -78,7 +78,8 @@
                     "Istanbul" : "InvalidTimestampOlderParent",
                     "Berlin" : "InvalidTimestampOlderParent",
                     "London" : "InvalidTimestampOlderParent",
-                    ">=Merge" : "3675PreMerge1559BlockRejected"
+                    "Merge" : "3675PreMerge1559BlockRejected",
+                    ">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
                 },
                 "transactions" : [
                     {

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/pastUncleTimestampFiller.json b/src/BlockchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/pastUncleTimestampFiller.json
@@ -81,7 +81,8 @@
                     "Istanbul" : "InvalidTimestampOlderParent",
                     "Berlin" : "InvalidTimestampOlderParent",
                     "London" : "InvalidTimestampOlderParent",
-                    ">=Merge" : "3675PreMerge1559BlockRejected"
+                    "Merge" : "3675PreMerge1559BlockRejected",
+                    ">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
                 },
                 "transactions" : [
                     {

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/timestampTooHighFiller.json b/src/BlockchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/timestampTooHighFiller.json
@@ -100,7 +100,8 @@
                     }
                 },
                 "expectException" : {
-                    ">=Merge" : "3675PreMerge1559BlockRejected"
+                    "Merge" : "3675PreMerge1559BlockRejected",
+                    ">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
                 },
                 "transactions" : [
                     {

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/timestampTooLowFiller.json b/src/BlockchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/timestampTooLowFiller.json
@@ -100,7 +100,8 @@
                     }
                 },
                 "expectException" : {
-                    ">=Merge" : "3675PreMerge1559BlockRejected"
+                    "Merge" : "3675PreMerge1559BlockRejected",
+                    ">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
                 },
                 "transactions" : [
                     {

diff --git a/...ockchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/unknownUncleParentHashFiller.json b/...ockchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/unknownUncleParentHashFiller.json
@@ -75,7 +75,8 @@
                     "Istanbul" : "InvalidUncleParentHash",
                     "Berlin" : "InvalidUncleParentHash",
                     "London" : "InvalidUncleParentHash",
-                    ">=Merge" : "3675PreMerge1559BlockRejected"
+                    "Merge" : "3675PreMerge1559BlockRejected",
+                    ">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
                 },
                 "transactions" : [
                     {

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/wrongParentHashFiller.json b/src/BlockchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/wrongParentHashFiller.json
@@ -78,7 +78,8 @@
                     "Istanbul" : "InvalidUncleParentHash",
                     "Berlin" : "InvalidUncleParentHash",
                     "London" : "InvalidUncleParentHash",
-                    ">=Merge" : "3675PreMerge1559BlockRejected"
+                    "Merge" : "3675PreMerge1559BlockRejected",
+                    ">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
                 },
                 "transactions" : [
                     {

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/wrongStateRootFiller.json b/src/BlockchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/wrongStateRootFiller.json
@@ -103,7 +103,8 @@
                     }
                 },
                 "expectException" : { 
-                    ">=Merge" : "3675PreMerge1559BlockRejected"
+                    "Merge" : "3675PreMerge1559BlockRejected",
+                    ">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
                 },
                 "transactions" : [
                     {