diff options
fix gstatetest src for new solidity
Diffstat (limited to 'src/GeneralStateTestsFiller/stQuadraticComplexityTest')
15 files changed, 37 insertions, 24 deletions
diff --git a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call1MB1024CalldepthFiller.json b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call1MB1024CalldepthFiller.json index 184e08bab..94ddfdfe2 100644 --- a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call1MB1024CalldepthFiller.json +++ b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call1MB1024CalldepthFiller.json @@ -105,7 +105,7 @@ }, "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0xfffffffffffff", - "code" : "{ [[ 0 ]] (+ @@0 1) (if (LT @@0 1024) [[ 1 ]] (CALL (- (GAS) 1005000) 0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 1000000 0 0) [[ 2 ]] 1 ) }", + "code" : "{ (def 'i 0x80) [[ 0 ]] (+ @@0 1) (if (LT @@0 1024) [[ 1 ]] (CALL (- (GAS) 1005000) 0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 1000000 0 0) [[ 2 ]] 1 ) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000Filler.json b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000Filler.json index d9cca7574..1981c7aa1 100644 --- a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000Filler.json +++ b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000Filler.json @@ -65,7 +65,7 @@ }, "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0xfffffffffffff", - "code" : "{ (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1600 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 50000 0 0) ) [[ 1 ]] @i}", + "code" : "{ (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1600 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 50000 0 0) ) [[ 1 ]] @i}", "nonce" : "0", "storage" : { } @@ -87,4 +87,4 @@ ] } } -}
\ No newline at end of file +} diff --git a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000_ecrecFiller.json b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000_ecrecFiller.json index 310925ba5..d7fbe6ae1 100644 --- a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000_ecrecFiller.json +++ b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000_ecrecFiller.json @@ -51,7 +51,7 @@ }, "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0xffffffffffffffffffffffffffffffff", - "code" : "{ (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 500 1 1 0 50000 0 0) ) [[ 1 ]] @i}", + "code" : "{ (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 500 1 1 0 50000 0 0) ) [[ 1 ]] @i}", "nonce" : "0", "storage" : { } @@ -73,4 +73,4 @@ ] } } -}
\ No newline at end of file +} diff --git a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000_identity2Filler.json b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000_identity2Filler.json index ef24cd677..f9456963a 100644 --- a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000_identity2Filler.json +++ b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000_identity2Filler.json @@ -51,7 +51,7 @@ }, "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0xfffffffffffff", - "code" : "{ [ 1 ] 42 (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1564 4 1 0 50000 1 50000) ) [[ 1 ]] @i [[ 2 ]] @1 }", + "code" : "{ (def 'i 0x80) [ 1 ] 42 (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1564 4 1 0 50000 1 50000) ) [[ 1 ]] @i [[ 2 ]] @1 }", "nonce" : "0", "storage" : { } @@ -73,4 +73,4 @@ ] } } -}
\ No newline at end of file +} diff --git a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000_identityFiller.json b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000_identityFiller.json index 73a03b64e..b60bff8a0 100644 --- a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000_identityFiller.json +++ b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000_identityFiller.json @@ -51,7 +51,7 @@ }, "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0xfffffffffffff", - "code" : "{ (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1564 4 1 0 50000 0 0) ) [[ 1 ]] @i}", + "code" : "{ (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1564 4 1 0 50000 0 0) ) [[ 1 ]] @i}", "nonce" : "0", "storage" : { } @@ -73,4 +73,4 @@ ] } } -}
\ No newline at end of file +} diff --git a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000_rip160Filler.json b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000_rip160Filler.json index b64bea8b9..0768c89ff 100644 --- a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000_rip160Filler.json +++ b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000_rip160Filler.json @@ -51,7 +51,7 @@ }, "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0xfffffffffffff", - "code" : "{ (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 78200 3 1 0 50000 0 0) ) [[ 1 ]] @i}", + "code" : "{ (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 78200 3 1 0 50000 0 0) ) [[ 1 ]] @i}", "nonce" : "0", "storage" : { } @@ -73,4 +73,4 @@ ] } } -}
\ No newline at end of file +} diff --git a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000_sha256Filler.json b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000_sha256Filler.json index 711abe89b..b82e7a49e 100644 --- a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000_sha256Filler.json +++ b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000_sha256Filler.json @@ -100,7 +100,7 @@ }, "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0xfffffffffffff", - "code" : "{ (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 78200 2 1 0 50000 0 0) ) [[ 1 ]] @i}", + "code" : "{ (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 78200 2 1 0 50000 0 0) ) [[ 1 ]] @i}", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000bytesContract50_1Filler.json b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000bytesContract50_1Filler.json index 76989dae6..3400363af 100644 --- a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000bytesContract50_1Filler.json +++ b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000bytesContract50_1Filler.json @@ -109,7 +109,7 @@ }, "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0xfffffffffffff", - "code" : "{ (for {} (< @i 50) [i](+ @i 1) [[ 0 ]] (CALL 88250000000 0xaaa50000fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) ) [[ 1 ]] @i }", + "code" : "{ (def 'i 0x80) (for {} (< @i 50) [i](+ @i 1) [[ 0 ]] (CALL 88250000000 0xaaa50000fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) ) [[ 1 ]] @i }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000bytesContract50_2Filler.json b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000bytesContract50_2Filler.json index 689a5759d..b91261fdf 100644 --- a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000bytesContract50_2Filler.json +++ b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000bytesContract50_2Filler.json @@ -109,7 +109,7 @@ }, "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0xfffffffffffff", - "code" : "{ (for {} (< @i 50) [i](+ @i 1) [[ 0 ]] (CALL 88250000000 0xaaa50000fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) ) [[ 1 ]] @i }", + "code" : "{ (def 'i 0x80) (for {} (< @i 50) [i](+ @i 1) [[ 0 ]] (CALL 88250000000 0xaaa50000fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) ) [[ 1 ]] @i }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000bytesContract50_3Filler.json b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000bytesContract50_3Filler.json index cbe13611b..1946f314c 100644 --- a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000bytesContract50_3Filler.json +++ b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000bytesContract50_3Filler.json @@ -109,7 +109,7 @@ }, "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0xfffffffffffff", - "code" : "{ (for {} (< @i 50) [i](+ @i 1) [[ 0 ]] (CALL 88250000000 0xaaa50000fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) ) [[ 1 ]] @i }", + "code" : "{ (def 'i 0x80) (for {} (< @i 50) [i](+ @i 1) [[ 0 ]] (CALL 88250000000 0xaaa50000fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) ) [[ 1 ]] @i }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Callcode50000Filler.json b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Callcode50000Filler.json index ca67720e8..6a1e04704 100644 --- a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Callcode50000Filler.json +++ b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Callcode50000Filler.json @@ -65,7 +65,7 @@ }, "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0xfffffffffffff", - "code" : "{ (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALLCODE 1600 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 50000 0 0) ) [[ 1 ]] @i}", + "code" : "{ (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALLCODE 1600 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 50000 0 0) ) [[ 1 ]] @i}", "nonce" : "0", "storage" : { } @@ -87,4 +87,4 @@ ] } } -}
\ No newline at end of file +} diff --git a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Create1000Filler.json b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Create1000Filler.json index 35c5e154a..65e7b2fdf 100644 --- a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Create1000Filler.json +++ b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Create1000Filler.json @@ -14086,7 +14086,7 @@ }, "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0xfffffffffffff", - "code" : "{ (for {} (< @i 1000) [i](+ @i 1) [[ 0 ]] (CREATE 1 0 50000) ) [[ 1 ]] @i}", + "code" : "{ (def 'i 0x80) (for {} (< @i 1000) [i](+ @i 1) [[ 0 ]] (CREATE 1 0 50000) ) [[ 1 ]] @i}", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/QuadraticComplexitySolidity_CallDataCopyFiller.json b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/QuadraticComplexitySolidity_CallDataCopyFiller.json index 14657cc9b..46d30c637 100644 --- a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/QuadraticComplexitySolidity_CallDataCopyFiller.json +++ b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/QuadraticComplexitySolidity_CallDataCopyFiller.json @@ -43,7 +43,20 @@ ], "pre" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "//" : "}\t\t\t\t\t\t\t\t\t", + "//" : "contract caller ", + "//" : "{ ", + "//" : " int value; ", + "//" : " function run(int count) ", + "//" : " { ", + "//" : " value = count; ", + "//" : " address a = 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b; ", + "//" : " while(count > 0) ", + "//" : " { ", + "//" : " a.call('just', 'call'); ", + "//" : " count = count - 1; ", + "//" : " } ", + "//" : " } ", + "//" : "} ", "balance" : "500000000", "code" : "0x60003560e060020a9004806361a4770614601557005b601e6004356024565b60006000f35b60008160008190555073b94f5374fce5edbc8e2a8697c15331677e6ebf0b90505b600082131560bf5780600160a060020a03166000600060007f6a7573740000000000000000000000000000000000000000000000000000000081526004017f63616c6c000000000000000000000000000000000000000000000000000000008152602001600060008560155a03f150506001820391506045565b505056", "nonce" : "0", @@ -74,4 +87,4 @@ ] } } -}
\ No newline at end of file +} diff --git a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Return50000Filler.json b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Return50000Filler.json index c1f1e1e4e..140c75b73 100644 --- a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Return50000Filler.json +++ b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Return50000Filler.json @@ -65,7 +65,7 @@ }, "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0xfffffffffffff", - "code" : "{ (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1564 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 50000 0 0) ) [[ 1 ]] @i }", + "code" : "{ (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1564 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 50000 0 0) ) [[ 1 ]] @i }", "nonce" : "0", "storage" : { } @@ -87,4 +87,4 @@ ] } } -}
\ No newline at end of file +} diff --git a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Return50000_2Filler.json b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Return50000_2Filler.json index bc0a56f9a..63454dbf3 100644 --- a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Return50000_2Filler.json +++ b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Return50000_2Filler.json @@ -65,7 +65,7 @@ }, "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0xfffffffffffff", - "code" : "{ (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1564 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 50000 0 0) ) [[ 1 ]] @i }", + "code" : "{ (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1564 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 50000 0 0) ) [[ 1 ]] @i }", "nonce" : "0", "storage" : { } @@ -87,4 +87,4 @@ ] } } -}
\ No newline at end of file +} |