aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--GeneralStateTests/stRandom2/201503110226PYTHON_DUP6.json79
-rw-r--r--GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_28000_96.json167
-rw-r--r--src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5616_28000_96Filler.json35
3 files changed, 169 insertions, 112 deletions
diff --git a/GeneralStateTests/stRandom2/201503110226PYTHON_DUP6.json b/GeneralStateTests/stRandom2/201503110226PYTHON_DUP6.json
index aead73ebe..11c2a57f9 100644
--- a/GeneralStateTests/stRandom2/201503110226PYTHON_DUP6.json
+++ b/GeneralStateTests/stRandom2/201503110226PYTHON_DUP6.json
@@ -2,8 +2,9 @@
"201503110226PYTHON_DUP6" : {
"_info" : {
"comment" : "This test used to be a VM test and it once failed in python client some day. Since the test contains a BALANCE instruction (which must be mocked), it's moved to GeneralSateTest https://github.com/ethereum/tests/pull/445/files#r179426325",
- "filledwith" : "cpp-1.3.0+commit.6ae986d2.Linux.g++",
- "lllcversion" : "Version: 0.4.22-develop.2018.3.16+commit.2b2527f3.Linux.g++",
+ "filling-rpc-server" : "eth/1.3.0-20449+commit.0aa883d9.dirty/linux/gnu5.4.0/debug",
+ "filling-tool-version" : "retesteth-0.0.1+commit.98de0277.Linux.g++",
+ "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
"source" : "src/GeneralStateTestsFiller/stRandom2/201503110226PYTHON_DUP6Filler.json",
"sourceHash" : "e3c45b0840d53d4702b17b0306e55a0096f44554c1176aed44b5f63884db36ff"
},
@@ -15,104 +16,104 @@
"currentTimestamp" : "0x03e8",
"previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
+ "pre" : {
+ "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x45414443434042405b85",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x38beec8feeca2598",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "0x"
+ ],
+ "gasLimit" : [
+ "0x2710"
+ ],
+ "gasPrice" : "0x5af3107a4000",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "value" : [
+ "0x0de0b6b3a7640000"
+ ]
+ },
"post" : {
"Byzantium" : [
{
- "hash" : "0x97bc1cfe54c890cf7260f16182afbfdfdc3a57684e566d0827348e42c3be1cd9",
"indexes" : {
"data" : 0,
"gas" : 0,
"value" : 0
},
+ "hash" : "0x97bc1cfe54c890cf7260f16182afbfdfdc3a57684e566d0827348e42c3be1cd9",
"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
}
],
"Constantinople" : [
{
- "hash" : "0x97bc1cfe54c890cf7260f16182afbfdfdc3a57684e566d0827348e42c3be1cd9",
"indexes" : {
"data" : 0,
"gas" : 0,
"value" : 0
},
+ "hash" : "0x97bc1cfe54c890cf7260f16182afbfdfdc3a57684e566d0827348e42c3be1cd9",
"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
}
],
"EIP150" : [
{
- "hash" : "0x97bc1cfe54c890cf7260f16182afbfdfdc3a57684e566d0827348e42c3be1cd9",
"indexes" : {
"data" : 0,
"gas" : 0,
"value" : 0
},
+ "hash" : "0x14a9995ac65e78508883050f353b4a79d112e0ef28d517e08fbf19f5fc2cb9b9",
"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
}
],
"EIP158" : [
{
- "hash" : "0x97bc1cfe54c890cf7260f16182afbfdfdc3a57684e566d0827348e42c3be1cd9",
"indexes" : {
"data" : 0,
"gas" : 0,
"value" : 0
},
+ "hash" : "0x97bc1cfe54c890cf7260f16182afbfdfdc3a57684e566d0827348e42c3be1cd9",
"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
}
],
"Frontier" : [
{
- "hash" : "0x97bc1cfe54c890cf7260f16182afbfdfdc3a57684e566d0827348e42c3be1cd9",
"indexes" : {
"data" : 0,
"gas" : 0,
"value" : 0
},
+ "hash" : "0x14a9995ac65e78508883050f353b4a79d112e0ef28d517e08fbf19f5fc2cb9b9",
"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
}
],
"Homestead" : [
{
- "hash" : "0x97bc1cfe54c890cf7260f16182afbfdfdc3a57684e566d0827348e42c3be1cd9",
"indexes" : {
"data" : 0,
"gas" : 0,
"value" : 0
},
+ "hash" : "0x14a9995ac65e78508883050f353b4a79d112e0ef28d517e08fbf19f5fc2cb9b9",
"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
}
]
- },
- "pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x45414443434042405b85",
- "nonce" : "0x00",
- "storage" : {
- }
- },
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x38beec8feeca2598",
- "code" : "",
- "nonce" : "0x00",
- "storage" : {
- }
- }
- },
- "transaction" : {
- "data" : [
- "0x"
- ],
- "gasLimit" : [
- "0x2710"
- ],
- "gasPrice" : "0x5af3107a4000",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
- "value" : [
- "0x0de0b6b3a7640000"
- ]
}
}
} \ No newline at end of file
diff --git a/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_28000_96.json b/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_28000_96.json
index 1fd4f006b..3ff5272e0 100644
--- a/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_28000_96.json
+++ b/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_28000_96.json
@@ -1,11 +1,12 @@
{
"ecmul_0-3_5616_28000_96" : {
"_info" : {
- "comment" : "",
- "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
+ "comment" : "Puts the point (0, 3) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495616 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes",
+ "filling-rpc-server" : "eth/1.3.0-20449+commit.0aa883d9.dirty/linux/gnu5.4.0/debug",
+ "filling-tool-version" : "retesteth-0.0.1+commit.98de0277.Linux.g++",
"lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
"source" : "src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5616_28000_96Filler.json",
- "sourceHash" : "4cde278d0a2c42fc2926b6e98cf5f25dfaae8dc54830783e70664902b404d840"
+ "sourceHash" : "8d8fa364f97db8a519ec7aa1f4103226d1a02477320f5a957e06d1b1ac48b50f"
},
"env" : {
"currentCoinbase" : "0x3535353535353535353535353535353535353535",
@@ -15,162 +16,122 @@
"currentTimestamp" : "0x03e8",
"previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
},
- "post" : {
- "Byzantium" : [
- {
- "hash" : "0x41d8fd264853c79997c692917095fc4b2b43e94e424a47ae10632ae85b3c5c01",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- },
- "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
- },
- {
- "hash" : "0x41d8fd264853c79997c692917095fc4b2b43e94e424a47ae10632ae85b3c5c01",
- "indexes" : {
- "data" : 0,
- "gas" : 1,
- "value" : 0
- },
- "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
- },
- {
- "hash" : "0x41d8fd264853c79997c692917095fc4b2b43e94e424a47ae10632ae85b3c5c01",
- "indexes" : {
- "data" : 0,
- "gas" : 2,
- "value" : 0
- },
- "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
- },
- {
- "hash" : "0x41d8fd264853c79997c692917095fc4b2b43e94e424a47ae10632ae85b3c5c01",
- "indexes" : {
- "data" : 0,
- "gas" : 3,
- "value" : 0
- },
- "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
- }
- ]
- },
"pre" : {
"0x0000000000000000000000000000000000000000" : {
"balance" : "0x01",
- "code" : "",
+ "code" : "0x",
"nonce" : "0x00",
"storage" : {
}
},
"0x0000000000000000000000000000000000000001" : {
"balance" : "0x01",
- "code" : "",
+ "code" : "0x",
"nonce" : "0x00",
"storage" : {
}
},
"0x0000000000000000000000000000000000000002" : {
"balance" : "0x01",
- "code" : "",
+ "code" : "0x",
"nonce" : "0x00",
"storage" : {
}
},
"0x0000000000000000000000000000000000000003" : {
"balance" : "0x01",
- "code" : "",
+ "code" : "0x",
"nonce" : "0x00",
"storage" : {
}
},
"0x0000000000000000000000000000000000000004" : {
"balance" : "0x01",
- "code" : "",
+ "code" : "0x",
"nonce" : "0x00",
"storage" : {
}
},
"0x0000000000000000000000000000000000000005" : {
"balance" : "0x01",
- "code" : "",
+ "code" : "0x",
"nonce" : "0x00",
"storage" : {
}
},
"0x0000000000000000000000000000000000000006" : {
"balance" : "0x01",
- "code" : "",
+ "code" : "0x",
"nonce" : "0x00",
"storage" : {
}
},
"0x0000000000000000000000000000000000000007" : {
"balance" : "0x01",
- "code" : "",
+ "code" : "0x",
"nonce" : "0x00",
"storage" : {
}
},
"0x10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b" : {
"balance" : "0x0de0b6b3a7640000",
- "code" : "",
+ "code" : "0x",
"nonce" : "0x00",
"storage" : {
}
},
"0x13cbb8d99c6c4e0f2728c7d72606e78a29c4e224" : {
"balance" : "0x0de0b6b3a7640000",
- "code" : "",
+ "code" : "0x",
"nonce" : "0x00",
"storage" : {
}
},
"0x24143873e0e0815fdcbcffdbe09c979cbf9ad013" : {
"balance" : "0x0de0b6b3a7640000",
- "code" : "",
+ "code" : "0x",
"nonce" : "0x00",
"storage" : {
}
},
"0x3535353535353535353535353535353535353535" : {
"balance" : "0x00",
- "code" : "",
+ "code" : "0x",
"nonce" : "0x00",
"storage" : {
}
},
"0x598443f1880ef585b21f1d7585bd0577402861e5" : {
"balance" : "0x0de0b6b3a7640000",
- "code" : "",
+ "code" : "0x",
"nonce" : "0x00",
"storage" : {
}
},
"0x77db2bebba79db42a978f896968f4afce746ea1f" : {
"balance" : "0x0de0b6b3a7640000",
- "code" : "",
+ "code" : "0x",
"nonce" : "0x00",
"storage" : {
}
},
"0x7d577a597b2742b498cb5cf0c26cdcd726d39e6e" : {
"balance" : "0x0de0b6b3a7640000",
- "code" : "",
+ "code" : "0x",
"nonce" : "0x00",
"storage" : {
}
},
"0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
- "balance" : "0x00",
- "code" : "",
+ "balance" : "0x0249f0",
+ "code" : "0x",
"nonce" : "0xad",
"storage" : {
}
},
"0x90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c" : {
"balance" : "0x0de0b6b3a7640000",
- "code" : "",
+ "code" : "0x",
"nonce" : "0x00",
"storage" : {
}
@@ -185,14 +146,14 @@
},
"0xdceceaf3fc5c0a63d195d69b1a90011b7b19650d" : {
"balance" : "0x0de0b6b3a7640000",
- "code" : "",
+ "code" : "0x",
"nonce" : "0x00",
"storage" : {
}
},
"0xe0fc04fa2d34a66b779fd5cee748268032a146c0" : {
"balance" : "0x0de0b6b3a7640000",
- "code" : "",
+ "code" : "0x",
"nonce" : "0x00",
"storage" : {
}
@@ -215,6 +176,84 @@
"value" : [
"0x"
]
+ },
+ "post" : {
+ "Byzantium" : [
+ {
+ "indexes" : {
+ "data" : 0,
+ "gas" : 3,
+ "value" : 0
+ },
+ "hash" : "0x631a600601a67ef3357813281d417e141e5eddf306abd4d8824bdc141536e3c6",
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ {
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "hash" : "0x5145a26ec9e0b04383b1b395ac87b540fc214198bc77fc5a244d3f5d3cad0771",
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ {
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "hash" : "0xdc493a2fa7886ab60c203fab5fbf1710557d6ddcd1c469085ec62e7aff7de903",
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ {
+ "indexes" : {
+ "data" : 0,
+ "gas" : 2,
+ "value" : 0
+ },
+ "hash" : "0x37f41a86f2b2d6de7096d0733ed8f1a5af6c3c5ca03e4a4541dc9307e141eb91",
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ }
+ ],
+ "Constantinople" : [
+ {
+ "indexes" : {
+ "data" : 0,
+ "gas" : 3,
+ "value" : 0
+ },
+ "hash" : "0x631a600601a67ef3357813281d417e141e5eddf306abd4d8824bdc141536e3c6",
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ {
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "hash" : "0x5145a26ec9e0b04383b1b395ac87b540fc214198bc77fc5a244d3f5d3cad0771",
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ {
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "hash" : "0xdc493a2fa7886ab60c203fab5fbf1710557d6ddcd1c469085ec62e7aff7de903",
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ {
+ "indexes" : {
+ "data" : 0,
+ "gas" : 2,
+ "value" : 0
+ },
+ "hash" : "0x37f41a86f2b2d6de7096d0733ed8f1a5af6c3c5ca03e4a4541dc9307e141eb91",
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ }
+ ]
}
}
-}
+} \ No newline at end of file
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5616_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5616_28000_96Filler.json
index 269a6e178..27bd88538 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5616_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5616_28000_96Filler.json
@@ -1,5 +1,8 @@
{
"ecmul_0-3_5616_28000_96": {
+ "_info" : {
+ "comment" : "Puts the point (0, 3) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495616 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes"
+ },
"env": {
"currentCoinbase": "0x3535353535353535353535353535353535353535",
"currentDifficulty": "0x020000",
@@ -60,7 +63,7 @@
"code": "0x"
},
"82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
- "balance" : "0",
+ "balance" : "150000",
"storage": {},
"nonce": "173",
"code": "0x"
@@ -148,10 +151,29 @@
]
},
"expect": [
+ {
+ "indexes": {
+ "data": 0,
+ "gas": [3],
+ "value": 0
+ },
+ "network": [
+ ">=Byzantium"
+ ],
+ "result": {
+ "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
+ "nonce": "173",
+ "balance": "150000"
+ },
+ "3535353535353535353535353535353535353535": {
+ "shouldnotexist": "1"
+ }
+ }
+ },
{
"indexes": {
"data": 0,
- "gas": -1,
+ "gas": [0,1,2],
"value": 0
},
"network": [
@@ -210,6 +232,7 @@
},
"82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
"storage": {},
+ "nonce": "174",
"code": "0x"
},
"0000000000000000000000000000000000000006": {
@@ -248,11 +271,6 @@
"balance": "1000000000000000000",
"code": "0x"
},
- "3535353535353535353535353535353535353535": {
- "storage": {},
- "nonce": "0",
- "code": "0x"
- },
"0000000000000000000000000000000000000002": {
"storage": {},
"nonce": "0",
@@ -279,7 +297,6 @@
}
}
}
- ],
- "explanation": "Puts the point (0, 3) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495616 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes"
+ ]
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-17 08:16:46 +0800