From 181e3bfa0be619619a63d452247f43927bd767b8 Mon Sep 17 00:00:00 2001 From: Yoichi Hirai Date: Wed, 23 Aug 2017 16:26:42 +0200 Subject: Fix uncleHeaderAt2ByzantiumFiller with a correct state root hash See https://github.com/ethereum/tests/pull/269#discussion_r134723534 --- .../uncleHeaderAtBlock2ByzantiumFiller.json | 86 +++++++++++++++++++++ .../uncleHeaderAtBlock2MetropolisFiller.json | 87 ---------------------- 2 files changed, 86 insertions(+), 87 deletions(-) create mode 100644 src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2ByzantiumFiller.json delete mode 100644 src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2MetropolisFiller.json (limited to 'src/BlockchainTestsFiller/bcUncleTest') diff --git a/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2ByzantiumFiller.json b/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2ByzantiumFiller.json new file mode 100644 index 000000000..30f094e7b --- /dev/null +++ b/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2ByzantiumFiller.json @@ -0,0 +1,86 @@ +{ + "uncleHeaderAtBlock2Byzantium" : { + "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" + }, + "expect" : [ + { + "network" : ["Frontier", "Homestead", "EIP150", "EIP158", "Constantinople"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "10" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "1" + } + } + } + ], + "pre" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "10000000000000", + "nonce" : "0", + "code" : "", + "storage": {} + } + }, + "blocks" : [ + { + "transactions" : [ + { + "data" : "", + "gasLimit" : "314159", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", + "value" : "10" + } + ], + "uncleHeaders" : [ + ] + }, + { + "expectExceptionFrontier" : "InvalidStateRoot", + "expectExceptionHomestead" : "InvalidStateRoot", + "expectExceptionEIP150" : "InvalidStateRoot", + "expectExceptionEIP158" : "InvalidStateRoot", + "expectExceptionConstantinople" : "InvalidStateRoot", + "blockHeader" : { + "stateRoot" : "e1aff725a27c18dbb8d70c2d0e049511dabba2f595c20f7c67ad4026d6275f88", + "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/uncleHeaderAtBlock2MetropolisFiller.json b/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2MetropolisFiller.json deleted file mode 100644 index a712a4d8f..000000000 --- a/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2MetropolisFiller.json +++ /dev/null @@ -1,87 +0,0 @@ -{ - "uncleHeaderAtBlock2Byzantium" : { - "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" - }, - "expect" : [ - { - "network" : ["Frontier", "Homestead", "EIP150", "EIP158", "Byzantium", "Constantinople"], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "10" - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "1" - } - } - } - ], - "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "10000000000000", - "nonce" : "0", - "code" : "", - "storage": {} - } - }, - "blocks" : [ - { - "transactions" : [ - { - "data" : "", - "gasLimit" : "314159", - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", - "value" : "10" - } - ], - "uncleHeaders" : [ - ] - }, - { - "expectExceptionFrontier" : "InvalidStateRoot", - "expectExceptionHomestead" : "InvalidStateRoot", - "expectExceptionEIP150" : "InvalidStateRoot", - "expectExceptionEIP158" : "InvalidStateRoot", - "expectExceptionByzantium" : "InvalidStateRoot", - "expectExceptionConstantinople" : "InvalidStateRoot", - "blockHeader" : { - "stateRoot" : "187f42cfebad21c551446195f12bfae8e95b3005a18d9ad2668f9c1f729b2662", - "updatePoW" : "1" - }, - "transactions" : [ - { - "data" : "", - "gasLimit" : "314159", - "gasPrice" : "1", - "nonce" : "1", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", - "value" : "10" - } - ], - "uncleHeaders" : [ - { - "populateFromBlock" : "0" - } - ] - } - ] - } -} -- cgit