diff options
| author | winsvega <winsvega@mail.ru> | 2017-06-24 04:21:38 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-24 04:21:38 +0800 |
| commit | 4988d34926ed84976466805527e12e90344f79dd (patch) | |
| tree | 1aa54687d4c0a13e2957988a4495fbdddf546470 /src/GeneralStateTestsFiller | |
| parent | a83f7cf93747ae96c16e0cf2d987ec1ba7367128 (diff) | |
| parent | e9e8dc0219a2017fa318bda4c997d1192d1fc498 (diff) | |
| download | tangerine-tests-4988d34926ed84976466805527e12e90344f79dd.tar tangerine-tests-4988d34926ed84976466805527e12e90344f79dd.tar.gz tangerine-tests-4988d34926ed84976466805527e12e90344f79dd.tar.bz2 tangerine-tests-4988d34926ed84976466805527e12e90344f79dd.tar.lz tangerine-tests-4988d34926ed84976466805527e12e90344f79dd.tar.xz tangerine-tests-4988d34926ed84976466805527e12e90344f79dd.tar.zst tangerine-tests-4988d34926ed84976466805527e12e90344f79dd.zip | |
Merge pull request #162 from ethereum/eip86test
Eip86test (zeroSigTransaction, newCreate rule)
Diffstat (limited to 'src/GeneralStateTestsFiller')
42 files changed, 1364 insertions, 174 deletions
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_ExampleContractFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_ExampleContractFiller.json index 83230127e..52ad3b873 100644 --- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_ExampleContractFiller.json +++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_ExampleContractFiller.json @@ -23,6 +23,21 @@ } } } + }, + { + "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, + "network" : ["Metropolis" ], + "result" : { + "911d0b7a3d71943b292ab42d14865e7a1e21e6cf" : { + "storage" : { + "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x01" : "0x42", + "0x02" : "0x23", + "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x05" : "0x03e8" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_NoCollisionFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_NoCollisionFiller.json index 9a4a84c7d..c7f263b23 100644 --- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_NoCollisionFiller.json +++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_NoCollisionFiller.json @@ -23,6 +23,21 @@ } } } + }, + { + "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, + "network" : ["Metropolis" ], + "result" : { + "911d0b7a3d71943b292ab42d14865e7a1e21e6cf" : { + "storage" : { + "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x01" : "0x42", + "0x02" : "0x23", + "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x05" : "0x03e8" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsFiller.json index d9403746b..fdc96f087 100644 --- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsFiller.json +++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsFiller.json @@ -50,6 +50,20 @@ } } } + }, + { + "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, + "network" : ["Metropolis"], + "result" : { + "746e5505debcfbf945fca34bfb241878ca2a6193" : { + "balance" : "0x0186a0", + "code" : "0x396000f3006000355415600957005b60", + "nonce" : "0x01", + "storage" : { + "0x01" : "0x01" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.json b/src/GeneralStateTestsFiller/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.json index c61def654..dec3b9081 100644 --- a/src/GeneralStateTestsFiller/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.json +++ b/src/GeneralStateTestsFiller/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.json @@ -12,22 +12,94 @@ { "indexes" : { "data" : -1, - "gas" : -1, + "gas" : [0], "value" : -1 }, "network" : ["EIP150", "EIP158", "Frontier"], "result" : { - "6295ee1b4f6dd65047762f924ecd367c17eabf8f": { - "balance" : "0" - }, - "1000000000000000000000000000000000000001": { - "storage" : { - "0x01" : "0x01" - } - } + "6295ee1b4f6dd65047762f924ecd367c17eabf8f": { + "balance" : "0" + }, + "1000000000000000000000000000000000000001": { + "storage" : { + "0x01" : "0x01" + } + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : [1], + "value" : -1 + }, + "network" : ["EIP150", "EIP158"], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f": { + "balance" : "0" + }, + "1000000000000000000000000000000000000001": { + "storage" : { + "0x01" : "0x00" + } + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : [1], + "value" : -1 + }, + "network" : ["Frontier"], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f": { + "shouldnotexist" : "1" + }, + "1000000000000000000000000000000000000001": { + "storage" : { + "0x01" : "0x00" + } + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : [0], + "value" : -1 + }, + "network" : [ "Metropolis"], + "result" : { + "7465a28fa39704747c9317bb30c7910b059a7976": { + "balance" : "0" + }, + "1000000000000000000000000000000000000001": { + "storage" : { + "0x01" : "0x01" + } + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : [1], + "value" : -1 + }, + "network" : [ "Metropolis"], + "result" : { + "7465a28fa39704747c9317bb30c7910b059a7976": { + "balance" : "0" + }, + "1000000000000000000000000000000000000001": { + "storage" : { + "0x01" : "0x00" + } + } } }, - { + { "indexes" : { "data" : -1, "gas" : -1, @@ -35,14 +107,14 @@ }, "network" : ["Homestead"], "result" : { - "6295ee1b4f6dd65047762f924ecd367c17eabf8f": { - "shouldnotexist" : "1" - }, - "1000000000000000000000000000000000000001": { - "storage" : { - "0x01" : "0x00" - } - } + "6295ee1b4f6dd65047762f924ecd367c17eabf8f": { + "shouldnotexist" : "1" + }, + "1000000000000000000000000000000000000001": { + "storage" : { + "0x01" : "0x00" + } + } } } ], @@ -75,7 +147,7 @@ "0x6040600060406000600073100000000000000000000000000000000000000161c350f1" ], "gasLimit" : [ - "96000" + "96000", "60000" ], "gasPrice" : "1", "nonce" : "0", diff --git a/src/GeneralStateTestsFiller/stCodeSizeLimit/codesizeValidFiller.json b/src/GeneralStateTestsFiller/stCodeSizeLimit/codesizeValidFiller.json index 4b89285e7..1f772f20a 100644 --- a/src/GeneralStateTestsFiller/stCodeSizeLimit/codesizeValidFiller.json +++ b/src/GeneralStateTestsFiller/stCodeSizeLimit/codesizeValidFiller.json @@ -15,12 +15,25 @@ "gas" : -1, "value" : -1 }, - "network" : ["ALL"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "1" } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["Metropolis"], + "result" : { + "9f521cb25cf091325b9112f6cc2e2d6d44b1b9c4" : { + "balance" : "1" + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItselfFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItselfFiller.json index d71de4068..c66a42783 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItselfFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItselfFiller.json @@ -27,10 +27,10 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0xe808" + "balance" : "58039" }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a427ee" + "balance" : "999999941951" } } }, @@ -52,10 +52,10 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "22870" + "balance" : "22190" }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "999999977120" + "balance" : "999999977800" } } }, @@ -77,10 +77,10 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "53740" + "balance" : "52379" }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "999999946250" + "balance" : "999999947611" } } }, @@ -102,12 +102,40 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "59400" + "balance" : "58039" }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "999999940590" + "balance" : "999999941951" } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["Metropolis"], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "shouldnotexist" : "1" + }, + "1a3e089e89a1d995552b4005c40cd5c8832b929b" : { + "shouldnotexist" : "1" + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "storage" : { + "0x01" : "12" + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "58039" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "999999941951" + } + } } ], "pre" : @@ -119,19 +147,19 @@ "storage" : { } }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "code" : "This indicates that a call from transaction was initiated", - "code" : "{[[1]]12}", - "nonce" : "0", - "storage" : { + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "This indicates that a call from transaction was initiated", + "code" : "{[[1]]12}", + "nonce" : "0", + "storage" : { + } } - } }, "transaction" : { - "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT 0x6295ee1b4f6dd65047762f924ecd367c17eabf8f)}", + "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT (ADDRESS))}", "data" : [ - "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf3600052736295ee1b4f6dd65047762f924ecd367c17eabf8fff" + "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf360005230ff" ], "gasLimit" : [ "150000" diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateEContractInInit_TrFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateEContractInInit_TrFiller.json index 4147446fb..60b64b5a0 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateEContractInInit_TrFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateEContractInInit_TrFiller.json @@ -33,6 +33,24 @@ "gas" : -1, "value" : -1 }, + "network" : [ "Metropolis"], + "result" : { + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "12" + } + }, + "b5469acfebf441ecbe4cb959ccad5194fe8b068f" : { + "nonce" : "0x02" + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, "network" : ["Frontier", "Homestead", "EIP150"], "result" : { "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_TrFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_TrFiller.json index 54e46ecb2..23e386554 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_TrFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_TrFiller.json @@ -33,6 +33,27 @@ { "indexes" : { "data" : -1, + "gas" : 0, + "value" : -1 + }, + "network" : ["Metropolis"], + "result" : { + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "0x0c" + } + }, + "3a66a37b996c100ed79602b8aed81d8849e05dff" : { + "nonce" : "0x02" + }, + "a42676447b7cedfa5fde894d1d3df24aab362701" : { + "shouldnotexist" : "1" + } + } + }, + { + "indexes" : { + "data" : -1, "gas" : 1, "value" : -1 }, diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInit_TrFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInit_TrFiller.json index 966d191e7..63679347e 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInit_TrFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInit_TrFiller.json @@ -36,6 +36,27 @@ "gas" : -1, "value" : -1 }, + "network" : ["Metropolis"], + "result" : { + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "12" + } + }, + "3a66a37b996c100ed79602b8aed81d8849e05dff" : { + "nonce" : "0x02" + }, + "cd9f6a0226f5f41059425cb856d8f62ec75b804d" : { + "code" : "0x600c600055" + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, "network" : ["Frontier", "Homestead", "EIP150"], "result" : { "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_empty000CreateinInitCode_TransactionFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_empty000CreateinInitCode_TransactionFiller.json index b96c5d4bf..97956bab0 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_empty000CreateinInitCode_TransactionFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_empty000CreateinInitCode_TransactionFiller.json @@ -36,6 +36,27 @@ "gas" : -1, "value" : -1 }, + "network" : ["Metropolis"], + "result" : { + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "12" + } + }, + "2d54d3ffbc4cb1893dc3448ac6719ca59dc26a7b" : { + "nonce" : "0x02" + }, + "a42676447b7cedfa5fde894d1d3df24aab362701" : { + "shouldnotexist" : "1" + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, "network" : ["Frontier", "Homestead", "EIP150"], "result" : { "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/vitalikTransactionTestFiller.json b/src/GeneralStateTestsFiller/stEIP158Specific/vitalikTransactionTestFiller.json index a6bd6db3c..403c4d4eb 100644 --- a/src/GeneralStateTestsFiller/stEIP158Specific/vitalikTransactionTestFiller.json +++ b/src/GeneralStateTestsFiller/stEIP158Specific/vitalikTransactionTestFiller.json @@ -17,36 +17,36 @@ }, "network" : ["EIP158"], "result" : { - "ee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4": { - "nonce": "0x00", - "balance": "0x00", - "storage": {}, - "code": "0x" - }, - "1bc78ae0e5ec5cb439f1d5355d6f90d38343e109": { - "nonce": "0x03", - "balance": "0x00", - "storage": {}, - "code": "0x" - }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba": { - "nonce": "0x00", - "balance": "0x044dec", - "storage": {}, - "code": "0x" - }, - "51f9d7f98e997bdd6bebde4c2dd27be8c99303aa": { - "nonce": "0x01", - "balance": "0x00", - "storage": {}, - "code": "0x6000603f5359610043806100135939610056566c010000000000000000000000007fee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4d53532071d6cd0cb86facd5605ff6100008061003f60003961003f565b6000f35b816000f0905050fe" - }, - "cd2a3d9f938e13cd947ec05abc7fe734df8dd826": { - "nonce": "0x0150", - "balance": "0xfffffffffffffbb213", - "storage": {}, - "code": "0x" - } + "ee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4": { + "nonce": "0x00", + "balance": "0x00", + "storage": {}, + "code": "0x" + }, + "1bc78ae0e5ec5cb439f1d5355d6f90d38343e109": { + "nonce": "0x03", + "balance": "0x00", + "storage": {}, + "code": "0x" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba": { + "nonce": "0x00", + "balance": "0x044dec", + "storage": {}, + "code": "0x" + }, + "51f9d7f98e997bdd6bebde4c2dd27be8c99303aa": { + "nonce": "0x01", + "balance": "0x00", + "storage": {}, + "code": "0x6000603f5359610043806100135939610056566c010000000000000000000000007fee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4d53532071d6cd0cb86facd5605ff6100008061003f60003961003f565b6000f35b816000f0905050fe" + }, + "cd2a3d9f938e13cd947ec05abc7fe734df8dd826": { + "nonce": "0x0150", + "balance": "0xfffffffffffffbb213", + "storage": {}, + "code": "0x" + } } }, { @@ -57,39 +57,39 @@ }, "network" : ["EIP150"], "result" : { - "ee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4": { - "nonce": "0x00", - "balance": "0x00", - "storage": {}, - "code": "0x" - }, - "1bc78ae0e5ec5cb439f1d5355d6f90d38343e109": { - "nonce": "0x02", - "balance": "0x00", - "storage": {}, - "code": "0x" - }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba": { - "nonce": "0x00", - "balance": "307092", - "storage": {}, - "code": "0x" - }, - "13d3d0eedf83404aa5cc882d6756098cd21e3f56": { - "nonce": "0x00", - "balance": "0x00", - "storage": {}, - "code": "0x6000603f5359610043806100135939610056566c010000000000000000000000007fee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4d53532071d6cd0cb86facd5605ff6100008061003f60003961003f565b6000f35b816000f0905050fe" - }, - "cd2a3d9f938e13cd947ec05abc7fe734df8dd826": { - "nonce": "0x0150", - "balance": "4722366482869644906603", - "storage": {}, - "code": "0x" - } + "ee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4": { + "nonce": "0x00", + "balance": "0x00", + "storage": {}, + "code": "0x" + }, + "1bc78ae0e5ec5cb439f1d5355d6f90d38343e109": { + "nonce": "0x02", + "balance": "0x00", + "storage": {}, + "code": "0x" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba": { + "nonce": "0x00", + "balance": "307092", + "storage": {}, + "code": "0x" + }, + "13d3d0eedf83404aa5cc882d6756098cd21e3f56": { + "nonce": "0x00", + "balance": "0x00", + "storage": {}, + "code": "0x6000603f5359610043806100135939610056566c010000000000000000000000007fee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4d53532071d6cd0cb86facd5605ff6100008061003f60003961003f565b6000f35b816000f0905050fe" + }, + "cd2a3d9f938e13cd947ec05abc7fe734df8dd826": { + "nonce": "0x0150", + "balance": "4722366482869644906603", + "storage": {}, + "code": "0x" + } } }, - { + { "indexes" : { "data" : -1, "gas" : -1, @@ -97,26 +97,71 @@ }, "network" : ["Frontier", "Homestead"], "result" : { - "ee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4": { - "nonce": "0x00", - "balance": "0x00", - "storage": {}, - "code": "0x" - }, - "1bc78ae0e5ec5cb439f1d5355d6f90d38343e109": { - "nonce": "0x02", - "balance": "0x00", - "storage": {}, - "code": "0x" - }, - "51f9d7f98e997bdd6bebde4c2dd27be8c99303aa": { - "shouldnotexist" : "1" - }, - "cd2a3d9f938e13cd947ec05abc7fe734df8dd826": { - "nonce": "0x0150", - "storage": {}, - "code": "0x" - } + "ee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4": { + "nonce": "0x00", + "balance": "0x00", + "storage": {}, + "code": "0x" + }, + "1bc78ae0e5ec5cb439f1d5355d6f90d38343e109": { + "nonce": "0x02", + "balance": "0x00", + "storage": {}, + "code": "0x" + }, + "51f9d7f98e997bdd6bebde4c2dd27be8c99303aa": { + "shouldnotexist" : "1" + }, + "cd2a3d9f938e13cd947ec05abc7fe734df8dd826": { + "nonce": "0x0150", + "storage": {}, + "code": "0x" + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["Metropolis"], + "result" : { + "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0x044dec", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + }, + "0xcd2a3d9f938e13cd947ec05abc7fe734df8dd826" : { + "balance" : "0xfffffffffffffbb213", + "code" : "", + "nonce" : "0x0150", + "storage" : { + } + }, + "0xd0f54d2f3eb0c681a93ae58b6d0b87a705c28758" : { + "balance" : "0x00", + "code" : "", + "nonce" : "0x03", + "storage" : { + } + }, + "0xd5004138be50a26d1b5ff3afc9761221cc8f4a4f" : { + "balance" : "0x00", + "code" : "0x6000603f5359610043806100135939610056566c010000000000000000000000007fee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4d53532071d6cd0cb86facd5605ff6100008061003f60003961003f565b6000f35b816000f0905050fe", + "nonce" : "0x01", + "storage" : { + } + }, + "0xee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4" : { + "balance" : "0x00", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + } } } ], diff --git a/src/GeneralStateTestsFiller/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransactionFiller.json b/src/GeneralStateTestsFiller/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransactionFiller.json index 4ecc7b63b..34d2c2e96 100644 --- a/src/GeneralStateTestsFiller/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransactionFiller.json +++ b/src/GeneralStateTestsFiller/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransactionFiller.json @@ -14,16 +14,26 @@ "network" : ["Homestead"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f": { - "shouldnotexist" : "1" - } + "shouldnotexist" : "1" + } } }, - { + { "indexes" : { "data" : -1, "gas" : -1, "value" : -1}, "network" : ["Frontier", "EIP158", "EIP150"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f": { - } + "balance" : "0" + } + } + }, + { + "indexes" : { "data" : -1, "gas" : -1, "value" : -1}, + "network" : [ "Metropolis"], + "result" : { + "7465a28fa39704747c9317bb30c7910b059a7976": { + "balance" : "0" + } } } ], @@ -35,14 +45,14 @@ "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "100000", "code" : "{(CALL 50000 0x1000000000000000000000000000000000000001 0 0 64 0 64)}", "nonce" : "0", "storage" : { } }, - "1000000000000000000000000000000000000001" : { + "1000000000000000000000000000000000000001" : { "balance" : "0", "code" : "{(SSTORE 1 1)}", "nonce" : "0", diff --git a/src/GeneralStateTestsFiller/stHomesteadSpecific/createContractViaTransactionCost53000Filler.json b/src/GeneralStateTestsFiller/stHomesteadSpecific/createContractViaTransactionCost53000Filler.json index 44dfbe810..0a92175ca 100644 --- a/src/GeneralStateTestsFiller/stHomesteadSpecific/createContractViaTransactionCost53000Filler.json +++ b/src/GeneralStateTestsFiller/stHomesteadSpecific/createContractViaTransactionCost53000Filler.json @@ -11,7 +11,7 @@ "expect" : [ { "indexes" : { "data" : -1, "gas" : -1, "value" : -1}, - "network" : ["Homestead", "EIP158", "EIP150"], + "network" : ["Homestead", "EIP158", "EIP150", "Metropolis"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "nonce" : "1", @@ -19,7 +19,7 @@ } } }, - { + { "indexes" : { "data" : -1, "gas" : -1, "value" : -1}, "network" : ["Frontier"], "result" : { diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateStopInInitcodeFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateStopInInitcodeFiller.json index cc1796310..973b71fd4 100644 --- a/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateStopInInitcodeFiller.json +++ b/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateStopInInitcodeFiller.json @@ -24,6 +24,22 @@ "nonce" : "1" } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["Metropolis"], + "result" : { + "84147880172d4d4ee91be294755fe22f97c672b2" : { + "balance" : "1" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "1" + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stSpecialTest/StackDepthLimitSECFiller.json b/src/GeneralStateTestsFiller/stSpecialTest/StackDepthLimitSECFiller.json index 32e0a32af..55469c478 100644 --- a/src/GeneralStateTestsFiller/stSpecialTest/StackDepthLimitSECFiller.json +++ b/src/GeneralStateTestsFiller/stSpecialTest/StackDepthLimitSECFiller.json @@ -22,7 +22,7 @@ } } }, - { + { "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, "network" : ["Homestead", "EIP150", "EIP158"], "result" : { @@ -34,6 +34,19 @@ "balance" : "99940878" } } + }, + { + "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, + "network" : ["Metropolis"], + "result" : { + "7a2dd0a42f313c302a32815f6f76dc96254911df" : { + "balance" : "0x0a", + "code" : "0x600060006000600060003060405a03f1" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "99940878" + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stSpecialTest/deploymentErrorFiller.json b/src/GeneralStateTestsFiller/stSpecialTest/deploymentErrorFiller.json index add12c186..6b568178e 100644 --- a/src/GeneralStateTestsFiller/stSpecialTest/deploymentErrorFiller.json +++ b/src/GeneralStateTestsFiller/stSpecialTest/deploymentErrorFiller.json @@ -15,12 +15,25 @@ "gas" : -1, "value" : -1 }, - "network" : ["ALL"], + "network" : ["Frontier","Homestead","EIP150","EIP158"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "code" : "0x606060405236156100a35760e060020a60003504630a19b14a81146100ab578063278b8c0e146100e25780632e1a7d4d14610111578063338b5dea14610125578063577863941461015057806365e17c9d146101595780636c86888b1461016b57806393f0bb51146101da5780639e281a9814610207578063c281309e14610232578063d0e30db01461023b578063f7888aec14610287578063fb6e155f146102bb575b6103e6610002565b6103e660043560243560443560643560843560a43560c43560e4356101043561012435610144356000600034111561042b57610002565b6103e660043560243560443560643560843560a43560c43560e43561010435600060003411156108b457610002565b6103e66004356000341115610ab357610002565b6103e66004356024356000341180610146575081600160a060020a03166000145b15610b6157610002565b6103e860035481565b6103fa600254600160a060020a031681565b61041760043560243560443560643560843560a43560c43560e43561010435610124356101443561016435600160a060020a038c8116600090815260208181526040808320938516835292905290812054839010801590610c96575082610c938e8e8e8e8e8e8e8e8e8e6102df565b6103e660043560243560443560643560843560a43560c43560e435610104356000341115610ca457610002565b6103e66004356024356000341180610228575081600160a060020a03166000145b15610d3057610002565b6103e860045481565b6103e633600160a060020a03166000908152600080516020610f9f8339815191526020526040902054610ea390345b6000828201610f8f8482108015906102825750838210155b610660565b6103e8600435602435600160a060020a03828116600090815260208181526040808320938516835292905220545b92915050565b6103e860043560243560443560643560843560a43560c43560e43561010435610124355b600060006000600060028e8e8e8e8e8e6040518087600160a060020a0316606060020a02815260140186815260200185600160a060020a0316606060020a02815260140184815260200183815260200182815260200196505050505050506020604051808303816000866161da5a03f1156100025750506040805180516000828152602083810180865283905260ff8c1684860152606084018b9052608084018a90529351919650600160a060020a038c169360019360a0808201949293601f19840193928390039091019190866161da5a03f11561000257505060206040510351600160a060020a03161480156103d75750894311155b1515610f295760009350610f18565b005b60408051918252519081900360200190f35b60408051600160a060020a03929092168252519081900360200190f35b604080519115158252519081900360200190f35b60028c8c8c8c8c8c6040518087600160a060020a0316606060020a02815260140186815260200185600160a060020a0316606060020a02815260140184815260200183815260200182815260200196505050505050506020604051808303816000866161da5a03f1156100025750506040805180516000828152602083810180865283905260ff8a168486015260608401899052608084018890529351919450600160a060020a038a169360019360a0818101949293601f19840193928390039091019190866161da5a03f11561000257505060206040510351600160a060020a031614801561051b5750874311155b801561054057506000818152600160205260409020548b9061053d908461026a565b11155b80156105715750600160a060020a038c81166000908152602081815260408083203390941683529290522054829010155b80156105b457508a6105838a8461060a565b811561000257600160a060020a038c8116600090815260208181526040808320938c16835292905220549190049010155b151561062b57610002565b600160a060020a038d81166000908152602081815260408083203385168452909152808220939093559088168152205460035461066c9190670de0b6b3a7640000906106bc90869083035b6000828202610f8f8483148061028257508385838115610002570414610660565b600160a060020a038c811660009081526020818152604080832033909416835292905220546105bf90835b6000610f96838311155b801515610ab057610002565b600160a060020a038d81166000908152602081815260408083208b8516845290915280822093909355600254909116815220546003546106c89190670de0b6b3a7640000906106bc90869061060a565b8115610002570461026a565b600160a060020a038d8116600090815260208181526040808320600254851684528252808320949094558d83168252818152838220928a168252919091522054610717908c61076c8c8661060a565b600160a060020a038b81166000908152602081815260408083208b851684529091528082209390935533909116815220546004546107789190670de0b6b3a7640000908e906107cd906107e09084038f61060a565b81156100025704610656565b600160a060020a038b8116600090815260208181526040808320338516845290915280822093909355600254909116815220546004546107e69190670de0b6b3a7640000908e906107cd906107e0908f61060a565b811561000257048115610002570461026a565b8761060a565b600160a060020a038b81166000908152602081815260408083206002549094168352928152828220939093558381526001909252902054610827908361026a565b6000828152600160205260409020557f6effdda786735d5033bfad5f53e5131abcced9e52be6c507b62d639685fbed6d8c838c8e8d830281156100025760408051600160a060020a03968716815260208101959095529285168484015204606083015289831660808301523390921660a082015290519081900360c00190a1505050505050505050505050565b60028a8a8a8a8a8a6040518087600160a060020a0316606060020a02815260140186815260200185600160a060020a0316606060020a02815260140184815260200183815260200182815260200196505050505050506020604051808303816000866161da5a03f1156100025750506040805180516000828152602083810180865283905260ff8916848601526060840188905260808401879052935191945033600160a060020a03169360019360a0818101949293601f19840193928390039091019190866161da5a03f115610002575050604051601f190151600160a060020a0316146109a257610002565b6000818152600160209081526040918290208b90558151600160a060020a038d811682529181018c90528a821681840152606081018a90526080810189905260a081018890523390911660c082015260ff861660e08201526101008101859052610120810184905290517f1e0b760c386003e9cb9bcf4fcf3997886042859d9b6ed6320e804597fcdb28b0918190036101400190a150505050505050505050565b33600160a060020a03166000818152600080516020610f9f8339815191526020908152604080832054815193845291830193909352818301849052606082015290517ff341246adaac6f497bc2a656f546ab9e182111d630394f0c57c710a59a2cb5679181900360800190a15b50565b33600160a060020a03166000908152600080516020610f9f833981519152602052604090205481901015610ae657610002565b33600160a060020a03166000908152600080516020610f9f8339815191526020526040902054610b169082610656565b33600160a060020a03166000818152600080516020610f9f8339815191526020526040808220939093559151909183919081818185876185025a03f1925050501515610a4357610002565b81600160a060020a03166323b872dd3330846040518460e060020a0281526004018084600160a060020a0316815260200183600160a060020a031681526020018281526020019350505050602060405180830381600087803b15610002576161da5a03f1156100025750506040515115159050610bdd57610002565b600160a060020a038281166000908152602081815260408083203390941683529290522054610c0c908261026a565b600160a060020a03838116600081815260208181526040808320339095168084529482529182902085905581519283528201929092528082018490526060810192909252517fdcbc1c05240f31ff3ad067ef1ee35ce4997762752e3a095284754544f4c709d79181900360800190a15050565b5060015b9c9b505050505050505050505050565b10155b1515610c7f57506000610c83565b60408051600160a060020a038b81168252602082018b905289811682840152606082018990526080820188905260a08201879052331660c082015260ff851660e08201526101008101849052610120810183905290517f91daf02b6d1454acd74c097a67e389a9d9371da3ff51366947022dc36748ce4d918190036101400190a1505050505050505050565b600160a060020a03828116600090815260208181526040808320339094168352929052205481901015610d6257610002565b600160a060020a038281166000908152602081815260408083203390941683529290522054610d919082610656565b600160a060020a03838116600081815260208181526040808320339095168084529482528083209590955584517fa9059cbb0000000000000000000000000000000000000000000000000000000081526004810194909452602484018690529351919363a9059cbb936044818101949293918390030190829087803b15610002576161da5a03f1156100025750506040515115159050610e3057610002565b600160a060020a03828116600081815260208181526040808320339095168084529482529182902054825193845290830193909352818101849052606082019290925290517ff341246adaac6f497bc2a656f546ab9e182111d630394f0c57c710a59a2cb5679181900360800190a15050565b33600160a060020a03166000818152600080516020610f9f8339815191526020908152604080832085905580519283529082019290925234818301526060810192909252517fdcbc1c05240f31ff3ad067ef1ee35ce4997762752e3a095284754544f4c709d79181900360800190a1565b8093505b5050509a9950505050505050505050565b600083815260016020526040902054610f43908e90610656565b600160a060020a038d8116600090815260208181526040808320938d16835292905220549092508b90610f76908f61060a565b81156100025704905080821015610f1457819350610f18565b9392505050565b508082036102b556ad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["Metropolis"], + "result" : { + "e60a706f9c69e8281a5f5b346bc78765bb381ad3" : { + "code" : "0x606060405236156100a35760e060020a60003504630a19b14a81146100ab578063278b8c0e146100e25780632e1a7d4d14610111578063338b5dea14610125578063577863941461015057806365e17c9d146101595780636c86888b1461016b57806393f0bb51146101da5780639e281a9814610207578063c281309e14610232578063d0e30db01461023b578063f7888aec14610287578063fb6e155f146102bb575b6103e6610002565b6103e660043560243560443560643560843560a43560c43560e4356101043561012435610144356000600034111561042b57610002565b6103e660043560243560443560643560843560a43560c43560e43561010435600060003411156108b457610002565b6103e66004356000341115610ab357610002565b6103e66004356024356000341180610146575081600160a060020a03166000145b15610b6157610002565b6103e860035481565b6103fa600254600160a060020a031681565b61041760043560243560443560643560843560a43560c43560e43561010435610124356101443561016435600160a060020a038c8116600090815260208181526040808320938516835292905290812054839010801590610c96575082610c938e8e8e8e8e8e8e8e8e8e6102df565b6103e660043560243560443560643560843560a43560c43560e435610104356000341115610ca457610002565b6103e66004356024356000341180610228575081600160a060020a03166000145b15610d3057610002565b6103e860045481565b6103e633600160a060020a03166000908152600080516020610f9f8339815191526020526040902054610ea390345b6000828201610f8f8482108015906102825750838210155b610660565b6103e8600435602435600160a060020a03828116600090815260208181526040808320938516835292905220545b92915050565b6103e860043560243560443560643560843560a43560c43560e43561010435610124355b600060006000600060028e8e8e8e8e8e6040518087600160a060020a0316606060020a02815260140186815260200185600160a060020a0316606060020a02815260140184815260200183815260200182815260200196505050505050506020604051808303816000866161da5a03f1156100025750506040805180516000828152602083810180865283905260ff8c1684860152606084018b9052608084018a90529351919650600160a060020a038c169360019360a0808201949293601f19840193928390039091019190866161da5a03f11561000257505060206040510351600160a060020a03161480156103d75750894311155b1515610f295760009350610f18565b005b60408051918252519081900360200190f35b60408051600160a060020a03929092168252519081900360200190f35b604080519115158252519081900360200190f35b60028c8c8c8c8c8c6040518087600160a060020a0316606060020a02815260140186815260200185600160a060020a0316606060020a02815260140184815260200183815260200182815260200196505050505050506020604051808303816000866161da5a03f1156100025750506040805180516000828152602083810180865283905260ff8a168486015260608401899052608084018890529351919450600160a060020a038a169360019360a0818101949293601f19840193928390039091019190866161da5a03f11561000257505060206040510351600160a060020a031614801561051b5750874311155b801561054057506000818152600160205260409020548b9061053d908461026a565b11155b80156105715750600160a060020a038c81166000908152602081815260408083203390941683529290522054829010155b80156105b457508a6105838a8461060a565b811561000257600160a060020a038c8116600090815260208181526040808320938c16835292905220549190049010155b151561062b57610002565b600160a060020a038d81166000908152602081815260408083203385168452909152808220939093559088168152205460035461066c9190670de0b6b3a7640000906106bc90869083035b6000828202610f8f8483148061028257508385838115610002570414610660565b600160a060020a038c811660009081526020818152604080832033909416835292905220546105bf90835b6000610f96838311155b801515610ab057610002565b600160a060020a038d81166000908152602081815260408083208b8516845290915280822093909355600254909116815220546003546106c89190670de0b6b3a7640000906106bc90869061060a565b8115610002570461026a565b600160a060020a038d8116600090815260208181526040808320600254851684528252808320949094558d83168252818152838220928a168252919091522054610717908c61076c8c8661060a565b600160a060020a038b81166000908152602081815260408083208b851684529091528082209390935533909116815220546004546107789190670de0b6b3a7640000908e906107cd906107e09084038f61060a565b81156100025704610656565b600160a060020a038b8116600090815260208181526040808320338516845290915280822093909355600254909116815220546004546107e69190670de0b6b3a7640000908e906107cd906107e0908f61060a565b811561000257048115610002570461026a565b8761060a565b600160a060020a038b81166000908152602081815260408083206002549094168352928152828220939093558381526001909252902054610827908361026a565b6000828152600160205260409020557f6effdda786735d5033bfad5f53e5131abcced9e52be6c507b62d639685fbed6d8c838c8e8d830281156100025760408051600160a060020a03968716815260208101959095529285168484015204606083015289831660808301523390921660a082015290519081900360c00190a1505050505050505050505050565b60028a8a8a8a8a8a6040518087600160a060020a0316606060020a02815260140186815260200185600160a060020a0316606060020a02815260140184815260200183815260200182815260200196505050505050506020604051808303816000866161da5a03f1156100025750506040805180516000828152602083810180865283905260ff8916848601526060840188905260808401879052935191945033600160a060020a03169360019360a0818101949293601f19840193928390039091019190866161da5a03f115610002575050604051601f190151600160a060020a0316146109a257610002565b6000818152600160209081526040918290208b90558151600160a060020a038d811682529181018c90528a821681840152606081018a90526080810189905260a081018890523390911660c082015260ff861660e08201526101008101859052610120810184905290517f1e0b760c386003e9cb9bcf4fcf3997886042859d9b6ed6320e804597fcdb28b0918190036101400190a150505050505050505050565b33600160a060020a03166000818152600080516020610f9f8339815191526020908152604080832054815193845291830193909352818301849052606082015290517ff341246adaac6f497bc2a656f546ab9e182111d630394f0c57c710a59a2cb5679181900360800190a15b50565b33600160a060020a03166000908152600080516020610f9f833981519152602052604090205481901015610ae657610002565b33600160a060020a03166000908152600080516020610f9f8339815191526020526040902054610b169082610656565b33600160a060020a03166000818152600080516020610f9f8339815191526020526040808220939093559151909183919081818185876185025a03f1925050501515610a4357610002565b81600160a060020a03166323b872dd3330846040518460e060020a0281526004018084600160a060020a0316815260200183600160a060020a031681526020018281526020019350505050602060405180830381600087803b15610002576161da5a03f1156100025750506040515115159050610bdd57610002565b600160a060020a038281166000908152602081815260408083203390941683529290522054610c0c908261026a565b600160a060020a03838116600081815260208181526040808320339095168084529482529182902085905581519283528201929092528082018490526060810192909252517fdcbc1c05240f31ff3ad067ef1ee35ce4997762752e3a095284754544f4c709d79181900360800190a15050565b5060015b9c9b505050505050505050505050565b10155b1515610c7f57506000610c83565b60408051600160a060020a038b81168252602082018b905289811682840152606082018990526080820188905260a08201879052331660c082015260ff851660e08201526101008101849052610120810183905290517f91daf02b6d1454acd74c097a67e389a9d9371da3ff51366947022dc36748ce4d918190036101400190a1505050505050505050565b600160a060020a03828116600090815260208181526040808320339094168352929052205481901015610d6257610002565b600160a060020a038281166000908152602081815260408083203390941683529290522054610d919082610656565b600160a060020a03838116600081815260208181526040808320339095168084529482528083209590955584517fa9059cbb0000000000000000000000000000000000000000000000000000000081526004810194909452602484018690529351919363a9059cbb936044818101949293918390030190829087803b15610002576161da5a03f1156100025750506040515115159050610e3057610002565b600160a060020a03828116600081815260208181526040808320339095168084529482529182902054825193845290830193909352818101849052606082019290925290517ff341246adaac6f497bc2a656f546ab9e182111d630394f0c57c710a59a2cb5679181900360800190a15050565b33600160a060020a03166000818152600080516020610f9f8339815191526020908152604080832085905580519283529082019290925234818301526060810192909252517fdcbc1c05240f31ff3ad067ef1ee35ce4997762752e3a095284754544f4c709d79181900360800190a1565b8093505b5050509a9950505050505050505050565b600083815260016020526040902054610f43908e90610656565b600160a060020a038d8116600090815260208181526040808320938d16835292905220549092508b90610f76908f61060a565b81156100025704905080821015610f1457819350610f18565b9392505050565b508082036102b556ad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1DUPFiller.json b/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1DUPFiller.json index 06a07dc90..4c983b078 100644 --- a/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1DUPFiller.json +++ b/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1DUPFiller.json @@ -15,12 +15,25 @@ "gas" : -1, "value" : -1 }, - "network" : ["ALL"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "1" } } + }, + { + "indexes" : { + "data" : [11], + "gas" : -1, + "value" : -1 + }, + "network" : ["Metropolis"], + "result" : { + "1030cf6804a682ed06178f6b3b3028b3b626fff6" : { + "balance" : "1" + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1Filler.json b/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1Filler.json index f56de4424..8953b7c50 100644 --- a/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1Filler.json +++ b/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1Filler.json @@ -15,12 +15,25 @@ "gas" : -1, "value" : -1 }, - "network" : ["ALL"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "1" } } + }, + { + "indexes" : { + "data" : [1], + "gas" : -1, + "value" : -1 + }, + "network" : ["Metropolis"], + "result" : { + "2e26e9c9425cf4c48dd6c89248d85e62d71451a5" : { + "balance" : "1" + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1PUSHFiller.json b/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1PUSHFiller.json index ecc5d8cde..66ef680d7 100644 --- a/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1PUSHFiller.json +++ b/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1PUSHFiller.json @@ -15,12 +15,25 @@ "gas" : -1, "value" : -1 }, - "network" : ["ALL"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "1" } } + }, + { + "indexes" : { + "data" : [6], + "gas" : -1, + "value" : -1 + }, + "network" : ["Metropolis"], + "result" : { + "97c43c428b03eaf8a03b15808635623a74a1959e" : { + "balance" : "1" + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.json index cafcddedd..69c3a17f0 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.json @@ -10,14 +10,37 @@ }, "expect" : [ { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, + "indexes" : { "data" : 0, "gas" : -1, "value" : -1 }, "network" : ["Metropolis"], "result" : { - "6295ee1b4f6dd65047762f924ecd367c17eabf8f": { + "3eb343d99f94205712c88c1cc7817bd428f8d3ef": { + "nonce" : "1" + } + } + }, + { + "indexes" : { "data" : 1, "gas" : -1, "value" : -1 }, + "network" : ["Metropolis"], + "result" : { + "e005e77ffd2953dd93c80b805101c03dac64291b": { + "nonce" : "1" + } + } + }, + { + "indexes" : { "data" : 2, "gas" : -1, "value" : -1 }, + "network" : ["Metropolis"], + "result" : { + "a3383b59156e2e9a7ba1b632d8111c10fe9c7078": { + "nonce" : "1" + } + } + }, + { + "indexes" : { "data" : 3, "gas" : -1, "value" : -1 }, + "network" : ["Metropolis"], + "result" : { + "df0f13f932cd2b119699443b14ffa29b6934b47f": { "nonce" : "1" } } diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_contractCreationOOGdontLeaveEmptyContractViaTransactionFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_contractCreationOOGdontLeaveEmptyContractViaTransactionFiller.json index 96b506f51..6120d465a 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_contractCreationOOGdontLeaveEmptyContractViaTransactionFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_contractCreationOOGdontLeaveEmptyContractViaTransactionFiller.json @@ -13,7 +13,7 @@ "indexes" : { "data" : -1, "gas" : -1, "value" : -1}, "network" : ["Metropolis"], "result" : { - "6295ee1b4f6dd65047762f924ecd367c17eabf8f": { + "e005e77ffd2953dd93c80b805101c03dac64291b": { "nonce" : "1" } } diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CreateHashCollisionFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CreateHashCollisionFiller.json index 8ed32ba37..365b06061 100644 --- a/src/GeneralStateTestsFiller/stSystemOperationsTest/CreateHashCollisionFiller.json +++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CreateHashCollisionFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["ALL"], + "network" : ["Frontier", "Homestead" , "EIP150" , "EIP158"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { @@ -29,6 +29,27 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["Metropolis"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0x00" + } + }, + "d2571607e241ecf590ed94b12d87c94babe36db6" : { + "balance" : "42", + "code" : "0x60016001016055", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stTransactionTest/CreateTransactionSuccessFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/CreateTransactionSuccessFiller.json index 9af761d71..27755dad7 100644 --- a/src/GeneralStateTestsFiller/stTransactionTest/CreateTransactionSuccessFiller.json +++ b/src/GeneralStateTestsFiller/stTransactionTest/CreateTransactionSuccessFiller.json @@ -59,6 +59,23 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["Metropolis"], + "result" : { + "4befb935223101d5011e1398eda7d09b69d0940d" : { + "balance" : "100", + "code" : "0x60e060020a600035048063f8a8fd6d14601457005b601a6020565b60006000f35b56", + "nonce" : "1", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stTransactionTest/EmptyTransaction2Filler.json b/src/GeneralStateTestsFiller/stTransactionTest/EmptyTransaction2Filler.json index fe14bcf5a..6d1a18f2c 100644 --- a/src/GeneralStateTestsFiller/stTransactionTest/EmptyTransaction2Filler.json +++ b/src/GeneralStateTestsFiller/stTransactionTest/EmptyTransaction2Filler.json @@ -68,6 +68,26 @@ "nonce" : "1" } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["Metropolis"], + "result" : { + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "shouldnotexist" : "1" + }, + "96b19ced219f86286c413422a6698a7439d1fa52" : { + "code" : "0x" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "100000", + "nonce" : "1" + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stTransactionTest/EmptyTransaction3Filler.json b/src/GeneralStateTestsFiller/stTransactionTest/EmptyTransaction3Filler.json index c5cce275c..2c1a3f75c 100644 --- a/src/GeneralStateTestsFiller/stTransactionTest/EmptyTransaction3Filler.json +++ b/src/GeneralStateTestsFiller/stTransactionTest/EmptyTransaction3Filler.json @@ -48,7 +48,27 @@ "nonce" : "1" } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["Metropolis"], + "result" : { + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "53000" + }, + "96b19ced219f86286c413422a6698a7439d1fa52" : { + "code" : "0x" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "47000", + "nonce" : "1" + } } + } ], "pre" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { diff --git a/src/GeneralStateTestsFiller/stTransactionTest/TransactionSendingToEmptyFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/TransactionSendingToEmptyFiller.json index 8a6e4cc33..ae3e82070 100644 --- a/src/GeneralStateTestsFiller/stTransactionTest/TransactionSendingToEmptyFiller.json +++ b/src/GeneralStateTestsFiller/stTransactionTest/TransactionSendingToEmptyFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["ALL"], + "network" : ["Frontier", "Homestead", "EIP158", "EIP150"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "code" : "0x" @@ -24,6 +24,22 @@ "nonce" : "1" } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["Metropolis"], + "result" : { + "96b19ced219f86286c413422a6698a7439d1fa52" : { + "code" : "0x" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "1" + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stTransactionTest/zeroSigTransacrionCreateFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/zeroSigTransacrionCreateFiller.json index 08b3fc53f..f9dbbc635 100644 --- a/src/GeneralStateTestsFiller/stTransactionTest/zeroSigTransacrionCreateFiller.json +++ b/src/GeneralStateTestsFiller/stTransactionTest/zeroSigTransacrionCreateFiller.json @@ -33,7 +33,7 @@ }, "network" : ["Metropolis"], "result" : { - "b318d82866cd9f7d7a55dbbf0a80f787b72bf97c" : { + "96b19ced219f86286c413422a6698a7439d1fa52" : { "shouldnotexist" : "1" }, "ffffffffffffffffffffffffffffffffffffffff" : { @@ -49,7 +49,7 @@ }, "network" : ["Metropolis"], "result" : { - "b318d82866cd9f7d7a55dbbf0a80f787b72bf97c" : { + "96b19ced219f86286c413422a6698a7439d1fa52" : { "shouldnotexist" : "1" }, "ffffffffffffffffffffffffffffffffffffffff" : { @@ -65,7 +65,7 @@ }, "network" : ["Metropolis"], "result" : { - "b318d82866cd9f7d7a55dbbf0a80f787b72bf97c" : { + "96b19ced219f86286c413422a6698a7439d1fa52" : { "balance" : "0x00", "nonce" : "0x01" }, @@ -73,6 +73,26 @@ "nonce" : "0" } } + }, + { + "indexes" : { + "data" : [2], + "gas" : [3], + "value" : -1 + }, + "network" : ["Metropolis"], + "result" : { + "0x7b83414b72fa142b89526b0add709c106872e33a" : { + "nonce" : "0x01", + "storage" : { + "0x00" : "0xffffffffffffffffffffffffffffffffffffffff", + "0x01" : "0xffffffffffffffffffffffffffffffffffffffff" + } + }, + "ffffffffffffffffffffffffffffffffffffffff" : { + "nonce" : "0" + } + } } ], "pre" : { @@ -86,7 +106,7 @@ }, "transaction" : { "data" : [ - "", "0x1122334455667788990011223344556677889910" + "", "0x1122334455667788990011223344556677889910", "0x3260005533600155" ], "gasLimit" : [ "60000", "20000", "21000", "121000" diff --git a/src/GeneralStateTestsFiller/stTransactionTest/zeroSigTransacrionCreatePrice0Filler.json b/src/GeneralStateTestsFiller/stTransactionTest/zeroSigTransacrionCreatePrice0Filler.json index 189fead65..67c759c6c 100644 --- a/src/GeneralStateTestsFiller/stTransactionTest/zeroSigTransacrionCreatePrice0Filler.json +++ b/src/GeneralStateTestsFiller/stTransactionTest/zeroSigTransacrionCreatePrice0Filler.json @@ -20,12 +20,15 @@ "b318d82866cd9f7d7a55dbbf0a80f787b72bf97c" : { "shouldnotexist" : "1" }, - "ffffffffffffffffffffffffffffffffffffffff" : { - "nonce" : "0" - } + "96b19ced219f86286c413422a6698a7439d1fa52" : { + "shouldnotexist" : "1" + }, + "ffffffffffffffffffffffffffffffffffffffff" : { + "nonce" : "0" + } } }, - { + { "indexes" : { "data" : [1], "gas" : -1, @@ -33,15 +36,15 @@ }, "network" : ["Metropolis"], "result" : { - "b318d82866cd9f7d7a55dbbf0a80f787b72bf97c" : { + "96b19ced219f86286c413422a6698a7439d1fa52" : { "shouldnotexist" : "1" }, - "ffffffffffffffffffffffffffffffffffffffff" : { - "nonce" : "0" - } + "ffffffffffffffffffffffffffffffffffffffff" : { + "nonce" : "0" + } } }, - { + { "indexes" : { "data" : [0], "gas" : [1,2], @@ -49,12 +52,12 @@ }, "network" : ["Metropolis"], "result" : { - "b318d82866cd9f7d7a55dbbf0a80f787b72bf97c" : { + "96b19ced219f86286c413422a6698a7439d1fa52" : { "shouldnotexist" : "1" }, - "ffffffffffffffffffffffffffffffffffffffff" : { - "nonce" : "0" - } + "ffffffffffffffffffffffffffffffffffffffff" : { + "nonce" : "0" + } } }, { @@ -65,13 +68,30 @@ }, "network" : ["Metropolis"], "result" : { - "b318d82866cd9f7d7a55dbbf0a80f787b72bf97c" : { + "96b19ced219f86286c413422a6698a7439d1fa52" : { + "balance" : "0x00", + "nonce" : "0x01" + }, + "ffffffffffffffffffffffffffffffffffffffff" : { + "nonce" : "0" + } + } + }, + { + "indexes" : { + "data" : [2], + "gas" : [0,3], + "value" : -1 + }, + "network" : ["Metropolis"], + "result" : { + "e694f562ff94f848f46fc40892878a065d370a59" : { "balance" : "0x00", "nonce" : "0x01" }, - "ffffffffffffffffffffffffffffffffffffffff" : { - "nonce" : "0" - } + "ffffffffffffffffffffffffffffffffffffffff" : { + "nonce" : "0" + } } } ], @@ -86,7 +106,7 @@ }, "transaction" : { "data" : [ - "", "0x1122334455667788990011223344556677889910" + "", "0x1122334455667788990011223344556677889910", "0x6000" ], "gasLimit" : [ "60000", "20000", "21000", "121000" @@ -94,8 +114,8 @@ "gasPrice" : "0", "nonce" : "0", "v" : "1", - "r" : "0", - "s" : "0", + "r" : "0", + "s" : "0", "to" : "", "value" : [ "0" diff --git a/src/GeneralStateTestsFiller/stTransactionTest/zeroSigTransactionFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/zeroSigTransactionFiller.json index 58ac55dd5..705b0ee42 100644 --- a/src/GeneralStateTestsFiller/stTransactionTest/zeroSigTransactionFiller.json +++ b/src/GeneralStateTestsFiller/stTransactionTest/zeroSigTransactionFiller.json @@ -112,7 +112,7 @@ "s" : "0", "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0", "1" + "0", "1", "100000" ] } } diff --git a/src/GeneralStateTestsFiller/stTransactionTest/zeroSigTransactionOriginFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/zeroSigTransactionOriginFiller.json new file mode 100644 index 000000000..eb9b4341d --- /dev/null +++ b/src/GeneralStateTestsFiller/stTransactionTest/zeroSigTransactionOriginFiller.json @@ -0,0 +1,110 @@ +{ + "zeroSigTransactionOrigin" : { + "env" : { + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "0x020000", + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : [0,3], + "value" : 0 + }, + "network" : ["Metropolis"], + "result" : { + "ffffffffffffffffffffffffffffffffffffffff" : { + "balance" : "100000", + "code" : "", + "nonce" : "0", + "storage" : { + } + }, + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0xffffffffffffffffffffffffffffffffffffffff", + "0x01" : "0xffffffffffffffffffffffffffffffffffffffff" + } + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : [1,2], + "value" : 0 + }, + "network" : ["Metropolis"], + "result" : { + "ffffffffffffffffffffffffffffffffffffffff" : { + "balance" : "100000", + "code" : "", + "nonce" : "0", + "storage" : { + } + }, + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0", + "0x01" : "0" + } + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], + "result" : { + "ffffffffffffffffffffffffffffffffffffffff" : { + "balance" : "100000", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + } + } + ], + "pre" : { + "ffffffffffffffffffffffffffffffffffffffff" : { + "balance" : "100000", + "code" : "", + "nonce" : "0", + "storage" : { + } + }, + "1000000000000000000000000000000000000000" : { + "balance" : "100000", + "code" : "{ [[0]] (ORIGIN) [[1]] (CALLER) }", + "nonce" : "0", + "storage" : { + } + } + }, + "transaction" : { + "data" : [ + "" + ], + "gasLimit" : [ + "70000", "20000", "21000", "121000" + ], + "gasPrice" : "0", + "nonce" : "0", + "v" : "1", + "r" : "0", + "s" : "0", + "to" : "1000000000000000000000000000000000000000", + "value" : [ + "0", "1", "100000" + ] + } + } +} diff --git a/src/GeneralStateTestsFiller/stTransactionTest/zeroSigTransactionToZero2Filler.json b/src/GeneralStateTestsFiller/stTransactionTest/zeroSigTransactionToZero2Filler.json new file mode 100644 index 000000000..b8dfbed66 --- /dev/null +++ b/src/GeneralStateTestsFiller/stTransactionTest/zeroSigTransactionToZero2Filler.json @@ -0,0 +1,248 @@ +{ + "zeroSigTransactionToZero2" : { + "env" : { + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "0x020000", + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : 1 + }, + "network" : ["Metropolis"], + "result" : { + "a000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00" + } + }, + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x01" : "0x00" + } + }, + "2000000000000000000000000000000000000000" : { + "storage" : { + "0x01" : "0x00" + } + }, + "3000000000000000000000000000000000000000" : { + "storage" : { + "0x01" : "0x00" + } + }, + "ffffffffffffffffffffffffffffffffffffffff" : { + "balance" : "100000", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + } + }, + { + "indexes" : { + "data" : [0], + "gas" : [0], + "value" : 0 + }, + "network" : ["Metropolis"], + "result" : { + "a000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01" + } + }, + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x01" : "0x01", + "0x02" : "0xffffffffffffffffffffffffffffffffffffffff", + "0x03" : "0xa000000000000000000000000000000000000000" + } + }, + "ffffffffffffffffffffffffffffffffffffffff" : { + "balance" : "100000", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + } + }, + { + "indexes" : { + "data" : [1], + "gas" : [0], + "value" : 0 + }, + "network" : ["Metropolis"], + "result" : { + "a000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01" + } + }, + "2000000000000000000000000000000000000000" : { + "storage" : { + "0x01" : "0x01", + "0x02" : "0xffffffffffffffffffffffffffffffffffffffff", + "0x03" : "0xa000000000000000000000000000000000000000" + } + }, + "ffffffffffffffffffffffffffffffffffffffff" : { + "balance" : "100000", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + } + }, + { + "indexes" : { + "data" : [2], + "gas" : [0], + "value" : 0 + }, + "network" : ["Metropolis"], + "result" : { + "a000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01" + } + }, + "3000000000000000000000000000000000000000" : { + "storage" : { + "0x01" : "0x01", + "0x02" : "0xffffffffffffffffffffffffffffffffffffffff", + "0x03" : "0xa000000000000000000000000000000000000000" + } + }, + "ffffffffffffffffffffffffffffffffffffffff" : { + "balance" : "100000", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : [1,2], + "value" : 0 + }, + "network" : ["Metropolis"], + "result" : { + "a000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00" + } + }, + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x01" : "0x00" + } + }, + "2000000000000000000000000000000000000000" : { + "storage" : { + "0x01" : "0x00" + } + }, + "3000000000000000000000000000000000000000" : { + "storage" : { + "0x01" : "0x00" + } + }, + "ffffffffffffffffffffffffffffffffffffffff" : { + "balance" : "100000", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], + "result" : { + "ffffffffffffffffffffffffffffffffffffffff" : { + "balance" : "100000", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + } + } + ], + "pre" : { + "a000000000000000000000000000000000000000" : { + "balance" : "100000", + "code" : "{ [[0]](CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) }", + "nonce" : "0", + "storage" : { + } + }, + "1000000000000000000000000000000000000000" : { + "balance" : "100000", + "code" : "{ [[1]] (CALL (GAS) 0xffffffffffffffffffffffffffffffffffffffff (CALLVALUE) 0 0 0 0) [[2]] (ORIGIN) [[3]] (CALLER) }", + "nonce" : "0", + "storage" : { + } + }, + "2000000000000000000000000000000000000000" : { + "balance" : "100000", + "code" : "{ [[1]] (CALLCODE (GAS) 0xffffffffffffffffffffffffffffffffffffffff (CALLVALUE) 0 0 0 0) [[2]] (ORIGIN) [[3]] (CALLER) }", + "nonce" : "0", + "storage" : { + } + }, + "3000000000000000000000000000000000000000" : { + "balance" : "100000", + "code" : "{ [[1]] (DELEGATECALL (GAS) 0xffffffffffffffffffffffffffffffffffffffff 0 0 0 0) [[2]] (ORIGIN) [[3]] (CALLER) }", + "nonce" : "0", + "storage" : { + } + }, + "ffffffffffffffffffffffffffffffffffffffff" : { + "balance" : "100000", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + }, + "transaction" : { + "data" : [ + "0x0000000000000000000000001000000000000000000000000000000000000000", + "0x0000000000000000000000002000000000000000000000000000000000000000", + "0x0000000000000000000000003000000000000000000000000000000000000000" + ], + "gasLimit" : [ + "600000", "20000", "0" + ], + "gasPrice" : "0", + "nonce" : "0", + "v" : "1", + "r" : "0", + "s" : "0", + "to" : "a000000000000000000000000000000000000000", + "value" : [ + "0", "100" + ] + } + } +} diff --git a/src/GeneralStateTestsFiller/stTransactionTest/zeroSigTransactionToZeroFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/zeroSigTransactionToZeroFiller.json new file mode 100644 index 000000000..1b1143d64 --- /dev/null +++ b/src/GeneralStateTestsFiller/stTransactionTest/zeroSigTransactionToZeroFiller.json @@ -0,0 +1,74 @@ +{ + "zeroSigTransactionToZero" : { + "env" : { + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "0x020000", + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["Metropolis"], + "result" : { + "ffffffffffffffffffffffffffffffffffffffff" : { + "balance" : "100000", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], + "result" : { + "ffffffffffffffffffffffffffffffffffffffff" : { + "balance" : "100000", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + } + } + ], + "pre" : { + "ffffffffffffffffffffffffffffffffffffffff" : { + "balance" : "100000", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + }, + "transaction" : { + "data" : [ + "", "0x1122334455667788990011223344556677889910" + ], + "gasLimit" : [ + "60000", "20000", "21000", "121000" + ], + "gasPrice" : "0", + "nonce" : "0", + "v" : "1", + "r" : "0", + "s" : "0", + "to" : "ffffffffffffffffffffffffffffffffffffffff", + "value" : [ + "0", "1", "100000" + ] + } + } +} diff --git a/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsAfterFiller.json b/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsAfterFiller.json index 2fb6f2706..ce5281270 100644 --- a/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsAfterFiller.json +++ b/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsAfterFiller.json @@ -27,7 +27,7 @@ } } }, - { + { "indexes" : { "data" : -1, "gas" : -1, @@ -44,6 +44,24 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["Metropolis"], + "result" : { + "746e5505debcfbf945fca34bfb241878ca2a6193" : { + "balance" : "0x0186a0", + "code" : "0x396000f3006000355415600957005b60", + "nonce" : "0x01", + "storage" : { + "0x01" : "0x01" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsAtFiller.json b/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsAtFiller.json index d633c7440..260ffb33e 100644 --- a/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsAtFiller.json +++ b/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsAtFiller.json @@ -27,7 +27,7 @@ } } }, - { + { "indexes" : { "data" : -1, "gas" : -1, @@ -44,6 +44,24 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["Metropolis"], + "result" : { + "746e5505debcfbf945fca34bfb241878ca2a6193" : { + "balance" : "0x0186a0", + "code" : "0x396000f3006000355415600957005b60", + "nonce" : "0x01", + "storage" : { + "0x01" : "0x01" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsBeforeFiller.json b/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsBeforeFiller.json index 81b11b662..75185477a 100644 --- a/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsBeforeFiller.json +++ b/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsBeforeFiller.json @@ -27,7 +27,7 @@ } } }, - { + { "indexes" : { "data" : -1, "gas" : -1, @@ -44,6 +44,24 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["Metropolis"], + "result" : { + "746e5505debcfbf945fca34bfb241878ca2a6193" : { + "balance" : "0x0186a0", + "code" : "0x396000f3006000355415600957005b60", + "nonce" : "0x01", + "storage" : { + "0x01" : "0x01" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionFiller.json b/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionFiller.json index d1149d74d..efd58cc97 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionFiller.json @@ -37,7 +37,7 @@ } } }, - { + { "indexes" : { "data" : -1, "gas" : [0,1], @@ -64,6 +64,34 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : [0,1], + "value" : -1 + }, + "network" : ["Metropolis"], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "code" : "0x", + "nonce" : "0x02", + "storage" : { + } + }, + "4dcb137cde4f7b75e1a8f9d14cd6ad5d088e235d" : { + "balance" : "0x64", + "code" : "0x606060405236156100985760e060020a6000350463173825d9811461009a5780632f54bf6e146100f65780634123cb6b1461011a5780635c52c2f5146101235780637065cb4814610154578063746c917114610188578063b20d30a914610191578063b75c7dc6146101c5578063ba51a6df146101f5578063c2cf732614610229578063f00d4b5d14610269578063f1736d86146102a2575b005b6100986004356000600036436040518084848082843750505090910190815260405190819003602001902090506105b9815b600160a060020a0333166000908152610102602052604081205481808083811415610719576108b0565b6102ac6004355b600160a060020a0316600090815261010260205260408120541190565b6102ac60015481565b6100986000364360405180848480828437505050909101908152604051908190036020019020905061070b816100cc565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610531816100cc565b6102ac60005481565b610098600435600036436040518084848082843750505090910190815260405190819003602001902090506106ff816100cc565b610098600435600160a060020a03331660009081526101026020526040812054908080838114156102be57610340565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610678816100cc565b6102ac600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156106d1576106f5565b6100986004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506103ca816100cc565b6102ac6101055481565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156103405781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156103c3576103d8836100fd565b156103e357506103c5565b600160a060020a03841660009081526101026020526040812054925082141561040c57506103c5565b6103475b6101045460005b8181101561085f576101048054829081101561000257600091825260008051602061099483398151915201541461048a5761010480546101039160009184908110156100025760008051602061099483398151915201548252506020919091526040812081815560018101829055600201555b600101610417565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561052c5761053f826100fd565b1561054a575061052e565b610552610410565b60015460fa90106105675761056561057c565b505b60015460fa9010610492575061052e565b6106365b600060015b600154811015610899575b600154811080156105ac5750600281610100811015610002570154600014155b156108b95760010161058c565b156103c557600160a060020a0383166000908152610102602052604081205492508214156105e7575061052c565b6001600160005054036000600050541115610602575061052c565b600060028361010081101561000257508301819055600160a060020a03841681526101026020526040812055610578610410565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561052c5760015482111561068d575061052e565b600082905561069a610410565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106f057600094506106f5565b600194505b5050505092915050565b1561052c575061010555565b1561052e5760006101065550565b60008681526101036020526040812080549094509092508214156107a2578154835560018381018390556101048054918201808255828015829011610771578183600052602060002091820191016107719190610885565b5050506002840181905561010480548892908110156100025760009190915260008051602061099483398151915201555b506001820154600284900a908116600014156108b05760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a182546001901161089d57600086815261010360205260409020600201546101048054909190811015610002576040600090812060008051602061099483398151915292909201819055808255600180830182905560029092015595506108b09050565b61010480546000808355919091526103c590600080516020610994833981519152908101905b808211156108995760008155600101610885565b5090565b8254600019018355600183018054821790555b50505050919050565b5b600180541180156108dc57506001546002906101008110156100025701546000145b156108f057600180546000190190556108ba565b600154811080156109135750600154600290610100811015610002570154600014155b801561092d57506002816101008110156100025701546000145b1561098e57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61058156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe", + "nonce" : "0x01", + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01", + "0x0107" : "0", + "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionOOGFiller.json b/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionOOGFiller.json index 9981fd9e6..b72028b9f 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionOOGFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionOOGFiller.json @@ -39,7 +39,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Homestead", "EIP150", "EIP158"], + "network" : ["Homestead", "EIP150", "EIP158", "Metropolis"], "result" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { "balance" : "0x04661a", diff --git a/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionPartialFiller.json b/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionPartialFiller.json index fed0f154d..2b65bc852 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionPartialFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionPartialFiller.json @@ -63,6 +63,33 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["Metropolis"], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "code" : "0x", + "nonce" : "0x02", + "storage" : { + } + }, + "4dcb137cde4f7b75e1a8f9d14cd6ad5d088e235d" : { + "balance" : "0x64", + "code" : "0x606060405236156100985760e060020a6000350463173825d9811461009a5780632f54bf6e146100f65780634123cb6b1461011a5780635c52c2f5146101235780637065cb4814610154578063746c917114610188578063b20d30a914610191578063b75c7dc6146101c5578063ba51a6df146101f5578063c2cf732614610229578063f00d4b5d14610269578063f1736d86146102a2575b005b6100986004356000600036436040518084848082843750505090910190815260405190819003602001902090506105b9815b600160a060020a0333166000908152610102602052604081205481808083811415610719576108b0565b6102ac6004355b600160a060020a0316600090815261010260205260408120541190565b6102ac60015481565b6100986000364360405180848480828437505050909101908152604051908190036020019020905061070b816100cc565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610531816100cc565b6102ac60005481565b610098600435600036436040518084848082843750505090910190815260405190819003602001902090506106ff816100cc565b610098600435600160a060020a03331660009081526101026020526040812054908080838114156102be57610340565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610678816100cc565b6102ac600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156106d1576106f5565b6100986004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506103ca816100cc565b6102ac6101055481565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156103405781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156103c3576103d8836100fd565b156103e357506103c5565b600160a060020a03841660009081526101026020526040812054925082141561040c57506103c5565b6103475b6101045460005b8181101561085f576101048054829081101561000257600091825260008051602061099483398151915201541461048a5761010480546101039160009184908110156100025760008051602061099483398151915201548252506020919091526040812081815560018101829055600201555b600101610417565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561052c5761053f826100fd565b1561054a575061052e565b610552610410565b60015460fa90106105675761056561057c565b505b60015460fa9010610492575061052e565b6106365b600060015b600154811015610899575b600154811080156105ac5750600281610100811015610002570154600014155b156108b95760010161058c565b156103c557600160a060020a0383166000908152610102602052604081205492508214156105e7575061052c565b6001600160005054036000600050541115610602575061052c565b600060028361010081101561000257508301819055600160a060020a03841681526101026020526040812055610578610410565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561052c5760015482111561068d575061052e565b600082905561069a610410565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106f057600094506106f5565b600194505b5050505092915050565b1561052c575061010555565b1561052e5760006101065550565b60008681526101036020526040812080549094509092508214156107a2578154835560018381018390556101048054918201808255828015829011610771578183600052602060002091820191016107719190610885565b5050506002840181905561010480548892908110156100025760009190915260008051602061099483398151915201555b506001820154600284900a908116600014156108b05760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a182546001901161089d57600086815261010360205260409020600201546101048054909190811015610002576040600090812060008051602061099483398151915292909201819055808255600180830182905560029092015595506108b09050565b61010480546000808355919091526103c590600080516020610994833981519152908101905b808211156108995760008155600101610885565b5090565b8254600019018355600183018054821790555b50505050919050565b5b600180541180156108dc57506001546002906101008110156100025701546000145b156108f057600180546000190190556108ba565b600154811080156109135750600154600290610100811015610002570154600014155b801561092d57506002816101008110156100025701546000145b1561098e57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61058156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe", + "nonce" : "0x01", + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01", + "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedConstructionCorrectFiller.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedConstructionCorrectFiller.json index 857e83ffd..d36a70353 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedConstructionCorrectFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedConstructionCorrectFiller.json @@ -36,7 +36,7 @@ } } }, - { + { "indexes" : { "data" : -1, "gas" : -1, @@ -62,6 +62,33 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["Metropolis"], + "result" : { + "4ccb78c71f57c8a27ceb6f9c7c78215d9b98ebd2" : { + "balance" : "0x64", + "code" : "0x606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe", + "nonce" : "0x01", + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01", + "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01" + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "code" : "0x", + "nonce" : "0x01", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletConstructionFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletConstructionFiller.json index f5a665177..9a4e6c286 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/walletConstructionFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/walletConstructionFiller.json @@ -37,7 +37,7 @@ } } }, - { + { "indexes" : { "data" : -1, "gas" : [0,1], @@ -64,6 +64,34 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : [0,1], + "value" : -1 + }, + "network" : ["Metropolis"], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "code" : "0x", + "nonce" : "0x02", + "storage" : { + } + }, + "0c302bea46cc4c58595a900e5847dbe140553de6" : { + "balance" : "0x64", + "code" : "0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe", + "nonce" : "0x01", + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01", + "0x0107" : "0", + "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletConstructionOOGFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletConstructionOOGFiller.json index 428bd6e30..430e24981 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/walletConstructionOOGFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/walletConstructionOOGFiller.json @@ -45,7 +45,7 @@ } } }, - { + { "indexes" : { "data" : -1, "gas" : 1, @@ -80,6 +80,42 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : 1, + "value" : -1 + }, + "network" : ["Metropolis"], + "result" : { + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "1210063", + "code" : "0x", + "nonce" : "0x00", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "999999999998458204", + "code" : "0x", + "nonce" : "0x02", + "storage" : { + } + }, + "0c302bea46cc4c58595a900e5847dbe140553de6" : { + "balance" : "0x64", + "code" : "0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe", + "nonce" : "1", + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01", + "0x0107" : "0", + "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletConstructionPartialFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletConstructionPartialFiller.json index 8c1f7cfed..107d7335e 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/walletConstructionPartialFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/walletConstructionPartialFiller.json @@ -36,7 +36,7 @@ } } }, - { + { "indexes" : { "data" : -1, "gas" : -1, @@ -62,6 +62,33 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["Metropolis"], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0x02", + "storage" : { + } + }, + "0c302bea46cc4c58595a900e5847dbe140553de6" : { + "balance" : "0x64", + "code" : "0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe", + "nonce" : "0x01", + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01", + "0x0107" : "0", + "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01" + } + } + } } ], "pre" : { |