diff options
Diffstat (limited to 'src')
10 files changed, 25 insertions, 90 deletions
diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest70BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest70BCFiller.json index 9762f196c..89dcae187 100644 --- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest70BCFiller.json +++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest70BCFiller.json @@ -51,32 +51,6 @@ } } } - }, - { - "network" : ["Byzantium"], - "result" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a76586a0", - "code" : "0x43424044454245343af399e4a4734555", - "nonce" : "0x00", - "storage" : { - } - }, - "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : { - "balance" : "5000000000000050393", - "code" : "0x6000355415600957005b60203560003555", - "nonce" : "0x00", - "storage" : { - } - }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "999999999999849653", - "code" : "", - "nonce" : "0x01", - "storage" : { - } - } - } } ], "genesisBlockHeader" : { diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest99BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest99BCFiller.json index a99c9f878..6ad8ece3f 100644 --- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest99BCFiller.json +++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest99BCFiller.json @@ -65,14 +65,14 @@ } }, "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : { - "balance" : "5000000000000063818", + "balance" : "3000000000000063038", "code" : "0x6000355415600957005b60203560003555", "nonce" : "0x00", "storage" : { } }, "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "999999998514648540", + "balance" : "999999998514649320", "code" : "", "nonce" : "0x01", "storage" : { diff --git a/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestamp2Filler.json b/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestamp2Filler.json index 411345396..b64e162c5 100644 --- a/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestamp2Filler.json +++ b/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestamp2Filler.json @@ -19,7 +19,7 @@ }, "expect" : [ { - "network" : ["Frontier", "Homestead", "EIP150", "EIP158", "Byzantium"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "30" @@ -30,7 +30,7 @@ } }, { - "network" : ["Constantinople"], + "network" : ["Byzantium", "Constantinople"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "20" @@ -81,6 +81,7 @@ ] }, { + "expectExceptionByzantium" : "InvalidStateRoot", "expectExceptionConstantinople" : "InvalidStateRoot", "blockHeader" : { "stateRoot" : "77f96f4c766c10cd0207e2672b1b747c741ed75bc94e7be7abacb71cdca3c8fb", diff --git a/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestamp3Filler.json b/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestamp3Filler.json index 5eebd9a93..b6e153f54 100644 --- a/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestamp3Filler.json +++ b/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestamp3Filler.json @@ -19,7 +19,7 @@ }, "expect" : [ { - "network" : ["Frontier", "Homestead", "EIP150", "EIP158", "Byzantium"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158", "Byzantium", "Constantinople"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "20" @@ -28,17 +28,6 @@ "nonce" : "2" } } - }, - { - "network" : ["Constantinople"], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "30" - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "3" - } - } } ], "pre" : { @@ -86,6 +75,7 @@ "expectExceptionEIP150" : "InvalidStateRoot", "expectExceptionEIP158" : "InvalidStateRoot", "expectExceptionByzantium" : "InvalidStateRoot", + "expectExceptionConstantinople" : "InvalidStateRoot", "blockHeader" : { "stateRoot" : "3e9110dccee270e36e254d8e3b67cb18c12a9a0aa24065e24372a85856195c70", "updatePoW" : "1" diff --git a/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestampDifficultyDrop2Filler.json b/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestampDifficultyDrop2Filler.json index 62d397613..9e9e49376 100644 --- a/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestampDifficultyDrop2Filler.json +++ b/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestampDifficultyDrop2Filler.json @@ -19,7 +19,7 @@ }, "expect" : [ { - "network" : ["Frontier", "Homestead", "EIP150", "EIP158", "Byzantium"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158", "Constantinople"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "20" @@ -28,17 +28,6 @@ "nonce" : "2" } } - }, - { - "network" : ["Constantinople"], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "30" - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "3" - } - } } ], "pre" : { @@ -87,10 +76,10 @@ "expectExceptionHomestead" : "InvalidStateRoot", "expectExceptionEIP150" : "InvalidStateRoot", "expectExceptionEIP158" : "InvalidStateRoot", - "expectExceptionByzantium" : "InvalidStateRoot", + "expectExceptionConstantinople" : "InvalidStateRoot", "blocknumber" : "3", "blockHeader" : { - "stateRoot" : "3e9110dccee270e36e254d8e3b67cb18c12a9a0aa24065e24372a85856195c70", + "stateRoot" : "aa4b1943360f5a0ea3b1a2a1d661de5b6d773eb371bd84b319837d96ffc7b630", "updatePoW" : "1" }, "transactions" : [ diff --git a/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestampDifficultyDropFiller.json b/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestampDifficultyDropFiller.json index 1c7d51c1c..c8fd70c8d 100644 --- a/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestampDifficultyDropFiller.json +++ b/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestampDifficultyDropFiller.json @@ -19,7 +19,7 @@ }, "expect" : [ { - "network" : ["Frontier", "Homestead", "EIP150", "EIP158", "Byzantium"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "30" @@ -30,7 +30,7 @@ } }, { - "network" : ["Constantinople"], + "network" : ["Constantinople", "Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "20" @@ -83,6 +83,7 @@ ] }, { + "expectExceptionByzantium" : "InvalidStateRoot", "expectExceptionConstantinople" : "InvalidStateRoot", "blocknumber" : "3", "blockHeader" : { diff --git a/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/uncleBloomNot0Filler.json b/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/uncleBloomNot0Filler.json index 60cf741a2..824b23ecd 100644 --- a/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/uncleBloomNot0Filler.json +++ b/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/uncleBloomNot0Filler.json @@ -19,7 +19,7 @@ }, "expect" : [ { - "network" : ["Frontier", "Homestead", "EIP150", "EIP158", "Byzantium"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "30" @@ -30,7 +30,7 @@ } }, { - "network" : ["Constantinople"], + "network" : ["Byzantium", "Constantinople"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "20" @@ -83,6 +83,7 @@ ] }, { + "expectExceptionByzantium" : "InvalidStateRoot", "expectExceptionConstantinople" : "InvalidStateRoot", "blocknumber" : "3", "blockHeader" : { diff --git a/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/uncleBloomNot0_2Filler.json b/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/uncleBloomNot0_2Filler.json index 3e99ab96d..0e7c2b566 100644 --- a/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/uncleBloomNot0_2Filler.json +++ b/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/uncleBloomNot0_2Filler.json @@ -19,7 +19,7 @@ }, "expect" : [ { - "network" : ["Frontier", "Homestead", "EIP150", "EIP158", "Byzantium"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158", "Constantinople"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "20" @@ -28,17 +28,6 @@ "nonce" : "2" } } - }, - { - "network" : ["Constantinople"], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "30" - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "3" - } - } } ], "pre" : { @@ -87,10 +76,10 @@ "expectExceptionHomestead" : "InvalidStateRoot", "expectExceptionEIP150" : "InvalidStateRoot", "expectExceptionEIP158" : "InvalidStateRoot", - "expectExceptionByzantium" : "InvalidStateRoot", + "expectExceptionConstantinople" : "InvalidStateRoot", "blocknumber" : "3", "blockHeader" : { - "stateRoot" : "3e9110dccee270e36e254d8e3b67cb18c12a9a0aa24065e24372a85856195c70", + "stateRoot" : "aa4b1943360f5a0ea3b1a2a1d661de5b6d773eb371bd84b319837d96ffc7b630", "updatePoW" : "1" }, "transactions" : [ diff --git a/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2MetropolisFiller.json b/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2ByzantiumFiller.json index 1246d6298..30f094e7b 100644 --- a/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2MetropolisFiller.json +++ b/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2ByzantiumFiller.json @@ -19,7 +19,7 @@ }, "expect" : [ { - "network" : ["Frontier", "Homestead", "EIP150", "EIP158", "Byzantium"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158", "Constantinople"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "10" @@ -28,17 +28,6 @@ "nonce" : "1" } } - }, - { - "network" : ["Constantinople"], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "20" - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "2" - } - } } ], "pre" : { @@ -70,9 +59,9 @@ "expectExceptionHomestead" : "InvalidStateRoot", "expectExceptionEIP150" : "InvalidStateRoot", "expectExceptionEIP158" : "InvalidStateRoot", - "expectExceptionByzantium" : "InvalidStateRoot", + "expectExceptionConstantinople" : "InvalidStateRoot", "blockHeader" : { - "stateRoot" : "187f42cfebad21c551446195f12bfae8e95b3005a18d9ad2668f9c1f729b2662", + "stateRoot" : "e1aff725a27c18dbb8d70c2d0e049511dabba2f595c20f7c67ad4026d6275f88", "updatePoW" : "1" }, "transactions" : [ diff --git a/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2Filler.json b/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2Filler.json index 209cf7dc1..7fe1ec8b9 100644 --- a/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2Filler.json +++ b/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2Filler.json @@ -19,7 +19,7 @@ }, "expect" : [ { - "network" : ["Frontier", "Homestead", "EIP150", "EIP158", "Byzantium"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "20" @@ -30,7 +30,7 @@ } }, { - "network" : ["Constantinople"], + "network" : ["Byzantium", "Constantinople"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "10" @@ -66,6 +66,7 @@ ] }, { + "expectExceptionByzantium" : "InvalidStateRoot", "expectExceptionConstantinople" : "InvalidStateRoot", "blockHeader" : { "stateRoot" : "6ff22555fde6fe93e5b412a8691287a5be5708246adfd0c599604849925fcc34", |