From 814cf9f7a24acd95a7b05cb43c8ba91060f93974 Mon Sep 17 00:00:00 2001 From: Dimitry Date: Wed, 21 Jun 2017 15:58:24 +0300 Subject: update stMemoryStress with 250M gas limit --- .../stMemoryStressTest/CALLCODE_Bounds2Filler.json | 6 +- .../stMemoryStressTest/CALLCODE_Bounds3Filler.json | 6 +- .../stMemoryStressTest/CALLCODE_Bounds4Filler.json | 68 +++++++ .../stMemoryStressTest/CALLCODE_BoundsFiller.json | 6 +- .../stMemoryStressTest/CALL_Bounds2Filler.json | 6 +- .../stMemoryStressTest/CALL_Bounds2aFiller.json | 8 +- .../stMemoryStressTest/CALL_Bounds3Filler.json | 70 ++++++++ .../stMemoryStressTest/CALL_BoundsFiller.json | 6 +- .../stMemoryStressTest/CREATE_Bounds2Filler.json | 34 +--- .../stMemoryStressTest/CREATE_Bounds3Filler.json | 61 +++++++ .../stMemoryStressTest/CREATE_BoundsFiller.json | 8 +- .../DELEGATECALL_Bounds2Filler.json | 20 +-- .../DELEGATECALL_Bounds3Filler.json | 68 +++++++ .../DELEGATECALL_BoundsFiller.json | 20 +-- .../stMemoryStressTest/DUP_BoundsFiller.json | 58 ++++++ .../stMemoryStressTest/FillStackFiller.json | 14 +- .../stMemoryStressTest/JUMPI_BoundsFiller.json | 59 ++++++ .../stMemoryStressTest/JUMP_Bounds2Filler.json | 60 +++++++ .../stMemoryStressTest/JUMP_BoundsFiller.json | 58 ++++++ .../stMemoryStressTest/MLOAD_Bounds2Filler.json | 58 ++++++ .../stMemoryStressTest/MLOAD_Bounds3Filler.json | 2 +- .../stMemoryStressTest/MLOAD_BoundsFiller.json | 60 +++++++ .../stMemoryStressTest/MSTORE_Bounds2Filler.json | 59 ++++++ .../stMemoryStressTest/MSTORE_Bounds2aFiller.json | 4 +- .../stMemoryStressTest/MSTORE_BoundsFiller.json | 58 ++++++ .../stMemoryStressTest/POP_BoundsFiller.json | 58 ++++++ .../stMemoryStressTest/RETURN_BoundsFiller.json | 198 +++++++++++++++++++++ .../stMemoryStressTest/SLOAD_BoundsFiller.json | 58 ++++++ .../stMemoryStressTest/SSTORE_BoundsFiller.json | 68 +++++++ .../stMemoryStressTest/mload32bitBound2Filler.json | 15 +- .../stMemoryStressTest/mload32bitBoundFiller.json | 42 +---- .../mload32bitBound_MsizeFiller.json | 45 +---- .../mload32bitBound_return2Filler.json | 2 +- .../mload32bitBound_returnFiller.json | 2 +- .../static_CALL_Bounds2Filler.json | 74 ++++++++ .../static_CALL_Bounds2aFiller.json | 73 ++++++++ .../static_CALL_Bounds3Filler.json | 70 ++++++++ .../static_CALL_BoundsFiller.json | 74 ++++++++ 38 files changed, 1470 insertions(+), 186 deletions(-) create mode 100644 src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_Bounds4Filler.json create mode 100644 src/GeneralStateTestsFiller/stMemoryStressTest/CALL_Bounds3Filler.json create mode 100644 src/GeneralStateTestsFiller/stMemoryStressTest/CREATE_Bounds3Filler.json create mode 100644 src/GeneralStateTestsFiller/stMemoryStressTest/DELEGATECALL_Bounds3Filler.json create mode 100644 src/GeneralStateTestsFiller/stMemoryStressTest/DUP_BoundsFiller.json create mode 100644 src/GeneralStateTestsFiller/stMemoryStressTest/JUMPI_BoundsFiller.json create mode 100644 src/GeneralStateTestsFiller/stMemoryStressTest/JUMP_Bounds2Filler.json create mode 100644 src/GeneralStateTestsFiller/stMemoryStressTest/JUMP_BoundsFiller.json create mode 100644 src/GeneralStateTestsFiller/stMemoryStressTest/MLOAD_Bounds2Filler.json create mode 100644 src/GeneralStateTestsFiller/stMemoryStressTest/MLOAD_BoundsFiller.json create mode 100644 src/GeneralStateTestsFiller/stMemoryStressTest/MSTORE_Bounds2Filler.json create mode 100644 src/GeneralStateTestsFiller/stMemoryStressTest/MSTORE_BoundsFiller.json create mode 100644 src/GeneralStateTestsFiller/stMemoryStressTest/POP_BoundsFiller.json create mode 100644 src/GeneralStateTestsFiller/stMemoryStressTest/RETURN_BoundsFiller.json create mode 100644 src/GeneralStateTestsFiller/stMemoryStressTest/SLOAD_BoundsFiller.json create mode 100644 src/GeneralStateTestsFiller/stMemoryStressTest/SSTORE_BoundsFiller.json create mode 100644 src/GeneralStateTestsFiller/stMemoryStressTest/static_CALL_Bounds2Filler.json create mode 100644 src/GeneralStateTestsFiller/stMemoryStressTest/static_CALL_Bounds2aFiller.json create mode 100644 src/GeneralStateTestsFiller/stMemoryStressTest/static_CALL_Bounds3Filler.json create mode 100644 src/GeneralStateTestsFiller/stMemoryStressTest/static_CALL_BoundsFiller.json (limited to 'src') diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_Bounds2Filler.json b/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_Bounds2Filler.json index 903daecec..7bdbb7732 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_Bounds2Filler.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_Bounds2Filler.json @@ -19,9 +19,9 @@ "network" : ["ALL"], "result" : { "1000000000000000000000000000000000000000" : { - "balance" : "1", + "balance" : "0", "storage" : { - "0x00" : "0x01" + "0x00" : "0x00" } } } @@ -59,7 +59,7 @@ "" ], "gasLimit" : [ - "0x7fffffffffffffff" + "150000", "250000000" ], "gasPrice" : "1", "nonce" : "0", diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_Bounds3Filler.json b/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_Bounds3Filler.json index 283725ea2..f765a213c 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_Bounds3Filler.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_Bounds3Filler.json @@ -19,9 +19,9 @@ "network" : ["ALL"], "result" : { "1000000000000000000000000000000000000000" : { - "balance" : "1", + "balance" : "0", "storage" : { - "0x00" : "0x01" + "0x00" : "0x00" } } } @@ -59,7 +59,7 @@ "" ], "gasLimit" : [ - "0x7fffffffffffffff" + "150000", "250000000" ], "gasPrice" : "1", "nonce" : "0", diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_Bounds4Filler.json b/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_Bounds4Filler.json new file mode 100644 index 000000000..3a7a06477 --- /dev/null +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_Bounds4Filler.json @@ -0,0 +1,68 @@ +{ + "CALLCODE_Bounds4" : { + "env" : { + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "0x020000", + "currentGasLimit" : "0x7fffffffffffffff", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["ALL"], + "result" : { + "1000000000000000000000000000000000000000" : { + "balance" : "0", + "storage" : { + "0x00" : "0x00" + } + } + } + } + ], + "pre" : { + "1000000000000000000000000000000000000000" : { + "balance" : "0", + "code" : "{ (CALLCODE 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0 0xffffffffffffffff 0 0xffffffffffffffff) (CALLCODE 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0 0xffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffff) (CALLCODE 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (CALLCODE 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff) (CALLCODE 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff) (CALLCODE 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (CALLCODE 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff) }", + "nonce" : "0", + "storage" : { + } + }, + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ (SSTORE 0 (ADD 1 (SLOAD 0))) }", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + }, + "transaction" : { + "data" : [ + "" + ], + "gasLimit" : [ + "150000", "1000000", "250000000" + ], + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", + "value" : [ + "1" + ] + } + } +} diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_BoundsFiller.json b/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_BoundsFiller.json index 3aab1ed0a..7b4c8e8d5 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_BoundsFiller.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_BoundsFiller.json @@ -19,9 +19,9 @@ "network" : ["ALL"], "result" : { "1000000000000000000000000000000000000000" : { - "balance" : "1", + "balance" : "0", "storage" : { - "0x00" : "0x08" + "0x00" : "0x00" } } } @@ -58,7 +58,7 @@ "" ], "gasLimit" : [ - "0x7fffffffffffffff" + "150000", "250000000" ], "gasPrice" : "1", "nonce" : "0", diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/CALL_Bounds2Filler.json b/src/GeneralStateTestsFiller/stMemoryStressTest/CALL_Bounds2Filler.json index 7303bea7a..594bec3cf 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/CALL_Bounds2Filler.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/CALL_Bounds2Filler.json @@ -19,11 +19,11 @@ "network" : ["ALL"], "result" : { "1000000000000000000000000000000000000000" : { - "balance" : "1" + "balance" : "0" }, "1000000000000000000000000000000000000001" : { "storage" : { - "0x00" : "0x01" + "0x00" : "0x00" } } } @@ -60,7 +60,7 @@ "" ], "gasLimit" : [ - "0x7fffffffffffffff" + "150000", "250000000" ], "gasPrice" : "1", "nonce" : "0", diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/CALL_Bounds2aFiller.json b/src/GeneralStateTestsFiller/stMemoryStressTest/CALL_Bounds2aFiller.json index 4e8c2a721..339515ab1 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/CALL_Bounds2aFiller.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/CALL_Bounds2aFiller.json @@ -10,7 +10,7 @@ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : [ - { + { "indexes" : { "data" : -1, "gas" : -1, @@ -19,11 +19,11 @@ "network" : ["ALL"], "result" : { "1000000000000000000000000000000000000000" : { - "balance" : "1" + "balance" : "0" }, "1000000000000000000000000000000000000001" : { "storage" : { - "0x00" : "0x01" + "0x00" : "0x00" } } } @@ -60,7 +60,7 @@ "" ], "gasLimit" : [ - "0x7fffffffffffffff" + "150000", "250000000" ], "gasPrice" : "1", "nonce" : "0", diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/CALL_Bounds3Filler.json b/src/GeneralStateTestsFiller/stMemoryStressTest/CALL_Bounds3Filler.json new file mode 100644 index 000000000..3b4dc9af6 --- /dev/null +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/CALL_Bounds3Filler.json @@ -0,0 +1,70 @@ +{ + "CALL_Bounds3" : { + "env" : { + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "0x020000", + "currentGasLimit" : "0x7fffffffffffffff", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["ALL"], + "result" : { + "1000000000000000000000000000000000000000" : { + "balance" : "0" + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x00" : "0x00" + } + } + } + } + ], + "pre" : { + "1000000000000000000000000000000000000000" : { + "balance" : "0", + "code" : "{ (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0 0xffffffffffffffff 0 0xffffffffffffffff) (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0 0xffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffff) (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffff 0xffffffff 0xffffffff 0xffffffff) (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff) (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff) (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }", + "nonce" : "0", + "storage" : { + } + }, + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ (SSTORE 0 (ADD 1 (SLOAD 0))) }", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + }, + "transaction" : { + "data" : [ + "" + ], + "gasLimit" : [ + "150000", "1000000", "250000000" + ], + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", + "value" : [ + "1" + ] + } + } +} diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/CALL_BoundsFiller.json b/src/GeneralStateTestsFiller/stMemoryStressTest/CALL_BoundsFiller.json index 4006a1b5d..95aa08893 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/CALL_BoundsFiller.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/CALL_BoundsFiller.json @@ -19,11 +19,11 @@ "network" : ["ALL"], "result" : { "1000000000000000000000000000000000000000" : { - "balance" : "1" + "balance" : "0" }, "1000000000000000000000000000000000000001" : { "storage" : { - "0x00" : "0x08" + "0x00" : "0x00" } } } @@ -60,7 +60,7 @@ "" ], "gasLimit" : [ - "0x7fffffffffffffff" + "150000", "250000000" ], "gasPrice" : "1", "nonce" : "0", diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/CREATE_Bounds2Filler.json b/src/GeneralStateTestsFiller/stMemoryStressTest/CREATE_Bounds2Filler.json index 6b18aa158..8e34dded0 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/CREATE_Bounds2Filler.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/CREATE_Bounds2Filler.json @@ -16,39 +16,13 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP150"], + "network" : ["ALL"], "result" : { "1000000000000000000000000000000000000000" : { - "balance" : "99" + "balance" : "100" }, "13136008b64ff592819b2fa6d43f2835c452020e" : { - "balance" : "1", - "code" : "0x396000f3006000355415600957005b60", - "nonce" : "0", - "storage" : { - "0x01" : "0x01" - } - } - } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : ["EIP158"], - "result" : { - "1000000000000000000000000000000000000000" : { - "balance" : "99" - }, - "13136008b64ff592819b2fa6d43f2835c452020e" : { - "balance" : "1", - "code" : "0x396000f3006000355415600957005b60", - "nonce" : "1", - "storage" : { - "0x01" : "0x01" - } + "shouldnotexist" : "1" } } } @@ -75,7 +49,7 @@ "" ], "gasLimit" : [ - "0x7fffffffffffffff" + "150000", "250000000" ], "gasPrice" : "1", "nonce" : "0", diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/CREATE_Bounds3Filler.json b/src/GeneralStateTestsFiller/stMemoryStressTest/CREATE_Bounds3Filler.json new file mode 100644 index 000000000..8c6383706 --- /dev/null +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/CREATE_Bounds3Filler.json @@ -0,0 +1,61 @@ +{ + "CREATE_Bounds3" : { + "env" : { + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "0x020000", + "currentGasLimit" : "0x7fffffffffffffff", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["ALL"], + "result" : { + "1000000000000000000000000000000000000000" : { + "balance" : "100" + }, + "13136008b64ff592819b2fa6d43f2835c452020e" : { + "shouldnotexist" : "1" + } + } + } + ], + "pre" : { + "1000000000000000000000000000000000000000" : { + "balance" : "100", + "code" : "{ (MSTORE 0 0x6001600155601080600c6000396000f3006000355415600957005b6020356000 ) (MSTORE8 32 0x35) (MSTORE8 33 0x55) (CREATE 1 0 0xffffffffffffffff) (CREATE 1 0 0xffffffffffffffffffffffffffffffff) (CREATE 1 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (CREATE 1 0xfffffff 0) (CREATE 1 0xffffffff 0) (CREATE 1 0xffffffffffffffff 0) (CREATE 1 0xffffffffffffffffffffffffffffffff 0) (CREATE 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0) (CREATE 1 0xfffffff 0xfffffff) (CREATE 1 0xffffffff 0xffffffff) (CREATE 1 0xffffffffffffffff 0xffffffffffffffff) (CREATE 1 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff) (CREATE 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)}", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xfffffffffffffffffffffffffffffffffffffffffffffffff", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + }, + "transaction" : { + "data" : [ + "" + ], + "gasLimit" : [ + "150000", "1000000", "250000000" + ], + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", + "value" : [ + "0" + ] + } + } +} diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/CREATE_BoundsFiller.json b/src/GeneralStateTestsFiller/stMemoryStressTest/CREATE_BoundsFiller.json index 94035342e..9d4817d82 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/CREATE_BoundsFiller.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/CREATE_BoundsFiller.json @@ -19,13 +19,13 @@ "network" : ["ALL"], "result" : { "1000000000000000000000000000000000000000" : { - "balance" : "98" + "balance" : "100" }, "13136008b64ff592819b2fa6d43f2835c452020e" : { - "balance" : "1" + "shouldnotexist" : "1" }, "7c5a2c91b22d7a9226523d4ba717db6afb741ebd" : { - "balance" : "1" + "shouldnotexist" : "1" } } } @@ -52,7 +52,7 @@ "" ], "gasLimit" : [ - "0x7fffffffffffffff" + "150000", "250000000" ], "gasPrice" : "1", "nonce" : "0", diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/DELEGATECALL_Bounds2Filler.json b/src/GeneralStateTestsFiller/stMemoryStressTest/DELEGATECALL_Bounds2Filler.json index 196c25e9c..abad8e5d8 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/DELEGATECALL_Bounds2Filler.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/DELEGATECALL_Bounds2Filler.json @@ -16,7 +16,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier"], + "network" : ["ALL"], "result" : { "1000000000000000000000000000000000000000" : { "balance" : "0", @@ -24,22 +24,6 @@ } } } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : ["Homestead", "EIP158", "EIP150"], - "result" : { - "1000000000000000000000000000000000000000" : { - "balance" : "1", - "storage" : { - "0x00" : "0x01" - } - } - } } ], "pre" : @@ -73,7 +57,7 @@ "" ], "gasLimit" : [ - "0x7fffffffffffffff" + "150000", "250000000" ], "gasPrice" : "1", "nonce" : "0", diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/DELEGATECALL_Bounds3Filler.json b/src/GeneralStateTestsFiller/stMemoryStressTest/DELEGATECALL_Bounds3Filler.json new file mode 100644 index 000000000..df91b0072 --- /dev/null +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/DELEGATECALL_Bounds3Filler.json @@ -0,0 +1,68 @@ +{ + "DELEGATECALL_Bounds3" : { + "env" : { + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "0x020000", + "currentGasLimit" : "0x7fffffffffffffff", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["ALL"], + "result" : { + "1000000000000000000000000000000000000000" : { + "balance" : "0", + "storage" : { + "0x00" : "0x00" + } + } + } + } + ], + "pre" : { + "1000000000000000000000000000000000000000" : { + "balance" : "0", + "code" : "{ (DELEGATECALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffff 0 0xffffffffffffffff) (DELEGATECALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffff) (DELEGATECALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (DELEGATECALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff) (DELEGATECALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff) (DELEGATECALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }", + "nonce" : "0", + "storage" : { + } + }, + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ (SSTORE 0 (ADD 1 (SLOAD 0))) }", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + }, + "transaction" : { + "data" : [ + "" + ], + "gasLimit" : [ + "150000", "1000000", "250000000" + ], + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", + "value" : [ + "1" + ] + } + } +} diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/DELEGATECALL_BoundsFiller.json b/src/GeneralStateTestsFiller/stMemoryStressTest/DELEGATECALL_BoundsFiller.json index dca75253c..83eec8462 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/DELEGATECALL_BoundsFiller.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/DELEGATECALL_BoundsFiller.json @@ -16,7 +16,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier"], + "network" : ["ALL"], "result" : { "1000000000000000000000000000000000000000" : { "balance" : "0", @@ -25,22 +25,6 @@ } } } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : ["Homestead", "EIP150", "EIP158"], - "result" : { - "1000000000000000000000000000000000000000" : { - "balance" : "1", - "storage" : { - "0x00" : "0x09" - } - } - } } ], "pre" : @@ -74,7 +58,7 @@ "" ], "gasLimit" : [ - "0x7fffffffffffffff" + "150000", "250000000" ], "gasPrice" : "1", "nonce" : "0", diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/DUP_BoundsFiller.json b/src/GeneralStateTestsFiller/stMemoryStressTest/DUP_BoundsFiller.json new file mode 100644 index 000000000..2e36cf9e7 --- /dev/null +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/DUP_BoundsFiller.json @@ -0,0 +1,58 @@ +{ + "DUP_Bounds" : { + "env" : { + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "0x020000", + "currentGasLimit" : "0x7fffffffffffffff", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["ALL"], + "result" : { + "1000000000000000000000000000000000000000" : { + "balance" : "1" + } + } + } + ], + "pre" : { + "1000000000000000000000000000000000000000" : { + "balance" : "0", + "code" : "{ (DUP1 0) (DUP1 0xffffffff) (DUP1 0xffffffffffffffff) (DUP1 0xffffffffffffffffffffffffffffffff) (DUP1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (DUP2 0 0) (DUP2 0xffffffff 0xffffffff) (DUP2 0xffffffffffffffff 0xffffffffffffffff) (DUP2 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff) (DUP2 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (DUP3 0 0 0) (DUP3 0xffffffff 0xffffffff 0xffffffff) (DUP3 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff) (DUP3 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff) (DUP3 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (DUP4 0 0 0 0) (DUP4 0xffffffff 0xffffffff 0xffffffff 0xffffffff) (DUP4 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff) (DUP4 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff) (DUP4 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (DUP5 0 0 0 0 0) (DUP5 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff) (DUP5 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff) (DUP5 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff) (DUP5 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (DUP6 0 0 0 0 0 0) (DUP6 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff) (DUP6 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff) (DUP6 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff) (DUP6 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (DUP7 0 0 0 0 0 0 0) (DUP7 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff) (DUP7 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff) (DUP7 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff) (DUP7 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (DUP8 0 0 0 0 0 0 0 0) (DUP8 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff) (DUP8 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff) (DUP8 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff) (DUP8 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)}", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x7fffffffffffffff", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + }, + "transaction" : { + "data" : [ + "" + ], + "gasLimit" : [ + "150000", "1000000", "250000000" + ], + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", + "value" : [ + "1" + ] + } + } +} diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/FillStackFiller.json b/src/GeneralStateTestsFiller/stMemoryStressTest/FillStackFiller.json index a2daff7ff..8540eb4e1 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/FillStackFiller.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/FillStackFiller.json @@ -1,5 +1,5 @@ { - "FillStack " : { + "FillStack" : { "env" : { "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5", "currentDifficulty" : "0x20000", @@ -12,7 +12,7 @@ { "indexes" : { "data" : -1, - "gas" : -1, + "gas" : 1, "value" : -1 }, "network" : "Frontier", @@ -25,14 +25,13 @@ } }, "945304eb96065b2a98b57a48a06ae28d285a71b5" : { - "balance" : "0x2ff006", + "balance" : "250000046", "code" : "0x6000355415600957005b60203560003555", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7341028", "code" : "0x", "nonce" : "0x01", "storage" : { @@ -43,7 +42,7 @@ { "indexes" : { "data" : -1, - "gas" : -1, + "gas" : 1, "value" : -1 }, "network" : ["Homestead", "EIP150", "EIP158"], @@ -56,14 +55,13 @@ } }, "945304eb96065b2a98b57a48a06ae28d285a71b5" : { - "balance" : "0x2ff006", + "balance" : "250000046", "code" : "0x6000355415600957005b60203560003555", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7341028", "code" : "0x", "nonce" : "0x01", "storage" : { @@ -100,7 +98,7 @@ "0x5b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe457f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3504357155320803a97" ], "gasLimit" : [ - "3141592" + "3141592", "250000000" ], "gasPrice" : "1", "nonce" : "0", diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/JUMPI_BoundsFiller.json b/src/GeneralStateTestsFiller/stMemoryStressTest/JUMPI_BoundsFiller.json new file mode 100644 index 000000000..65daffa8c --- /dev/null +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/JUMPI_BoundsFiller.json @@ -0,0 +1,59 @@ +{ + "JUMPI_Bounds" : { + "env" : { + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "0x020000", + "currentGasLimit" : "0x7fffffffffffffff", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["ALL"], + "result" : { + "1000000000000000000000000000000000000000" : { + "balance" : "0", + "code" : "0x600163ffffffff57600167ffffffffffffffff5760016fffffffffffffffffffffffffffffffff5760017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff57" + } + } + } + ], + "pre" : { + "1000000000000000000000000000000000000000" : { + "balance" : "0", + "code" : "{ (JUMPI 0xffffffff 1) (JUMPI 0xffffffffffffffff 1) (JUMPI 0xffffffffffffffffffffffffffffffff 1) (JUMPI 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1) }", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x7fffffffffffffff", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + }, + "transaction" : { + "data" : [ + "" + ], + "gasLimit" : [ + "150000", "250000000" + ], + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", + "value" : [ + "1" + ] + } + } +} diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/JUMP_Bounds2Filler.json b/src/GeneralStateTestsFiller/stMemoryStressTest/JUMP_Bounds2Filler.json new file mode 100644 index 000000000..61d73e1b4 --- /dev/null +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/JUMP_Bounds2Filler.json @@ -0,0 +1,60 @@ +{ + "JUMP_Bounds2" : { + "env" : { + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "0x020000", + "currentGasLimit" : "0x7fffffffffffffff", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["ALL"], + "result" : { + "1000000000000000000000000000000000000000" : { + "balance" : "0", + "code" : "0x63ffffffff5667ffffffffffffffff566fffffffffffffffffffffffffffffffff567fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff56" + } + } + } + ], + "pre" : { + "1000000000000000000000000000000000000000" : { + "balance" : "0", + "code" : "{ (JUMP 0xffffffff) (JUMP 0xffffffffffffffff) (JUMP 0xffffffffffffffffffffffffffffffff) (JUMP 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }", + "code" : "0x63ffffffff5667ffffffffffffffff566fffffffffffffffffffffffffffffffff567fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff56", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x7fffffffffffffff", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + }, + "transaction" : { + "data" : [ + "" + ], + "gasLimit" : [ + "150000", "250000000" + ], + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", + "value" : [ + "1" + ] + } + } +} diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/JUMP_BoundsFiller.json b/src/GeneralStateTestsFiller/stMemoryStressTest/JUMP_BoundsFiller.json new file mode 100644 index 000000000..44f4f09e3 --- /dev/null +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/JUMP_BoundsFiller.json @@ -0,0 +1,58 @@ +{ + "JUMP_Bounds" : { + "env" : { + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "0x020000", + "currentGasLimit" : "0x7fffffffffffffff", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["ALL"], + "result" : { + "1000000000000000000000000000000000000000" : { + "balance" : "0" + } + } + } + ], + "pre" : { + "1000000000000000000000000000000000000000" : { + "balance" : "0", + "code" : "{ (JUMP 0) }", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x7fffffffffffffff", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + }, + "transaction" : { + "data" : [ + "" + ], + "gasLimit" : [ + "150000", "250000000" + ], + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", + "value" : [ + "1" + ] + } + } +} diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/MLOAD_Bounds2Filler.json b/src/GeneralStateTestsFiller/stMemoryStressTest/MLOAD_Bounds2Filler.json new file mode 100644 index 000000000..18677418e --- /dev/null +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/MLOAD_Bounds2Filler.json @@ -0,0 +1,58 @@ +{ + "MLOAD_Bounds2" : { + "env" : { + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "0x020000", + "currentGasLimit" : "0x7fffffffffffffff", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["ALL"], + "result" : { + "1000000000000000000000000000000000000000" : { + "balance" : "0" + } + } + } + ], + "pre" : { + "1000000000000000000000000000000000000000" : { + "balance" : "0", + "code" : "{ (MLOAD 0xffffffffffffffff) (MLOAD 0xffffffffffffffffffffffffffffffff) (MLOAD 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x7ffffffffffffffffff", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + }, + "transaction" : { + "data" : [ + "" + ], + "gasLimit" : [ + "150000", "250000000" + ], + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", + "value" : [ + "1" + ] + } + } +} diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/MLOAD_Bounds3Filler.json b/src/GeneralStateTestsFiller/stMemoryStressTest/MLOAD_Bounds3Filler.json index 06ea39e2b..e732a7874 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/MLOAD_Bounds3Filler.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/MLOAD_Bounds3Filler.json @@ -46,7 +46,7 @@ "" ], "gasLimit" : [ - "35000000" + "35000000", "250000000" ], "gasPrice" : "1", "nonce" : "0", diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/MLOAD_BoundsFiller.json b/src/GeneralStateTestsFiller/stMemoryStressTest/MLOAD_BoundsFiller.json new file mode 100644 index 000000000..841a3da44 --- /dev/null +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/MLOAD_BoundsFiller.json @@ -0,0 +1,60 @@ +{ + "MLOAD_Bounds" : { + "env" : { + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "0x020000", + "currentGasLimit" : "2^63-1", + "currentGasLimit" : "0x7fffffffffffffff", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["ALL"], + "result" : { + "1000000000000000000000000000000000000000" : { + "balance" : "0" + } + } + } + ], + "pre" : + { + "1000000000000000000000000000000000000000" : { + "balance" : "0", + "code" : "{ (MLOAD 0) (MLOAD 0xffffffff) }", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x7ffffffffffffffffff", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + }, + "transaction" : { + "data" : [ + "" + ], + "gasLimit" : [ + "150000", "250000000" + ], + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", + "value" : [ + "1" + ] + } + } +} diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/MSTORE_Bounds2Filler.json b/src/GeneralStateTestsFiller/stMemoryStressTest/MSTORE_Bounds2Filler.json new file mode 100644 index 000000000..b5c021d00 --- /dev/null +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/MSTORE_Bounds2Filler.json @@ -0,0 +1,59 @@ +{ + "MSTORE_Bounds2" : { + "env" : { + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "0x020000", + "currentGasLimit" : "2^63-1", + "currentGasLimit" : "0x7fffffffffffffff", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["ALL"], + "result" : { + "1000000000000000000000000000000000000000" : { + "balance" : "0" + } + } + } + ], + "pre" : { + "1000000000000000000000000000000000000000" : { + "balance" : "0", + "code" : "{ (MSTORE 0xffffffffff 1)}", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + }, + "transaction" : { + "data" : [ + "" + ], + "gasLimit" : [ + "150000", "250000000" + ], + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", + "value" : [ + "1" + ] + } + } +} diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/MSTORE_Bounds2aFiller.json b/src/GeneralStateTestsFiller/stMemoryStressTest/MSTORE_Bounds2aFiller.json index eb0e58a9c..8ad19f1aa 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/MSTORE_Bounds2aFiller.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/MSTORE_Bounds2aFiller.json @@ -13,7 +13,7 @@ { "indexes" : { "data" : -1, - "gas" : -1, + "gas" : 1, "value" : -1 }, "network" : ["ALL"], @@ -46,7 +46,7 @@ "" ], "gasLimit" : [ - "34000000" + "150000", "250000000" ], "gasPrice" : "1", "nonce" : "0", diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/MSTORE_BoundsFiller.json b/src/GeneralStateTestsFiller/stMemoryStressTest/MSTORE_BoundsFiller.json new file mode 100644 index 000000000..2e1b14a83 --- /dev/null +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/MSTORE_BoundsFiller.json @@ -0,0 +1,58 @@ +{ + "MSTORE_Bounds" : { + "env" : { + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "0x020000", + "currentGasLimit" : "0x7fffffffffffffff", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["ALL"], + "result" : { + "1000000000000000000000000000000000000000" : { + "balance" : "0" + } + } + } + ], + "pre" : { + "1000000000000000000000000000000000000000" : { + "balance" : "0", + "code" : "{ (MSTORE 0xffffffffffffffff 1)}", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + }, + "transaction" : { + "data" : [ + "" + ], + "gasLimit" : [ + "150000", "250000000" + ], + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", + "value" : [ + "1" + ] + } + } +} diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/POP_BoundsFiller.json b/src/GeneralStateTestsFiller/stMemoryStressTest/POP_BoundsFiller.json new file mode 100644 index 000000000..57106c5c0 --- /dev/null +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/POP_BoundsFiller.json @@ -0,0 +1,58 @@ +{ + "POP_Bounds" : { + "env" : { + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "0x020000", + "currentGasLimit" : "0x7fffffffffffffff", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["ALL"], + "result" : { + "1000000000000000000000000000000000000000" : { + "balance" : "1" + } + } + } + ], + "pre" : { + "1000000000000000000000000000000000000000" : { + "balance" : "0", + "code" : "{ (POP 0) (POP 0xffffffff) (POP 0xffffffffffffffff) (POP 0xffffffffffffffffffffffffffffffff) (POP 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x7ffffffffffffffffff", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + }, + "transaction" : { + "data" : [ + "" + ], + "gasLimit" : [ + "150000", "250000000" + ], + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", + "value" : [ + "1" + ] + } + } +} diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/RETURN_BoundsFiller.json b/src/GeneralStateTestsFiller/stMemoryStressTest/RETURN_BoundsFiller.json new file mode 100644 index 000000000..f2ea0c374 --- /dev/null +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/RETURN_BoundsFiller.json @@ -0,0 +1,198 @@ +{ + "RETURN_Bounds" : { + "env" : { + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "0x020000", + "currentGasLimit" : "0x7fffffffffffffff", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : 1, + "value" : -1 + }, + "network" : ["Frontier", "Homestead"], + "result" : { + "1000000000000000000000000000000000000000" : { + "balance" : "0", + "storage" : { + } + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : 1, + "value" : -1 + }, + "network" : ["EIP158", "EIP150", "Metropolis"], + "result" : { + "1000000000000000000000000000000000000000" : { + "balance" : "1", + "storage" : { + "0x01" : "0x01", + "0x02" : "0x01", + "0x03" : "0x01", + "0x04" : "0x01", + "0x05" : "0x01", + "0x06" : "0x01", + "0x07" : "0x01", + "0x08" : "0x01", + "0x09" : "0x01", + "0x0a" : "0x01", + "0x0b" : "0x01" + } + } + } + } + ], + "pre" : { + "1000000000000000000000000000000000000000" : { + "balance" : "0", + "code" : "{ [[1]] (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0 0 0 0) [[2]] (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000002 0 0 0 0 0) [[3]] (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000003 0 0 0 0 0) [[4]] (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000004 0 0 0 0 0) [[5]] (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000005 0 0 0 0 0) [[6]] (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000006 0 0 0 0 0) [[7]] (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000006 0 0 0 0 0) [[8]] (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000006 0 0 0 0 0) [[9]] (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000006 0 0 0 0 0) [[10]] (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000006 0 0 0 0 0) [[11]] (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000006 0 0 0 0 0) [[12]] (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000006 0 0 0 0 0) [[13]] (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000006 0 0 0 0 0) [[14]] (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000006 0 0 0 0 0) [[15]] (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000006 0 0 0 0 0) [[16]] (CALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000006 0 0 0 0 0)}", + "nonce" : "0", + "storage" : { + } + }, + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ (RETURN 0 0) }", + "nonce" : "0", + "storage" : { + } + }, + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ (RETURN 0xfffffff 0) }", + "nonce" : "0", + "storage" : { + } + }, + "1000000000000000000000000000000000000003" : { + "balance" : "0", + "code" : "{ (RETURN 0xffffffff 0) }", + "nonce" : "0", + "storage" : { + } + }, + "1000000000000000000000000000000000000004" : { + "balance" : "0", + "code" : "{ (RETURN 0xffffffffffffffff 0) }", + "nonce" : "0", + "storage" : { + } + }, + "1000000000000000000000000000000000000005" : { + "balance" : "0", + "code" : "{ (RETURN 0xfffffffffffffffffffffffffff 0) }", + "nonce" : "0", + "storage" : { + } + }, + "1000000000000000000000000000000000000006" : { + "balance" : "0", + "code" : "{ (RETURN 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0) }", + "nonce" : "0", + "storage" : { + } + }, + "1000000000000000000000000000000000000007" : { + "balance" : "0", + "code" : "{ (RETURN 0 0xfffffff) }", + "nonce" : "0", + "storage" : { + } + }, + "1000000000000000000000000000000000000008" : { + "balance" : "0", + "code" : "{ (RETURN 0 0xffffffff) }", + "nonce" : "0", + "storage" : { + } + }, + "1000000000000000000000000000000000000009" : { + "balance" : "0", + "code" : "{ (RETURN 0 0xffffffffffffffff) }", + "nonce" : "0", + "storage" : { + } + }, + "1000000000000000000000000000000000000010" : { + "balance" : "0", + "code" : "{ (RETURN 0 0xfffffffffffffffffffffffffff) }", + "nonce" : "0", + "storage" : { + } + }, + "1000000000000000000000000000000000000011" : { + "balance" : "0", + "code" : "{ (RETURN 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }", + "nonce" : "0", + "storage" : { + } + }, + "1000000000000000000000000000000000000012" : { + "balance" : "0", + "code" : "{ (RETURN 0xfffffff 0xfffffff) }", + "nonce" : "0", + "storage" : { + } + }, + "1000000000000000000000000000000000000013" : { + "balance" : "0", + "code" : "{ (RETURN 0xffffffff 0xffffffff) }", + "nonce" : "0", + "storage" : { + } + }, + "1000000000000000000000000000000000000014" : { + "balance" : "0", + "code" : "{ (RETURN 0xffffffffffffffff 0xffffffffffffffff) }", + "nonce" : "0", + "storage" : { + } + }, + "1000000000000000000000000000000000000015" : { + "balance" : "0", + "code" : "{ (RETURN 0xfffffffffffffffffffffffffff 0xfffffffffffffffffffffffffff) }", + "nonce" : "0", + "storage" : { + } + }, + "1000000000000000000000000000000000000016" : { + "balance" : "0", + "code" : "{ (RETURN 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + }, + "transaction" : { + "data" : [ + "" + ], + "gasLimit" : [ + "150000", "250000000" + ], + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", + "value" : [ + "1" + ] + } + } +} diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/SLOAD_BoundsFiller.json b/src/GeneralStateTestsFiller/stMemoryStressTest/SLOAD_BoundsFiller.json new file mode 100644 index 000000000..08eef5d88 --- /dev/null +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/SLOAD_BoundsFiller.json @@ -0,0 +1,58 @@ +{ + "SLOAD_Bounds" : { + "env" : { + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "0x020000", + "currentGasLimit" : "0x7fffffffffffffff", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["ALL"], + "result" : { + "1000000000000000000000000000000000000000" : { + "balance" : "1" + } + } + } + ], + "pre" : { + "1000000000000000000000000000000000000000" : { + "balance" : "0", + "code" : "{ (SLOAD 0) (SLOAD 0xffffffff) (SLOAD 0xffffffffffffffff) (SLOAD 0xffffffffffffffffffffffffffffffff) (SLOAD 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x7ffffffffffffffffff", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + }, + "transaction" : { + "data" : [ + "" + ], + "gasLimit" : [ + "150000", "250000000" + ], + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", + "value" : [ + "1" + ] + } + } +} diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/SSTORE_BoundsFiller.json b/src/GeneralStateTestsFiller/stMemoryStressTest/SSTORE_BoundsFiller.json new file mode 100644 index 000000000..a08e25e15 --- /dev/null +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/SSTORE_BoundsFiller.json @@ -0,0 +1,68 @@ +{ + "SSTORE_Bounds" : { + "env" : { + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "0x020000", + "currentGasLimit" : "0x7fffffffffffffff", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : 1, + "value" : -1 + }, + "network" : ["ALL"], + "result" : { + "1000000000000000000000000000000000000000" : { + "balance" : "1", + "storage" : { + "0xffffffff" : "1", + "0xffffffffffffffff" : "1", + "0xffffffffffffffffffffffffffffffff" : "1", + "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" : "1", + "128" : "0xffffffffffffffffffffffffffffffff", + "256" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "32" : "0xffffffff", + "64" : "0xffffffffffffffff" + } + } + } + } + ], + "pre" : { + "1000000000000000000000000000000000000000" : { + "balance" : "0", + "code" : "{ (SSTORE 0xffffffff 1) (SSTORE 0xffffffffffffffff 1) (SSTORE 0xffffffffffffffffffffffffffffffff 1) (SSTORE 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1) (SSTORE 32 0xffffffff) (SSTORE 64 0xffffffffffffffff) (SSTORE 128 0xffffffffffffffffffffffffffffffff) (SSTORE 256 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x7ffffffffffffffffff", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + }, + "transaction" : { + "data" : [ + "" + ], + "gasLimit" : [ + "150000", "250000000" + ], + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", + "value" : [ + "1" + ] + } + } +} diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/mload32bitBound2Filler.json b/src/GeneralStateTestsFiller/stMemoryStressTest/mload32bitBound2Filler.json index 4598de171..674c3ff92 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/mload32bitBound2Filler.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/mload32bitBound2Filler.json @@ -1,5 +1,5 @@ { - "mload32bitBound2 " : { + "mload32bitBound2" : { "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", @@ -12,7 +12,7 @@ { "indexes" : { "data" : -1, - "gas" : -1, + "gas" : 1, "value" : -1 }, "network" : "Frontier", @@ -25,14 +25,13 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x225eebec75ab", + "balance" : "250000000", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0135564b51921f", "code" : "0x", "nonce" : "0x01", "storage" : { @@ -43,7 +42,7 @@ { "indexes" : { "data" : -1, - "gas" : -1, + "gas" : 1, "value" : -1 }, "network" : ["Homestead", "EIP150", "EIP158"], @@ -56,14 +55,14 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x225eebec75ab", + "balance" : "250000000", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0135564b51921f", + "balance" : "377910554219850", "code" : "0x", "nonce" : "0x01", "storage" : { @@ -99,7 +98,7 @@ "" ], "gasLimit" : [ - "37791080412587" + "150000", "250000000" ], "gasPrice" : "1", "nonce" : "0", diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/mload32bitBoundFiller.json b/src/GeneralStateTestsFiller/stMemoryStressTest/mload32bitBoundFiller.json index 88975ef6c..04ef51f88 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/mload32bitBoundFiller.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/mload32bitBoundFiller.json @@ -1,5 +1,5 @@ { - "mload32bitBound " : { + "mload32bitBound" : { "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", @@ -12,10 +12,10 @@ { "indexes" : { "data" : -1, - "gas" : -1, + "gas" : 1, "value" : -1 }, - "network" : "Frontier", + "network" : ["ALL"], "result" : { "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x0de0b6b3a7640000", @@ -25,45 +25,13 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x10000804025c", + "balance" : "250000000", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x90004824153c", - "code" : "0x", - "nonce" : "0x01", - "storage" : { - } - } - } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : ["Homestead", "EIP150", "EIP158"], - "result" : { - "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x64010000000051600155", - "nonce" : "0x00", - "storage" : { - } - }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x10000804025c", - "code" : "0x", - "nonce" : "0x00", - "storage" : { - } - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x90004824153c", "code" : "0x", "nonce" : "0x01", "storage" : { @@ -93,7 +61,7 @@ "" ], "gasLimit" : [ - "17592320524892" + "150000", "250000000" ], "gasPrice" : "1", "nonce" : "0", diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/mload32bitBound_MsizeFiller.json b/src/GeneralStateTestsFiller/stMemoryStressTest/mload32bitBound_MsizeFiller.json index 36641afc8..a0292263b 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/mload32bitBound_MsizeFiller.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/mload32bitBound_MsizeFiller.json @@ -1,5 +1,5 @@ { - "mload32bitBound_Msize " : { + "mload32bitBound_Msize" : { "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", @@ -12,60 +12,27 @@ { "indexes" : { "data" : -1, - "gas" : -1, + "gas" : 1, "value" : -1 }, - "network" : "Frontier", + "network" : ["ALL"], "result" : { "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x0de0b6b3a7640000", "code" : "0x600163ffffffff5259600055", "nonce" : "0x00", "storage" : { - "0x00" : "0x0100000020" + "0x00" : "0x00" } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x20001808a039", + "balance" : "250000000", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x1869ec3b06110147", - "code" : "0x", - "nonce" : "0x01", - "storage" : { - } - } - } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : ["Homestead", "EIP150", "EIP158"], - "result" : { - "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x600163ffffffff5259600055", - "nonce" : "0x00", - "storage" : { - "0x00" : "0x0100000020" - } - }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x20001808a039", - "code" : "0x", - "nonce" : "0x00", - "storage" : { - } - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x1869ec3b06110147", "code" : "0x", "nonce" : "0x01", "storage" : { @@ -95,7 +62,7 @@ "" ], "gasLimit" : [ - "175923205248920000" + "150000", "250000000" ], "gasPrice" : "1", "nonce" : "0", diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/mload32bitBound_return2Filler.json b/src/GeneralStateTestsFiller/stMemoryStressTest/mload32bitBound_return2Filler.json index c6126a60e..f9d4571da 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/mload32bitBound_return2Filler.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/mload32bitBound_return2Filler.json @@ -57,7 +57,7 @@ "" ], "gasLimit" : [ - "175923205248920000" + "150000", "250000000" ], "gasPrice" : "1", "nonce" : "0", diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/mload32bitBound_returnFiller.json b/src/GeneralStateTestsFiller/stMemoryStressTest/mload32bitBound_returnFiller.json index 7ca44682b..84c11bff8 100644 --- a/src/GeneralStateTestsFiller/stMemoryStressTest/mload32bitBound_returnFiller.json +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/mload32bitBound_returnFiller.json @@ -57,7 +57,7 @@ "" ], "gasLimit" : [ - "175923205248920000" + "150000", "250000000" ], "gasPrice" : "1", "nonce" : "0", diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/static_CALL_Bounds2Filler.json b/src/GeneralStateTestsFiller/stMemoryStressTest/static_CALL_Bounds2Filler.json new file mode 100644 index 000000000..d98d52e48 --- /dev/null +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/static_CALL_Bounds2Filler.json @@ -0,0 +1,74 @@ +{ + "static_CALL_Bounds2" : { + "env" : { + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "0x020000", + "currentGasLimit" : "2^63-1", + "currentGasLimit" : "0x7fffffffffffffff", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["ALL"], + "result" : { + "1000000000000000000000000000000000000000" : { + "balance" : "0" + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x00" : "0x00" + } + } + } + } + ], + "pre" : + { + "1000000000000000000000000000000000000000" : { + "balance" : "0", + "code" : "{ (STATICCALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xfffffff 0xfffffff 0xfffffff 0xfffffff) }", + "nonce" : "0", + "storage" : { + } + }, + + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ (SSTORE 0 (ADD 1 (SLOAD 0))) }", + "nonce" : "0", + "storage" : { + } + }, + + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + }, + "transaction" : { + "data" : [ + "" + ], + "gasLimit" : [ + "150000", "250000000" + ], + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", + "value" : [ + "1" + ] + } + } +} diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/static_CALL_Bounds2aFiller.json b/src/GeneralStateTestsFiller/stMemoryStressTest/static_CALL_Bounds2aFiller.json new file mode 100644 index 000000000..d233b0d59 --- /dev/null +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/static_CALL_Bounds2aFiller.json @@ -0,0 +1,73 @@ +{ + "static_CALL_Bounds2a" : { + "env" : { + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "0x020000", + "currentGasLimit" : "2^63-1", + "currentGasLimit" : "0x7fffffffffffffff", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["ALL"], + "result" : { + "1000000000000000000000000000000000000000" : { + "balance" : "0" + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + } + } + } + } + ], + "pre" : + { + "1000000000000000000000000000000000000000" : { + "balance" : "0", + "code" : "{ (STATICCALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xffffffff 0xffffffff 0xffffffff 0xffffffff) }", + "nonce" : "0", + "storage" : { + } + }, + + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ (SSTORE 0 (ADD 1 (SLOAD 0))) }", + "nonce" : "0", + "storage" : { + } + }, + + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + }, + "transaction" : { + "data" : [ + "" + ], + "gasLimit" : [ + "150000", "250000000" + ], + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", + "value" : [ + "1" + ] + } + } +} diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/static_CALL_Bounds3Filler.json b/src/GeneralStateTestsFiller/stMemoryStressTest/static_CALL_Bounds3Filler.json new file mode 100644 index 000000000..59b630ef4 --- /dev/null +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/static_CALL_Bounds3Filler.json @@ -0,0 +1,70 @@ +{ + "static_CALL_Bounds3" : { + "env" : { + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "0x020000", + "currentGasLimit" : "0x7fffffffffffffff", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["ALL"], + "result" : { + "1000000000000000000000000000000000000000" : { + "balance" : "0" + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x00" : "0x00" + } + } + } + } + ], + "pre" : { + "1000000000000000000000000000000000000000" : { + "balance" : "0", + "code" : "{ (STATICCALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffff 0 0xffffffffffffffff) (STATICCALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffff) (STATICCALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (STATICCALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xffffffff 0xffffffff 0xffffffff 0xffffffff) (STATICCALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff) (STATICCALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff) (STATICCALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }", + "nonce" : "0", + "storage" : { + } + }, + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ (MSTORE 0 (ADD 1 (SLOAD 0))) }", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + }, + "transaction" : { + "data" : [ + "" + ], + "gasLimit" : [ + "150000", "250000000" + ], + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", + "value" : [ + "1" + ] + } + } +} diff --git a/src/GeneralStateTestsFiller/stMemoryStressTest/static_CALL_BoundsFiller.json b/src/GeneralStateTestsFiller/stMemoryStressTest/static_CALL_BoundsFiller.json new file mode 100644 index 000000000..d4a9e9901 --- /dev/null +++ b/src/GeneralStateTestsFiller/stMemoryStressTest/static_CALL_BoundsFiller.json @@ -0,0 +1,74 @@ +{ + "static_CALL_Bounds" : { + "env" : { + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "0x020000", + "currentGasLimit" : "2^63-1", + "currentGasLimit" : "0x7fffffffffffffff", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["ALL"], + "result" : { + "1000000000000000000000000000000000000000" : { + "balance" : "0" + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x00" : "0x00" + } + } + } + } + ], + "pre" : + { + "1000000000000000000000000000000000000000" : { + "balance" : "0", + "code" : "{ (STATICCALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0 0 0) (STATICCALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xfffffff 0 0xfffffff) (STATICCALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffff 0 0xffffffff) (STATICCALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xfffffff 0 0xfffffff 0) (STATICCALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xffffffff 0 0xffffffff 0) (STATICCALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xffffffffffffffff 0 0xffffffffffffffff 0) (STATICCALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffff 0) (STATICCALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0) }", + "nonce" : "0", + "storage" : { + } + }, + + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ (MSTORE 0 (ADD 1 (SLOAD 0))) }", + "nonce" : "0", + "storage" : { + } + }, + + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + }, + "transaction" : { + "data" : [ + "" + ], + "gasLimit" : [ + "150000", "250000000" + ], + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", + "value" : [ + "1" + ] + } + } +} -- cgit v1.2.3