aboutsummaryrefslogtreecommitdiffstats
path: root/src/GeneralStateTestsFiller
diff options
context:
space:
mode:
Diffstat (limited to 'src/GeneralStateTestsFiller')
-rw-r--r--src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallValueCheckFiller.json4
-rw-r--r--src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverCheckLengthFiller.json4
-rw-r--r--src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverCheckLengthWrongVFiller.json4
-rw-r--r--src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call1MB1024CalldepthFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000Filler.json4
-rw-r--r--src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000_ecrecFiller.json4
-rw-r--r--src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000_identity2Filler.json4
-rw-r--r--src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000_identityFiller.json4
-rw-r--r--src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000_rip160Filler.json4
-rw-r--r--src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000_sha256Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000bytesContract50_1Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000bytesContract50_2Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call50000bytesContract50_3Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stQuadraticComplexityTest/Callcode50000Filler.json4
-rw-r--r--src/GeneralStateTestsFiller/stQuadraticComplexityTest/Create1000Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stQuadraticComplexityTest/QuadraticComplexitySolidity_CallDataCopyFiller.json17
-rw-r--r--src/GeneralStateTestsFiller/stQuadraticComplexityTest/Return50000Filler.json4
-rw-r--r--src/GeneralStateTestsFiller/stQuadraticComplexityTest/Return50000_2Filler.json4
-rw-r--r--src/GeneralStateTestsFiller/stSystemOperationsTest/Call10Filler.json4
-rw-r--r--src/GeneralStateTestsFiller/stSystemOperationsTest/CalltoReturn2Filler.json (renamed from src/GeneralStateTestsFiller/stSystemOperationsTest/callstatelessToReturn1Filler.json)8
20 files changed, 49 insertions, 36 deletions
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallValueCheckFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallValueCheckFiller.json
index af41ee244..22cd15428 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallValueCheckFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallValueCheckFiller.json
@@ -36,7 +36,7 @@
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
"0x00" : "0x01",
- "0x01" : "0x80"
+ "0x01" : "0x17"
}
}
}
@@ -52,7 +52,7 @@
},
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
"balance" : "23",
- "code" : "{[[ 1 ]] CALLVALUE}",
+ "code" : "{[[ 1 ]] (CALLVALUE) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverCheckLengthFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverCheckLengthFiller.json
index 3f6cf9af4..5ff029e6b 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverCheckLengthFiller.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverCheckLengthFiller.json
@@ -20,7 +20,7 @@
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
"0x" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
- "0x01" : "0x80",
+ "0x01" : "0xa0",
"0x02" : "0x01"
}
}
@@ -30,7 +30,7 @@
"pre" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "20000000",
- "code" : "{ (MSTORE 128 0x1122334455667788990011223344556677889900112233445566778899001122) (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 300000 1 0 0 128 128 32) [[ 0 ]] (MLOAD 128) [[ 1 ]] MSIZE }",
+ "code" : "{ (MSTORE 128 0x1122334455667788990011223344556677889900112233445566778899001122) (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 300000 1 0 0 128 128 32) [[ 0 ]] (MLOAD 128) [[ 1 ]] (MSIZE) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverCheckLengthWrongVFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverCheckLengthWrongVFiller.json
index fbada5d17..94a62f601 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverCheckLengthWrongVFiller.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverCheckLengthWrongVFiller.json
@@ -20,7 +20,7 @@
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
"0x" : "0x1122334455667788990011223344556677889900112233445566778899001122",
- "0x01" : "0x80",
+ "0x01" : "0xa0",
"0x02" : "0x01"
}
}
@@ -30,7 +30,7 @@
"pre" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "20000000",
- "code" : "{ (MSTORE 128 0x1122334455667788990011223344556677889900112233445566778899001122) (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 29) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 300000 1 0 0 128 128 32) [[ 0 ]] (MLOAD 128) [[ 1 ]] MSIZE }",
+ "code" : "{ (MSTORE 128 0x1122334455667788990011223344556677889900112233445566778899001122) (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 29) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 300000 1 0 0 128 128 32) [[ 0 ]] (MLOAD 128) [[ 1 ]] (MSIZE) }",
"nonce" : "0",
"storage" : {
}
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
+}
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/Call10Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/Call10Filler.json
index adb92ef0c..12c70f9e9 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/Call10Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/Call10Filler.json
@@ -43,7 +43,7 @@
},
"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "1000",
- "code" : "{ (for {} (< @i 10) [i](+ @i 1) [[ 0 ]](CALL 0xfffffffffff 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 50000 0 0) ) [[ 1 ]] @i}",
+ "code" : "{ (def 'i 0x80) (for {} (< @i 10) [i](+ @i 1) [[ 0 ]](CALL 0xfffffffffff 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 50000 0 0) ) [[ 1 ]] @i}",
"nonce" : "0",
"storage" : {
}
@@ -65,4 +65,4 @@
]
}
}
-} \ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/callstatelessToReturn1Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CalltoReturn2Filler.json
index a0905c8ee..8526be1b8 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/callstatelessToReturn1Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CalltoReturn2Filler.json
@@ -1,5 +1,5 @@
{
- "callstatelessToReturn1" : {
+ "CalltoReturn2" : {
"env" : {
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "256",
@@ -20,7 +20,7 @@
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"nonce" : "0",
"storage" : {
- "0x" : "0x80"
+ "0x" : "0x00"
}
}
}
@@ -29,7 +29,7 @@
"pre" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "1000000000000000000",
- "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALLSTATELESS 500 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 0 2 ) }",
+ "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 5000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 0 2 ) }",
"nonce" : "0",
"storage" : {
}
@@ -65,4 +65,4 @@
]
}
}
-} \ No newline at end of file
+}