diff options
| author | Yoichi Hirai <i@yoichihirai.com> | 2017-08-23 23:11:37 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-23 23:11:37 +0800 |
| commit | 738cf17893af31ed5f4a52fb70165b4b40316beb (patch) | |
| tree | ad2d4e4a4bf19d9d794bd58ea694df25d902156b /src/BlockchainTestsFiller/bcUncleHeaderValiditiy | |
| parent | f6c2a0241b37b51ffaf333cc6eb9f803c5e42572 (diff) | |
| parent | 181e3bfa0be619619a63d452247f43927bd767b8 (diff) | |
| download | dexon-tests-738cf17893af31ed5f4a52fb70165b4b40316beb.tar dexon-tests-738cf17893af31ed5f4a52fb70165b4b40316beb.tar.gz dexon-tests-738cf17893af31ed5f4a52fb70165b4b40316beb.tar.bz2 dexon-tests-738cf17893af31ed5f4a52fb70165b4b40316beb.tar.lz dexon-tests-738cf17893af31ed5f4a52fb70165b4b40316beb.tar.xz dexon-tests-738cf17893af31ed5f4a52fb70165b4b40316beb.tar.zst dexon-tests-738cf17893af31ed5f4a52fb70165b4b40316beb.zip | |
Merge pull request #269 from ethereum/eip649
EIP649: difficulty and reward changes
Diffstat (limited to 'src/BlockchainTestsFiller/bcUncleHeaderValiditiy')
6 files changed, 17 insertions, 46 deletions
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" : [ |