diff options
author | winsvega <winsvega@mail.ru> | 2017-08-04 17:35:59 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-04 17:35:59 +0800 |
commit | 45f8be4196b2830728d4b1ea1b7564ad89e6ab0c (patch) | |
tree | c7dcfb82c49dac1a0277a774c27862f6894d8b6e /src/BlockchainTestsFiller | |
parent | 8736b076d5f94b29a1fbcf191368e94eae3a9eef (diff) | |
parent | 431ac68e525a0616a4122f38826217e80699c8d5 (diff) | |
download | dexon-tests-45f8be4196b2830728d4b1ea1b7564ad89e6ab0c.tar dexon-tests-45f8be4196b2830728d4b1ea1b7564ad89e6ab0c.tar.gz dexon-tests-45f8be4196b2830728d4b1ea1b7564ad89e6ab0c.tar.bz2 dexon-tests-45f8be4196b2830728d4b1ea1b7564ad89e6ab0c.tar.lz dexon-tests-45f8be4196b2830728d4b1ea1b7564ad89e6ab0c.tar.xz dexon-tests-45f8be4196b2830728d4b1ea1b7564ad89e6ab0c.tar.zst dexon-tests-45f8be4196b2830728d4b1ea1b7564ad89e6ab0c.zip |
Merge pull request #241 from ethereum/metrosplit
Metrosplit
Diffstat (limited to 'src/BlockchainTestsFiller')
53 files changed, 64 insertions, 59 deletions
diff --git a/src/BlockchainTestsFiller/TransitionTests/bcEIP158ToMetropolis/MetropolisTransitionFiller.json b/src/BlockchainTestsFiller/TransitionTests/bcEIP158ToByzantium/ByzantiumTransitionFiller.json index 6faee6d63..013612594 100644 --- a/src/BlockchainTestsFiller/TransitionTests/bcEIP158ToMetropolis/MetropolisTransitionFiller.json +++ b/src/BlockchainTestsFiller/TransitionTests/bcEIP158ToByzantium/ByzantiumTransitionFiller.json @@ -1,5 +1,5 @@ { - "MetropolisTransition" : { + "ByzantiumTransition" : { "genesisBlockHeader" : { "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1", @@ -17,7 +17,7 @@ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" }, - "network" : "EIP158ToMetropolisAt5", + "network" : "EIP158ToByzantiumAt5", "expect" : { "1000000000000000000000000000000000000001" : { "balance" : "2" diff --git a/src/BlockchainTestsFiller/bcBlockGasLimitTest/GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideFirstFiller.json b/src/BlockchainTestsFiller/bcBlockGasLimitTest/GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideFirstFiller.json index e6c2c2bfb..4f7e44b43 100644 --- a/src/BlockchainTestsFiller/bcBlockGasLimitTest/GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideFirstFiller.json +++ b/src/BlockchainTestsFiller/bcBlockGasLimitTest/GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideFirstFiller.json @@ -27,7 +27,7 @@ } }, { - "network" : ["EIP150", "EIP158", "Metropolis"], + "network" : ["EIP150", "EIP158", "Byzantium", "Constantinople"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "89999999999999999998729950" diff --git a/src/BlockchainTestsFiller/bcBlockGasLimitTest/GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideLastFiller.json b/src/BlockchainTestsFiller/bcBlockGasLimitTest/GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideLastFiller.json index 8c1f0ba88..3e5a1228d 100644 --- a/src/BlockchainTestsFiller/bcBlockGasLimitTest/GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideLastFiller.json +++ b/src/BlockchainTestsFiller/bcBlockGasLimitTest/GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideLastFiller.json @@ -50,7 +50,8 @@ "expectExceptionHomestead" : "BlockGasLimitReached", "expectExceptionEIP150" : "TooMuchGasUsed", "expectExceptionEIP158" : "TooMuchGasUsed", - "expectExceptionMetropolis" : "TooMuchGasUsed", + "expectExceptionByzantium" : "TooMuchGasUsed", + "expectExceptionConstantinople" : "TooMuchGasUsed", "blockHeaderPremine" : { "gasLimit" : "149000" }, diff --git a/src/BlockchainTestsFiller/bcBlockGasLimitTest/SuicideTransactionFiller.json b/src/BlockchainTestsFiller/bcBlockGasLimitTest/SuicideTransactionFiller.json index 82b7877c2..7170c6c17 100644 --- a/src/BlockchainTestsFiller/bcBlockGasLimitTest/SuicideTransactionFiller.json +++ b/src/BlockchainTestsFiller/bcBlockGasLimitTest/SuicideTransactionFiller.json @@ -27,7 +27,7 @@ } }, { - "network" : ["EIP150", "EIP158", "Metropolis"], + "network" : ["EIP150", "EIP158", "Byzantium", "Constantinople"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "90000000000000009999869980" diff --git a/src/BlockchainTestsFiller/bcExploitTest/DelegateCallSpamFiller.json b/src/BlockchainTestsFiller/bcExploitTest/DelegateCallSpamFiller.json index 0810b7a49..61f851c1a 100644 --- a/src/BlockchainTestsFiller/bcExploitTest/DelegateCallSpamFiller.json +++ b/src/BlockchainTestsFiller/bcExploitTest/DelegateCallSpamFiller.json @@ -19,7 +19,7 @@ }, "expect" : [ { - "network" : ["Frontier", "EIP150", "EIP158", "Metropolis"], + "network" : ["Frontier", "EIP150", "EIP158", "Byzantium"], "result" : { "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "storage" : { diff --git a/src/BlockchainTestsFiller/bcExploitTest/ShanghaiLoveFiller.json b/src/BlockchainTestsFiller/bcExploitTest/ShanghaiLoveFiller.json index b69b7a6eb..1d885804a 100644 --- a/src/BlockchainTestsFiller/bcExploitTest/ShanghaiLoveFiller.json +++ b/src/BlockchainTestsFiller/bcExploitTest/ShanghaiLoveFiller.json @@ -19,7 +19,7 @@ }, "expect" : [ { - "network" : ["Frontier", "EIP150", "EIP158", "Metropolis"], + "network" : ["Frontier", "EIP150", "EIP158", "Byzantium"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "9999999999999999999999999999999999999999995500000", diff --git a/src/BlockchainTestsFiller/bcExploitTest/StrangeContractCreationFiller.json b/src/BlockchainTestsFiller/bcExploitTest/StrangeContractCreationFiller.json index 99c1a3768..45cbd8929 100644 --- a/src/BlockchainTestsFiller/bcExploitTest/StrangeContractCreationFiller.json +++ b/src/BlockchainTestsFiller/bcExploitTest/StrangeContractCreationFiller.json @@ -32,7 +32,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "0x00", diff --git a/src/BlockchainTestsFiller/bcForkStressTest/AmIOnEIP150Filler.json b/src/BlockchainTestsFiller/bcForkStressTest/AmIOnEIP150Filler.json index af4e9c29c..fda415320 100644 --- a/src/BlockchainTestsFiller/bcForkStressTest/AmIOnEIP150Filler.json +++ b/src/BlockchainTestsFiller/bcForkStressTest/AmIOnEIP150Filler.json @@ -29,7 +29,7 @@ } }, { - "network" : ["EIP150", "EIP158", "Metropolis"], + "network" : ["EIP150", "EIP158", "Byzantium"], "result" : { "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "storage": { diff --git a/src/BlockchainTestsFiller/bcGasPricerTest/RPC_API_TestFiller.json b/src/BlockchainTestsFiller/bcGasPricerTest/RPC_API_TestFiller.json index b34b072b8..ac7832134 100644 --- a/src/BlockchainTestsFiller/bcGasPricerTest/RPC_API_TestFiller.json +++ b/src/BlockchainTestsFiller/bcGasPricerTest/RPC_API_TestFiller.json @@ -19,7 +19,7 @@ }, "expect" : [ { - "network" : ["Frontier", "Homestead", "EIP150", "EIP158", "Metropolis"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158", "Byzantium"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "320" diff --git a/src/BlockchainTestsFiller/bcInvalidHeaderTest/wrongCoinbaseFiller.json b/src/BlockchainTestsFiller/bcInvalidHeaderTest/wrongCoinbaseFiller.json index 77a326828..545f65cbd 100644 --- a/src/BlockchainTestsFiller/bcInvalidHeaderTest/wrongCoinbaseFiller.json +++ b/src/BlockchainTestsFiller/bcInvalidHeaderTest/wrongCoinbaseFiller.json @@ -47,7 +47,8 @@ "expectExceptionHomestead" : "InvalidReceiptsStateRoot", "expectExceptionEIP150" : "InvalidReceiptsStateRoot", "expectExceptionEIP158" : "InvalidReceiptsStateRoot", - "expectExceptionMetropolis" : "InvalidStateRoot", + "expectExceptionByzantium" : "InvalidStateRoot", + "expectExceptionConstantinople" : "InvalidStateRoot", "blockHeader" : { "coinbase" : "9888f1f195afa192cfee860698584c030f4c9db1", "updatePoW" : "1" diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest109BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest109BCFiller.json index 8d210b5e0..4652d2764 100644 --- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest109BCFiller.json +++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest109BCFiller.json @@ -81,7 +81,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium"], "result" : { "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x0de0b6b3a76586a0", diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest113BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest113BCFiller.json index 55b71f5e2..363355c29 100644 --- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest113BCFiller.json +++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest113BCFiller.json @@ -54,7 +54,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium"], "result" : { "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x32f99975", diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest127BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest127BCFiller.json index d5709e0f8..99a746c91 100644 --- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest127BCFiller.json +++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest127BCFiller.json @@ -54,7 +54,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium"], "result" : { "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x0de0b6b3a76586a0", diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest128BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest128BCFiller.json index 327a407db..9cb38310c 100644 --- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest128BCFiller.json +++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest128BCFiller.json @@ -54,7 +54,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium"], "result" : { "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x3453f6b2", diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest132BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest132BCFiller.json index a580dddbb..2314d44f6 100644 --- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest132BCFiller.json +++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest132BCFiller.json @@ -53,7 +53,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium"], "result" : { "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x4996c9cc", diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest21BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest21BCFiller.json index f3fa12f88..71394bc95 100644 --- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest21BCFiller.json +++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest21BCFiller.json @@ -79,7 +79,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium"], "result" : { "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x0de0b6b3a76586a0", diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest344BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest344BCFiller.json index a040728ae..5ef961d3a 100644 --- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest344BCFiller.json +++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest344BCFiller.json @@ -79,7 +79,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium"], "result" : { "0x0000000000000000000000000000000000000000" : { "balance" : "0x3057c563", diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest34BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest34BCFiller.json index ccc9d34c4..ebd34d41a 100644 --- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest34BCFiller.json +++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest34BCFiller.json @@ -54,7 +54,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium"], "result" : { "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x0de0b6b3a76586a0", diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest35BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest35BCFiller.json index c9391f564..d545d3f1d 100644 --- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest35BCFiller.json +++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest35BCFiller.json @@ -81,7 +81,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium"], "result" : { "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x0de0b6b3a76586a0", diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest40BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest40BCFiller.json index 16290dfb4..c530e2ef5 100644 --- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest40BCFiller.json +++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest40BCFiller.json @@ -54,7 +54,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium"], "result" : { "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x35a22465", diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest44BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest44BCFiller.json index a435b0cf0..9875d77bb 100644 --- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest44BCFiller.json +++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest44BCFiller.json @@ -54,7 +54,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium"], "result" : { "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x0de0b6b3a76586a0", diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest56BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest56BCFiller.json index d0fe32050..b9f698ba1 100644 --- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest56BCFiller.json +++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest56BCFiller.json @@ -54,7 +54,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium"], "result" : { "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x0de0b6b3a76586a0", diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest61BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest61BCFiller.json index 49f31db6a..343489f17 100644 --- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest61BCFiller.json +++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest61BCFiller.json @@ -53,7 +53,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium"], "result" : { "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x6899bd45", diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest65BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest65BCFiller.json index 5d95db709..3082ffaea 100644 --- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest65BCFiller.json +++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest65BCFiller.json @@ -79,7 +79,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium"], "result" : { "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000100000", diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest68BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest68BCFiller.json index 7460f5fe9..ac66f7049 100644 --- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest68BCFiller.json +++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest68BCFiller.json @@ -53,7 +53,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium"], "result" : { "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x0de0b6b3a76586a0", diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest70BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest70BCFiller.json index 7706a26d3..9762f196c 100644 --- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest70BCFiller.json +++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest70BCFiller.json @@ -53,7 +53,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium"], "result" : { "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x0de0b6b3a76586a0", diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest71BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest71BCFiller.json index 78e70ac5d..4619c550f 100644 --- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest71BCFiller.json +++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest71BCFiller.json @@ -53,7 +53,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium"], "result" : { "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x0de0b6b3a76586a0", diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest76BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest76BCFiller.json index bff06b0cf..c592fbee0 100644 --- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest76BCFiller.json +++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest76BCFiller.json @@ -55,7 +55,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium"], "result" : { "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x69ca96ed", diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest79BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest79BCFiller.json index 0bdcc2d39..55da3cf5c 100644 --- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest79BCFiller.json +++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest79BCFiller.json @@ -54,7 +54,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium"], "result" : { "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x1571e2ae", diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest86BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest86BCFiller.json index 6db736de5..df35ce315 100644 --- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest86BCFiller.json +++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest86BCFiller.json @@ -53,7 +53,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium"], "result" : { "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x3aecace0", diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest8BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest8BCFiller.json index ea66ece79..eeeb1e444 100644 --- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest8BCFiller.json +++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest8BCFiller.json @@ -96,7 +96,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium"], "result" : { "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x0de0b6b3a76586a0", diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest91BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest91BCFiller.json index bb3b12fd6..dc3a63385 100644 --- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest91BCFiller.json +++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest91BCFiller.json @@ -54,7 +54,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium"], "result" : { "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x7bcee261", diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest93BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest93BCFiller.json index e107f722a..e97487762 100644 --- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest93BCFiller.json +++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest93BCFiller.json @@ -53,7 +53,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium"], "result" : { "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x0de0b6b3a76586a0", diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest99BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest99BCFiller.json index d310ad836..a99c9f878 100644 --- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest99BCFiller.json +++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest99BCFiller.json @@ -54,7 +54,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium"], "result" : { "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x5887b108", diff --git a/src/BlockchainTestsFiller/bcStateTests/BadStateRootTxBCFiller.json b/src/BlockchainTestsFiller/bcStateTests/BadStateRootTxBCFiller.json index dd3995785..68c024e2a 100644 --- a/src/BlockchainTestsFiller/bcStateTests/BadStateRootTxBCFiller.json +++ b/src/BlockchainTestsFiller/bcStateTests/BadStateRootTxBCFiller.json @@ -36,7 +36,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium"], "result" : { "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1975583", diff --git a/src/BlockchainTestsFiller/bcStateTests/OOGStateCopyContainingDeletedContractFiller.json b/src/BlockchainTestsFiller/bcStateTests/OOGStateCopyContainingDeletedContractFiller.json index f563a2ee3..8446857d9 100644 --- a/src/BlockchainTestsFiller/bcStateTests/OOGStateCopyContainingDeletedContractFiller.json +++ b/src/BlockchainTestsFiller/bcStateTests/OOGStateCopyContainingDeletedContractFiller.json @@ -71,7 +71,7 @@ } }, { - "network" : ["EIP158", "Metropolis"], + "network" : ["EIP158", "Byzantium"], "result" : { "2e0de3fc10a88911ff857126db1a5f0da6f25173" : { diff --git a/src/BlockchainTestsFiller/bcStateTests/blockhashTestsFiller.json b/src/BlockchainTestsFiller/bcStateTests/blockhashTestsFiller.json index f7a16c053..cdc11197a 100644 --- a/src/BlockchainTestsFiller/bcStateTests/blockhashTestsFiller.json +++ b/src/BlockchainTestsFiller/bcStateTests/blockhashTestsFiller.json @@ -51,7 +51,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { diff --git a/src/BlockchainTestsFiller/bcStateTests/multimpleBalanceInstructionFiller.json b/src/BlockchainTestsFiller/bcStateTests/multimpleBalanceInstructionFiller.json index 245bf232e..48c04cebb 100644 --- a/src/BlockchainTestsFiller/bcStateTests/multimpleBalanceInstructionFiller.json +++ b/src/BlockchainTestsFiller/bcStateTests/multimpleBalanceInstructionFiller.json @@ -63,7 +63,7 @@ } }, { - "network" : ["EIP150", "EIP158", "Metropolis"], + "network" : ["EIP150", "EIP158", "Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { diff --git a/src/BlockchainTestsFiller/bcStateTests/suicideCoinbaseFiller.json b/src/BlockchainTestsFiller/bcStateTests/suicideCoinbaseFiller.json index 36cb3b924..2d9f16925 100644 --- a/src/BlockchainTestsFiller/bcStateTests/suicideCoinbaseFiller.json +++ b/src/BlockchainTestsFiller/bcStateTests/suicideCoinbaseFiller.json @@ -34,7 +34,7 @@ } }, { - "network" : ["Homstead", "EIP150", "EIP158", "Metropolis"], + "network" : ["Homstead", "EIP150", "EIP158", "Byzantium"], "result" : { "0000000000000000000000000000000000000000" : { "balance" : "2002" diff --git a/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestamp2Filler.json b/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestamp2Filler.json index 24c72014d..b64e162c5 100644 --- a/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestamp2Filler.json +++ b/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestamp2Filler.json @@ -30,7 +30,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium", "Constantinople"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "20" @@ -81,7 +81,8 @@ ] }, { - "expectExceptionMetropolis" : "InvalidStateRoot", + "expectExceptionByzantium" : "InvalidStateRoot", + "expectExceptionConstantinople" : "InvalidStateRoot", "blockHeader" : { "stateRoot" : "77f96f4c766c10cd0207e2672b1b747c741ed75bc94e7be7abacb71cdca3c8fb", "updatePoW" : "1" diff --git a/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestamp3Filler.json b/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestamp3Filler.json index 8e8c783aa..3de42df4a 100644 --- a/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestamp3Filler.json +++ b/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestamp3Filler.json @@ -30,7 +30,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium", "Constantinople"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "30" diff --git a/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestampDifficultyDrop2Filler.json b/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestampDifficultyDrop2Filler.json index 3fa7ab5c2..09396236d 100644 --- a/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestampDifficultyDrop2Filler.json +++ b/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestampDifficultyDrop2Filler.json @@ -30,7 +30,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium", "Constantinople"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "30" diff --git a/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestampDifficultyDropFiller.json b/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestampDifficultyDropFiller.json index 1b82f7120..1be7d1edd 100644 --- a/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestampDifficultyDropFiller.json +++ b/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/futureUncleTimestampDifficultyDropFiller.json @@ -30,7 +30,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium", "Constantinople"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "20" @@ -83,7 +83,8 @@ ] }, { - "expectExceptionMetropolis" : "InvalidStateRoot", + "expectExceptionByzantium" : "InvalidStateRoot", + "expectExceptionConstantinople" : "InvalidStateRoot", "blocknumber" : "3", "blockHeader" : { "stateRoot" : "77f96f4c766c10cd0207e2672b1b747c741ed75bc94e7be7abacb71cdca3c8fb", diff --git a/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/uncleBloomNot0Filler.json b/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/uncleBloomNot0Filler.json index 39707c289..824b23ecd 100644 --- a/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/uncleBloomNot0Filler.json +++ b/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/uncleBloomNot0Filler.json @@ -30,7 +30,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium", "Constantinople"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "20" @@ -83,7 +83,8 @@ ] }, { - "expectExceptionMetropolis" : "InvalidStateRoot", + "expectExceptionByzantium" : "InvalidStateRoot", + "expectExceptionConstantinople" : "InvalidStateRoot", "blocknumber" : "3", "blockHeader" : { "stateRoot" : "77f96f4c766c10cd0207e2672b1b747c741ed75bc94e7be7abacb71cdca3c8fb", diff --git a/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/uncleBloomNot0_2Filler.json b/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/uncleBloomNot0_2Filler.json index d74781f86..4d8b74821 100644 --- a/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/uncleBloomNot0_2Filler.json +++ b/src/BlockchainTestsFiller/bcUncleHeaderValiditiy/uncleBloomNot0_2Filler.json @@ -30,7 +30,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium", "Constantinople"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "30" diff --git a/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2Filler.json b/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2Filler.json index f2948b825..7fe1ec8b9 100644 --- a/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2Filler.json +++ b/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2Filler.json @@ -30,7 +30,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium", "Constantinople"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "10" @@ -66,7 +66,8 @@ ] }, { - "expectExceptionMetropolis" : "InvalidStateRoot", + "expectExceptionByzantium" : "InvalidStateRoot", + "expectExceptionConstantinople" : "InvalidStateRoot", "blockHeader" : { "stateRoot" : "6ff22555fde6fe93e5b412a8691287a5be5708246adfd0c599604849925fcc34", "updatePoW" : "1" diff --git a/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2MetropolisFiller.json b/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2MetropolisFiller.json index a4a0446be..abcd5d02a 100644 --- a/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2MetropolisFiller.json +++ b/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2MetropolisFiller.json @@ -1,5 +1,5 @@ { - "uncleHeaderAtBlock2Metropolis" : { + "uncleHeaderAtBlock2Byzantium" : { "genesisBlockHeader" : { "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1", @@ -30,7 +30,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium", "Constantinople"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "20" diff --git a/src/BlockchainTestsFiller/bcValidBlockTest/RecallSuicidedContractFiller.json b/src/BlockchainTestsFiller/bcValidBlockTest/RecallSuicidedContractFiller.json index 9b7b9ac98..35ec66eee 100644 --- a/src/BlockchainTestsFiller/bcValidBlockTest/RecallSuicidedContractFiller.json +++ b/src/BlockchainTestsFiller/bcValidBlockTest/RecallSuicidedContractFiller.json @@ -43,7 +43,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium"], "result" : { "8888f1f195afa192cfee860698584c030f4c9db1" : { "balance" : "15000000000001210790" diff --git a/src/BlockchainTestsFiller/bcValidBlockTest/RecallSuicidedContractInOneBlockFiller.json b/src/BlockchainTestsFiller/bcValidBlockTest/RecallSuicidedContractInOneBlockFiller.json index 86585b3ed..298a6feb4 100644 --- a/src/BlockchainTestsFiller/bcValidBlockTest/RecallSuicidedContractInOneBlockFiller.json +++ b/src/BlockchainTestsFiller/bcValidBlockTest/RecallSuicidedContractInOneBlockFiller.json @@ -43,7 +43,7 @@ } }, { - "network" : ["Metropolis"], + "network" : ["Byzantium"], "result" : { "8888f1f195afa192cfee860698584c030f4c9db1" : { "balance" : "10000000000001210790" diff --git a/src/BlockchainTestsFiller/bcValidBlockTest/SimpleTx3Filler.json b/src/BlockchainTestsFiller/bcValidBlockTest/SimpleTx3Filler.json index a2fff154b..7ebaf20ef 100644 --- a/src/BlockchainTestsFiller/bcValidBlockTest/SimpleTx3Filler.json +++ b/src/BlockchainTestsFiller/bcValidBlockTest/SimpleTx3Filler.json @@ -33,7 +33,7 @@ } }, { - "network" : ["Homestead", "EIP150", "EIP158", "Metropolis"], + "network" : ["Homestead", "EIP150", "EIP158", "Byzantium"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "10" diff --git a/src/BlockchainTestsFiller/bcValidBlockTest/dataTx2Filler.json b/src/BlockchainTestsFiller/bcValidBlockTest/dataTx2Filler.json index f5f3213c0..ba6811da9 100644 --- a/src/BlockchainTestsFiller/bcValidBlockTest/dataTx2Filler.json +++ b/src/BlockchainTestsFiller/bcValidBlockTest/dataTx2Filler.json @@ -27,7 +27,7 @@ } }, { - "network" : ["Homestead", "EIP150", "EIP158", "Metropolis"], + "network" : ["Homestead", "EIP150", "EIP158", "Byzantium"], "result" : { "8888f1f195afa192cfee860698584c030f4c9db1" : { "balance" : "5000000000005000000" diff --git a/src/BlockchainTestsFiller/bcValidBlockTest/dataTxFiller.json b/src/BlockchainTestsFiller/bcValidBlockTest/dataTxFiller.json index 1b0cf535c..5e7133ca7 100644 --- a/src/BlockchainTestsFiller/bcValidBlockTest/dataTxFiller.json +++ b/src/BlockchainTestsFiller/bcValidBlockTest/dataTxFiller.json @@ -27,7 +27,7 @@ } }, { - "network" : ["Homestead", "Metropolis", "EIP150", "EIP158"], + "network" : ["Homestead", "Byzantium", "EIP150", "EIP158"], "result" : { "8888f1f195afa192cfee860698584c030f4c9db1" : { "balance" : "5000000000000000000" diff --git a/src/BlockchainTestsFiller/bcWalletTest/walletReorganizeOwnersFiller.json b/src/BlockchainTestsFiller/bcWalletTest/walletReorganizeOwnersFiller.json index 81a4b2c75..e181fa50f 100644 --- a/src/BlockchainTestsFiller/bcWalletTest/walletReorganizeOwnersFiller.json +++ b/src/BlockchainTestsFiller/bcWalletTest/walletReorganizeOwnersFiller.json @@ -30,7 +30,6 @@ "storage" : { "0x00" : "0x01", "0x01" : "0xfa", - "0x0107" : "0x43ce", "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", "0x0340fa4cda2d6dc44bfd80ddc515353a0f249a02b6978248445826d062accd41" : "0xe9", "0x035da1ef4913aecbd383e1526405847c1a84ecc4997e7627eb36e2df476bdb92" : "0x22", |