diff options
| author | Dimitry <dimitry@ethereum.org> | 2017-10-06 00:44:38 +0800 |
|---|---|---|
| committer | Dimitry <dimitry@ethereum.org> | 2017-10-06 00:44:38 +0800 |
| commit | adaa3459f1f381370d56a4449927da97a28ad731 (patch) | |
| tree | eaa78b4eb92e491536318dba3b5c1eea61b308d8 /src/GeneralStateTestsFiller | |
| parent | 555106b5bbb375815ae1944d1ef19356cc9f4648 (diff) | |
| download | tangerine-tests-adaa3459f1f381370d56a4449927da97a28ad731.tar tangerine-tests-adaa3459f1f381370d56a4449927da97a28ad731.tar.gz tangerine-tests-adaa3459f1f381370d56a4449927da97a28ad731.tar.bz2 tangerine-tests-adaa3459f1f381370d56a4449927da97a28ad731.tar.lz tangerine-tests-adaa3459f1f381370d56a4449927da97a28ad731.tar.xz tangerine-tests-adaa3459f1f381370d56a4449927da97a28ad731.tar.zst tangerine-tests-adaa3459f1f381370d56a4449927da97a28ad731.zip | |
fix test fillers
Diffstat (limited to 'src/GeneralStateTestsFiller')
33 files changed, 606 insertions, 604 deletions
diff --git a/src/GeneralStateTestsFiller/stAttackTest/CrashingTransactionFiller.json b/src/GeneralStateTestsFiller/stAttackTest/CrashingTransactionFiller.json index 295f60c2a..7270d6756 100644 --- a/src/GeneralStateTestsFiller/stAttackTest/CrashingTransactionFiller.json +++ b/src/GeneralStateTestsFiller/stAttackTest/CrashingTransactionFiller.json @@ -1,8 +1,8 @@ { "CrashingTransaction" : { - "_info" : { - "comment" : "https://ropsten.etherscan.io/tx/0x8ec445380649f6c75a042a438ea9256c2fab2a6a3437904c9e5a712fcbf8a54a" - }, + "_info" : { + "comment" : "https://ropsten.etherscan.io/tx/0x8ec445380649f6c75a042a438ea9256c2fab2a6a3437904c9e5a712fcbf8a54a" + }, "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCodeFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCodeFiller.json index 2e93ac60d..7f09c9ded 100644 --- a/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCodeFiller.json +++ b/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCodeFiller.json @@ -57,11 +57,11 @@ "pre" : { "1000000000000000000000000000000000000000" : { "balance" : "10000", - "//comment1" : "{ (MSTORE 0 0x600160005533601455) (RETURN 23 9) }", + "//comment1" : "{ (MSTORE 0 0x600160005533601455) (RETURN 23 9) }", "//comment2" : "{ (MSTORE 0 0x6860016000553360145560005260096017f3) [[ 10 ]] (CREATE 1 14 18) [[ 11 ]] (CALLCODE 100000 0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6 0 0 64 0 64 ) }", - "//comment3" : "0x716860016000553360145560005260096017f36000526012600e6001f0600a55604060006040600060007313136008b64ff592819b2fa6d43f2835c452020e620186a0f2600b55", - "//comment4" : " 0x0102030405060708091011121314151617181920212223242526272829303132 0x0102030405060708091011121314151617181920212223242526272829303132", - "code" : "{ (MSTORE 0 0x716860016000553360145560005260096017f36000526012600e6001f0600a55) (MSTORE 32 0x6040600060406000600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b662) (MSTORE 64 0x0186a0f2600b5500000000000000000000000000000000000000000000000000) (CREATE 1 0 96) }", + "//comment3" : "0x716860016000553360145560005260096017f36000526012600e6001f0600a55604060006040600060007313136008b64ff592819b2fa6d43f2835c452020e620186a0f2600b55", + "//comment4" : " 0x0102030405060708091011121314151617181920212223242526272829303132 0x0102030405060708091011121314151617181920212223242526272829303132", + "code" : "{ (MSTORE 0 0x716860016000553360145560005260096017f36000526012600e6001f0600a55) (MSTORE 32 0x6040600060406000600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b662) (MSTORE 64 0x0186a0f2600b5500000000000000000000000000000000000000000000000000) (CREATE 1 0 96) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExistingContractFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExistingContractFiller.json index 8347ac549..511326a72 100644 --- a/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExistingContractFiller.json +++ b/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExistingContractFiller.json @@ -31,7 +31,7 @@ "1000000000000000000000000000000000000000" : { "balance" : "10000", "code" : "{ (MSTORE 0 0x6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b562) (MSTORE 32 0x0186a0f260005500000000000000000000000000000000000000000000000000) (CREATE 1 0 64) }", - "code2" : "{ (MSTORE 0 0x6001600155600260025560036003556004600455600560055560066006556007) (MSTORE 32 0x60075560086008556009600955600a600a550000000000000000000000000000) (CREATE 1 0 64) }", + "//code2" : "{ (MSTORE 0 0x6001600155600260025560036003556004600455600560055560066006556007) (MSTORE 32 0x60075560086008556009600955600a600a550000000000000000000000000000) (CREATE 1 0 64) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stCreateTest/CreateCollisionToEmptyFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CreateCollisionToEmptyFiller.json index b50c1abde..98496a06f 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CreateCollisionToEmptyFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CreateCollisionToEmptyFiller.json @@ -1,6 +1,6 @@ { "CreateCollisionToEmpty" : { - "_info" : { + "_info" : { "comment" : "data0 - create collision to empty, data1 - to empty but nonce, data2 - to contract with code" }, "env" : { diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/EXP_EmptyFiller.json b/src/GeneralStateTestsFiller/stEIP158Specific/EXP_EmptyFiller.json index a3d8b4560..2bbd6986a 100644 --- a/src/GeneralStateTestsFiller/stEIP158Specific/EXP_EmptyFiller.json +++ b/src/GeneralStateTestsFiller/stEIP158Specific/EXP_EmptyFiller.json @@ -17,24 +17,24 @@ }, "network" : ["EIP158"], "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "comment" : "https://etherpad.net/p/EIP158", - "storage" : { - "0x00" : "0x08d5b6", - "0x02" : "0x0873c4", - "0x03" : "0x01", - "0x04" : "0x07d76c", - "0x06" : "0x07741c", - "0x08" : "0x070f3c", - "0x0a" : "0x06a73c", - "0x0b" : "0x01", - "0x0c" : "0x060ae4", - "0x0d" : "0x01", - "0x0e" : "0x056e8c", - "0x0f" : "0x01", - "0x64" : "0x04d234" - } - } + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "//comment" : "https://etherpad.net/p/EIP158", + "storage" : { + "0x00" : "0x08d5b6", + "0x02" : "0x0873c4", + "0x03" : "0x01", + "0x04" : "0x07d76c", + "0x06" : "0x07741c", + "0x08" : "0x070f3c", + "0x0a" : "0x06a73c", + "0x0b" : "0x01", + "0x0c" : "0x060ae4", + "0x0d" : "0x01", + "0x0e" : "0x056e8c", + "0x0f" : "0x01", + "0x64" : "0x04d234" + } + } } }, { @@ -45,24 +45,24 @@ }, "network" : ["EIP150"], "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "comment" : "https://etherpad.net/p/EIP158", - "storage" : { - "0x00" : "0x08d5b6", - "0x02" : "0x0873ec", - "0x03" : "0x01", - "0x04" : "0x07d794", - "0x06" : "0x077584", - "0x08" : "0x071324", - "0x0a" : "0x06b024", - "0x0b" : "0x01", - "0x0c" : "0x0613cc", - "0x0d" : "0x01", - "0x0e" : "0x057774", - "0x0f" : "0x01", - "0x64" : "0x04db1c" - } - } + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "//comment" : "https://etherpad.net/p/EIP158", + "storage" : { + "0x00" : "0x08d5b6", + "0x02" : "0x0873ec", + "0x03" : "0x01", + "0x04" : "0x07d794", + "0x06" : "0x077584", + "0x08" : "0x071324", + "0x0a" : "0x06b024", + "0x0b" : "0x01", + "0x0c" : "0x0613cc", + "0x0d" : "0x01", + "0x0e" : "0x057774", + "0x0f" : "0x01", + "0x64" : "0x04db1c" + } + } } }, { diff --git a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_0_0_following_successful_createFiller.json b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_0_0_following_successful_createFiller.json index 0d7c02a66..c6f1f2a1f 100644 --- a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_0_0_following_successful_createFiller.json +++ b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_0_0_following_successful_createFiller.json @@ -22,7 +22,7 @@ } }, "945304eb96065b2a98b57a48a06ae28d285a71b5" : { - "shouldexist" : false + "shouldnotexist" : "1" } } }, diff --git a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_following_too_big_transferFiller.json b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_following_too_big_transferFiller.json index 27bba6316..a42400913 100644 --- a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_following_too_big_transferFiller.json +++ b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_following_too_big_transferFiller.json @@ -1,8 +1,8 @@ { "returndatacopy_following_too_big_transfer" : { - "_info" : { - "comment" : "This test tries RETURNDATACOPY with a non-zero size after a CALL that fails because of insufficient balance." - }, + "_info" : { + "comment" : "This test tries RETURNDATACOPY with a non-zero size after a CALL that fails because of insufficient balance." + }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json index 22e183874..21297119a 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json @@ -31,7 +31,7 @@ } }, { - "comment" : "OOG in subcall", + "//comment" : "OOG in subcall", "indexes" : { "data" : 0, "gas" : 1, @@ -39,12 +39,12 @@ }, "network" : ["ALL"], "result" : { - "3e180b1862f9d158abb5e519a6d8605540c23682" : { - "balance" : "0x06", + "3e180b1862f9d158abb5e519a6d8605540c23682" : { + "balance" : "0x06", "code" : "{ [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[4]] 12 }", "nonce" : "54", "storage" : { - "0x00" : "0x01", + "0x00" : "0x01", "0x04" : "0x0c" } }, @@ -55,7 +55,7 @@ } }, { - "comment" : "OOG after subcall", + "//comment" : "OOG after subcall", "indexes" : { "data" : 1, "gas" : 0, @@ -63,8 +63,8 @@ }, "network" : ["EIP158", "EIP150"], "result" : { - "3e180b1862f9d158abb5e519a6d8605540c23682" : { - "balance" : "0x05", + "3e180b1862f9d158abb5e519a6d8605540c23682" : { + "balance" : "0x05", "code" : "{ [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[4]] 12 }", "nonce" : "54", "storage" : { @@ -77,7 +77,7 @@ } }, { - "comment" : "OOG after subcall", + "//comment" : "OOG after subcall", "indexes" : { "data" : 1, "gas" : 0, @@ -85,8 +85,8 @@ }, "network" : ["Homestead", "Frontier"], "result" : { - "3e180b1862f9d158abb5e519a6d8605540c23682" : { - "balance" : "0x05", + "3e180b1862f9d158abb5e519a6d8605540c23682" : { + "balance" : "0x05", "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455", "nonce" : "54", "storage" : { @@ -99,7 +99,7 @@ } }, { - "comment" : "double OOG", + "//comment" : "double OOG", "indexes" : { "data" : 0, "gas" : 0, @@ -107,9 +107,9 @@ }, "network" : ["ALL"], "result" : { - "3e180b1862f9d158abb5e519a6d8605540c23682" : { - "balance" : "0x05", - "code" : "{ [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[4]] 12 }", + "3e180b1862f9d158abb5e519a6d8605540c23682" : { + "balance" : "0x05", + "code" : "{ [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[4]] 12 }", "nonce" : "54", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateOOGFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateOOGFiller.json index 2e7aa1ea4..47b0db599 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateOOGFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateOOGFiller.json @@ -10,7 +10,7 @@ }, "expect" : [ { - "comment" : "NO OOG", + "//comment" : "NO OOG", "indexes" : { "data" : 1, "gas" : 1, @@ -18,10 +18,10 @@ }, "network" : ["EIP158"], "result" : { - "3e180b1862f9d158abb5e519a6d8605540c23682" : { - "nonce" : "1" - }, - "a000000000000000000000000000000000000000" : { + "3e180b1862f9d158abb5e519a6d8605540c23682" : { + "nonce" : "1" + }, + "a000000000000000000000000000000000000000" : { "storage" : { "0x00" : "0x01", "0x01" : "0x01", @@ -37,7 +37,7 @@ } }, { - "comment" : "NO OOG", + "//comment" : "NO OOG", "indexes" : { "data" : 1, "gas" : 1, @@ -45,10 +45,10 @@ }, "network" : ["EIP150"], "result" : { - "3e180b1862f9d158abb5e519a6d8605540c23682" : { - "nonce" : "0" - }, - "a000000000000000000000000000000000000000" : { + "3e180b1862f9d158abb5e519a6d8605540c23682" : { + "nonce" : "0" + }, + "a000000000000000000000000000000000000000" : { "storage" : { "0x00" : "0x01", "0x01" : "0x01", @@ -64,7 +64,7 @@ } }, { - "comment" : "NO OOG", + "//comment" : "NO OOG", "indexes" : { "data" : 1, "gas" : 1, @@ -72,9 +72,9 @@ }, "network" : ["Frontier", "Homestead"], "result" : { - "3e180b1862f9d158abb5e519a6d8605540c23682" : { - "shouldnotexist" : "1" - }, + "3e180b1862f9d158abb5e519a6d8605540c23682" : { + "shouldnotexist" : "1" + }, "a000000000000000000000000000000000000000" : { "storage" : { } @@ -86,7 +86,7 @@ } }, { - "comment" : "OOG in subcall", + "//comment" : "OOG in subcall", "indexes" : { "data" : 0, "gas" : 1, @@ -94,10 +94,10 @@ }, "network" : ["ALL"], "result" : { - "3e180b1862f9d158abb5e519a6d8605540c23682" : { - "shouldnotexist" : "1" - }, - "a000000000000000000000000000000000000000" : { + "3e180b1862f9d158abb5e519a6d8605540c23682" : { + "shouldnotexist" : "1" + }, + "a000000000000000000000000000000000000000" : { "storage" : { "0x00" : "0x01", "0x04" : "0x0c" @@ -110,7 +110,7 @@ } }, { - "comment" : "OOG after subcall / double OOG", + "//comment" : "OOG after subcall / double OOG", "indexes" : { "data" : [1, 0], "gas" : 0, diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json index 2fa1c198b..c741ddf4f 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json @@ -78,7 +78,7 @@ } }, { - "comment" : "OOG", + "//comment" : "OOG", "indexes" : { "data" : 0, "gas" : 1, diff --git a/src/GeneralStateTestsFiller/stSolidityTest/AmbiguousMethodFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/AmbiguousMethodFiller.json index 489d6eb74..a5725a976 100644 --- a/src/GeneralStateTestsFiller/stSolidityTest/AmbiguousMethodFiller.json +++ b/src/GeneralStateTestsFiller/stSolidityTest/AmbiguousMethodFiller.json @@ -28,23 +28,23 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "100000", - "//comment1" : "contract contract1", - "//comment2" : "{", - "//comment3" : " uint value;", - "//comment4" : " function run()", - "//comment5" : " {", - "//comment6" : " value = 225;", - "//comment7" : " }", - "//comment8" : "}", - "//comment9" : "", - "//comment10" : "contract contract2", - "//comment11" : "{", - "//comment12" : " uint value2;", - "//comment13" : " function run()", - "//comment14" : " {", - "//comment15" : " value2 = 335;", - "//comment16" : " }", - "//comment17" : "}", + "//comment1" : "contract contract1", + "//comment2" : "{", + "//comment3" : " uint value;", + "//comment4" : " function run()", + "//comment5" : " {", + "//comment6" : " value = 225;", + "//comment7" : " }", + "//comment8" : "}", + "//comment9" : "", + "//comment10" : "contract contract2", + "//comment11" : "{", + "//comment12" : " uint value2;", + "//comment13" : " function run()", + "//comment14" : " {", + "//comment15" : " value2 = 335;", + "//comment16" : " }", + "//comment17" : "}", "code" : "0x60003560e060020a90048063c040622614601557005b601b6021565b60006000f35b61014f60008190555056", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stSolidityTest/CallInfiniteLoopFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/CallInfiniteLoopFiller.json index a200b099c..4d5c219d9 100644 --- a/src/GeneralStateTestsFiller/stSolidityTest/CallInfiniteLoopFiller.json +++ b/src/GeneralStateTestsFiller/stSolidityTest/CallInfiniteLoopFiller.json @@ -26,23 +26,23 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "100000", - "//comment1" : "contract recursiveMethods", - "//comment2" : "{", - "//comment3" : " function testInfiniteLoop()", - "//comment4" : " {", - "//comment5" : " while(true){}", - "//comment6" : " }", - "//comment7" : " ", - "//comment8" : " function testRecursiveMethods()", - "//comment9" : " {", - "//comment10" : " testRecursiveMethods2();", - "//comment11" : " }", - "//comment12" : " ", - "//comment13" : " function testRecursiveMethods2()", - "//comment14" : " {", - "//comment15" : " testRecursiveMethods();", - "//comment16" : " }", - "//comment17" : "}", + "//comment1" : "contract recursiveMethods", + "//comment2" : "{", + "//comment3" : " function testInfiniteLoop()", + "//comment4" : " {", + "//comment5" : " while(true){}", + "//comment6" : " }", + "//comment7" : " ", + "//comment8" : " function testRecursiveMethods()", + "//comment9" : " {", + "//comment10" : " testRecursiveMethods2();", + "//comment11" : " }", + "//comment12" : " ", + "//comment13" : " function testRecursiveMethods2()", + "//comment14" : " {", + "//comment15" : " testRecursiveMethods();", + "//comment16" : " }", + "//comment17" : "}", "code" : "0x60003560e060020a90048063296df0df1460295780634893d88a146035578063981a316514604157005b602f604d565b60006000f35b603b6062565b60006000f35b6047605a565b60006000f35b5b600115605857604e565b565b60606062565b565b6068605a565b56", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stSolidityTest/CallLowLevelCreatesSolidityFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/CallLowLevelCreatesSolidityFiller.json index 969d0b243..daef56e6f 100644 --- a/src/GeneralStateTestsFiller/stSolidityTest/CallLowLevelCreatesSolidityFiller.json +++ b/src/GeneralStateTestsFiller/stSolidityTest/CallLowLevelCreatesSolidityFiller.json @@ -30,32 +30,32 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "100000", - "//comment1": "contract subcaller", - "//comment2": "{", - "//comment3": " function init(address a)", - "//comment4": " {", - "//comment5": " main(a).setdata(225);", - "//comment6": " }", - "//comment7": "}", - "//comment8": "", - "//comment9": "contract main", - "//comment10": "{", - "//comment11": " uint data;", - "//comment12": " address msgsender;", - "//comment13": " function run() returns (uint)", - "//comment14": " {", - "//comment15": " data = 1;", - "//comment16": " msgsender = 0x095e7baea6a6c7c4c2dfeb977efac326af552d87;", - "//comment17": " subcaller a = new subcaller();", - "//comment18": " a.init(msgsender);", - "//comment19": " return data;", - "//comment20": " }", - "//comment21": " ", - "//comment22": " function setdata(uint _data)", - "//comment23": " {", - "//comment24": " data = _data;", - "//comment25": " }", - "//comment26": "}", + "//comment1": "contract subcaller", + "//comment2": "{", + "//comment3": " function init(address a)", + "//comment4": " {", + "//comment5": " main(a).setdata(225);", + "//comment6": " }", + "//comment7": "}", + "//comment8": "", + "//comment9": "contract main", + "//comment10": "{", + "//comment11": " uint data;", + "//comment12": " address msgsender;", + "//comment13": " function run() returns (uint)", + "//comment14": " {", + "//comment15": " data = 1;", + "//comment16": " msgsender = 0x095e7baea6a6c7c4c2dfeb977efac326af552d87;", + "//comment17": " subcaller a = new subcaller();", + "//comment18": " a.init(msgsender);", + "//comment19": " return data;", + "//comment20": " }", + "//comment21": " ", + "//comment22": " function setdata(uint _data)", + "//comment23": " {", + "//comment24": " data = _data;", + "//comment25": " }", + "//comment26": "}", "code" : "0x60003560e060020a9004806330debb4214610021578063c04062261461003257005b61002c6004356100c7565b60006000f35b61003a610044565b8060005260206000f35b60006000600160008190555073095e7baea6a6c7c4c2dfeb977efac326af552d87600181905550606a6100d2600039606a60006000f0905080600160a060020a03166319ab453c600060008260e060020a026000526004600154600160a060020a03168152602001600060008660325a03f16100bc57005b505060005491505090565b80600081905550505600605e80600c6000396000f30060003560e060020a9004806319ab453c14601557005b601e6004356024565b60006000f35b80600160a060020a03166330debb42600060008260e060020a02600052600460e18152602001600060008660325a03f1605957005b50505056", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stSolidityTest/CallRecursiveMethodsFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/CallRecursiveMethodsFiller.json index fd6b2ca62..bfa7bdbac 100644 --- a/src/GeneralStateTestsFiller/stSolidityTest/CallRecursiveMethodsFiller.json +++ b/src/GeneralStateTestsFiller/stSolidityTest/CallRecursiveMethodsFiller.json @@ -26,23 +26,23 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "100000", - "//comment1" : "contract recursiveMethods", - "//comment2" : "{", - "//comment3" : " function testInfiniteLoop()", - "//comment4" : " {", - "//comment5" : " while(true){}", - "//comment6" : " }", - "//comment7" : " ", - "//comment8" : " function testRecursiveMethods()", - "//comment9" : " {", - "//comment10" : " testRecursiveMethods2();", - "//comment11" : " }", - "//comment12" : " ", - "//comment13" : " function testRecursiveMethods2()", - "//comment14" : " {", - "//comment15" : " testRecursiveMethods();", - "//comment16" : " }", - "//comment17" : "}", + "//comment1" : "contract recursiveMethods", + "//comment2" : "{", + "//comment3" : " function testInfiniteLoop()", + "//comment4" : " {", + "//comment5" : " while(true){}", + "//comment6" : " }", + "//comment7" : " ", + "//comment8" : " function testRecursiveMethods()", + "//comment9" : " {", + "//comment10" : " testRecursiveMethods2();", + "//comment11" : " }", + "//comment12" : " ", + "//comment13" : " function testRecursiveMethods2()", + "//comment14" : " {", + "//comment15" : " testRecursiveMethods();", + "//comment16" : " }", + "//comment17" : "}", "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463296df0df811460415780634893d88a14604d578063981a316514605957005b60476065565b60006000f35b6053607a565b60006000f35b605f6072565b60006000f35b5b6001156070576066565b565b6078607a565b565b60806072565b56", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stSolidityTest/ContractInheritanceFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/ContractInheritanceFiller.json index 4dae11ce5..a08f4df95 100644 --- a/src/GeneralStateTestsFiller/stSolidityTest/ContractInheritanceFiller.json +++ b/src/GeneralStateTestsFiller/stSolidityTest/ContractInheritanceFiller.json @@ -28,43 +28,43 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "100000", - "//comment1" : "contract base", - "//comment2" : "{", - "//comment3" : " function methodA() returns (uint32)", - "//comment4" : " {", - "//comment5" : " return 1;", - "//comment6" : " }", - "//comment7" : "}", - "//comment8" : "", - "//comment9" : "contract frombase is base", - "//comment10" : "{", - "//comment11" : " function methodA() returns (uint32)", - "//comment12" : " {", - "//comment13" : " return 2;", - "//comment14" : " }", - "//comment15" : "}", - "//comment16" : "", - "//comment17" : "contract main", - "//comment18" : "{", - "//comment19" : " bool returnValue;", - "//comment20" : " function run() returns (bool)", - "//comment21" : " {", - "//comment22" : " returnValue = testInheretance();", - "//comment23" : " return returnValue;", - "//comment24" : " }", - "//comment25" : " ", - "//comment26" : " function testInheretance() returns (bool res)", - "//comment27" : " {", - "//comment28" : " res = true;", - "//comment29" : " base contract1 = new base();", - "//comment30" : " if (contract1.methodA() != 1)", - "//comment31" : " return false;", - "//comment32" : "", - "//comment33" : " frombase contract2 = new frombase();", - "//comment34" : " if (contract2.methodA() != 2)", - "//comment35" : " return false;", - "//comment36" : " }", - "//comment37" : "}", + "//comment1" : "contract base", + "//comment2" : "{", + "//comment3" : " function methodA() returns (uint32)", + "//comment4" : " {", + "//comment5" : " return 1;", + "//comment6" : " }", + "//comment7" : "}", + "//comment8" : "", + "//comment9" : "contract frombase is base", + "//comment10" : "{", + "//comment11" : " function methodA() returns (uint32)", + "//comment12" : " {", + "//comment13" : " return 2;", + "//comment14" : " }", + "//comment15" : "}", + "//comment16" : "", + "//comment17" : "contract main", + "//comment18" : "{", + "//comment19" : " bool returnValue;", + "//comment20" : " function run() returns (bool)", + "//comment21" : " {", + "//comment22" : " returnValue = testInheretance();", + "//comment23" : " return returnValue;", + "//comment24" : " }", + "//comment25" : " ", + "//comment26" : " function testInheretance() returns (bool res)", + "//comment27" : " {", + "//comment28" : " res = true;", + "//comment29" : " base contract1 = new base();", + "//comment30" : " if (contract1.methodA() != 1)", + "//comment31" : " return false;", + "//comment32" : "", + "//comment33" : " frombase contract2 = new frombase();", + "//comment34" : " if (contract2.methodA() != 2)", + "//comment35" : " return false;", + "//comment36" : " }", + "//comment37" : "}", "code" : "0x7c010000000000000000000000000000000000000000000000000000000060003504633e0bca3b8114610039578063c0406226146100a857005b6100b55b600160008060456101ec8339604560006000f091508173ffffffffffffffffffffffffffffffffffffffff166381bda09b60206000827c010000000000000000000000000000000000000000000000000000000002600052600460006000866161da5a03f161011957005b6100bf60006100c961003d565b8060005260206000f35b8060005260206000f35b600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016919091179081905560ff16919050565b505060005163ffffffff166002141561019d575b5b505090565b505060005163ffffffff1660011415610194575b60456101a7600039604560006000f090508073ffffffffffffffffffffffffffffffffffffffff166381bda09b60206000827c010000000000000000000000000000000000000000000000000000000002600052600460006000866161da5a03f16100ff57005b60009250610114565b600092506101145600603980600c6000396000f3007c0100000000000000000000000000000000000000000000000000000000600035046381bda09b8114602d57005b60026000818152602090f3603980600c6000396000f3007c0100000000000000000000000000000000000000000000000000000000600035046381bda09b8114602d57005b60016000818152602090f3", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stSolidityTest/CreateContractFromMethodFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/CreateContractFromMethodFiller.json index b9825847c..d2a3580ad 100644 --- a/src/GeneralStateTestsFiller/stSolidityTest/CreateContractFromMethodFiller.json +++ b/src/GeneralStateTestsFiller/stSolidityTest/CreateContractFromMethodFiller.json @@ -73,31 +73,31 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "100000", - "//comment1": "contract TestContract", - "//comment2": "{", - "//comment3": " function testMethod() returns (int res)", - "//comment4": " {", - "//comment5": " return 225;", - "//comment6": " }", - "//comment7": "", - "//comment8": " function destroy(address sendFoundsTo)", - "//comment9": " {", - "//comment10": " suicide(sendFoundsTo);", - "//comment11": " }", - "//comment12": "}", - "//comment13": "", - "//comment14": "contract main", - "//comment15": "{", - "//comment16": " function run() returns (uint)", - "//comment17": " {", - "//comment18": " createContractFromMethod();", - "//comment19": " }", - "//comment20": " ", - "//comment21": " function createContractFromMethod() returns (TestContract a)", - "//comment22": " {", - "//comment23": " a = new TestContract();", - "//comment24": " }", - "//comment25": "}", + "//comment1": "contract TestContract", + "//comment2": "{", + "//comment3": " function testMethod() returns (int res)", + "//comment4": " {", + "//comment5": " return 225;", + "//comment6": " }", + "//comment7": "", + "//comment8": " function destroy(address sendFoundsTo)", + "//comment9": " {", + "//comment10": " suicide(sendFoundsTo);", + "//comment11": " }", + "//comment12": "}", + "//comment13": "", + "//comment14": "contract main", + "//comment15": "{", + "//comment16": " function run() returns (uint)", + "//comment17": " {", + "//comment18": " createContractFromMethod();", + "//comment19": " }", + "//comment20": " ", + "//comment21": " function createContractFromMethod() returns (TestContract a)", + "//comment22": " {", + "//comment23": " a = new TestContract();", + "//comment24": " }", + "//comment25": "}", "code" : "0x60003560e060020a900480637ee17e1214601f578063c040622614602b57005b60256047565b60006000f35b6031603b565b8060005260206000f35b600060436047565b5090565b60006060605d600039606060006000f09050905600605480600c6000396000f30060003560e060020a90048062f55d9d14601e578063b9c3d0a514602d57005b60276004356046565b60006000f35b6033603d565b8060005260206000f35b600060e1905090565b80600160a060020a0316ff5056", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsCreate4ContractsFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsCreate4ContractsFiller.json index 47cc179fb..3daad5e81 100644 --- a/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsCreate4ContractsFiller.json +++ b/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsCreate4ContractsFiller.json @@ -94,47 +94,47 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000000000000000000", - "//comment1" : "contract recursiveCreate1", - "//comment2" : "{", - "//comment3" : " uint depp;", - "//comment4" : " function recursiveCreate1(address a, uint depth)", - "//comment5" : " {", - "//comment6" : " depth = depth - 1;", - "//comment7" : "depp = depth;", - "//comment8" : " if(depth > 0)", - "//comment9" : " main(a).create2(depth);", - "//comment10" : " }", - "//comment11" : "}", - "//comment12" : "", - "//comment13" : "contract recursiveCreate2", - "//comment14" : "{", - "//comment15" : " uint depp;", - "//comment16" : " function recursiveCreate2(address a, uint depth)", - "//comment17" : " {", - "//comment18" : " depth = depth - 1;", - "//comment19" : "depp = depth;", - "//comment20" : " if(depth > 0)", - "//comment21" : " recursiveCreate1 rec1 = new recursiveCreate1(a, depth);", - "//comment22" : " }", - "//comment23" : "}", - "//comment24" : "", - "//comment25" : "contract main", - "//comment26" : "{", - "//comment27" : " address maincontract;", - "//comment28" : " uint depp;", - "//comment29" : " function run(uint depth)", - "//comment30" : " {", - "//comment31" : " maincontract = 0x095e7baea6a6c7c4c2dfeb977efac326af552d87;", - "//comment32" : " depp = depth;", - "//comment33" : " recursiveCreate1 rec1 = new recursiveCreate1(maincontract, depth);", - "//comment34" : " }", - "//comment35" : "", - "//comment36" : " function create2(uint depth)", - "//comment37" : " {", - "//comment38" : " recursiveCreate2 rec2 = new recursiveCreate2(maincontract, depth);", - "//comment39" : " address(rec2).send(2);", - "//comment40" : " }", - "//comment41" : "}", + "//comment1" : "contract recursiveCreate1", + "//comment2" : "{", + "//comment3" : " uint depp;", + "//comment4" : " function recursiveCreate1(address a, uint depth)", + "//comment5" : " {", + "//comment6" : " depth = depth - 1;", + "//comment7" : "depp = depth;", + "//comment8" : " if(depth > 0)", + "//comment9" : " main(a).create2(depth);", + "//comment10" : " }", + "//comment11" : "}", + "//comment12" : "", + "//comment13" : "contract recursiveCreate2", + "//comment14" : "{", + "//comment15" : " uint depp;", + "//comment16" : " function recursiveCreate2(address a, uint depth)", + "//comment17" : " {", + "//comment18" : " depth = depth - 1;", + "//comment19" : "depp = depth;", + "//comment20" : " if(depth > 0)", + "//comment21" : " recursiveCreate1 rec1 = new recursiveCreate1(a, depth);", + "//comment22" : " }", + "//comment23" : "}", + "//comment24" : "", + "//comment25" : "contract main", + "//comment26" : "{", + "//comment27" : " address maincontract;", + "//comment28" : " uint depp;", + "//comment29" : " function run(uint depth)", + "//comment30" : " {", + "//comment31" : " maincontract = 0x095e7baea6a6c7c4c2dfeb977efac326af552d87;", + "//comment32" : " depp = depth;", + "//comment33" : " recursiveCreate1 rec1 = new recursiveCreate1(maincontract, depth);", + "//comment34" : " }", + "//comment35" : "", + "//comment36" : " function create2(uint depth)", + "//comment37" : " {", + "//comment38" : " recursiveCreate2 rec2 = new recursiveCreate2(maincontract, depth);", + "//comment39" : " address(rec2).send(2);", + "//comment40" : " }", + "//comment41" : "}", "code" : "0x60003560e060020a90048063820b13f614610021578063a444f5e91461003257005b61002c600435610093565b60006000f35b61003d600435610043565b60006000f35b600073095e7baea6a6c7c4c2dfeb977efac326af552d8760008190555081600181905550606b6101ad600039606b600054600160a060020a0316815260200182815260200160006000f090505050565b600060c86100e560003960c8600054600160a060020a0316815260200182815260200160006000f0905080600160a060020a0316600060026000600060006000848787f16100dd57005b50505050505600604060c860043960045160245160006001820391508160008190555060008211602657604c565b606b605d600039606b83600160a060020a0316815260200182815260200160006000f090505b505050600180605c6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f30000", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsFiller.json index d253ff969..2ca3857a2 100644 --- a/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsFiller.json +++ b/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsFiller.json @@ -86,47 +86,47 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000000000000000000", - "//comment1" : "contract recursiveCreate1", - "//comment2" : "{", - "//comment3" : " uint depp;", - "//comment4" : " function recursiveCreate1(address a, uint depth)", - "//comment5" : " {", - "//comment6" : " depth = depth - 1;", - "//comment7" : "depp = depth;", - "//comment8" : " if(depth > 0)", - "//comment9" : " main(a).create2(depth);", - "//comment10" : " }", - "//comment11" : "}", - "//comment12" : "", - "//comment13" : "contract recursiveCreate2", - "//comment14" : "{", - "//comment15" : " uint depp;", - "//comment16" : " function recursiveCreate2(address a, uint depth)", - "//comment17" : " {", - "//comment18" : " depth = depth - 1;", - "//comment19" : "depp = depth;", - "//comment20" : " if(depth > 0)", - "//comment21" : " recursiveCreate1 rec1 = new recursiveCreate1(a, depth);", - "//comment22" : " }", - "//comment23" : "}", - "//comment24" : "", - "//comment25" : "contract main", - "//comment26" : "{", - "//comment27" : " address maincontract;", - "//comment28" : " uint depp;", - "//comment29" : " function run(uint depth)", - "//comment30" : " {", - "//comment31" : " maincontract = 0x095e7baea6a6c7c4c2dfeb977efac326af552d87;", - "//comment32" : " depp = depth;", - "//comment33" : " recursiveCreate1 rec1 = new recursiveCreate1(maincontract, depth);", - "//comment34" : " }", - "//comment35" : "", - "//comment36" : " function create2(uint depth)", - "//comment37" : " {", - "//comment38" : " recursiveCreate2 rec2 = new recursiveCreate2(maincontract, depth);", - "//comment39" : " address(rec2).send(2);", - "//comment40" : " }", - "//comment41" : "}", + "//comment1" : "contract recursiveCreate1", + "//comment2" : "{", + "//comment3" : " uint depp;", + "//comment4" : " function recursiveCreate1(address a, uint depth)", + "//comment5" : " {", + "//comment6" : " depth = depth - 1;", + "//comment7" : "depp = depth;", + "//comment8" : " if(depth > 0)", + "//comment9" : " main(a).create2(depth);", + "//comment10" : " }", + "//comment11" : "}", + "//comment12" : "", + "//comment13" : "contract recursiveCreate2", + "//comment14" : "{", + "//comment15" : " uint depp;", + "//comment16" : " function recursiveCreate2(address a, uint depth)", + "//comment17" : " {", + "//comment18" : " depth = depth - 1;", + "//comment19" : "depp = depth;", + "//comment20" : " if(depth > 0)", + "//comment21" : " recursiveCreate1 rec1 = new recursiveCreate1(a, depth);", + "//comment22" : " }", + "//comment23" : "}", + "//comment24" : "", + "//comment25" : "contract main", + "//comment26" : "{", + "//comment27" : " address maincontract;", + "//comment28" : " uint depp;", + "//comment29" : " function run(uint depth)", + "//comment30" : " {", + "//comment31" : " maincontract = 0x095e7baea6a6c7c4c2dfeb977efac326af552d87;", + "//comment32" : " depp = depth;", + "//comment33" : " recursiveCreate1 rec1 = new recursiveCreate1(maincontract, depth);", + "//comment34" : " }", + "//comment35" : "", + "//comment36" : " function create2(uint depth)", + "//comment37" : " {", + "//comment38" : " recursiveCreate2 rec2 = new recursiveCreate2(maincontract, depth);", + "//comment39" : " address(rec2).send(2);", + "//comment40" : " }", + "//comment41" : "}", "code" : "0x60003560e060020a90048063820b13f614610021578063a444f5e91461003257005b61002c600435610093565b60006000f35b61003d600435610043565b60006000f35b600073095e7baea6a6c7c4c2dfeb977efac326af552d8760008190555081600181905550606b6101ad600039606b600054600160a060020a0316815260200182815260200160006000f090505050565b600060c86100e560003960c8600054600160a060020a0316815260200182815260200160006000f0905080600160a060020a0316600060026000600060006000848787f16100dd57005b50505050505600604060c860043960045160245160006001820391508160008190555060008211602657604c565b606b605d600039606b83600160a060020a0316815260200182815260200160006000f090505b505050600180605c6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f30000", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stSolidityTest/TestBlockAndTransactionPropertiesFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/TestBlockAndTransactionPropertiesFiller.json index 66fe584ca..7c4d51b28 100644 --- a/src/GeneralStateTestsFiller/stSolidityTest/TestBlockAndTransactionPropertiesFiller.json +++ b/src/GeneralStateTestsFiller/stSolidityTest/TestBlockAndTransactionPropertiesFiller.json @@ -28,49 +28,49 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "100000", - "//comment1" : "contract main", - "//comment2" : "{", - "//comment3" : " bool returnValue;", - "//comment4" : " function run() returns (bool)", - "//comment5" : " {", - "//comment6" : " returnValue = testBlockAndTransactionProperties();", - "//comment7" : " return returnValue;", - "//comment8" : " }", - "//comment9" : "", - "//comment10" : " function testBlockAndTransactionProperties() returns (bool res)", - "//comment11" : " {", - "//comment12" : " res = true;", - "//comment13" : " if (block.coinbase != 0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba)", - "//comment14" : " return false;", - "//comment15" : "", - "//comment16" : " if (block.difficulty != 45678256)", - "//comment17" : " return false;", - "//comment18" : "", - "//comment19" : " if (block.gaslimit != 0x7fffffffffffffff)", - "//comment20" : " return false;", - "//comment21" : "", - "//comment22" : " if (block.number != 120)", - "//comment23" : " return false;", - "//comment24" : "", - "//comment25" : " //try to call this", - "//comment26" : " block.blockhash(120);", - "//comment27" : " block.timestamp;", - "//comment28" : " msg.gas;", - "//comment29" : "", - "//comment30" : " if (msg.sender != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)", - "//comment31" : " return false;", - "//comment32" : "", - "//comment33" : " if (msg.value != 100)", - "//comment34" : " return false;", - "//comment35" : "", - "//comment36" : " if (tx.gasprice != 1)", - "//comment37" : " return false;", - "//comment38" : "", - "//comment39" : " if (tx.origin != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)", - "//comment40" : " return false;", - "//comment41" : "", - "//comment42" : " }", - "//comment43" : "}", + "//comment1" : "contract main", + "//comment2" : "{", + "//comment3" : " bool returnValue;", + "//comment4" : " function run() returns (bool)", + "//comment5" : " {", + "//comment6" : " returnValue = testBlockAndTransactionProperties();", + "//comment7" : " return returnValue;", + "//comment8" : " }", + "//comment9" : "", + "//comment10" : " function testBlockAndTransactionProperties() returns (bool res)", + "//comment11" : " {", + "//comment12" : " res = true;", + "//comment13" : " if (block.coinbase != 0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba)", + "//comment14" : " return false;", + "//comment15" : "", + "//comment16" : " if (block.difficulty != 45678256)", + "//comment17" : " return false;", + "//comment18" : "", + "//comment19" : " if (block.gaslimit != 0x7fffffffffffffff)", + "//comment20" : " return false;", + "//comment21" : "", + "//comment22" : " if (block.number != 120)", + "//comment23" : " return false;", + "//comment24" : "", + "//comment25" : " //try to call this", + "//comment26" : " block.blockhash(120);", + "//comment27" : " block.timestamp;", + "//comment28" : " msg.gas;", + "//comment29" : "", + "//comment30" : " if (msg.sender != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)", + "//comment31" : " return false;", + "//comment32" : "", + "//comment33" : " if (msg.value != 100)", + "//comment34" : " return false;", + "//comment35" : "", + "//comment36" : " if (tx.gasprice != 1)", + "//comment37" : " return false;", + "//comment38" : "", + "//comment39" : " if (tx.origin != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)", + "//comment40" : " return false;", + "//comment41" : "", + "//comment42" : " }", + "//comment43" : "}", "code" : "0x60606040526000357c010000000000000000000000000000000000000000000000000000000090048063c040622614610044578063e97384dc1461006957610042565b005b610051600480505061008e565b60405180821515815260200191505060405180910390f35b61007660048050506100c9565b60405180821515815260200191505060405180910390f35b60006100986100c9565b600060006101000a81548160ff02191690830217905550600060009054906101000a900460ff1690506100c6565b90565b6000600190508050732adc25665018aa1fe0e6bc666dac8fc2697ff9ba4173ffffffffffffffffffffffffffffffffffffffff1614151561010d57600090506101f7565b6302b8feb04414151561012357600090506101f7565b677fffffffffffffff4514151561013d57600090506101f7565b60784314151561015057600090506101f7565b6078405042505a5073a94f5374fce5edbc8e2a8697c15331677e6ebf0b3373ffffffffffffffffffffffffffffffffffffffff1614151561019457600090506101f7565b6064341415156101a757600090506101f7565b60013a1415156101ba57600090506101f7565b73a94f5374fce5edbc8e2a8697c15331677e6ebf0b3273ffffffffffffffffffffffffffffffffffffffff161415156101f657600090506101f7565b5b9056", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stSolidityTest/TestContractInteractionFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/TestContractInteractionFiller.json index b66bbeeb2..7b540ea53 100644 --- a/src/GeneralStateTestsFiller/stSolidityTest/TestContractInteractionFiller.json +++ b/src/GeneralStateTestsFiller/stSolidityTest/TestContractInteractionFiller.json @@ -29,35 +29,35 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "100000", - "//comment1": "contract TestContract", - "//comment2": "{", - "//comment3": " function testMethod() returns (int res)", - "//comment4": " {", - "//comment5": " return 225;", - "//comment6": " }", - "//comment7": "", - "//comment8": " function destroy(address sendFoundsTo)", - "//comment9": " {", - "//comment10": " suicide(sendFoundsTo);", - "//comment11": " }", - "//comment12": "}", - "//comment13": "contract main", - "//comment14": "{", - "//comment15": " bool returnValue;", - "//comment16": " function run() returns (bool)", - "//comment17": " {", - "//comment18": " returnValue = testContractInteraction();", - "//comment19": " return returnValue;", - "//comment20": " }", - "//comment21": "", - "//comment22" : " function testContractInteraction() returns (bool res)", - "//comment23" : " {", - "//comment24" : " TestContract a = new TestContract();", - "//comment25" : " if (a.testMethod() == 225)", - "//comment26" : " return true;", - "//comment27" : " return false;", - "//comment28" : " }", - "//comment29": "}", + "//comment1": "contract TestContract", + "//comment2": "{", + "//comment3": " function testMethod() returns (int res)", + "//comment4": " {", + "//comment5": " return 225;", + "//comment6": " }", + "//comment7": "", + "//comment8": " function destroy(address sendFoundsTo)", + "//comment9": " {", + "//comment10": " suicide(sendFoundsTo);", + "//comment11": " }", + "//comment12": "}", + "//comment13": "contract main", + "//comment14": "{", + "//comment15": " bool returnValue;", + "//comment16": " function run() returns (bool)", + "//comment17": " {", + "//comment18": " returnValue = testContractInteraction();", + "//comment19": " return returnValue;", + "//comment20": " }", + "//comment21": "", + "//comment22" : " function testContractInteraction() returns (bool res)", + "//comment23" : " {", + "//comment24" : " TestContract a = new TestContract();", + "//comment25" : " if (a.testMethod() == 225)", + "//comment26" : " return true;", + "//comment27" : " return false;", + "//comment28" : " }", + "//comment29": "}", "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114610039578063ed973fe91461004b57005b6100416100ea565b8060005260206000f35b61005361005d565b8060005260206000f35b60006000608161011a600039608160006000f0905073ffffffffffffffffffffffffffffffffffffffff811663b9c3d0a5602060007fb9c3d0a50000000000000000000000000000000000000000000000000000000081526004600060008660325a03f16100c757005b505060005160e1146100d8576100e1565b600191506100e6565b600091505b5090565b60006100f461005d565b600060006101000a81548160ff0219169083021790555060ff600160005404169050905600607580600c6000396000f3007c01000000000000000000000000000000000000000000000000000000006000350462f55d9d81146036578063b9c3d0a514604557005b603f6004356055565b60006000f35b604b6070565b8060005260206000f35b8073ffffffffffffffffffffffffffffffffffffffff16ff50565b60e19056", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stSolidityTest/TestContractSuicideFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/TestContractSuicideFiller.json index c4cf495a8..5c37c33fd 100644 --- a/src/GeneralStateTestsFiller/stSolidityTest/TestContractSuicideFiller.json +++ b/src/GeneralStateTestsFiller/stSolidityTest/TestContractSuicideFiller.json @@ -29,36 +29,36 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "100000", - "//comment1": "contract TestContract", - "//comment2": "{", - "//comment3": " function testMethod() returns (int res)", - "//comment4": " {", - "//comment5": " return 225;", - "//comment6": " }", - "//comment7": "", - "//comment8": " function destroy(address sendFoundsTo)", - "//comment9": " {", - "//comment10": " suicide(sendFoundsTo);", - "//comment11": " }", - "//comment12": "}", - "//comment13": "contract main", - "//comment14": "{", - "//comment15": " bool returnValue;", - "//comment16": " function run() returns (bool)", - "//comment17": " {", - "//comment18": " returnValue = testContractSuicide();", - "//comment19": " return returnValue;", - "//comment20": " }", - "//comment21": "", - "//comment22": " function testContractSuicide() returns (bool res)", - "//comment23": " {", - "//comment24": " TestContract a = new TestContract();", - "//comment25": " a.destroy(block.coinbase);", - "//comment26": " if (a.testMethod() == 225) //we should be able to call a contract", - "//comment27": " return true;", - "//comment28": " return false;", - "//comment29": " }", - "//comment30": "}", + "//comment1": "contract TestContract", + "//comment2": "{", + "//comment3": " function testMethod() returns (int res)", + "//comment4": " {", + "//comment5": " return 225;", + "//comment6": " }", + "//comment7": "", + "//comment8": " function destroy(address sendFoundsTo)", + "//comment9": " {", + "//comment10": " suicide(sendFoundsTo);", + "//comment11": " }", + "//comment12": "}", + "//comment13": "contract main", + "//comment14": "{", + "//comment15": " bool returnValue;", + "//comment16": " function run() returns (bool)", + "//comment17": " {", + "//comment18": " returnValue = testContractSuicide();", + "//comment19": " return returnValue;", + "//comment20": " }", + "//comment21": "", + "//comment22": " function testContractSuicide() returns (bool res)", + "//comment23": " {", + "//comment24": " TestContract a = new TestContract();", + "//comment25": " a.destroy(block.coinbase);", + "//comment26": " if (a.testMethod() == 225) //we should be able to call a contract", + "//comment27": " return true;", + "//comment28": " return false;", + "//comment29": " }", + "//comment30": "}", "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463a60eedda8114610039578063c04062261461004b57005b61004161005d565b8060005260206000f35b61005361015a565b8060005260206000f35b60006000608161018a600039608160006000f0905073ffffffffffffffffffffffffffffffffffffffff811662f55d9d6000807ef55d9d00000000000000000000000000000000000000000000000000000000825260044173ffffffffffffffffffffffffffffffffffffffff168152602001600060008660325a03f16100e057005b505073ffffffffffffffffffffffffffffffffffffffff811663b9c3d0a5602060007fb9c3d0a50000000000000000000000000000000000000000000000000000000081526004600060008660325a03f161013757005b505060005160e11461014857610151565b60019150610156565b600091505b5090565b600061016461005d565b600060006101000a81548160ff0219169083021790555060ff600160005404169050905600607580600c6000396000f3007c01000000000000000000000000000000000000000000000000000000006000350462f55d9d81146036578063b9c3d0a514604557005b603f600435605a565b60006000f35b604b6055565b8060005260206000f35b60e190565b8073ffffffffffffffffffffffffffffffffffffffff16ff5056", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stSolidityTest/TestCryptographicFunctionsFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/TestCryptographicFunctionsFiller.json index 1e557f2a8..75c7b8f5b 100644 --- a/src/GeneralStateTestsFiller/stSolidityTest/TestCryptographicFunctionsFiller.json +++ b/src/GeneralStateTestsFiller/stSolidityTest/TestCryptographicFunctionsFiller.json @@ -28,34 +28,34 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "100000", - "//comment1" : "contract main", - "//comment2" : "{", - "//comment3" : " bool returnValue;", - "//comment4" : " function run() returns (bool)", - "//comment5" : " {", - "//comment6" : " returnValue = testCryptographicFunctions();", - "//comment7" : " return returnValue;", - "//comment8" : " }", - "//comment9" : "", - "//comment10" : " function testCryptographicFunctions() returns (bool res)", - "//comment11" : " {", - "//comment12" : " res = true;", - "//comment13" : " if (sha3('teststring') != 0x43c4b4524adb81e4e9a5c4648a98e9d320e3908ac5b6c889144b642cd08ae16d)", - "//comment14" : " return false;", - "//comment15" : "", - "//comment16" : " if (sha256('teststring') != 0x3c8727e019a42b444667a587b6001251becadabbb36bfed8087a92c18882d111)", - "//comment17" : " return false;", - "//comment18" : "", - "//comment19" : " if (ripemd160('teststring') != 0xcd566972b5e50104011a92b59fa8e0b1234851ae)", - "//comment20" : " return false;", - "//comment21" : "", - "//comment22" : "if (ecrecover(0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c,", - "//comment23" : " 28, 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f,", - "//comment24" : " 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549)", - "//comment25" : " != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)", - "//comment26" : " return false;", - "//comment27" : " }", - "//comment28" : "}", + "//comment1" : "contract main", + "//comment2" : "{", + "//comment3" : " bool returnValue;", + "//comment4" : " function run() returns (bool)", + "//comment5" : " {", + "//comment6" : " returnValue = testCryptographicFunctions();", + "//comment7" : " return returnValue;", + "//comment8" : " }", + "//comment9" : "", + "//comment10" : " function testCryptographicFunctions() returns (bool res)", + "//comment11" : " {", + "//comment12" : " res = true;", + "//comment13" : " if (sha3('teststring') != 0x43c4b4524adb81e4e9a5c4648a98e9d320e3908ac5b6c889144b642cd08ae16d)", + "//comment14" : " return false;", + "//comment15" : "", + "//comment16" : " if (sha256('teststring') != 0x3c8727e019a42b444667a587b6001251becadabbb36bfed8087a92c18882d111)", + "//comment17" : " return false;", + "//comment18" : "", + "//comment19" : " if (ripemd160('teststring') != 0xcd566972b5e50104011a92b59fa8e0b1234851ae)", + "//comment20" : " return false;", + "//comment21" : "", + "//comment22" : "if (ecrecover(0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c,", + "//comment23" : " 28, 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f,", + "//comment24" : " 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549)", + "//comment25" : " != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)", + "//comment26" : " return false;", + "//comment27" : " }", + "//comment28" : "}", "code" : "0x6000357c010000000000000000000000000000000000000000000000000000000090048063c04062261461003a578063e0a9fd281461004c57005b61004261005e565b8060005260206000f35b610054610099565b8060005260206000f35b6000610068610099565b600060006101000a81548160ff02191690830217905550600060009054906101000a900460ff169050610096565b90565b60006001905080507f43c4b4524adb81e4e9a5c4648a98e9d320e3908ac5b6c889144b642cd08ae16d60010260407f74657374737472696e67000000000000000000000000000000000000000000008152600a016040900360402014156100ff57610108565b600090506102ec565b7f3c8727e019a42b444667a587b6001251becadabbb36bfed8087a92c18882d11160010260026020600060007f74657374737472696e67000000000000000000000000000000000000000000008152600a0160006000856161da5a03f161016b57005b50600051141561017a57610183565b600090506102ec565b73cd566972b5e50104011a92b59fa8e0b1234851ae6c010000000000000000000000000260036020600060007f74657374737472696e67000000000000000000000000000000000000000000008152600a0160006000856161da5a03f16101e657005b506000516c010000000000000000000000000214156102045761020d565b600090506102ec565b73a94f5374fce5edbc8e2a8697c15331677e6ebf0b60016020600060007f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c6001028152602001601c81526020017f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f60010281526020017feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549600102815260200160006000856161da5a03f16102bd57005b5060005173ffffffffffffffffffffffffffffffffffffffff1614156102e2576102eb565b600090506102ec565b5b9056", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stSolidityTest/TestKeywordsFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/TestKeywordsFiller.json index 4af87bcc6..06130ed2a 100644 --- a/src/GeneralStateTestsFiller/stSolidityTest/TestKeywordsFiller.json +++ b/src/GeneralStateTestsFiller/stSolidityTest/TestKeywordsFiller.json @@ -28,49 +28,49 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "100000", - "//comment1": "contract main", - "//comment2": "{", - "//comment3": " bool returnValue;", - "//comment4": " function run() returns (bool)", - "//comment5": " {", - "//comment6": " returnValue = testKeywords();", - "//comment7": " return returnValue;", - "//comment8": " }", - "//comment9": "", - "//comment10": " function testKeywords() returns (bool res)", - "//comment11": " {", - "//comment12": " //some simple checks for the if statemnt", - "//comment13": " //if, else, while, for, break, continue, return", - "//comment14": " int i = 0;", - "//comment15": " res = false;", - "//comment16": "", - "//comment17": " if (i == 0)", - "//comment18": " {", - "//comment19": " if( i <= -25)", - "//comment20": " {", - "//comment21": " return false;", - "//comment22": " }", - "//comment23": " else", - "//comment24": " {", - "//comment25": " while(i < 10)", - "//comment26": " i++;", - "//comment27": "", - "//comment28": " if (i == 10)", - "//comment29": " {", - "//comment30": " for(var j=10; j>0; j--)", - "//comment31": " {", - "//comment32": " i--;", - "//comment33": " }", - "//comment34": " }", - "//comment35": " }", - "//comment36": " }", - "//comment37": "", - "//comment38": " if (i == 0)", - "//comment39": " return true;", - "//comment40": "", - "//comment41": " return false;", - "//comment42": " }", - "//comment43": "}", + "//comment1": "contract main", + "//comment2": "{", + "//comment3": " bool returnValue;", + "//comment4": " function run() returns (bool)", + "//comment5": " {", + "//comment6": " returnValue = testKeywords();", + "//comment7": " return returnValue;", + "//comment8": " }", + "//comment9": "", + "//comment10": " function testKeywords() returns (bool res)", + "//comment11": " {", + "//comment12": " //some simple checks for the if statemnt", + "//comment13": " //if, else, while, for, break, continue, return", + "//comment14": " int i = 0;", + "//comment15": " res = false;", + "//comment16": "", + "//comment17": " if (i == 0)", + "//comment18": " {", + "//comment19": " if( i <= -25)", + "//comment20": " {", + "//comment21": " return false;", + "//comment22": " }", + "//comment23": " else", + "//comment24": " {", + "//comment25": " while(i < 10)", + "//comment26": " i++;", + "//comment27": "", + "//comment28": " if (i == 10)", + "//comment29": " {", + "//comment30": " for(var j=10; j>0; j--)", + "//comment31": " {", + "//comment32": " i--;", + "//comment33": " }", + "//comment34": " }", + "//comment35": " }", + "//comment36": " }", + "//comment37": "", + "//comment38": " if (i == 0)", + "//comment39": " return true;", + "//comment40": "", + "//comment41": " return false;", + "//comment42": " }", + "//comment43": "}", "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463380e439681146037578063c040622614604757005b603d6084565b8060005260206000f35b604d6057565b8060005260206000f35b6000605f6084565b600060006101000a81548160ff0219169083021790555060ff60016000540416905090565b6000808160011560cd575b600a82121560a157600190910190608f565b81600a1460ac5760c9565b50600a5b60008160ff16111560c85760019182900391900360b0565b5b60d5565b6000925060ed565b8160001460e05760e8565b6001925060ed565b600092505b50509056", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stSolidityTest/TestOverflowFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/TestOverflowFiller.json index b7362d019..e2ca8da4c 100644 --- a/src/GeneralStateTestsFiller/stSolidityTest/TestOverflowFiller.json +++ b/src/GeneralStateTestsFiller/stSolidityTest/TestOverflowFiller.json @@ -28,31 +28,31 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "100000", - "//comment1" : "contract main", - "//comment2" : "{", - "//comment3" : " bool returnValue;", - "//comment4" : " function run() returns (bool)", - "//comment5" : " {", - "//comment6" : " returnValue = testOverflow();", - "//comment7" : " return returnValue;", - "//comment8" : " }", - "//comment9" : "", - "//comment10" : " function testOverflow() returns (bool res)", - "//comment11" : " {", - "//comment12" : " res = true;", - "//comment13" : " uint256 a = 115792089237316195423570985008687907853269984665640564039457584007913129639935;", - "//comment14" : " if (a + 1 != 0)", - "//comment15" : " return false;", - "//comment16" : "", - "//comment17" : " uint32 b = 4294967295;", - "//comment18" : " if (b + 1 != 0)", - "//comment19" : " return false;", - "//comment20" : "", - "//comment21" : " uint64 c = 18446744073709551615;", - "//comment22" : " if (c + 1 != 0)", - "//comment23" : " return false;", - "//comment24" : " }", - "//comment25" : "}", + "//comment1" : "contract main", + "//comment2" : "{", + "//comment3" : " bool returnValue;", + "//comment4" : " function run() returns (bool)", + "//comment5" : " {", + "//comment6" : " returnValue = testOverflow();", + "//comment7" : " return returnValue;", + "//comment8" : " }", + "//comment9" : "", + "//comment10" : " function testOverflow() returns (bool res)", + "//comment11" : " {", + "//comment12" : " res = true;", + "//comment13" : " uint256 a = 115792089237316195423570985008687907853269984665640564039457584007913129639935;", + "//comment14" : " if (a + 1 != 0)", + "//comment15" : " return false;", + "//comment16" : "", + "//comment17" : " uint32 b = 4294967295;", + "//comment18" : " if (b + 1 != 0)", + "//comment19" : " return false;", + "//comment20" : "", + "//comment21" : " uint64 c = 18446744073709551615;", + "//comment22" : " if (c + 1 != 0)", + "//comment23" : " return false;", + "//comment24" : " }", + "//comment25" : "}", "code" : "0x6000357c0100000000000000000000000000000000000000000000000000000000900480638040cac41461003a578063c04062261461004c57005b610042610099565b8060005260206000f35b61005461005e565b8060005260206000f35b6000610068610099565b600060006101000a81548160ff02191690830217905550600060009054906101000a900460ff169050610096565b90565b60006000600060006001935083507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff925060006001840114156100db576100e4565b6000935061013b565b63ffffffff915060006001830163ffffffff1614156101025761010b565b6000935061013b565b67ffffffffffffffff905060006001820167ffffffffffffffff1614156101315761013a565b6000935061013b565b5b5050509056", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stSolidityTest/TestStoreGasPricesFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/TestStoreGasPricesFiller.json index 3ec40b75c..4a7e1e5b0 100644 --- a/src/GeneralStateTestsFiller/stSolidityTest/TestStoreGasPricesFiller.json +++ b/src/GeneralStateTestsFiller/stSolidityTest/TestStoreGasPricesFiller.json @@ -40,34 +40,34 @@ "//comment5" : " function run() returns (bool)", "//comment6" : " {", "//comment7" : " uint startgas = msg.gas;", - "//comment8" : "", - "//comment9" : " storage = 1; //zero to non zero", - "//comment10" : " m_gasUsed[0] = startgas - msg.gas;", - "//comment11" : " startgas = msg.gas;", - "//comment12" : "", - "//comment13" : " storage = 2; //non zero to non zero", - "//comment14" : " m_gasUsed[1] = startgas - msg.gas;", - "//comment15" : " startgas = msg.gas;", - "//comment16" : "", - "//comment17" : " storage = 2; //non zero to same non zero", - "//comment18" : " m_gasUsed[2] = startgas - msg.gas;", - "//comment19" : " startgas = msg.gas;", - "//comment20" : "", - "//comment21" : " storage = 24784793845734; //non zero to huge non zero", - "//comment22" : " m_gasUsed[3] = startgas - msg.gas;", - "//comment23" : " startgas = msg.gas;", - "//comment24" : "", - "//comment25" : " storage = 2; //huge non zero to non zero", - "//comment26" : " m_gasUsed[4] = startgas - msg.gas;", - "//comment27" : " startgas = msg.gas;", - "//comment28" : "", - "//comment29" : " storage = 0; //non zero to zero", - "//comment30" : " m_gasUsed[5] = startgas - msg.gas;", - "//comment31" : " startgas = msg.gas;", - "//comment32" : "", - "//comment33" : " return true;", - "//comment34" : " }", - "//comment35" : "}", + "//comment8" : "", + "//comment9" : " storage = 1; //zero to non zero", + "//comment10" : " m_gasUsed[0] = startgas - msg.gas;", + "//comment11" : " startgas = msg.gas;", + "//comment12" : "", + "//comment13" : " storage = 2; //non zero to non zero", + "//comment14" : " m_gasUsed[1] = startgas - msg.gas;", + "//comment15" : " startgas = msg.gas;", + "//comment16" : "", + "//comment17" : " storage = 2; //non zero to same non zero", + "//comment18" : " m_gasUsed[2] = startgas - msg.gas;", + "//comment19" : " startgas = msg.gas;", + "//comment20" : "", + "//comment21" : " storage = 24784793845734; //non zero to huge non zero", + "//comment22" : " m_gasUsed[3] = startgas - msg.gas;", + "//comment23" : " startgas = msg.gas;", + "//comment24" : "", + "//comment25" : " storage = 2; //huge non zero to non zero", + "//comment26" : " m_gasUsed[4] = startgas - msg.gas;", + "//comment27" : " startgas = msg.gas;", + "//comment28" : "", + "//comment29" : " storage = 0; //non zero to zero", + "//comment30" : " m_gasUsed[5] = startgas - msg.gas;", + "//comment31" : " startgas = msg.gas;", + "//comment32" : "", + "//comment33" : " return true;", + "//comment34" : " }", + "//comment35" : "}", "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114602d57005b6033603d565b8060005260206000f35b600060005a600160205590505a81036000555a600260205590505a81036001555a600260205590505a81036002555a65168aa8d53fe660205590505a81036003555a600260205590505a81036004555a600060205590505a81036005555a5060019291505056", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stSolidityTest/TestStructuresAndVariablessFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/TestStructuresAndVariablessFiller.json index 53ef8cc9e..660192164 100644 --- a/src/GeneralStateTestsFiller/stSolidityTest/TestStructuresAndVariablessFiller.json +++ b/src/GeneralStateTestsFiller/stSolidityTest/TestStructuresAndVariablessFiller.json @@ -33,49 +33,49 @@ "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "100000", - "//comment1" : "contract main", - "//comment2" : "{", - "//comment3" : " struct StructTest", - "//comment4" : " {", - "//comment5" : " address addr;", - "//comment6" : " int amount;", - "//comment7" : " bytes32 str;", - "//comment8" : " mapping (uint => address) funders;", - "//comment9" : " }", - "//comment10" : "", - "//comment11" : " bool returnValue;", - "//comment12" : " int globalValue;", - "//comment13" : " StructTest globalData;", - "//comment14" : " function run() returns (bool)", - "//comment15" : " {", - "//comment16" : " globalValue = 255;", - "//comment17" : " globalData.addr = 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b;", - "//comment18" : " globalData.amount = 255;", - "//comment19" : " globalData.str = 'global data 32 length string';", - "//comment20" : " globalData.funders[0] = 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b;", - "//comment21" : " returnValue = testStructuresAndVariabless();", - "//comment22" : " return returnValue;", - "//comment23" : " }", - "//comment24" : "", - "//comment25" : " function testStructuresAndVariabless() returns (bool res)", - "//comment26" : " {", - "//comment27" : " res = true;", - "//comment28" : " if (globalValue != 255)", - "//comment29" : " return false;", - "//comment30" : "", - "//comment31" : " if (globalValue != globalData.amount)", - "//comment32" : " return false;", - "//comment33" : "", - "//comment34" : " if (globalData.addr != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)", - "//comment35" : " return false;", - "//comment36" : "", - "//comment37" : " if (globalData.str != 'global data 32 length string')", - "//comment38" : " return false;", - "//comment39" : "", - "//comment40" : " if (globalData.funders[0] != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)", - "//comment41" : " return false;", - "//comment42" : " }", - "//comment43" : "}", + "//comment1" : "contract main", + "//comment2" : "{", + "//comment3" : " struct StructTest", + "//comment4" : " {", + "//comment5" : " address addr;", + "//comment6" : " int amount;", + "//comment7" : " bytes32 str;", + "//comment8" : " mapping (uint => address) funders;", + "//comment9" : " }", + "//comment10" : "", + "//comment11" : " bool returnValue;", + "//comment12" : " int globalValue;", + "//comment13" : " StructTest globalData;", + "//comment14" : " function run() returns (bool)", + "//comment15" : " {", + "//comment16" : " globalValue = 255;", + "//comment17" : " globalData.addr = 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b;", + "//comment18" : " globalData.amount = 255;", + "//comment19" : " globalData.str = 'global data 32 length string';", + "//comment20" : " globalData.funders[0] = 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b;", + "//comment21" : " returnValue = testStructuresAndVariabless();", + "//comment22" : " return returnValue;", + "//comment23" : " }", + "//comment24" : "", + "//comment25" : " function testStructuresAndVariabless() returns (bool res)", + "//comment26" : " {", + "//comment27" : " res = true;", + "//comment28" : " if (globalValue != 255)", + "//comment29" : " return false;", + "//comment30" : "", + "//comment31" : " if (globalValue != globalData.amount)", + "//comment32" : " return false;", + "//comment33" : "", + "//comment34" : " if (globalData.addr != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)", + "//comment35" : " return false;", + "//comment36" : "", + "//comment37" : " if (globalData.str != 'global data 32 length string')", + "//comment38" : " return false;", + "//comment39" : "", + "//comment40" : " if (globalData.funders[0] != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)", + "//comment41" : " return false;", + "//comment42" : " }", + "//comment43" : "}", "code" : "0x7c010000000000000000000000000000000000000000000000000000000060003504632a9afb838114610039578063c04062261461004b57005b61004161005d565b8060005260206000f35b61005361016c565b8060005260206000f35b600160ff8154141561006e57610076565b506000610169565b60015460035414156100875761008f565b506000610169565b73a94f5374fce5edbc8e2a8697c15331677e6ebf0b73ffffffffffffffffffffffffffffffffffffffff60016002540481161614156100cd576100d5565b506000610169565b7f676c6f62616c2064617461203332206c656e67746820737472696e670000000060045414156101045761010c565b506000610169565b6005600080815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673a94f5374fce5edbc8e2a8697c15331677e6ebf0b141561016057610168565b506000610169565b5b90565b600060ff806001555073a94f5374fce5edbc8e2a8697c15331677e6ebf0b6002805473ffffffffffffffffffffffffffffffffffffffff1916821790555060ff80600355507f676c6f62616c2064617461203332206c656e67746820737472696e6700000000806004555073a94f5374fce5edbc8e2a8697c15331677e6ebf0b6005600080815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff0219169083021790555061022f61005d565b600060006101000a81548160ff0219169083021790555060ff6001600054041690509056", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODEFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODEFiller.json index 669956da7..447f00264 100644 --- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODEFiller.json +++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODEFiller.json @@ -61,11 +61,11 @@ }, "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", - "nonce" : "0", - "comment" : " Zero-value call to nonexistent account: should (i) charge only 700 gas, (ii) not create an account", - "code" : "{ [[0]](GAS) [[1]] (CALLCODE 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }", - "storage": { - } + "nonce" : "0", + "//comment" : " Zero-value call to nonexistent account: should (i) charge only 700 gas, (ii) not create an account", + "code" : "{ [[0]](GAS) [[1]] (CALLCODE 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }", + "storage": { + } } }, "transaction" : { diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLFiller.json index ea3952187..fd3d2c030 100644 --- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLFiller.json +++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLFiller.json @@ -89,11 +89,11 @@ }, "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", - "nonce" : "0", - "comment" : " Zero-value call to nonexistent account: should (i) charge only 700 gas, (ii) not create an account", - "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }", - "storage": { - } + "nonce" : "0", + "//comment" : " Zero-value call to nonexistent account: should (i) charge only 700 gas, (ii) not create an account", + "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }", + "storage": { + } } }, "transaction" : { diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToEmptyFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToEmptyFiller.json index a63ea92e7..beb12498d 100644 --- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToEmptyFiller.json +++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToEmptyFiller.json @@ -89,11 +89,11 @@ }, "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", - "nonce" : "0", - "comment" : " Zero-value call to empty account: should (i) charge only 700 gas, (ii) delete an account", - "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }", - "storage": { - } + "nonce" : "0", + "//comment" : " Zero-value call to empty account: should (i) charge only 700 gas, (ii) delete an account", + "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }", + "storage": { + } }, "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "", diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalanceFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalanceFiller.json index e5f0e61d1..6cfc8a2fe 100644 --- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalanceFiller.json +++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalanceFiller.json @@ -61,11 +61,11 @@ }, "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", - "nonce" : "0", - "comment" : " Zero-value call to empty account: should (i) charge only 700 gas, (ii) delete an account", - "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }", - "storage": { - } + "nonce" : "0", + "//comment" : " Zero-value call to empty account: should (i) charge only 700 gas, (ii) delete an account", + "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }", + "storage": { + } }, "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "100", diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKeyFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKeyFiller.json index 0c49b0185..ee6a631fe 100644 --- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKeyFiller.json +++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKeyFiller.json @@ -91,11 +91,11 @@ }, "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0", - "nonce" : "0", - "comment" : " Zero-value call to empty account: should (i) charge only 700 gas, (ii) delete an account", - "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }", - "storage": { - } + "nonce" : "0", + "//comment" : " Zero-value call to empty account: should (i) charge only 700 gas, (ii) delete an account", + "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }", + "storage": { + } }, "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "", diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKeyFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKeyFiller.json index 4a3ecc36d..7fff171e2 100644 --- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKeyFiller.json +++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKeyFiller.json @@ -30,9 +30,11 @@ }, "network" : ["Frontier", "Homestead", "EIP150"], "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "storage" : { "0x00" : "0x01" } + } } } ], diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/pairingTestFiller.json b/src/GeneralStateTestsFiller/stZeroKnowledge/pairingTestFiller.json index b5507b80e..b887a7353 100644 --- a/src/GeneralStateTestsFiller/stZeroKnowledge/pairingTestFiller.json +++ b/src/GeneralStateTestsFiller/stZeroKnowledge/pairingTestFiller.json @@ -69,16 +69,16 @@ }, "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "", - "//comment1" : "zeroCash transaction data", - "//comment2" : "inputLength, data1, data2, data3, ...", - "code" : "{(MSTORE 32 (CALLDATALOAD 32)) (MSTORE 64 (CALLDATALOAD 64)) (MSTORE 96 (CALLDATALOAD 96)) (MSTORE 128 (CALLDATALOAD 128)) (MSTORE 160 (CALLDATALOAD 160)) (MSTORE 192 (CALLDATALOAD 192)) (MSTORE 224 (CALLDATALOAD 224)) (MSTORE 256 (CALLDATALOAD 256)) (MSTORE 288 (CALLDATALOAD 288)) (MSTORE 320 (CALLDATALOAD 320)) (MSTORE 352 (CALLDATALOAD 352)) (MSTORE 384 (CALLDATALOAD 384)) (MSTORE 416 (CALLDATALOAD 416)) (MSTORE 448 (CALLDATALOAD 448)) (MSTORE 480 (CALLDATALOAD 480)) (MSTORE 512 (CALLDATALOAD 512)) (MSTORE 544 (CALLDATALOAD 544)) (MSTORE 576 (CALLDATALOAD 576)) (MSTORE 608 (CALLDATALOAD 608)) (MSTORE 640 (CALLDATALOAD 640)) (MSTORE 672 (CALLDATALOAD 672)) (MSTORE 704 (CALLDATALOAD 704)) (MSTORE 736 (CALLDATALOAD 736)) [[0]](CALLCODE 500000 8 0 32 (CALLDATALOAD 0) 1000 32) [[1]] (MLOAD 1000) }", + "//comment1" : "zeroCash transaction data", + "//comment2" : "inputLength, data1, data2, data3, ...", + "code" : "{(MSTORE 32 (CALLDATALOAD 32)) (MSTORE 64 (CALLDATALOAD 64)) (MSTORE 96 (CALLDATALOAD 96)) (MSTORE 128 (CALLDATALOAD 128)) (MSTORE 160 (CALLDATALOAD 160)) (MSTORE 192 (CALLDATALOAD 192)) (MSTORE 224 (CALLDATALOAD 224)) (MSTORE 256 (CALLDATALOAD 256)) (MSTORE 288 (CALLDATALOAD 288)) (MSTORE 320 (CALLDATALOAD 320)) (MSTORE 352 (CALLDATALOAD 352)) (MSTORE 384 (CALLDATALOAD 384)) (MSTORE 416 (CALLDATALOAD 416)) (MSTORE 448 (CALLDATALOAD 448)) (MSTORE 480 (CALLDATALOAD 480)) (MSTORE 512 (CALLDATALOAD 512)) (MSTORE 544 (CALLDATALOAD 544)) (MSTORE 576 (CALLDATALOAD 576)) (MSTORE 608 (CALLDATALOAD 608)) (MSTORE 640 (CALLDATALOAD 640)) (MSTORE 672 (CALLDATALOAD 672)) (MSTORE 704 (CALLDATALOAD 704)) (MSTORE 736 (CALLDATALOAD 736)) [[0]](CALLCODE 500000 8 0 32 (CALLDATALOAD 0) 1000 32) [[1]] (MLOAD 1000) }", "nonce" : "0", "storage" : { } }, "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "", - "//comment1" : "NEGATE", + "//comment" : "NEGATE", "code" : "{ (MSTORE 0 (CALLDATALOAD 0)) (MSTORE 32 (CALLDATALOAD 32)) (MSTORE 64 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000) [[0]](CALLCODE 5000000 7 0 0 96 1000 64) [[1]](MLOAD 1000) [[2]](MLOAD 1032) }", "nonce" : "0", "storage" : { @@ -86,7 +86,7 @@ }, "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "", - "//comment1" : "ADD", + "//comment" : "ADD", "code" : "{ (MSTORE 0 (CALLDATALOAD 0)) (MSTORE 32 (CALLDATALOAD 32)) (MSTORE 64 (CALLDATALOAD 64)) (MSTORE 96 (CALLDATALOAD 96)) [[0]](CALLCODE 5000000 6 0 0 128 1000 64) [[1]](MLOAD 1000) [[2]](MLOAD 1032) }", "nonce" : "0", "storage" : { |