From dddae98d955ec68f5acb5765ede86235a4528606 Mon Sep 17 00:00:00 2001 From: Dimitry Date: Sat, 22 Jun 2019 21:46:04 +0300 Subject: [PATCH] remove blockchain logic tests --- .../callcodeOutput1.json | 103 ---------- .../callcodeOutput3partial.json | 103 ---------- .../suicideCoinbase.json | 118 ----------- .../stTransactionTest/EmptyTransaction2.json | 122 ------------ .../SuicidesMixingCoinbase.json | 173 ---------------- .../UserTransactionZeroCost.json | 122 ------------ .../UserTransactionZeroCostWithData.json | 186 ------------------ .../EmptyTransaction2Filler.json | 6 +- .../SuicidesMixingCoinbaseFiller.json | 0 .../UserTransactionZeroCost2Filler.json | 98 +++++++++ .../UserTransactionZeroCostFiller.json | 0 ...UserTransactionZeroCostWithDataFiller.json | 0 .../callcodeOutput1Filler.json | 3 + .../callcodeOutput3partialFiller.json | 0 .../suicideCoinbaseFiller.json | 8 +- 15 files changed, 108 insertions(+), 934 deletions(-) delete mode 100644 GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1.json delete mode 100644 GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial.json delete mode 100644 GeneralStateTests/stSystemOperationsTest/suicideCoinbase.json delete mode 100644 GeneralStateTests/stTransactionTest/EmptyTransaction2.json delete mode 100644 GeneralStateTests/stTransactionTest/SuicidesMixingCoinbase.json delete mode 100644 GeneralStateTests/stTransactionTest/UserTransactionZeroCost.json delete mode 100644 GeneralStateTests/stTransactionTest/UserTransactionZeroCostWithData.json rename src/{GeneralStateTestsFiller/stTransactionTest => 0MoveToBlockchain}/EmptyTransaction2Filler.json (96%) rename src/{GeneralStateTestsFiller/stTransactionTest => 0MoveToBlockchain}/SuicidesMixingCoinbaseFiller.json (100%) create mode 100644 src/0MoveToBlockchain/UserTransactionZeroCost2Filler.json rename src/{GeneralStateTestsFiller/stTransactionTest => 0MoveToBlockchain}/UserTransactionZeroCostFiller.json (100%) rename src/{GeneralStateTestsFiller/stTransactionTest => 0MoveToBlockchain}/UserTransactionZeroCostWithDataFiller.json (100%) rename src/{GeneralStateTestsFiller/stDelegatecallTestHomestead => 0MoveToBlockchain}/callcodeOutput1Filler.json (94%) rename src/{GeneralStateTestsFiller/stDelegatecallTestHomestead => 0MoveToBlockchain}/callcodeOutput3partialFiller.json (100%) rename src/{GeneralStateTestsFiller/stSystemOperationsTest => 0MoveToBlockchain}/suicideCoinbaseFiller.json (91%) diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1.json b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1.json deleted file mode 100644 index d49745b4993..00000000000 --- a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1.json +++ /dev/null @@ -1,103 +0,0 @@ -{ - "callcodeOutput1" : { - "_info" : { - "comment" : "", - "filledwith" : "testeth 1.7.0-alpha.0+commit.1e771655.dirty", - "lllcversion" : "Version: 0.5.0-develop.2019.6.1+commit.9709dfe0.Linux.g++", - "source" : "src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput1Filler.json", - "sourceHash" : "f5535d42572e76d91db2771950357e337fde8de7208860c671e0cb3049c0c475" - }, - "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", - "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" - }, - "post" : { - "Byzantium" : [ - { - "hash" : "0xb30cb132c5dcad75bae0377f1c798af7f22f3d007c03e538126204b188015c47", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ], - "Constantinople" : [ - { - "hash" : "0xb30cb132c5dcad75bae0377f1c798af7f22f3d007c03e538126204b188015c47", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ], - "ConstantinopleFix" : [ - { - "hash" : "0xb30cb132c5dcad75bae0377f1c798af7f22f3d007c03e538126204b188015c47", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ], - "Homestead" : [ - { - "hash" : "0x068ae35f557da951c6407104a8a59d0bf8348710cf2c2f41d57107b18e8b9000", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ] - }, - "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055", - "nonce" : "0x00", - "storage" : { - } - }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "", - "nonce" : "0x00", - "storage" : { - } - }, - "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6001600101600055", - "nonce" : "0x00", - "storage" : { - } - } - }, - "transaction" : { - "data" : [ - "0x" - ], - "gasLimit" : [ - "0x10c8e0" - ], - "gasPrice" : "0x00", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", - "value" : [ - "0x0186a0" - ] - } - } -} \ No newline at end of file diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial.json b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial.json deleted file mode 100644 index 1de00b05542..00000000000 --- a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial.json +++ /dev/null @@ -1,103 +0,0 @@ -{ - "callcodeOutput3partial" : { - "_info" : { - "comment" : "", - "filledwith" : "testeth 1.7.0-alpha.0+commit.1e771655.dirty", - "lllcversion" : "Version: 0.5.0-develop.2019.6.1+commit.9709dfe0.Linux.g++", - "source" : "src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFiller.json", - "sourceHash" : "7d18861fa722ad07c37f2cfa8911002542168399c7512007fe8d11a75f23306b" - }, - "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", - "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" - }, - "post" : { - "Byzantium" : [ - { - "hash" : "0xcd37783c7cd7783f650009c3a0542dd9b20aaa48f929e5e53722d1d3e9582c2f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ], - "Constantinople" : [ - { - "hash" : "0xcd37783c7cd7783f650009c3a0542dd9b20aaa48f929e5e53722d1d3e9582c2f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ], - "ConstantinopleFix" : [ - { - "hash" : "0xcd37783c7cd7783f650009c3a0542dd9b20aaa48f929e5e53722d1d3e9582c2f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ], - "Homestead" : [ - { - "hash" : "0x5bc2c3418e307e12aeb67b03a2a2c0d84aa6b35c286bd61dc900c872bdfb565b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ] - }, - "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055", - "nonce" : "0x00", - "storage" : { - } - }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "", - "nonce" : "0x00", - "storage" : { - } - }, - "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6001600101600055", - "nonce" : "0x00", - "storage" : { - } - } - }, - "transaction" : { - "data" : [ - "0x" - ], - "gasLimit" : [ - "0x0dbba0" - ], - "gasPrice" : "0x00", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", - "value" : [ - "0x0186a0" - ] - } - } -} \ No newline at end of file diff --git a/GeneralStateTests/stSystemOperationsTest/suicideCoinbase.json b/GeneralStateTests/stSystemOperationsTest/suicideCoinbase.json deleted file mode 100644 index fa6fb0eba79..00000000000 --- a/GeneralStateTests/stSystemOperationsTest/suicideCoinbase.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "suicideCoinbase" : { - "_info" : { - "comment" : "", - "filledwith" : "testeth 1.6.0-alpha.0-11+commit.978e68d2", - "lllcversion" : "Version: 0.5.0-develop.2018.11.9+commit.9709dfe0.Linux.g++", - "source" : "src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCoinbaseFiller.json", - "sourceHash" : "c04dc9b077d93e79fa0c8dbdb4493c064feafeb80feeb381cd73d98f90ee1f8d" - }, - "env" : { - "currentCoinbase" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", - "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" - }, - "post" : { - "Byzantium" : [ - { - "hash" : "0x6f0998481c651b0b5fe26d002bfd4b3759de8aafa7273b0f458ec594ffb39c51", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ], - "Constantinople" : [ - { - "hash" : "0x6f0998481c651b0b5fe26d002bfd4b3759de8aafa7273b0f458ec594ffb39c51", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ], - "ConstantinopleFix" : [ - { - "hash" : "0x6f0998481c651b0b5fe26d002bfd4b3759de8aafa7273b0f458ec594ffb39c51", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ], - "EIP158" : [ - { - "hash" : "0x6f0998481c651b0b5fe26d002bfd4b3759de8aafa7273b0f458ec594ffb39c51", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ], - "Frontier" : [ - { - "hash" : "0xdfcfa45a38ccf8f8ad55c0b47a85832dbbe77df48bc34bac4e78f77415970f35", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ], - "Homestead" : [ - { - "hash" : "0xdfcfa45a38ccf8f8ad55c0b47a85832dbbe77df48bc34bac4e78f77415970f35", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ] - }, - "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x73a94f5374fce5edbc8e2a8697c15331677e6ebf0bff", - "nonce" : "0x00", - "storage" : { - } - }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "", - "nonce" : "0x00", - "storage" : { - } - } - }, - "transaction" : { - "data" : [ - "0x" - ], - "gasLimit" : [ - "0x0f4240" - ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", - "value" : [ - "0x0186a0" - ] - } - } -} \ No newline at end of file diff --git a/GeneralStateTests/stTransactionTest/EmptyTransaction2.json b/GeneralStateTests/stTransactionTest/EmptyTransaction2.json deleted file mode 100644 index ff9711189e2..00000000000 --- a/GeneralStateTests/stTransactionTest/EmptyTransaction2.json +++ /dev/null @@ -1,122 +0,0 @@ -{ - "EmptyTransaction2" : { - "_info" : { - "comment" : "", - "filledwith" : "testeth 1.6.0-alpha.0-11+commit.978e68d2", - "lllcversion" : "Version: 0.5.0-develop.2018.11.9+commit.9709dfe0.Linux.g++", - "source" : "src/GeneralStateTestsFiller/stTransactionTest/EmptyTransaction2Filler.json", - "sourceHash" : "72c6ead16c7fd847827e6717894425940cc2497b3f2a1d562eb571fca8f0bc45" - }, - "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", - "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" - }, - "post" : { - "Byzantium" : [ - { - "hash" : "0x2d2b88bc228443c611081f7db686b82a1beebe9d0fc79ce5e9604666e0b39fd0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ], - "Constantinople" : [ - { - "hash" : "0x2d2b88bc228443c611081f7db686b82a1beebe9d0fc79ce5e9604666e0b39fd0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ], - "ConstantinopleFix" : [ - { - "hash" : "0x2d2b88bc228443c611081f7db686b82a1beebe9d0fc79ce5e9604666e0b39fd0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ], - "EIP150" : [ - { - "hash" : "0x7c9b70b846a70a1731baf76adc6ffc016628cdabb8b5e9b4ab84f5134dc6ac89", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ], - "EIP158" : [ - { - "hash" : "0x2d2b88bc228443c611081f7db686b82a1beebe9d0fc79ce5e9604666e0b39fd0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ], - "Frontier" : [ - { - "hash" : "0x7c9b70b846a70a1731baf76adc6ffc016628cdabb8b5e9b4ab84f5134dc6ac89", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ], - "Homestead" : [ - { - "hash" : "0x7c9b70b846a70a1731baf76adc6ffc016628cdabb8b5e9b4ab84f5134dc6ac89", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ] - }, - "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0186a0", - "code" : "", - "nonce" : "0x00", - "storage" : { - } - } - }, - "transaction" : { - "data" : [ - "0x" - ], - "gasLimit" : [ - "0xd6d8" - ], - "gasPrice" : "0x00", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "", - "value" : [ - "0x00" - ] - } - } -} \ No newline at end of file diff --git a/GeneralStateTests/stTransactionTest/SuicidesMixingCoinbase.json b/GeneralStateTests/stTransactionTest/SuicidesMixingCoinbase.json deleted file mode 100644 index d3b4c138b66..00000000000 --- a/GeneralStateTests/stTransactionTest/SuicidesMixingCoinbase.json +++ /dev/null @@ -1,173 +0,0 @@ -{ - "SuicidesMixingCoinbase" : { - "_info" : { - "comment" : "", - "filledwith" : "testeth 1.6.0-alpha.0-11+commit.978e68d2", - "lllcversion" : "Version: 0.5.0-develop.2018.11.9+commit.9709dfe0.Linux.g++", - "source" : "src/GeneralStateTestsFiller/stTransactionTest/SuicidesMixingCoinbaseFiller.json", - "sourceHash" : "f291bbb5ed841c4160f3db6e98d5ee36a91c46d99bcfac89c8468c2259ea4651" - }, - "env" : { - "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", - "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" - }, - "post" : { - "Byzantium" : [ - { - "hash" : "0xebb113c5ae196dafdbb9c9a8e77c02e7b1e6bb6faf4339ea869bb1d0a6b9559f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - }, - { - "hash" : "0x101a8295ac56dc085b0c840487b73794c7b05226580c431e947f56c4424379f4", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ], - "Constantinople" : [ - { - "hash" : "0xebb113c5ae196dafdbb9c9a8e77c02e7b1e6bb6faf4339ea869bb1d0a6b9559f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - }, - { - "hash" : "0x101a8295ac56dc085b0c840487b73794c7b05226580c431e947f56c4424379f4", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ], - "ConstantinopleFix" : [ - { - "hash" : "0xebb113c5ae196dafdbb9c9a8e77c02e7b1e6bb6faf4339ea869bb1d0a6b9559f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - }, - { - "hash" : "0x101a8295ac56dc085b0c840487b73794c7b05226580c431e947f56c4424379f4", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ], - "EIP158" : [ - { - "hash" : "0xebb113c5ae196dafdbb9c9a8e77c02e7b1e6bb6faf4339ea869bb1d0a6b9559f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - }, - { - "hash" : "0x101a8295ac56dc085b0c840487b73794c7b05226580c431e947f56c4424379f4", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ], - "Frontier" : [ - { - "hash" : "0x817945bbc020475158f8657c02ee71851475fbeee62bb4b19d58ac28bbd4528c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - }, - { - "hash" : "0x817945bbc020475158f8657c02ee71851475fbeee62bb4b19d58ac28bbd4528c", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ], - "Homestead" : [ - { - "hash" : "0x817945bbc020475158f8657c02ee71851475fbeee62bb4b19d58ac28bbd4528c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - }, - { - "hash" : "0x817945bbc020475158f8657c02ee71851475fbeee62bb4b19d58ac28bbd4528c", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ] - }, - "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x035b60", - "code" : "", - "nonce" : "0x00", - "storage" : { - } - }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x03e8", - "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff", - "nonce" : "0x00", - "storage" : { - } - } - }, - "transaction" : { - "data" : [ - "0x" - ], - "gasLimit" : [ - "0x54c4", - "0xea60" - ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", - "value" : [ - "0x0a" - ] - } - } -} \ No newline at end of file diff --git a/GeneralStateTests/stTransactionTest/UserTransactionZeroCost.json b/GeneralStateTests/stTransactionTest/UserTransactionZeroCost.json deleted file mode 100644 index ff4517c0e0c..00000000000 --- a/GeneralStateTests/stTransactionTest/UserTransactionZeroCost.json +++ /dev/null @@ -1,122 +0,0 @@ -{ - "UserTransactionZeroCost" : { - "_info" : { - "comment" : "", - "filledwith" : "testeth 1.6.0-alpha.0-11+commit.978e68d2", - "lllcversion" : "Version: 0.5.0-develop.2018.11.9+commit.9709dfe0.Linux.g++", - "source" : "src/GeneralStateTestsFiller/stTransactionTest/UserTransactionZeroCostFiller.json", - "sourceHash" : "50942c7b2776f7886bea38e423e23e9771b17892d877e1cb280eaf4e93805513" - }, - "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", - "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" - }, - "post" : { - "Byzantium" : [ - { - "hash" : "0x6fa96e06aa7cafbd86e0d99b4cbd4b2924eb3e5c8d66eccba3b11a2c93907652", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ], - "Constantinople" : [ - { - "hash" : "0x6fa96e06aa7cafbd86e0d99b4cbd4b2924eb3e5c8d66eccba3b11a2c93907652", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ], - "ConstantinopleFix" : [ - { - "hash" : "0x6fa96e06aa7cafbd86e0d99b4cbd4b2924eb3e5c8d66eccba3b11a2c93907652", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ], - "EIP150" : [ - { - "hash" : "0xa2bff976f733022a4932ccfca0b8049b1569bfa83309e50b1fe698ec3d8e3c74", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ], - "EIP158" : [ - { - "hash" : "0x6fa96e06aa7cafbd86e0d99b4cbd4b2924eb3e5c8d66eccba3b11a2c93907652", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ], - "Frontier" : [ - { - "hash" : "0xa2bff976f733022a4932ccfca0b8049b1569bfa83309e50b1fe698ec3d8e3c74", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ], - "Homestead" : [ - { - "hash" : "0xa2bff976f733022a4932ccfca0b8049b1569bfa83309e50b1fe698ec3d8e3c74", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ] - }, - "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xa7f8", - "code" : "", - "nonce" : "0x00", - "storage" : { - } - } - }, - "transaction" : { - "data" : [ - "0x" - ], - "gasLimit" : [ - "0x891c" - ], - "gasPrice" : "0x00", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", - "value" : [ - "0x0384" - ] - } - } -} \ No newline at end of file diff --git a/GeneralStateTests/stTransactionTest/UserTransactionZeroCostWithData.json b/GeneralStateTests/stTransactionTest/UserTransactionZeroCostWithData.json deleted file mode 100644 index 04fd67da37e..00000000000 --- a/GeneralStateTests/stTransactionTest/UserTransactionZeroCostWithData.json +++ /dev/null @@ -1,186 +0,0 @@ -{ - "UserTransactionZeroCostWithData" : { - "_info" : { - "comment" : "", - "filledwith" : "testeth 1.6.0-alpha.0-11+commit.978e68d2", - "lllcversion" : "Version: 0.5.0-develop.2018.11.9+commit.9709dfe0.Linux.g++", - "source" : "src/GeneralStateTestsFiller/stTransactionTest/UserTransactionZeroCostWithDataFiller.json", - "sourceHash" : "d25451de0de70567badb35f3c03c96cdf1bb346392cb5380c1dcd832165984e0" - }, - "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", - "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" - }, - "post" : { - "Byzantium" : [ - { - "hash" : "0xa58bfc327c55e66f416e226023e67a47dd01e8f1c9e370379ec936551dd4aeb1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - }, - { - "hash" : "0xa58bfc327c55e66f416e226023e67a47dd01e8f1c9e370379ec936551dd4aeb1", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ], - "Constantinople" : [ - { - "hash" : "0xa58bfc327c55e66f416e226023e67a47dd01e8f1c9e370379ec936551dd4aeb1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - }, - { - "hash" : "0xa58bfc327c55e66f416e226023e67a47dd01e8f1c9e370379ec936551dd4aeb1", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ], - "ConstantinopleFix" : [ - { - "hash" : "0xa58bfc327c55e66f416e226023e67a47dd01e8f1c9e370379ec936551dd4aeb1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - }, - { - "hash" : "0xa58bfc327c55e66f416e226023e67a47dd01e8f1c9e370379ec936551dd4aeb1", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ], - "EIP150" : [ - { - "hash" : "0x3a5e8a1cf1708fdf3de65990a78901893ff686d889e78b387e039206bb41b1ba", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - }, - { - "hash" : "0x3a5e8a1cf1708fdf3de65990a78901893ff686d889e78b387e039206bb41b1ba", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ], - "EIP158" : [ - { - "hash" : "0xa58bfc327c55e66f416e226023e67a47dd01e8f1c9e370379ec936551dd4aeb1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - }, - { - "hash" : "0xa58bfc327c55e66f416e226023e67a47dd01e8f1c9e370379ec936551dd4aeb1", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ], - "Frontier" : [ - { - "hash" : "0x3a5e8a1cf1708fdf3de65990a78901893ff686d889e78b387e039206bb41b1ba", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - }, - { - "hash" : "0x3a5e8a1cf1708fdf3de65990a78901893ff686d889e78b387e039206bb41b1ba", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ], - "Homestead" : [ - { - "hash" : "0x3a5e8a1cf1708fdf3de65990a78901893ff686d889e78b387e039206bb41b1ba", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - }, - { - "hash" : "0x3a5e8a1cf1708fdf3de65990a78901893ff686d889e78b387e039206bb41b1ba", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ] - }, - "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x020788", - "code" : "", - "nonce" : "0x00", - "storage" : { - } - } - }, - "transaction" : { - "data" : [ - "0x3240349548983454" - ], - "gasLimit" : [ - "0x7f58", - "0xea60" - ], - "gasPrice" : "0x00", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", - "value" : [ - "0x0384" - ] - } - } -} \ No newline at end of file diff --git a/src/GeneralStateTestsFiller/stTransactionTest/EmptyTransaction2Filler.json b/src/0MoveToBlockchain/EmptyTransaction2Filler.json similarity index 96% rename from src/GeneralStateTestsFiller/stTransactionTest/EmptyTransaction2Filler.json rename to src/0MoveToBlockchain/EmptyTransaction2Filler.json index 88664c5fd21..b7b8abc00d8 100644 --- a/src/GeneralStateTestsFiller/stTransactionTest/EmptyTransaction2Filler.json +++ b/src/0MoveToBlockchain/EmptyTransaction2Filler.json @@ -58,7 +58,7 @@ "network" : ["EIP158"], "result" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "shouldnotexist" : "1" + "nonce" : "0" }, "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "code" : "0x" @@ -78,7 +78,7 @@ "network" : [">=Byzantium"], "result" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "shouldnotexist" : "1" + "nonce" : "0" }, "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "code" : "0x" @@ -104,7 +104,7 @@ "" ], "gasLimit" : [ - "55000" + "185000" ], "gasPrice" : "", "nonce" : "", diff --git a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesMixingCoinbaseFiller.json b/src/0MoveToBlockchain/SuicidesMixingCoinbaseFiller.json similarity index 100% rename from src/GeneralStateTestsFiller/stTransactionTest/SuicidesMixingCoinbaseFiller.json rename to src/0MoveToBlockchain/SuicidesMixingCoinbaseFiller.json diff --git a/src/0MoveToBlockchain/UserTransactionZeroCost2Filler.json b/src/0MoveToBlockchain/UserTransactionZeroCost2Filler.json new file mode 100644 index 00000000000..3bbda9e1462 --- /dev/null +++ b/src/0MoveToBlockchain/UserTransactionZeroCost2Filler.json @@ -0,0 +1,98 @@ +{ + "UserTransactionZeroCost2" : { + "env" : { + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "0x020000", + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["Frontier", "Homestead"], + "result" : { + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "42100", + "nonce" : "1" + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "900" + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["EIP150"], + "result" : { + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "nonce" : "0" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "42100", + "nonce" : "1" + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "900" + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=EIP158"], + "result" : { + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "shouldnotexist" : "1" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "42100", + "nonce" : "1" + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "900" + } + } + } + ], + "pre" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "43000", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + }, + "transaction" : { + "data" : [ + "" + ], + "gasLimit" : [ + "135100" + ], + "gasPrice" : "0", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "value" : [ + "900" + ] + } + } +} diff --git a/src/GeneralStateTestsFiller/stTransactionTest/UserTransactionZeroCostFiller.json b/src/0MoveToBlockchain/UserTransactionZeroCostFiller.json similarity index 100% rename from src/GeneralStateTestsFiller/stTransactionTest/UserTransactionZeroCostFiller.json rename to src/0MoveToBlockchain/UserTransactionZeroCostFiller.json diff --git a/src/GeneralStateTestsFiller/stTransactionTest/UserTransactionZeroCostWithDataFiller.json b/src/0MoveToBlockchain/UserTransactionZeroCostWithDataFiller.json similarity index 100% rename from src/GeneralStateTestsFiller/stTransactionTest/UserTransactionZeroCostWithDataFiller.json rename to src/0MoveToBlockchain/UserTransactionZeroCostWithDataFiller.json diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput1Filler.json b/src/0MoveToBlockchain/callcodeOutput1Filler.json similarity index 94% rename from src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput1Filler.json rename to src/0MoveToBlockchain/callcodeOutput1Filler.json index 27a9586c8c8..ebc7668951f 100644 --- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput1Filler.json +++ b/src/0MoveToBlockchain/callcodeOutput1Filler.json @@ -1,5 +1,8 @@ { "callcodeOutput1" : { + "_info" : { + "comment" : "gasPrice is 0. test must be blockchain, because in state tests the reward would be 0 and no coinbase account will be in the post state" + }, "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFiller.json b/src/0MoveToBlockchain/callcodeOutput3partialFiller.json similarity index 100% rename from src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFiller.json rename to src/0MoveToBlockchain/callcodeOutput3partialFiller.json diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCoinbaseFiller.json b/src/0MoveToBlockchain/suicideCoinbaseFiller.json similarity index 91% rename from src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCoinbaseFiller.json rename to src/0MoveToBlockchain/suicideCoinbaseFiller.json index 19c2131b592..f25b7b8f0ab 100644 --- a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCoinbaseFiller.json +++ b/src/0MoveToBlockchain/suicideCoinbaseFiller.json @@ -21,14 +21,14 @@ "balance" : "1999999999999989498", "nonce" : "1" }, - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0", "code" : "", - "//comment" : "Coinbase is being touched after transaction execution" + "//comment" : "Coinbase is being touched after transaction execution" } } }, - { + { "indexes" : { "data" : -1, "gas" : -1, @@ -40,7 +40,7 @@ "balance" : "1999999999999986998", "nonce" : "1" }, - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "shouldnotexist" : "1" } }