diff options
Diffstat (limited to 'src/BlockchainTestsFiller/bcUncleTest')
24 files changed, 226 insertions, 37 deletions
diff --git a/src/BlockchainTestsFiller/bcUncleTest/EqualUncleInTwoDifferentBlocksFiller.json b/src/BlockchainTestsFiller/bcUncleTest/EqualUncleInTwoDifferentBlocksFiller.json index 0241d0e83..f4c601359 100644 --- a/src/BlockchainTestsFiller/bcUncleTest/EqualUncleInTwoDifferentBlocksFiller.json +++ b/src/BlockchainTestsFiller/bcUncleTest/EqualUncleInTwoDifferentBlocksFiller.json @@ -17,6 +17,7 @@ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" }, + "sealEngine" : "NoProof", "expect" : [ { "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], diff --git a/src/BlockchainTestsFiller/bcUncleTest/InChainUncleFatherFiller.json b/src/BlockchainTestsFiller/bcUncleTest/InChainUncleFatherFiller.json index 540aee2d3..fc1346812 100644 --- a/src/BlockchainTestsFiller/bcUncleTest/InChainUncleFatherFiller.json +++ b/src/BlockchainTestsFiller/bcUncleTest/InChainUncleFatherFiller.json @@ -17,9 +17,10 @@ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" }, + "sealEngine" : "NoProof", "expect" : [ { - "network" : ["ALL"], + "network" : [">=Frontier"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "20" diff --git a/src/BlockchainTestsFiller/bcUncleTest/InChainUncleFiller.json b/src/BlockchainTestsFiller/bcUncleTest/InChainUncleFiller.json index b912467dc..6005a2086 100644 --- a/src/BlockchainTestsFiller/bcUncleTest/InChainUncleFiller.json +++ b/src/BlockchainTestsFiller/bcUncleTest/InChainUncleFiller.json @@ -17,9 +17,10 @@ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" }, + "sealEngine" : "NoProof", "expect" : [ { - "network" : ["ALL"], + "network" : [">=Frontier"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "20" diff --git a/src/BlockchainTestsFiller/bcUncleTest/InChainUncleGrandPaFiller.json b/src/BlockchainTestsFiller/bcUncleTest/InChainUncleGrandPaFiller.json index 776bde3e0..4fe68850f 100644 --- a/src/BlockchainTestsFiller/bcUncleTest/InChainUncleGrandPaFiller.json +++ b/src/BlockchainTestsFiller/bcUncleTest/InChainUncleGrandPaFiller.json @@ -17,9 +17,10 @@ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" }, + "sealEngine" : "NoProof", "expect" : [ { - "network" : ["ALL"], + "network" : [">=Frontier"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "20" diff --git a/src/BlockchainTestsFiller/bcUncleTest/InChainUncleGreatGrandPaFiller.json b/src/BlockchainTestsFiller/bcUncleTest/InChainUncleGreatGrandPaFiller.json index b820efe3e..24d42eb09 100644 --- a/src/BlockchainTestsFiller/bcUncleTest/InChainUncleGreatGrandPaFiller.json +++ b/src/BlockchainTestsFiller/bcUncleTest/InChainUncleGreatGrandPaFiller.json @@ -17,9 +17,10 @@ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" }, + "sealEngine" : "NoProof", "expect" : [ { - "network" : ["ALL"], + "network" : [">=Frontier"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "30" diff --git a/src/BlockchainTestsFiller/bcUncleTest/InChainUncleGreatGreatGrandPaFiller.json b/src/BlockchainTestsFiller/bcUncleTest/InChainUncleGreatGreatGrandPaFiller.json index 160981719..24156fd40 100644 --- a/src/BlockchainTestsFiller/bcUncleTest/InChainUncleGreatGreatGrandPaFiller.json +++ b/src/BlockchainTestsFiller/bcUncleTest/InChainUncleGreatGreatGrandPaFiller.json @@ -17,9 +17,10 @@ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" }, + "sealEngine" : "NoProof", "expect" : [ { - "network" : ["ALL"], + "network" : [">=Frontier"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "40" diff --git a/src/BlockchainTestsFiller/bcUncleTest/InChainUncleGreatGreatGreatGrandPaFiller.json b/src/BlockchainTestsFiller/bcUncleTest/InChainUncleGreatGreatGreatGrandPaFiller.json index 8e3ab1f7d..f82f525b9 100644 --- a/src/BlockchainTestsFiller/bcUncleTest/InChainUncleGreatGreatGreatGrandPaFiller.json +++ b/src/BlockchainTestsFiller/bcUncleTest/InChainUncleGreatGreatGreatGrandPaFiller.json @@ -17,9 +17,10 @@ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" }, + "sealEngine" : "NoProof", "expect" : [ { - "network" : ["ALL"], + "network" : [">=Frontier"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "50" diff --git a/src/BlockchainTestsFiller/bcUncleTest/InChainUncleGreatGreatGreatGreatGrandPaFiller.json b/src/BlockchainTestsFiller/bcUncleTest/InChainUncleGreatGreatGreatGreatGrandPaFiller.json index 5471e495b..310a20c82 100644 --- a/src/BlockchainTestsFiller/bcUncleTest/InChainUncleGreatGreatGreatGreatGrandPaFiller.json +++ b/src/BlockchainTestsFiller/bcUncleTest/InChainUncleGreatGreatGreatGreatGrandPaFiller.json @@ -17,9 +17,10 @@ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" }, + "sealEngine" : "NoProof", "expect" : [ { - "network" : ["ALL"], + "network" : ["Frontier"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "60" diff --git a/src/BlockchainTestsFiller/bcUncleTest/UncleIsBrotherFiller.json b/src/BlockchainTestsFiller/bcUncleTest/UncleIsBrotherFiller.json index d256f35fe..89341d446 100644 --- a/src/BlockchainTestsFiller/bcUncleTest/UncleIsBrotherFiller.json +++ b/src/BlockchainTestsFiller/bcUncleTest/UncleIsBrotherFiller.json @@ -17,9 +17,10 @@ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" }, + "sealEngine" : "NoProof", "expect" : [ { - "network" : ["ALL"], + "network" : [">=Frontier"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "20" diff --git a/src/BlockchainTestsFiller/bcUncleTest/oneUncleFiller.json b/src/BlockchainTestsFiller/bcUncleTest/oneUncleFiller.json index f606d18df..c2239740c 100644 --- a/src/BlockchainTestsFiller/bcUncleTest/oneUncleFiller.json +++ b/src/BlockchainTestsFiller/bcUncleTest/oneUncleFiller.json @@ -17,9 +17,10 @@ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" }, + "sealEngine" : "NoProof", "expect" : [ { - "network" : ["ALL"], + "network" : [">=Frontier"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "30" diff --git a/src/BlockchainTestsFiller/bcUncleTest/oneUncleGeneration2Filler.json b/src/BlockchainTestsFiller/bcUncleTest/oneUncleGeneration2Filler.json index 78fc8bc9a..889fa2bee 100644 --- a/src/BlockchainTestsFiller/bcUncleTest/oneUncleGeneration2Filler.json +++ b/src/BlockchainTestsFiller/bcUncleTest/oneUncleGeneration2Filler.json @@ -17,6 +17,7 @@ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" }, + "sealEngine" : "NoProof", "expect" : [ { "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], @@ -33,7 +34,7 @@ } }, { - "network" : ["Byzantium", "Constantinople"], + "network" : ["Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "40" @@ -45,6 +46,20 @@ "balance" : "2250000000000000000" } } + }, + { + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "40" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "4" + }, + "bcde5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1500000000000000000" + } + } } ], "pre" : { diff --git a/src/BlockchainTestsFiller/bcUncleTest/oneUncleGeneration3Filler.json b/src/BlockchainTestsFiller/bcUncleTest/oneUncleGeneration3Filler.json index 5270d463a..266e791cd 100644 --- a/src/BlockchainTestsFiller/bcUncleTest/oneUncleGeneration3Filler.json +++ b/src/BlockchainTestsFiller/bcUncleTest/oneUncleGeneration3Filler.json @@ -17,6 +17,7 @@ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" }, + "sealEngine" : "NoProof", "expect" : [ { "network" : ["Homestead", "Frontier", "EIP150", "EIP158"], @@ -33,7 +34,7 @@ } }, { - "network" : ["Byzantium", "Constantinople"], + "network" : ["Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "50" @@ -45,6 +46,20 @@ "balance" : "1875000000000000000" } } + }, + { + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "50" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "5" + }, + "bcde5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1250000000000000000" + } + } } ], "pre" : { diff --git a/src/BlockchainTestsFiller/bcUncleTest/oneUncleGeneration4Filler.json b/src/BlockchainTestsFiller/bcUncleTest/oneUncleGeneration4Filler.json index 265dd4ac5..4b964841e 100644 --- a/src/BlockchainTestsFiller/bcUncleTest/oneUncleGeneration4Filler.json +++ b/src/BlockchainTestsFiller/bcUncleTest/oneUncleGeneration4Filler.json @@ -17,6 +17,7 @@ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" }, + "sealEngine" : "NoProof", "expect" : [ { "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], @@ -45,6 +46,20 @@ "balance" : "1500000000000000000" } } + }, + { + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "60" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "6" + }, + "bcde5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000" + } + } } ], "pre" : { diff --git a/src/BlockchainTestsFiller/bcUncleTest/oneUncleGeneration5Filler.json b/src/BlockchainTestsFiller/bcUncleTest/oneUncleGeneration5Filler.json index a8531701a..1a7da5d68 100644 --- a/src/BlockchainTestsFiller/bcUncleTest/oneUncleGeneration5Filler.json +++ b/src/BlockchainTestsFiller/bcUncleTest/oneUncleGeneration5Filler.json @@ -17,6 +17,7 @@ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" }, + "sealEngine" : "NoProof", "expect" : [ { "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], @@ -33,7 +34,7 @@ } }, { - "network" : ["Byzantium", "Constantinople"], + "network" : ["Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "70" @@ -45,6 +46,20 @@ "balance" : "1125000000000000000" } } + }, + { + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "70" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "7" + }, + "bcde5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "750000000000000000" + } + } } ], "pre" : { diff --git a/src/BlockchainTestsFiller/bcUncleTest/oneUncleGeneration6Filler.json b/src/BlockchainTestsFiller/bcUncleTest/oneUncleGeneration6Filler.json index f93ea5ace..50e376711 100644 --- a/src/BlockchainTestsFiller/bcUncleTest/oneUncleGeneration6Filler.json +++ b/src/BlockchainTestsFiller/bcUncleTest/oneUncleGeneration6Filler.json @@ -17,6 +17,7 @@ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" }, + "sealEngine" : "NoProof", "expect" : [ { "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], @@ -31,6 +32,34 @@ "balance" : "1250000000000000000" } } + }, + { + "network" : ["Byzantium"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "80" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "8" + }, + "bcde5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "750000000000000000" + } + } + }, + { + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "80" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "8" + }, + "bcde5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "500000000000000000" + } + } } ], "pre" : { diff --git a/src/BlockchainTestsFiller/bcUncleTest/oneUncleGeneration7Filler.json b/src/BlockchainTestsFiller/bcUncleTest/oneUncleGeneration7Filler.json index 16a2073b4..1fe31d195 100644 --- a/src/BlockchainTestsFiller/bcUncleTest/oneUncleGeneration7Filler.json +++ b/src/BlockchainTestsFiller/bcUncleTest/oneUncleGeneration7Filler.json @@ -17,9 +17,10 @@ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" }, + "sealEngine" : "NoProof", "expect" : [ { - "network" : ["ALL"], + "network" : [">=Frontier"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "80" diff --git a/src/BlockchainTestsFiller/bcUncleTest/threeUncleFiller.json b/src/BlockchainTestsFiller/bcUncleTest/threeUncleFiller.json index f8b6fcc40..1e55fcb07 100644 --- a/src/BlockchainTestsFiller/bcUncleTest/threeUncleFiller.json +++ b/src/BlockchainTestsFiller/bcUncleTest/threeUncleFiller.json @@ -17,9 +17,10 @@ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" }, + "sealEngine" : "NoProof", "expect" : [ { - "network" : ["ALL"], + "network" : [">=Frontier"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "20" diff --git a/src/BlockchainTestsFiller/bcUncleTest/twoEqualUncleFiller.json b/src/BlockchainTestsFiller/bcUncleTest/twoEqualUncleFiller.json index b317c165f..948afe1bb 100644 --- a/src/BlockchainTestsFiller/bcUncleTest/twoEqualUncleFiller.json +++ b/src/BlockchainTestsFiller/bcUncleTest/twoEqualUncleFiller.json @@ -17,9 +17,10 @@ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" }, + "sealEngine" : "NoProof", "expect" : [ { - "network" : ["ALL"], + "network" : [">=Frontier"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "20" diff --git a/src/BlockchainTestsFiller/bcUncleTest/twoUncleFiller.json b/src/BlockchainTestsFiller/bcUncleTest/twoUncleFiller.json index ee1a99286..2e1e7bca2 100644 --- a/src/BlockchainTestsFiller/bcUncleTest/twoUncleFiller.json +++ b/src/BlockchainTestsFiller/bcUncleTest/twoUncleFiller.json @@ -17,6 +17,7 @@ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" }, + "sealEngine" : "NoProof", "expect" : [ { "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], @@ -51,6 +52,23 @@ "balance" : "2625000000000000000" } } + }, + { + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "30" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "3" + }, + "bcde5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1750000000000000000" + }, + "ccde5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1750000000000000000" + } + } } ], "pre" : { diff --git a/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2ByzantiumFiller.json b/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2ByzantiumFiller.json index 2a9136405..26d32e8e4 100644 --- a/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2ByzantiumFiller.json +++ b/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2ByzantiumFiller.json @@ -17,15 +17,16 @@ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" }, + "sealEngine" : "NoProof", "expect" : [ { - "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], + "network" : ["Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "10" + "balance" : "20" }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "1" + "nonce" : "2" } } } @@ -55,10 +56,6 @@ ] }, { - "expectExceptionFrontier" : "InvalidStateRoot", - "expectExceptionHomestead" : "InvalidStateRoot", - "expectExceptionEIP150" : "InvalidStateRoot", - "expectExceptionEIP158" : "InvalidStateRoot", "blockHeader" : { "stateRoot" : "0xe1aff725a27c18dbb8d70c2d0e049511dabba2f595c20f7c67ad4026d6275f88", "updatePoW" : "1" diff --git a/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2ConstantinopleFiller.json b/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2ConstantinopleFiller.json new file mode 100644 index 000000000..96331f515 --- /dev/null +++ b/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2ConstantinopleFiller.json @@ -0,0 +1,82 @@ +{ + "uncleHeaderAtBlock2Constantinople" : { + "genesisBlockHeader" : { + "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1", + "difficulty" : "131072", + "extraData" : "0x42", + "gasLimit" : "3141592", + "gasUsed" : "0", + "number" : "0", + "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000", + "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", + "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a", + "timestamp" : "0x54c98c81", + "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", + "nonce" : "0x0102030405060708", + "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", + "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + "sealEngine" : "NoProof", + "expect" : [ + { + "network" : [">=Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "2" + } + } + } + ], + "pre" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "10000000000000", + "nonce" : "0", + "code" : "", + "storage": {} + } + }, + "blocks" : [ + { + "transactions" : [ + { + "data" : "", + "gasLimit" : "314159", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", + "value" : "10" + } + ], + "uncleHeaders" : [ + ] + }, + { + "blockHeader" : { + "stateRoot" : "0xb72dc47bc7672257c507ffa10abbcd36181b6cfc2ebf59e8654acb3db45b5159", + "updatePoW" : "1" + }, + "transactions" : [ + { + "data" : "", + "gasLimit" : "314159", + "gasPrice" : "1", + "nonce" : "1", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", + "value" : "10" + } + ], + "uncleHeaders" : [ + { + "populateFromBlock" : "0" + } + ] + } + ] + } +} diff --git a/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2Filler.json b/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2Filler.json index 3cfaa44a1..a5bba62b5 100644 --- a/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2Filler.json +++ b/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2Filler.json @@ -17,6 +17,7 @@ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" }, + "sealEngine" : "NoProof", "expect" : [ { "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], @@ -28,17 +29,6 @@ "nonce" : "2" } } - }, - { - "network" : ["Byzantium", "Constantinople"], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "10" - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "1" - } - } } ], "pre" : { @@ -66,8 +56,6 @@ ] }, { - "expectExceptionByzantium" : "InvalidStateRoot", - "expectExceptionConstantinople" : "InvalidStateRoot", "blockHeader" : { "stateRoot" : "0x6ff22555fde6fe93e5b412a8691287a5be5708246adfd0c599604849925fcc34", "updatePoW" : "1" diff --git a/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderWithGeneration0Filler.json b/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderWithGeneration0Filler.json index d5efef3c4..d3603e8c3 100644 --- a/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderWithGeneration0Filler.json +++ b/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderWithGeneration0Filler.json @@ -17,9 +17,10 @@ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" }, + "sealEngine" : "NoProof", "expect" : [ { - "network" : ["ALL"], + "network" : [">=Frontier"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "20" diff --git a/src/BlockchainTestsFiller/bcUncleTest/uncleWithSameBlockNumberFiller.json b/src/BlockchainTestsFiller/bcUncleTest/uncleWithSameBlockNumberFiller.json index 79c103970..f16b15939 100644 --- a/src/BlockchainTestsFiller/bcUncleTest/uncleWithSameBlockNumberFiller.json +++ b/src/BlockchainTestsFiller/bcUncleTest/uncleWithSameBlockNumberFiller.json @@ -17,9 +17,10 @@ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" }, + "sealEngine" : "NoProof", "expect" : [ { - "network" : ["ALL"], + "network" : [">=Frontier"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "20" |