Skip to content

Commit

Permalink
fix InvalidBlocks/bcUncleTest
Browse files Browse the repository at this point in the history
  • Loading branch information
@winsvega
winsvega committed Feb 28, 2023
1 parent c25515d commit f06217a
Show file tree
Hide file tree
Showing 24 changed files with 48 additions and 25 deletions.
3 changes: 2 additions & 1 deletion ...lockchainTestsFiller/InvalidBlocks/bcUncleTest/EqualUncleInTwoDifferentBlocks2Filler.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@
}
},
"expectException" : {
">=Merge" : "3675PreMerge1559BlockRejected"
"Merge" : "3675PreMerge1559BlockRejected",
">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
},
"transactions" : [
{
Expand Down
3 changes: 2 additions & 1 deletion ...BlockchainTestsFiller/InvalidBlocks/bcUncleTest/EqualUncleInTwoDifferentBlocksFiller.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@
"Istanbul" : "UncleInChain",
"Berlin" : "UncleInChain",
"London" : "UncleInChain",
">=Merge" : "3675PreMerge1559BlockRejected"
"Merge" : "3675PreMerge1559BlockRejected",
">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
},
"transactions" : [
{
Expand Down
3 changes: 2 additions & 1 deletion src/BlockchainTestsFiller/InvalidBlocks/bcUncleTest/InChainUncleFatherFiller.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@
"Istanbul" : "UncleIsAncestor",
"Berlin" : "UncleIsAncestor",
"London" : "UncleIsAncestor",
">=Merge" : "3675PreMerge1559BlockRejected"
"Merge" : "3675PreMerge1559BlockRejected",
">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
},
"transactions" : [
{
Expand Down
3 changes: 2 additions & 1 deletion src/BlockchainTestsFiller/InvalidBlocks/bcUncleTest/InChainUncleFiller.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@
"Istanbul" : "UncleIsAncestor",
"Berlin" : "UncleIsAncestor",
"London" : "UncleIsAncestor",
">=Merge" : "3675PreMerge1559BlockRejected"
"Merge" : "3675PreMerge1559BlockRejected",
">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
},
"transactions" : [
{
Expand Down
3 changes: 2 additions & 1 deletion src/BlockchainTestsFiller/InvalidBlocks/bcUncleTest/InChainUncleGrandPaFiller.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@
"Istanbul" : "UncleIsAncestor",
"Berlin" : "UncleIsAncestor",
"London" : "UncleIsAncestor",
">=Merge" : "3675PreMerge1559BlockRejected"
"Merge" : "3675PreMerge1559BlockRejected",
">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
},
"transactions" : [
{
Expand Down
3 changes: 2 additions & 1 deletion src/BlockchainTestsFiller/InvalidBlocks/bcUncleTest/InChainUncleGreatGrandPaFiller.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@
"Istanbul" : "UncleIsAncestor",
"Berlin" : "UncleIsAncestor",
"London" : "UncleIsAncestor",
">=Merge" : "3675PreMerge1559BlockRejected"
"Merge" : "3675PreMerge1559BlockRejected",
">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
},
"transactions" : [
{
Expand Down
3 changes: 2 additions & 1 deletion src/BlockchainTestsFiller/InvalidBlocks/bcUncleTest/InChainUncleGreatGreatGrandPaFiller.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@
"Istanbul" : "UncleIsAncestor",
"Berlin" : "UncleIsAncestor",
"London" : "UncleIsAncestor",
">=Merge" : "3675PreMerge1559BlockRejected"
"Merge" : "3675PreMerge1559BlockRejected",
">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
},
"transactions" : [
{
Expand Down
3 changes: 2 additions & 1 deletion ...kchainTestsFiller/InvalidBlocks/bcUncleTest/InChainUncleGreatGreatGreatGrandPaFiller.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@
"Istanbul" : "UncleIsAncestor",
"Berlin" : "UncleIsAncestor",
"London" : "UncleIsAncestor",
">=Merge" : "3675PreMerge1559BlockRejected"
"Merge" : "3675PreMerge1559BlockRejected",
">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
},
"transactions" : [
{
Expand Down
3 changes: 2 additions & 1 deletion ...nTestsFiller/InvalidBlocks/bcUncleTest/InChainUncleGreatGreatGreatGreatGrandPaFiller.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@
"Istanbul" : "UncleIsAncestor",
"Berlin" : "UncleIsAncestor",
"London" : "UncleIsAncestor",
">=Merge" : "3675PreMerge1559BlockRejected"
"Merge" : "3675PreMerge1559BlockRejected",
">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
},
"transactions" : [
{
Expand Down
3 changes: 2 additions & 1 deletion src/BlockchainTestsFiller/InvalidBlocks/bcUncleTest/UncleIsBrotherFiller.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@
"Istanbul" : "UncleParentIsNotAncestor",
"Berlin" : "UncleParentIsNotAncestor",
"London" : "UncleParentIsNotAncestor",
">=Merge" : "3675PreMerge1559BlockRejected"
"Merge" : "3675PreMerge1559BlockRejected",
">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
},
"transactions" : [
],
Expand Down
3 changes: 2 additions & 1 deletion src/BlockchainTestsFiller/InvalidBlocks/bcUncleTest/oneUncleFiller.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@
{
"expectException" : {
"//comment" : "Block with uncles treated as eip1559 block (not PoS format)",
">=Merge" : "3675PreMerge1559BlockRejected"
"Merge" : "3675PreMerge1559BlockRejected",
">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
},
"transactions" : [
{
Expand Down
3 changes: 2 additions & 1 deletion src/BlockchainTestsFiller/InvalidBlocks/bcUncleTest/oneUncleGeneration2Filler.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@
{
"expectException" : {
"//comment" : "Block with uncles treated as eip1559 block (not PoS format)",
">=Merge" : "3675PreMerge1559BlockRejected"
"Merge" : "3675PreMerge1559BlockRejected",
">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
},
"transactions" : [
{
Expand Down
3 changes: 2 additions & 1 deletion src/BlockchainTestsFiller/InvalidBlocks/bcUncleTest/oneUncleGeneration3Filler.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@
{
"expectException" : {
"//comment" : "Block with uncles treated as eip1559 block (not PoS format)",
">=Merge" : "3675PreMerge1559BlockRejected"
"Merge" : "3675PreMerge1559BlockRejected",
">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
},
"transactions" : [
{
Expand Down
3 changes: 2 additions & 1 deletion src/BlockchainTestsFiller/InvalidBlocks/bcUncleTest/oneUncleGeneration4Filler.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@
{
"expectException" : {
"//comment" : "Block with uncles treated as eip1559 block (not PoS format)",
">=Merge" : "3675PreMerge1559BlockRejected"
"Merge" : "3675PreMerge1559BlockRejected",
">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
},
"transactions" : [
{
Expand Down
3 changes: 2 additions & 1 deletion src/BlockchainTestsFiller/InvalidBlocks/bcUncleTest/oneUncleGeneration5Filler.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,8 @@
{
"expectException" : {
"//comment" : "Block with uncles treated as eip1559 block (not PoS format)",
">=Merge" : "3675PreMerge1559BlockRejected"
"Merge" : "3675PreMerge1559BlockRejected",
">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
},
"transactions" : [
{
Expand Down
3 changes: 2 additions & 1 deletion src/BlockchainTestsFiller/InvalidBlocks/bcUncleTest/oneUncleGeneration6Filler.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,8 @@
{
"expectException" : {
"//comment" : "Block with uncles treated as eip1559 block (not PoS format)",
">=Merge" : "3675PreMerge1559BlockRejected"
"Merge" : "3675PreMerge1559BlockRejected",
">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
},
"transactions" : [
{
Expand Down
3 changes: 2 additions & 1 deletion src/BlockchainTestsFiller/InvalidBlocks/bcUncleTest/oneUncleGeneration7Filler.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,8 @@
"Istanbul" : "UncleParentIsNotAncestor",
"Berlin" : "UncleParentIsNotAncestor",
"London" : "UncleParentIsNotAncestor",
">=Merge" : "3675PreMerge1559BlockRejected"
"Merge" : "3675PreMerge1559BlockRejected",
">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
},
"transactions" : [
{
Expand Down
3 changes: 2 additions & 1 deletion src/BlockchainTestsFiller/InvalidBlocks/bcUncleTest/threeUncleFiller.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@
"Istanbul" : "TooManyUncles",
"Berlin" : "TooManyUncles",
"London" : "TooManyUncles",
">=Merge" : "3675PreMerge1559BlockRejected"
"Merge" : "3675PreMerge1559BlockRejected",
">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
},
"transactions" : [
{
Expand Down
3 changes: 2 additions & 1 deletion src/BlockchainTestsFiller/InvalidBlocks/bcUncleTest/twoEqualUncleFiller.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@
"Istanbul" : "UncleIsBrother",
"Berlin" : "UncleIsBrother",
"London" : "UncleIsBrother",
">=Merge" : "3675PreMerge1559BlockRejected"
"Merge" : "3675PreMerge1559BlockRejected",
">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
},
"transactions" : [
{
Expand Down
3 changes: 2 additions & 1 deletion src/BlockchainTestsFiller/InvalidBlocks/bcUncleTest/twoUncleFiller.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@
{
"expectException" : {
"//comment" : "Block with uncles treated as eip1559 block (not PoS format)",
">=Merge" : "3675PreMerge1559BlockRejected"
"Merge" : "3675PreMerge1559BlockRejected",
">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
},
"transactions" : [
{
Expand Down
5 changes: 3 additions & 2 deletions src/BlockchainTestsFiller/InvalidBlocks/bcUncleTest/uncleHeaderAtBlock2Filler.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,9 @@
},
{
"expectException" : {
"//comment" : "Block with uncles treated as eip1559 block (not PoS format)",
">=Merge" : "3675PreMerge1559BlockRejected"
"//comment" : "Block with uncles treated as eip1559 block (not PoS format) on Merge",
"Merge" : "3675PreMerge1559BlockRejected",
">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
},
"transactions" : [
{
Expand Down
3 changes: 2 additions & 1 deletion src/BlockchainTestsFiller/InvalidBlocks/bcUncleTest/uncleHeaderWithGeneration0Filler.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@
"Istanbul" : "UncleIsAncestor",
"Berlin" : "UncleIsAncestor",
"London" : "UncleIsAncestor",
">=Merge" : "3675PreMerge1559BlockRejected"
"Merge" : "3675PreMerge1559BlockRejected",
">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
},
"transactions" : [
{
Expand Down
3 changes: 2 additions & 1 deletion src/BlockchainTestsFiller/InvalidBlocks/bcUncleTest/uncleWithSameBlockNumberFiller.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@
"Istanbul" : "InvalidNumber",
"Berlin" : "InvalidNumber",
"London" : "InvalidNumber",
">=Merge" : "3675PreMerge1559BlockRejected"
"Merge" : "3675PreMerge1559BlockRejected",
">=Shanghai" : "PostMergeUncleHashIsNotEmpty"
},
"transactions" : [
{
Expand Down
2 changes: 1 addition & 1 deletion src/BlockchainTestsFiller/ValidBlocks/bcStateTests/multimpleBalanceInstructionFiller.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
},
"195e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
"//comment" : "Registering different balance report for sender on Shanghai, why?",
"//comment" : "Shanghai coinbase is warm. balance instruction takes less funds.",
"0x00" : "0x038d7e9060781e",
"0x01" : "0x056b9d9c",
"0x02" : "0x038d7e9060781e",
Expand Down

0 comments on commit f06217a

Please sign in to comment.