diff options
| author | Yoichi Hirai <i@yoichihirai.com> | 2017-08-17 20:12:42 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-17 20:12:42 +0800 |
| commit | 70e5862eb267226ca89fb9f395c97be1fdf6923a (patch) | |
| tree | c241111dde1f83da444a749e8c19e83feb368dc0 /src | |
| parent | 85f6d7cc01b6bd04e071f5ba579fc675cfd2043b (diff) | |
| parent | 8d668d9b4c21f7b4024ca30093729f226da61640 (diff) | |
| download | tangerine-tests-70e5862eb267226ca89fb9f395c97be1fdf6923a.tar tangerine-tests-70e5862eb267226ca89fb9f395c97be1fdf6923a.tar.gz tangerine-tests-70e5862eb267226ca89fb9f395c97be1fdf6923a.tar.bz2 tangerine-tests-70e5862eb267226ca89fb9f395c97be1fdf6923a.tar.lz tangerine-tests-70e5862eb267226ca89fb9f395c97be1fdf6923a.tar.xz tangerine-tests-70e5862eb267226ca89fb9f395c97be1fdf6923a.tar.zst tangerine-tests-70e5862eb267226ca89fb9f395c97be1fdf6923a.zip | |
Merge pull request #262 from ethereum/eip96-to-constantinople
Move EIP96 to Constantinople
Diffstat (limited to 'src')
8 files changed, 20 insertions, 20 deletions
diff --git a/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestamp2Filler.json b/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestamp2Filler.json index b64e162c5..411345396 100644 --- a/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestamp2Filler.json +++ b/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestamp2Filler.json @@ -19,7 +19,7 @@ }, "expect" : [ { - "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158", "Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "30" @@ -30,7 +30,7 @@ } }, { - "network" : ["Byzantium", "Constantinople"], + "network" : ["Constantinople"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "20" @@ -81,7 +81,6 @@ ] }, { - "expectExceptionByzantium" : "InvalidStateRoot", "expectExceptionConstantinople" : "InvalidStateRoot", "blockHeader" : { "stateRoot" : "77f96f4c766c10cd0207e2672b1b747c741ed75bc94e7be7abacb71cdca3c8fb", diff --git a/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestamp3Filler.json b/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestamp3Filler.json index 3de42df4a..5eebd9a93 100644 --- a/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestamp3Filler.json +++ b/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestamp3Filler.json @@ -19,7 +19,7 @@ }, "expect" : [ { - "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158", "Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "20" @@ -30,7 +30,7 @@ } }, { - "network" : ["Byzantium", "Constantinople"], + "network" : ["Constantinople"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "30" @@ -85,6 +85,7 @@ "expectExceptionHomestead" : "InvalidStateRoot", "expectExceptionEIP150" : "InvalidStateRoot", "expectExceptionEIP158" : "InvalidStateRoot", + "expectExceptionByzantium" : "InvalidStateRoot", "blockHeader" : { "stateRoot" : "3e9110dccee270e36e254d8e3b67cb18c12a9a0aa24065e24372a85856195c70", "updatePoW" : "1" diff --git a/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestampDifficultyDrop2Filler.json b/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestampDifficultyDrop2Filler.json index 09396236d..62d397613 100644 --- a/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestampDifficultyDrop2Filler.json +++ b/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestampDifficultyDrop2Filler.json @@ -19,7 +19,7 @@ }, "expect" : [ { - "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158", "Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "20" @@ -30,7 +30,7 @@ } }, { - "network" : ["Byzantium", "Constantinople"], + "network" : ["Constantinople"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "30" @@ -87,6 +87,7 @@ "expectExceptionHomestead" : "InvalidStateRoot", "expectExceptionEIP150" : "InvalidStateRoot", "expectExceptionEIP158" : "InvalidStateRoot", + "expectExceptionByzantium" : "InvalidStateRoot", "blocknumber" : "3", "blockHeader" : { "stateRoot" : "3e9110dccee270e36e254d8e3b67cb18c12a9a0aa24065e24372a85856195c70", diff --git a/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestampDifficultyDropFiller.json b/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestampDifficultyDropFiller.json index 1be7d1edd..1c7d51c1c 100644 --- a/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestampDifficultyDropFiller.json +++ b/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestampDifficultyDropFiller.json @@ -19,7 +19,7 @@ }, "expect" : [ { - "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158", "Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "30" @@ -30,7 +30,7 @@ } }, { - "network" : ["Byzantium", "Constantinople"], + "network" : ["Constantinople"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "20" @@ -83,7 +83,6 @@ ] }, { - "expectExceptionByzantium" : "InvalidStateRoot", "expectExceptionConstantinople" : "InvalidStateRoot", "blocknumber" : "3", "blockHeader" : { diff --git a/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/uncleBloomNot0Filler.json b/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/uncleBloomNot0Filler.json index 824b23ecd..60cf741a2 100644 --- a/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/uncleBloomNot0Filler.json +++ b/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/uncleBloomNot0Filler.json @@ -19,7 +19,7 @@ }, "expect" : [ { - "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158", "Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "30" @@ -30,7 +30,7 @@ } }, { - "network" : ["Byzantium", "Constantinople"], + "network" : ["Constantinople"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "20" @@ -83,7 +83,6 @@ ] }, { - "expectExceptionByzantium" : "InvalidStateRoot", "expectExceptionConstantinople" : "InvalidStateRoot", "blocknumber" : "3", "blockHeader" : { diff --git a/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/uncleBloomNot0_2Filler.json b/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/uncleBloomNot0_2Filler.json index 4d8b74821..3e99ab96d 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"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158", "Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "20" @@ -30,7 +30,7 @@ } }, { - "network" : ["Byzantium", "Constantinople"], + "network" : ["Constantinople"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "30" @@ -87,6 +87,7 @@ "expectExceptionHomestead" : "InvalidStateRoot", "expectExceptionEIP150" : "InvalidStateRoot", "expectExceptionEIP158" : "InvalidStateRoot", + "expectExceptionByzantium" : "InvalidStateRoot", "blocknumber" : "3", "blockHeader" : { "stateRoot" : "3e9110dccee270e36e254d8e3b67cb18c12a9a0aa24065e24372a85856195c70", diff --git a/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2Filler.json b/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2Filler.json index 7fe1ec8b9..209cf7dc1 100644 --- a/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2Filler.json +++ b/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2Filler.json @@ -19,7 +19,7 @@ }, "expect" : [ { - "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158", "Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "20" @@ -30,7 +30,7 @@ } }, { - "network" : ["Byzantium", "Constantinople"], + "network" : ["Constantinople"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "10" @@ -66,7 +66,6 @@ ] }, { - "expectExceptionByzantium" : "InvalidStateRoot", "expectExceptionConstantinople" : "InvalidStateRoot", "blockHeader" : { "stateRoot" : "6ff22555fde6fe93e5b412a8691287a5be5708246adfd0c599604849925fcc34", diff --git a/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2MetropolisFiller.json b/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2MetropolisFiller.json index abcd5d02a..1246d6298 100644 --- a/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2MetropolisFiller.json +++ b/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2MetropolisFiller.json @@ -19,7 +19,7 @@ }, "expect" : [ { - "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158", "Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "10" @@ -30,7 +30,7 @@ } }, { - "network" : ["Byzantium", "Constantinople"], + "network" : ["Constantinople"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "20" @@ -70,6 +70,7 @@ "expectExceptionHomestead" : "InvalidStateRoot", "expectExceptionEIP150" : "InvalidStateRoot", "expectExceptionEIP158" : "InvalidStateRoot", + "expectExceptionByzantium" : "InvalidStateRoot", "blockHeader" : { "stateRoot" : "187f42cfebad21c551446195f12bfae8e95b3005a18d9ad2668f9c1f729b2662", "updatePoW" : "1" |