aboutsummaryrefslogtreecommitdiffstats
path: root/GeneralStateTests/stMemoryTest
diff options
context:
space:
mode:
Diffstat (limited to 'GeneralStateTests/stMemoryTest')
-rw-r--r--GeneralStateTests/stMemoryTest/calldatacopy_dejavu.json150
-rw-r--r--GeneralStateTests/stMemoryTest/calldatacopy_dejavu2.json150
-rw-r--r--GeneralStateTests/stMemoryTest/codecopy_dejavu.json150
-rw-r--r--GeneralStateTests/stMemoryTest/codecopy_dejavu2.json148
-rw-r--r--GeneralStateTests/stMemoryTest/extcodecopy_dejavu.json150
-rw-r--r--GeneralStateTests/stMemoryTest/log1_dejavu.json150
-rw-r--r--GeneralStateTests/stMemoryTest/log2_dejavu.json150
-rw-r--r--GeneralStateTests/stMemoryTest/log3_dejavu.json150
-rw-r--r--GeneralStateTests/stMemoryTest/log4_dejavu.json150
-rw-r--r--GeneralStateTests/stMemoryTest/mem0b_singleByte.json152
-rw-r--r--GeneralStateTests/stMemoryTest/mem31b_singleByte.json152
-rw-r--r--GeneralStateTests/stMemoryTest/mem32b_singleByte.json152
-rw-r--r--GeneralStateTests/stMemoryTest/mem32kb+1.json154
-rw-r--r--GeneralStateTests/stMemoryTest/mem32kb+31.json154
-rw-r--r--GeneralStateTests/stMemoryTest/mem32kb+32.json154
-rw-r--r--GeneralStateTests/stMemoryTest/mem32kb+33.json154
-rw-r--r--GeneralStateTests/stMemoryTest/mem32kb-1.json154
-rw-r--r--GeneralStateTests/stMemoryTest/mem32kb-31.json154
-rw-r--r--GeneralStateTests/stMemoryTest/mem32kb-32.json154
-rw-r--r--GeneralStateTests/stMemoryTest/mem32kb-33.json154
-rw-r--r--GeneralStateTests/stMemoryTest/mem32kb.json154
-rw-r--r--GeneralStateTests/stMemoryTest/mem32kb_singleByte+1.json152
-rw-r--r--GeneralStateTests/stMemoryTest/mem32kb_singleByte+31.json152
-rw-r--r--GeneralStateTests/stMemoryTest/mem32kb_singleByte+32.json152
-rw-r--r--GeneralStateTests/stMemoryTest/mem32kb_singleByte+33.json152
-rw-r--r--GeneralStateTests/stMemoryTest/mem32kb_singleByte-1.json152
-rw-r--r--GeneralStateTests/stMemoryTest/mem32kb_singleByte-31.json152
-rw-r--r--GeneralStateTests/stMemoryTest/mem32kb_singleByte-32.json152
-rw-r--r--GeneralStateTests/stMemoryTest/mem32kb_singleByte-33.json152
-rw-r--r--GeneralStateTests/stMemoryTest/mem32kb_singleByte.json152
-rw-r--r--GeneralStateTests/stMemoryTest/mem33b_singleByte.json152
-rw-r--r--GeneralStateTests/stMemoryTest/mem64kb+1.json154
-rw-r--r--GeneralStateTests/stMemoryTest/mem64kb+31.json154
-rw-r--r--GeneralStateTests/stMemoryTest/mem64kb+32.json154
-rw-r--r--GeneralStateTests/stMemoryTest/mem64kb+33.json154
-rw-r--r--GeneralStateTests/stMemoryTest/mem64kb-1.json154
-rw-r--r--GeneralStateTests/stMemoryTest/mem64kb-31.json154
-rw-r--r--GeneralStateTests/stMemoryTest/mem64kb-32.json154
-rw-r--r--GeneralStateTests/stMemoryTest/mem64kb-33.json154
-rw-r--r--GeneralStateTests/stMemoryTest/mem64kb.json154
-rw-r--r--GeneralStateTests/stMemoryTest/mem64kb_singleByte+1.json152
-rw-r--r--GeneralStateTests/stMemoryTest/mem64kb_singleByte+31.json152
-rw-r--r--GeneralStateTests/stMemoryTest/mem64kb_singleByte+32.json152
-rw-r--r--GeneralStateTests/stMemoryTest/mem64kb_singleByte+33.json152
-rw-r--r--GeneralStateTests/stMemoryTest/mem64kb_singleByte-1.json152
-rw-r--r--GeneralStateTests/stMemoryTest/mem64kb_singleByte-31.json152
-rw-r--r--GeneralStateTests/stMemoryTest/mem64kb_singleByte-32.json152
-rw-r--r--GeneralStateTests/stMemoryTest/mem64kb_singleByte-33.json152
-rw-r--r--GeneralStateTests/stMemoryTest/mem64kb_singleByte.json152
-rw-r--r--GeneralStateTests/stMemoryTest/memReturn.json150
-rw-r--r--GeneralStateTests/stMemoryTest/mload16bitBound.json150
-rw-r--r--GeneralStateTests/stMemoryTest/mload8bitBound.json150
-rw-r--r--GeneralStateTests/stMemoryTest/mload_dejavu.json150
-rw-r--r--GeneralStateTests/stMemoryTest/mstore_dejavu.json150
-rw-r--r--GeneralStateTests/stMemoryTest/mstroe8_dejavu.json150
-rw-r--r--GeneralStateTests/stMemoryTest/sha3_dejavu.json150
-rw-r--r--GeneralStateTests/stMemoryTest/stackLimitGas_1023.json150
-rw-r--r--GeneralStateTests/stMemoryTest/stackLimitGas_1024.json150
-rw-r--r--GeneralStateTests/stMemoryTest/stackLimitGas_1025.json150
-rw-r--r--GeneralStateTests/stMemoryTest/stackLimitPush31_1023.json150
-rw-r--r--GeneralStateTests/stMemoryTest/stackLimitPush31_1024.json150
-rw-r--r--GeneralStateTests/stMemoryTest/stackLimitPush31_1025.json150
-rw-r--r--GeneralStateTests/stMemoryTest/stackLimitPush32_1023.json150
-rw-r--r--GeneralStateTests/stMemoryTest/stackLimitPush32_1024.json150
-rw-r--r--GeneralStateTests/stMemoryTest/stackLimitPush32_1025.json150
65 files changed, 5511 insertions, 4353 deletions
diff --git a/GeneralStateTests/stMemoryTest/calldatacopy_dejavu.json b/GeneralStateTests/stMemoryTest/calldatacopy_dejavu.json
index bc4fb1a59..6da2a60d3 100644
--- a/GeneralStateTests/stMemoryTest/calldatacopy_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/calldatacopy_dejavu.json
@@ -2,81 +2,97 @@
"calldatacopy_dejavu" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/calldatacopy_dejavuFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0xfb0eef5366c4b1d9bd479557e0cbf35f0b1512f3f6cfea8fd2853933ec3c3d23",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x60ff60ff630fffffff630fffffff37",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0a00000000",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x5a00000000",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xfb0eef5366c4b1d9bd479557e0cbf35f0b1512f3f6cfea8fd2853933ec3c3d23",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0xfb0eef5366c4b1d9bd479557e0cbf35f0b1512f3f6cfea8fd2853933ec3c3d23",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0xfb0eef5366c4b1d9bd479557e0cbf35f0b1512f3f6cfea8fd2853933ec3c3d23",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xfb0eef5366c4b1d9bd479557e0cbf35f0b1512f3f6cfea8fd2853933ec3c3d23",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x60ff60ff630fffffff630fffffff37",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0a00000000",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x5a00000000",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x60ff60ff630fffffff630fffffff37",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x60FF60FF630FFFFFFF630FFFFFFF37",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +102,14 @@
""
],
"gasLimit" : [
- "0x0a00000000"
+ "42949672960"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/calldatacopy_dejavu2.json b/GeneralStateTests/stMemoryTest/calldatacopy_dejavu2.json
index c562a7d32..ed284be3b 100644
--- a/GeneralStateTests/stMemoryTest/calldatacopy_dejavu2.json
+++ b/GeneralStateTests/stMemoryTest/calldatacopy_dejavu2.json
@@ -2,81 +2,99 @@
"calldatacopy_dejavu2" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/calldatacopy_dejavu2Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x74ee79796297a4556e905da5bc59648da679f19b3884a1a383e5b0c7a91c9e05",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x6005565b005b6042601f536101036000601f3760005180606014600357640badc0ffee60ff55",
+ "nonce" : "0x00",
+ "storage" : {
+ "0xff" : "0x0badc0ffee"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xa0a4",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff5f52",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x74ee79796297a4556e905da5bc59648da679f19b3884a1a383e5b0c7a91c9e05",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x74ee79796297a4556e905da5bc59648da679f19b3884a1a383e5b0c7a91c9e05",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x74ee79796297a4556e905da5bc59648da679f19b3884a1a383e5b0c7a91c9e05",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x74ee79796297a4556e905da5bc59648da679f19b3884a1a383e5b0c7a91c9e05",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x6005565b005b6042601f536101036000601f3760005180606014600357640badc0ffee60ff55",
+ "nonce" : "0x00",
+ "storage" : {
+ "0xff" : "0x0badc0ffee"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xa0a4",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff5f52",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
"code" : "0x6005565b005b6042601f536101036000601f3760005180606014600357640badc0ffee60ff55",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +104,14 @@
""
],
"gasLimit" : [
- "0x0a00000000"
+ "42949672960"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/codecopy_dejavu.json b/GeneralStateTests/stMemoryTest/codecopy_dejavu.json
index d67921360..ab581e35d 100644
--- a/GeneralStateTests/stMemoryTest/codecopy_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/codecopy_dejavu.json
@@ -2,81 +2,97 @@
"codecopy_dejavu" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/codecopy_dejavuFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x5e3bd4dc78514c1999c1d83a89bad70d4596bf2f1a8a53c406078f208257c174",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x60ff60ff630fffffff630fffffff39",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0a00000000",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x5a00000000",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x5e3bd4dc78514c1999c1d83a89bad70d4596bf2f1a8a53c406078f208257c174",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x5e3bd4dc78514c1999c1d83a89bad70d4596bf2f1a8a53c406078f208257c174",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x5e3bd4dc78514c1999c1d83a89bad70d4596bf2f1a8a53c406078f208257c174",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x5e3bd4dc78514c1999c1d83a89bad70d4596bf2f1a8a53c406078f208257c174",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x60ff60ff630fffffff630fffffff39",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0a00000000",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x5a00000000",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x60ff60ff630fffffff630fffffff39",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x60FF60FF630FFFFFFF630FFFFFFF39",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +102,14 @@
""
],
"gasLimit" : [
- "0x0a00000000"
+ "42949672960"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/codecopy_dejavu2.json b/GeneralStateTests/stMemoryTest/codecopy_dejavu2.json
index 2df6778a7..f5499aae2 100644
--- a/GeneralStateTests/stMemoryTest/codecopy_dejavu2.json
+++ b/GeneralStateTests/stMemoryTest/codecopy_dejavu2.json
@@ -2,81 +2,97 @@
"codecopy_dejavu2" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/codecopy_dejavu2Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x368b88a2614b03725ac64cec0ef73009aaa11390385f0273541932e152f03900",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x6005565b005b600a68010000000000000001601f3960005180600014600357640badc0ffee60",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x5246",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffffadb0",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x368b88a2614b03725ac64cec0ef73009aaa11390385f0273541932e152f03900",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x368b88a2614b03725ac64cec0ef73009aaa11390385f0273541932e152f03900",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x368b88a2614b03725ac64cec0ef73009aaa11390385f0273541932e152f03900",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x368b88a2614b03725ac64cec0ef73009aaa11390385f0273541932e152f03900",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x6005565b005b600a68010000000000000001601f3960005180600014600357640badc0ffee60",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x5246",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffffadb0",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
"code" : "0x6005565b005b600a68010000000000000001601f3960005180600014600357640badc0ffee60",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +102,14 @@
""
],
"gasLimit" : [
- "0x0a00000000"
+ "42949672960"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/extcodecopy_dejavu.json b/GeneralStateTests/stMemoryTest/extcodecopy_dejavu.json
index af0fef4c4..b5ff89588 100644
--- a/GeneralStateTests/stMemoryTest/extcodecopy_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/extcodecopy_dejavu.json
@@ -2,81 +2,97 @@
"extcodecopy_dejavu" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/extcodecopy_dejavuFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x7db301c0754d4f94248fcc32e831c45b1a730331848fe6b51d1381b3b08ba403",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x60ff60ff630fffffff630fffffff3c",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0a00000000",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x5a00000000",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x7db301c0754d4f94248fcc32e831c45b1a730331848fe6b51d1381b3b08ba403",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x7db301c0754d4f94248fcc32e831c45b1a730331848fe6b51d1381b3b08ba403",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x7db301c0754d4f94248fcc32e831c45b1a730331848fe6b51d1381b3b08ba403",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x7db301c0754d4f94248fcc32e831c45b1a730331848fe6b51d1381b3b08ba403",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x60ff60ff630fffffff630fffffff3c",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0a00000000",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x5a00000000",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x60ff60ff630fffffff630fffffff3c",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x60FF60FF630FFFFFFF630FFFFFFF3C",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +102,14 @@
""
],
"gasLimit" : [
- "0x0a00000000"
+ "42949672960"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/log1_dejavu.json b/GeneralStateTests/stMemoryTest/log1_dejavu.json
index 4719ae7ee..46a710833 100644
--- a/GeneralStateTests/stMemoryTest/log1_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/log1_dejavu.json
@@ -2,81 +2,97 @@
"log1_dejavu" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/log1_dejavuFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x236e71ab7e9bce4137b479cabfe2691738eb87b7e9221f69feab810e8d2d5def",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x60ff60ff630fffffffa1",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0a00000000",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x5a00000000",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x236e71ab7e9bce4137b479cabfe2691738eb87b7e9221f69feab810e8d2d5def",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x236e71ab7e9bce4137b479cabfe2691738eb87b7e9221f69feab810e8d2d5def",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x236e71ab7e9bce4137b479cabfe2691738eb87b7e9221f69feab810e8d2d5def",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x236e71ab7e9bce4137b479cabfe2691738eb87b7e9221f69feab810e8d2d5def",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x60ff60ff630fffffffa1",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0a00000000",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x5a00000000",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x60ff60ff630fffffffa1",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x60FF60FF630FFFFFFFA1",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +102,14 @@
""
],
"gasLimit" : [
- "0x0a00000000"
+ "42949672960"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/log2_dejavu.json b/GeneralStateTests/stMemoryTest/log2_dejavu.json
index cedab4691..0395b685c 100644
--- a/GeneralStateTests/stMemoryTest/log2_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/log2_dejavu.json
@@ -2,81 +2,97 @@
"log2_dejavu" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/log2_dejavuFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x4f5d3d8ba03ebe57a1ae72c00c7604c85a67edd03cc3b86ecbf3dbc760c17383",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x60ff60ff630fffffffa2",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0a00000000",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x5a00000000",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x4f5d3d8ba03ebe57a1ae72c00c7604c85a67edd03cc3b86ecbf3dbc760c17383",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x4f5d3d8ba03ebe57a1ae72c00c7604c85a67edd03cc3b86ecbf3dbc760c17383",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x4f5d3d8ba03ebe57a1ae72c00c7604c85a67edd03cc3b86ecbf3dbc760c17383",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x4f5d3d8ba03ebe57a1ae72c00c7604c85a67edd03cc3b86ecbf3dbc760c17383",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x60ff60ff630fffffffa2",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0a00000000",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x5a00000000",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x60ff60ff630fffffffa2",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x60FF60FF630FFFFFFFA2",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +102,14 @@
""
],
"gasLimit" : [
- "0x0a00000000"
+ "42949672960"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/log3_dejavu.json b/GeneralStateTests/stMemoryTest/log3_dejavu.json
index b54940d5d..d57d16e01 100644
--- a/GeneralStateTests/stMemoryTest/log3_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/log3_dejavu.json
@@ -2,81 +2,97 @@
"log3_dejavu" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/log3_dejavuFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x60ff60ff60ff630fffffffa2",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0a00000000",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x5a00000000",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x60ff60ff60ff630fffffffa2",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0a00000000",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x5a00000000",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x60ff60ff60ff630fffffffa2",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x60FF60FF60FF630FFFFFFFA2",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +102,14 @@
""
],
"gasLimit" : [
- "0x0a00000000"
+ "42949672960"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/log4_dejavu.json b/GeneralStateTests/stMemoryTest/log4_dejavu.json
index 847c7ec8a..7c069b11f 100644
--- a/GeneralStateTests/stMemoryTest/log4_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/log4_dejavu.json
@@ -2,81 +2,97 @@
"log4_dejavu" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/log4_dejavuFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x60ff60ff60ff630fffffffa2",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0a00000000",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x5a00000000",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x60ff60ff60ff630fffffffa2",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0a00000000",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x5a00000000",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x60ff60ff60ff630fffffffa2",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x60FF60FF60FF630FFFFFFFA2",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +102,14 @@
""
],
"gasLimit" : [
- "0x0a00000000"
+ "42949672960"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem0b_singleByte.json b/GeneralStateTests/stMemoryTest/mem0b_singleByte.json
index 177f299d9..a5f7ec3d0 100644
--- a/GeneralStateTests/stMemoryTest/mem0b_singleByte.json
+++ b/GeneralStateTests/stMemoryTest/mem0b_singleByte.json
@@ -2,81 +2,99 @@
"mem0b_singleByte" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem0b_singleByteFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0xe0efa836f999455740148dc120dc5f2344ad3b3c1323dca3852268d7b243d0ec",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a60005359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x20"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xa039",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff5fbd",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xe0efa836f999455740148dc120dc5f2344ad3b3c1323dca3852268d7b243d0ec",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0xe0efa836f999455740148dc120dc5f2344ad3b3c1323dca3852268d7b243d0ec",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0xe0efa836f999455740148dc120dc5f2344ad3b3c1323dca3852268d7b243d0ec",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xe0efa836f999455740148dc120dc5f2344ad3b3c1323dca3852268d7b243d0ec",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a60005359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x20"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xa039",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff5fbd",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a60005359600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE8 0 42) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +104,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem31b_singleByte.json b/GeneralStateTests/stMemoryTest/mem31b_singleByte.json
index 7f6ee2fce..6648e47b5 100644
--- a/GeneralStateTests/stMemoryTest/mem31b_singleByte.json
+++ b/GeneralStateTests/stMemoryTest/mem31b_singleByte.json
@@ -2,81 +2,99 @@
"mem31b_singleByte" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem31b_singleByteFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x604b731508388ec89df1d255944de348916844d5bd6c301ddc9cda6b78587154",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a601e5359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x20"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xa039",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff5fbd",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x604b731508388ec89df1d255944de348916844d5bd6c301ddc9cda6b78587154",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x604b731508388ec89df1d255944de348916844d5bd6c301ddc9cda6b78587154",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x604b731508388ec89df1d255944de348916844d5bd6c301ddc9cda6b78587154",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x604b731508388ec89df1d255944de348916844d5bd6c301ddc9cda6b78587154",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a601e5359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x20"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xa039",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff5fbd",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a601e5359600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE8 30 42) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +104,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem32b_singleByte.json b/GeneralStateTests/stMemoryTest/mem32b_singleByte.json
index c11fb074a..ed9287145 100644
--- a/GeneralStateTests/stMemoryTest/mem32b_singleByte.json
+++ b/GeneralStateTests/stMemoryTest/mem32b_singleByte.json
@@ -2,81 +2,99 @@
"mem32b_singleByte" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem32b_singleByteFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x37091fe21c4e51aec98d8c91dd43221caa0299562e7e6408f30a26c7d3f42b3e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a601f5359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x20"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xa039",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff5fbd",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x37091fe21c4e51aec98d8c91dd43221caa0299562e7e6408f30a26c7d3f42b3e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x37091fe21c4e51aec98d8c91dd43221caa0299562e7e6408f30a26c7d3f42b3e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x37091fe21c4e51aec98d8c91dd43221caa0299562e7e6408f30a26c7d3f42b3e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x37091fe21c4e51aec98d8c91dd43221caa0299562e7e6408f30a26c7d3f42b3e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a601f5359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x20"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xa039",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff5fbd",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a601f5359600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE8 31 42) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +104,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem32kb+1.json b/GeneralStateTests/stMemoryTest/mem32kb+1.json
index 15638762d..f6e35ee3c 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb+1.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb+1.json
@@ -2,81 +2,101 @@
"mem32kb+1" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+1Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x171d90f0d7d4dc497acbb9ae9293ab906ace85e65f13fb3088bdbd021e46097e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617ce152617ce15160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7d20",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0101bf",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffefe37",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x171d90f0d7d4dc497acbb9ae9293ab906ace85e65f13fb3088bdbd021e46097e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x171d90f0d7d4dc497acbb9ae9293ab906ace85e65f13fb3088bdbd021e46097e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x171d90f0d7d4dc497acbb9ae9293ab906ace85e65f13fb3088bdbd021e46097e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x171d90f0d7d4dc497acbb9ae9293ab906ace85e65f13fb3088bdbd021e46097e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617ce152617ce15160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7d20",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0101bf",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffefe37",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a617ce152617ce15160015559600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 31969 42) [[ 1 ]] (MLOAD 31969) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +106,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem32kb+31.json b/GeneralStateTests/stMemoryTest/mem32kb+31.json
index b83848804..c12800185 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb+31.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb+31.json
@@ -2,81 +2,101 @@
"mem32kb+31" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+31Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x431025fb6f5dfd2375add19f1c807edbde060fc825224234b00c1e6bed33693b",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617cff52617cff5160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7d20",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0101bf",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffefe37",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x431025fb6f5dfd2375add19f1c807edbde060fc825224234b00c1e6bed33693b",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x431025fb6f5dfd2375add19f1c807edbde060fc825224234b00c1e6bed33693b",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x431025fb6f5dfd2375add19f1c807edbde060fc825224234b00c1e6bed33693b",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x431025fb6f5dfd2375add19f1c807edbde060fc825224234b00c1e6bed33693b",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617cff52617cff5160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7d20",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0101bf",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffefe37",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a617cff52617cff5160015559600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 31999 42) [[ 1 ]] (MLOAD 31999) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +106,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem32kb+32.json b/GeneralStateTests/stMemoryTest/mem32kb+32.json
index fbb3cafaf..53e139bd7 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb+32.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb+32.json
@@ -2,81 +2,101 @@
"mem32kb+32" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+32Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x8300e03f4530881e7bf38b31e76bf0ea8b0661b8999bb5c6ed79d548a250fd3f",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617d0052617d005160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7d20",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0101bf",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffefe37",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x8300e03f4530881e7bf38b31e76bf0ea8b0661b8999bb5c6ed79d548a250fd3f",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x8300e03f4530881e7bf38b31e76bf0ea8b0661b8999bb5c6ed79d548a250fd3f",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x8300e03f4530881e7bf38b31e76bf0ea8b0661b8999bb5c6ed79d548a250fd3f",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x8300e03f4530881e7bf38b31e76bf0ea8b0661b8999bb5c6ed79d548a250fd3f",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617d0052617d005160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7d20",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0101bf",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffefe37",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a617d0052617d005160015559600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 32000 42) [[ 1 ]] (MLOAD 32000) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +106,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem32kb+33.json b/GeneralStateTests/stMemoryTest/mem32kb+33.json
index 6f084ad14..08a22b25c 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb+33.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb+33.json
@@ -2,81 +2,101 @@
"mem32kb+33" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+33Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x5aeebda7bc76659e25766c04d5e1d33ca3330a057e443093c675cba86c8eba22",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617d0152617d015160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7d40",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0101c5",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffefe31",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x5aeebda7bc76659e25766c04d5e1d33ca3330a057e443093c675cba86c8eba22",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x5aeebda7bc76659e25766c04d5e1d33ca3330a057e443093c675cba86c8eba22",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x5aeebda7bc76659e25766c04d5e1d33ca3330a057e443093c675cba86c8eba22",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x5aeebda7bc76659e25766c04d5e1d33ca3330a057e443093c675cba86c8eba22",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617d0152617d015160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7d40",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0101c5",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffefe31",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a617d0152617d015160015559600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 32001 42) [[ 1 ]] (MLOAD 32001) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +106,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem32kb-1.json b/GeneralStateTests/stMemoryTest/mem32kb-1.json
index dc60ed455..bfbac7652 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb-1.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb-1.json
@@ -2,81 +2,101 @@
"mem32kb-1" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-1Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x74214f4526e90cf38bfaf0df1b0dde9bdde8f28ff7018eb82efba1a27d46df37",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617cdf52617cdf5160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7d00",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0101b8",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffefe3e",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x74214f4526e90cf38bfaf0df1b0dde9bdde8f28ff7018eb82efba1a27d46df37",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x74214f4526e90cf38bfaf0df1b0dde9bdde8f28ff7018eb82efba1a27d46df37",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x74214f4526e90cf38bfaf0df1b0dde9bdde8f28ff7018eb82efba1a27d46df37",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x74214f4526e90cf38bfaf0df1b0dde9bdde8f28ff7018eb82efba1a27d46df37",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617cdf52617cdf5160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7d00",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0101b8",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffefe3e",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a617cdf52617cdf5160015559600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 31967 42) [[ 1 ]] (MLOAD 31967) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +106,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem32kb-31.json b/GeneralStateTests/stMemoryTest/mem32kb-31.json
index 1476b51f8..c53559ede 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb-31.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb-31.json
@@ -2,81 +2,101 @@
"mem32kb-31" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-31Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0xf8d026ebbc585731386c6ea601053567cc8a61cb5d6f914b2ca998434fcaf08d",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617cc152617cc15160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7d00",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0101b8",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffefe3e",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xf8d026ebbc585731386c6ea601053567cc8a61cb5d6f914b2ca998434fcaf08d",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0xf8d026ebbc585731386c6ea601053567cc8a61cb5d6f914b2ca998434fcaf08d",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0xf8d026ebbc585731386c6ea601053567cc8a61cb5d6f914b2ca998434fcaf08d",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xf8d026ebbc585731386c6ea601053567cc8a61cb5d6f914b2ca998434fcaf08d",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617cc152617cc15160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7d00",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0101b8",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffefe3e",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a617cc152617cc15160015559600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 31937 42) [[ 1 ]] (MLOAD 31937) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +106,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem32kb-32.json b/GeneralStateTests/stMemoryTest/mem32kb-32.json
index 8ce6a4af5..1ac9d36c8 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb-32.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb-32.json
@@ -2,81 +2,101 @@
"mem32kb-32" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-32Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0xf2ccd3bdd3afd712768712179ccd506a4711ceee3a6903be053399a74077ac61",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617cc052617cc05160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7ce0",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0101b1",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffefe45",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xf2ccd3bdd3afd712768712179ccd506a4711ceee3a6903be053399a74077ac61",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0xf2ccd3bdd3afd712768712179ccd506a4711ceee3a6903be053399a74077ac61",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0xf2ccd3bdd3afd712768712179ccd506a4711ceee3a6903be053399a74077ac61",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xf2ccd3bdd3afd712768712179ccd506a4711ceee3a6903be053399a74077ac61",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617cc052617cc05160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7ce0",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0101b1",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffefe45",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a617cc052617cc05160015559600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 31936 42) [[ 1 ]] (MLOAD 31936) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +106,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem32kb-33.json b/GeneralStateTests/stMemoryTest/mem32kb-33.json
index a4cc3c52f..280b3ab99 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb-33.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb-33.json
@@ -2,81 +2,101 @@
"mem32kb-33" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-33Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x55bd72cef2f9d05ec55e05fd8117ddab58ef72135d61be72e3a346d262c9f078",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617cbf52617cbf5160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7ce0",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0101b1",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffefe45",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x55bd72cef2f9d05ec55e05fd8117ddab58ef72135d61be72e3a346d262c9f078",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x55bd72cef2f9d05ec55e05fd8117ddab58ef72135d61be72e3a346d262c9f078",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x55bd72cef2f9d05ec55e05fd8117ddab58ef72135d61be72e3a346d262c9f078",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x55bd72cef2f9d05ec55e05fd8117ddab58ef72135d61be72e3a346d262c9f078",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617cbf52617cbf5160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7ce0",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0101b1",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffefe45",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a617cbf52617cbf5160015559600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 31935 42) [[ 1 ]] (MLOAD 31935) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +106,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem32kb.json b/GeneralStateTests/stMemoryTest/mem32kb.json
index 1b7563b0e..c86dffa7b 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb.json
@@ -2,81 +2,101 @@
"mem32kb" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem32kbFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x89e9ff8359f5e43c9c09a84961d7ab11f4d939c1aa4698f86324e13a3b2cb60f",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617ce052617ce05160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7d00",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0101b8",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffefe3e",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x89e9ff8359f5e43c9c09a84961d7ab11f4d939c1aa4698f86324e13a3b2cb60f",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x89e9ff8359f5e43c9c09a84961d7ab11f4d939c1aa4698f86324e13a3b2cb60f",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x89e9ff8359f5e43c9c09a84961d7ab11f4d939c1aa4698f86324e13a3b2cb60f",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x89e9ff8359f5e43c9c09a84961d7ab11f4d939c1aa4698f86324e13a3b2cb60f",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617ce052617ce05160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7d00",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0101b8",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffefe3e",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a617ce052617ce05160015559600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 31968 42) [[ 1 ]] (MLOAD 31968) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +106,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+1.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+1.json
index d98ea0d88..8805eed93 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+1.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+1.json
@@ -2,81 +2,99 @@
"mem32kb_singleByte+1" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+1Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0xbce6091d727ff3b6b29ce187a343cf270ecb87fde937d65d32d41d5c4a7d7119",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617d005359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7d20"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xb396",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff4c60",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xbce6091d727ff3b6b29ce187a343cf270ecb87fde937d65d32d41d5c4a7d7119",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0xbce6091d727ff3b6b29ce187a343cf270ecb87fde937d65d32d41d5c4a7d7119",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0xbce6091d727ff3b6b29ce187a343cf270ecb87fde937d65d32d41d5c4a7d7119",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xbce6091d727ff3b6b29ce187a343cf270ecb87fde937d65d32d41d5c4a7d7119",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617d005359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7d20"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xb396",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff4c60",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a617d005359600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE8 32000 42) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +104,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+31.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+31.json
index 9cc85a202..a619e7507 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+31.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+31.json
@@ -2,81 +2,99 @@
"mem32kb_singleByte+31" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+31Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x1cab92d6e5feda6736ef0b0714a018652323598895059e9e36da278c45c871a8",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617d1e5359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7d20"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xb396",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff4c60",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x1cab92d6e5feda6736ef0b0714a018652323598895059e9e36da278c45c871a8",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x1cab92d6e5feda6736ef0b0714a018652323598895059e9e36da278c45c871a8",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x1cab92d6e5feda6736ef0b0714a018652323598895059e9e36da278c45c871a8",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x1cab92d6e5feda6736ef0b0714a018652323598895059e9e36da278c45c871a8",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617d1e5359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7d20"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xb396",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff4c60",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a617d1e5359600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE8 32030 42) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +104,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+32.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+32.json
index ed18bd13e..00b000867 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+32.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+32.json
@@ -2,81 +2,99 @@
"mem32kb_singleByte+32" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+32Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x75efddbdc85b42ff3c7550bf024c89151a8ea87d117ecadedfd6e7581e5f358d",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617d1f5359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7d20"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xb396",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff4c60",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x75efddbdc85b42ff3c7550bf024c89151a8ea87d117ecadedfd6e7581e5f358d",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x75efddbdc85b42ff3c7550bf024c89151a8ea87d117ecadedfd6e7581e5f358d",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x75efddbdc85b42ff3c7550bf024c89151a8ea87d117ecadedfd6e7581e5f358d",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x75efddbdc85b42ff3c7550bf024c89151a8ea87d117ecadedfd6e7581e5f358d",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617d1f5359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7d20"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xb396",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff4c60",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a617d1f5359600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE8 32031 42) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +104,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+33.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+33.json
index eba46b0ad..9e5ff504b 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+33.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+33.json
@@ -2,81 +2,99 @@
"mem32kb_singleByte+33" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+33Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x07b152dfa501fa5581f636f29e759de90c51922b9d2b7cc92ddb8d284049a911",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617d205359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7d40"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xb39c",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff4c5a",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x07b152dfa501fa5581f636f29e759de90c51922b9d2b7cc92ddb8d284049a911",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x07b152dfa501fa5581f636f29e759de90c51922b9d2b7cc92ddb8d284049a911",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x07b152dfa501fa5581f636f29e759de90c51922b9d2b7cc92ddb8d284049a911",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x07b152dfa501fa5581f636f29e759de90c51922b9d2b7cc92ddb8d284049a911",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617d205359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7d40"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xb39c",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff4c5a",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a617d205359600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE8 32032 42) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +104,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-1.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-1.json
index 537eb64c4..333c86943 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-1.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-1.json
@@ -2,81 +2,99 @@
"mem32kb_singleByte-1" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-1Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0xdfaacf050276c37e00aa5cbbcdc87a77cedf780556330796cb6dd775498c7585",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617cfe5359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7d00"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xb38f",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff4c67",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xdfaacf050276c37e00aa5cbbcdc87a77cedf780556330796cb6dd775498c7585",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0xdfaacf050276c37e00aa5cbbcdc87a77cedf780556330796cb6dd775498c7585",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0xdfaacf050276c37e00aa5cbbcdc87a77cedf780556330796cb6dd775498c7585",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xdfaacf050276c37e00aa5cbbcdc87a77cedf780556330796cb6dd775498c7585",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617cfe5359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7d00"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xb38f",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff4c67",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a617cfe5359600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE8 31998 42) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +104,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-31.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-31.json
index 0c0fc2c4d..36729b120 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-31.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-31.json
@@ -2,81 +2,99 @@
"mem32kb_singleByte-31" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-31Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x91e686a5caf72969cc88c885746cefa69b3089a80543eb9c75f2f2ce822b1e08",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617ce05359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7d00"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xb38f",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff4c67",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x91e686a5caf72969cc88c885746cefa69b3089a80543eb9c75f2f2ce822b1e08",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x91e686a5caf72969cc88c885746cefa69b3089a80543eb9c75f2f2ce822b1e08",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x91e686a5caf72969cc88c885746cefa69b3089a80543eb9c75f2f2ce822b1e08",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x91e686a5caf72969cc88c885746cefa69b3089a80543eb9c75f2f2ce822b1e08",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617ce05359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7d00"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xb38f",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff4c67",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a617ce05359600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE8 31968 42) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +104,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-32.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-32.json
index e303fda62..60b946d1a 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-32.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-32.json
@@ -2,81 +2,99 @@
"mem32kb_singleByte-32" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-32Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x656252dfd066c252bc1a9c8b26fd3872596a192ce72b2fa09eb7148deef623a1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617cdf5359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7ce0"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xb388",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff4c6e",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x656252dfd066c252bc1a9c8b26fd3872596a192ce72b2fa09eb7148deef623a1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x656252dfd066c252bc1a9c8b26fd3872596a192ce72b2fa09eb7148deef623a1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x656252dfd066c252bc1a9c8b26fd3872596a192ce72b2fa09eb7148deef623a1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x656252dfd066c252bc1a9c8b26fd3872596a192ce72b2fa09eb7148deef623a1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617cdf5359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7ce0"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xb388",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff4c6e",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a617cdf5359600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE8 31967 42) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +104,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-33.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-33.json
index c14a82319..58fff6e80 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-33.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-33.json
@@ -2,81 +2,99 @@
"mem32kb_singleByte-33" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-33Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x176a30044205d80912efbb8c7ce308991823647e10a9bc68059ec54f086472f5",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617cde5359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7ce0"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xb388",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff4c6e",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x176a30044205d80912efbb8c7ce308991823647e10a9bc68059ec54f086472f5",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x176a30044205d80912efbb8c7ce308991823647e10a9bc68059ec54f086472f5",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x176a30044205d80912efbb8c7ce308991823647e10a9bc68059ec54f086472f5",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x176a30044205d80912efbb8c7ce308991823647e10a9bc68059ec54f086472f5",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617cde5359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7ce0"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xb388",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff4c6e",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a617cde5359600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE8 31966 42) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +104,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte.json
index 312a5d34a..2bb24ab9b 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte.json
@@ -2,81 +2,99 @@
"mem32kb_singleByte" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByteFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x40285d734359495522cfab98a87348a90ecc13735492c974c58ffa9965e39b21",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617cff5359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7d00"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xb38f",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff4c67",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x40285d734359495522cfab98a87348a90ecc13735492c974c58ffa9965e39b21",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x40285d734359495522cfab98a87348a90ecc13735492c974c58ffa9965e39b21",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x40285d734359495522cfab98a87348a90ecc13735492c974c58ffa9965e39b21",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x40285d734359495522cfab98a87348a90ecc13735492c974c58ffa9965e39b21",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a617cff5359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x7d00"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xb38f",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff4c67",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a617cff5359600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE8 31999 42) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +104,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem33b_singleByte.json b/GeneralStateTests/stMemoryTest/mem33b_singleByte.json
index d289fb691..898d6a275 100644
--- a/GeneralStateTests/stMemoryTest/mem33b_singleByte.json
+++ b/GeneralStateTests/stMemoryTest/mem33b_singleByte.json
@@ -2,81 +2,99 @@
"mem33b_singleByte" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem33b_singleByteFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x8c85aa000727196f46d60276a9d5f7e5f1fa3c227564037d4e67f485acc28143",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a60205359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x40"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xa03c",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff5fba",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x8c85aa000727196f46d60276a9d5f7e5f1fa3c227564037d4e67f485acc28143",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x8c85aa000727196f46d60276a9d5f7e5f1fa3c227564037d4e67f485acc28143",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x8c85aa000727196f46d60276a9d5f7e5f1fa3c227564037d4e67f485acc28143",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x8c85aa000727196f46d60276a9d5f7e5f1fa3c227564037d4e67f485acc28143",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a60205359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x40"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xa03c",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff5fba",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a60205359600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE8 32 42) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +104,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem64kb+1.json b/GeneralStateTests/stMemoryTest/mem64kb+1.json
index 489202cc2..c6cb66482 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb+1.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb+1.json
@@ -2,81 +2,101 @@
"mem64kb+1" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+1Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x3fd0c39dc30723b802d138155edd2d9799d1a5a9f099188e93a177fdaf230b9a",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61f9e15261f9e15160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xfa20",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x01245e",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffedb98",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x3fd0c39dc30723b802d138155edd2d9799d1a5a9f099188e93a177fdaf230b9a",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x3fd0c39dc30723b802d138155edd2d9799d1a5a9f099188e93a177fdaf230b9a",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x3fd0c39dc30723b802d138155edd2d9799d1a5a9f099188e93a177fdaf230b9a",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x3fd0c39dc30723b802d138155edd2d9799d1a5a9f099188e93a177fdaf230b9a",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61f9e15261f9e15160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xfa20",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x01245e",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffedb98",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a61f9e15261f9e15160015559600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 63969 42) [[ 1 ]] (MLOAD 63969) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +106,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem64kb+31.json b/GeneralStateTests/stMemoryTest/mem64kb+31.json
index 5a1cbd9d8..41e3b62a5 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb+31.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb+31.json
@@ -2,81 +2,101 @@
"mem64kb+31" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+31Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x4672c61dc31cdc14f6549392777b8e6be4290c41b4d49d76f9928843d8d6020b",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61f9ff5261f9ff5160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xfa20",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x01245e",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffedb98",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x4672c61dc31cdc14f6549392777b8e6be4290c41b4d49d76f9928843d8d6020b",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x4672c61dc31cdc14f6549392777b8e6be4290c41b4d49d76f9928843d8d6020b",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x4672c61dc31cdc14f6549392777b8e6be4290c41b4d49d76f9928843d8d6020b",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x4672c61dc31cdc14f6549392777b8e6be4290c41b4d49d76f9928843d8d6020b",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61f9ff5261f9ff5160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xfa20",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x01245e",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffedb98",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a61f9ff5261f9ff5160015559600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 63999 42) [[ 1 ]] (MLOAD 63999) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +106,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem64kb+32.json b/GeneralStateTests/stMemoryTest/mem64kb+32.json
index 6eee3c452..7a95a9c02 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb+32.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb+32.json
@@ -2,81 +2,101 @@
"mem64kb+32" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+32Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x749757456f4bf99685777d121180aa1b8824cfe2096fed7fa98220e5f3043fda",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61fa005261fa005160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xfa20",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x01245e",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffedb98",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x749757456f4bf99685777d121180aa1b8824cfe2096fed7fa98220e5f3043fda",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x749757456f4bf99685777d121180aa1b8824cfe2096fed7fa98220e5f3043fda",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x749757456f4bf99685777d121180aa1b8824cfe2096fed7fa98220e5f3043fda",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x749757456f4bf99685777d121180aa1b8824cfe2096fed7fa98220e5f3043fda",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61fa005261fa005160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xfa20",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x01245e",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffedb98",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a61fa005261fa005160015559600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 64000 42) [[ 1 ]] (MLOAD 64000) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +106,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem64kb+33.json b/GeneralStateTests/stMemoryTest/mem64kb+33.json
index 7e5709d23..5cb81c22d 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb+33.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb+33.json
@@ -2,81 +2,101 @@
"mem64kb+33" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+33Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x2b3c2cfc0fe0a279d8198025a6b6e4d840a4e93308276e89a52ab4d047bbfd24",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61fa015261fa015160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xfa40",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x012469",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffedb8d",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x2b3c2cfc0fe0a279d8198025a6b6e4d840a4e93308276e89a52ab4d047bbfd24",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x2b3c2cfc0fe0a279d8198025a6b6e4d840a4e93308276e89a52ab4d047bbfd24",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x2b3c2cfc0fe0a279d8198025a6b6e4d840a4e93308276e89a52ab4d047bbfd24",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x2b3c2cfc0fe0a279d8198025a6b6e4d840a4e93308276e89a52ab4d047bbfd24",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61fa015261fa015160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xfa40",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x012469",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffedb8d",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a61fa015261fa015160015559600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 64001 42) [[ 1 ]] (MLOAD 64001) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +106,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem64kb-1.json b/GeneralStateTests/stMemoryTest/mem64kb-1.json
index e78565390..31888c593 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb-1.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb-1.json
@@ -2,81 +2,101 @@
"mem64kb-1" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-1Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x9865c60dd34920cc8b049c244fbfbe6a5525290ba78b323680ee9e6ee44d302a",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61f9df5261f9df5160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xfa00",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x012453",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffedba3",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x9865c60dd34920cc8b049c244fbfbe6a5525290ba78b323680ee9e6ee44d302a",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x9865c60dd34920cc8b049c244fbfbe6a5525290ba78b323680ee9e6ee44d302a",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x9865c60dd34920cc8b049c244fbfbe6a5525290ba78b323680ee9e6ee44d302a",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x9865c60dd34920cc8b049c244fbfbe6a5525290ba78b323680ee9e6ee44d302a",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61f9df5261f9df5160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xfa00",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x012453",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffedba3",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a61f9df5261f9df5160015559600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 63967 42) [[ 1 ]] (MLOAD 63967) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +106,14 @@
""
],
"gasLimit" : [
- "0x500018d8"
+ "1342183640"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem64kb-31.json b/GeneralStateTests/stMemoryTest/mem64kb-31.json
index 411465a72..bbcaa071d 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb-31.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb-31.json
@@ -2,81 +2,101 @@
"mem64kb-31" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-31Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0xfd3557635cb0b3fc93f76329006b2358ed056c1d8e63ae95fd218e5d77a34c97",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61f9c15261f9c15160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xfa00",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x012453",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffedba3",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xfd3557635cb0b3fc93f76329006b2358ed056c1d8e63ae95fd218e5d77a34c97",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0xfd3557635cb0b3fc93f76329006b2358ed056c1d8e63ae95fd218e5d77a34c97",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0xfd3557635cb0b3fc93f76329006b2358ed056c1d8e63ae95fd218e5d77a34c97",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xfd3557635cb0b3fc93f76329006b2358ed056c1d8e63ae95fd218e5d77a34c97",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61f9c15261f9c15160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xfa00",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x012453",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffedba3",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a61f9c15261f9c15160015559600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 63937 42) [[ 1 ]] (MLOAD 63937) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +106,14 @@
""
],
"gasLimit" : [
- "0x500018d8"
+ "1342183640"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem64kb-32.json b/GeneralStateTests/stMemoryTest/mem64kb-32.json
index dfb1fbfea..3afc43de2 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb-32.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb-32.json
@@ -2,81 +2,101 @@
"mem64kb-32" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-32Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0xbb8997f7b498ae27647ba01f44e89446b901ccb9cc31167c2c980a420aaa7ff1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61f9c05261f9c05160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xf9e0",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x012448",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffedbae",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xbb8997f7b498ae27647ba01f44e89446b901ccb9cc31167c2c980a420aaa7ff1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0xbb8997f7b498ae27647ba01f44e89446b901ccb9cc31167c2c980a420aaa7ff1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0xbb8997f7b498ae27647ba01f44e89446b901ccb9cc31167c2c980a420aaa7ff1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xbb8997f7b498ae27647ba01f44e89446b901ccb9cc31167c2c980a420aaa7ff1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61f9c05261f9c05160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xf9e0",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x012448",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffedbae",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a61f9c05261f9c05160015559600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 63936 42) [[ 1 ]] (MLOAD 63936) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +106,14 @@
""
],
"gasLimit" : [
- "0x500018d8"
+ "1342183640"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem64kb-33.json b/GeneralStateTests/stMemoryTest/mem64kb-33.json
index 80fe02d28..7ee03c120 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb-33.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb-33.json
@@ -2,81 +2,101 @@
"mem64kb-33" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-33Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0xa631dedf42e2d3c1716243107eb5e916b9a24c36dae8943bf785bda6b9f07607",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61f9bf5261f9bf5160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xf9e0",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x012448",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffedbae",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xa631dedf42e2d3c1716243107eb5e916b9a24c36dae8943bf785bda6b9f07607",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0xa631dedf42e2d3c1716243107eb5e916b9a24c36dae8943bf785bda6b9f07607",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0xa631dedf42e2d3c1716243107eb5e916b9a24c36dae8943bf785bda6b9f07607",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xa631dedf42e2d3c1716243107eb5e916b9a24c36dae8943bf785bda6b9f07607",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61f9bf5261f9bf5160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xf9e0",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x012448",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffedbae",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a61f9bf5261f9bf5160015559600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 63935 42) [[ 1 ]] (MLOAD 63935) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +106,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem64kb.json b/GeneralStateTests/stMemoryTest/mem64kb.json
index 927b20fb4..ee88d83db 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb.json
@@ -2,81 +2,101 @@
"mem64kb" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem64kbFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0xbae3c3d010418555a351cd124aa6260c2b97744a53c3f69239099e890e03183c",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61f9e05261f9e05160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xfa00",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x012453",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffedba3",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xbae3c3d010418555a351cd124aa6260c2b97744a53c3f69239099e890e03183c",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0xbae3c3d010418555a351cd124aa6260c2b97744a53c3f69239099e890e03183c",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0xbae3c3d010418555a351cd124aa6260c2b97744a53c3f69239099e890e03183c",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xbae3c3d010418555a351cd124aa6260c2b97744a53c3f69239099e890e03183c",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61f9e05261f9e05160015559600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xfa00",
+ "0x01" : "0x2a"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x012453",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffedba3",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a61f9e05261f9e05160015559600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 63968 42) [[ 1 ]] (MLOAD 63968) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +106,14 @@
""
],
"gasLimit" : [
- "0x500018d8"
+ "1342183640"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+1.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+1.json
index 4f26c1e37..e832921e7 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+1.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+1.json
@@ -2,81 +2,99 @@
"mem64kb_singleByte+1" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+1Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0xfc23dd420b833dbfcf772497eff7a70a6bc226629092097461cac9ce73cdc67a",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61fa005359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xfa20"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xd635",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff29c1",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xfc23dd420b833dbfcf772497eff7a70a6bc226629092097461cac9ce73cdc67a",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0xfc23dd420b833dbfcf772497eff7a70a6bc226629092097461cac9ce73cdc67a",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0xfc23dd420b833dbfcf772497eff7a70a6bc226629092097461cac9ce73cdc67a",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xfc23dd420b833dbfcf772497eff7a70a6bc226629092097461cac9ce73cdc67a",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61fa005359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xfa20"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xd635",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff29c1",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a61fa005359600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE8 64000 42) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +104,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+31.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+31.json
index 764517f02..f339584e4 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+31.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+31.json
@@ -2,81 +2,99 @@
"mem64kb_singleByte+31" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+31Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x3c64f6daf9a82afa20b701121f233c206266672f7c31483c2d1c6b672dcce3a4",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61fa1e5359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xfa20"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xd635",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff29c1",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x3c64f6daf9a82afa20b701121f233c206266672f7c31483c2d1c6b672dcce3a4",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x3c64f6daf9a82afa20b701121f233c206266672f7c31483c2d1c6b672dcce3a4",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x3c64f6daf9a82afa20b701121f233c206266672f7c31483c2d1c6b672dcce3a4",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x3c64f6daf9a82afa20b701121f233c206266672f7c31483c2d1c6b672dcce3a4",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61fa1e5359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xfa20"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xd635",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff29c1",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a61fa1e5359600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE8 64030 42) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +104,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+32.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+32.json
index 6dc4607e6..c3a4447c1 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+32.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+32.json
@@ -2,81 +2,99 @@
"mem64kb_singleByte+32" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+32Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0xdf6fea74bff863af3b7cad335c92752c62a8f98ca94608d9976d841fc4125978",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61fa1f5359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xfa20"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xd635",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff29c1",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xdf6fea74bff863af3b7cad335c92752c62a8f98ca94608d9976d841fc4125978",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0xdf6fea74bff863af3b7cad335c92752c62a8f98ca94608d9976d841fc4125978",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0xdf6fea74bff863af3b7cad335c92752c62a8f98ca94608d9976d841fc4125978",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xdf6fea74bff863af3b7cad335c92752c62a8f98ca94608d9976d841fc4125978",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61fa1f5359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xfa20"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xd635",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff29c1",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a61fa1f5359600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE8 64031 42) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +104,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+33.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+33.json
index e8ed1a67c..a79e8e8f2 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+33.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+33.json
@@ -2,81 +2,99 @@
"mem64kb_singleByte+33" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+33Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0xdc9d2ddccb9a13e924b6792d42425ac4315003cc25d99ca08babfd650bb011c7",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61fa205359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xfa40"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xd640",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff29b6",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xdc9d2ddccb9a13e924b6792d42425ac4315003cc25d99ca08babfd650bb011c7",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0xdc9d2ddccb9a13e924b6792d42425ac4315003cc25d99ca08babfd650bb011c7",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0xdc9d2ddccb9a13e924b6792d42425ac4315003cc25d99ca08babfd650bb011c7",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xdc9d2ddccb9a13e924b6792d42425ac4315003cc25d99ca08babfd650bb011c7",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61fa205359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xfa40"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xd640",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff29b6",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a61fa205359600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE8 64032 42) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +104,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-1.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-1.json
index 82ecbd98c..3e5201f04 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-1.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-1.json
@@ -2,81 +2,99 @@
"mem64kb_singleByte-1" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-1Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x3134bbc4d51a887ad390a20299609bc4ce33dce55ae5a93cb2f438c9574ee6ba",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61f9fe5359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xfa00"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xd62a",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff29cc",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x3134bbc4d51a887ad390a20299609bc4ce33dce55ae5a93cb2f438c9574ee6ba",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x3134bbc4d51a887ad390a20299609bc4ce33dce55ae5a93cb2f438c9574ee6ba",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x3134bbc4d51a887ad390a20299609bc4ce33dce55ae5a93cb2f438c9574ee6ba",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x3134bbc4d51a887ad390a20299609bc4ce33dce55ae5a93cb2f438c9574ee6ba",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61f9fe5359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xfa00"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xd62a",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff29cc",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a61f9fe5359600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE8 63998 42) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +104,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-31.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-31.json
index a2213c33a..92b506c23 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-31.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-31.json
@@ -2,81 +2,99 @@
"mem64kb_singleByte-31" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-31Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x18f01239fc57124bb4ea01c93cc534a790b83e7a15dbb4a7e6b0e078e6c2e389",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61f9e05359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xfa00"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xd62a",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff29cc",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x18f01239fc57124bb4ea01c93cc534a790b83e7a15dbb4a7e6b0e078e6c2e389",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x18f01239fc57124bb4ea01c93cc534a790b83e7a15dbb4a7e6b0e078e6c2e389",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x18f01239fc57124bb4ea01c93cc534a790b83e7a15dbb4a7e6b0e078e6c2e389",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x18f01239fc57124bb4ea01c93cc534a790b83e7a15dbb4a7e6b0e078e6c2e389",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61f9e05359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xfa00"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xd62a",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff29cc",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a61f9e05359600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE8 63968 42) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +104,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-32.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-32.json
index 80f0e152e..b1a396d74 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-32.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-32.json
@@ -2,81 +2,99 @@
"mem64kb_singleByte-32" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-32Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x1642f55308622bc1a705dc5c3cc62816d433ad263ec5847b62dd51af677930a7",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61f9df5359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xf9e0"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xd61f",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff29d7",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x1642f55308622bc1a705dc5c3cc62816d433ad263ec5847b62dd51af677930a7",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x1642f55308622bc1a705dc5c3cc62816d433ad263ec5847b62dd51af677930a7",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x1642f55308622bc1a705dc5c3cc62816d433ad263ec5847b62dd51af677930a7",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x1642f55308622bc1a705dc5c3cc62816d433ad263ec5847b62dd51af677930a7",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61f9df5359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xf9e0"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xd61f",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff29d7",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a61f9df5359600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE8 63967 42) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +104,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-33.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-33.json
index 08d0c6c1e..e2a3be61c 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-33.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-33.json
@@ -2,81 +2,99 @@
"mem64kb_singleByte-33" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-33Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x01c97ed590df6f0773df08a1fd59b4bfd7771a755443d1c01f17d563b9999bdf",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61f9de5359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xf9e0"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xd61f",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff29d7",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x01c97ed590df6f0773df08a1fd59b4bfd7771a755443d1c01f17d563b9999bdf",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x01c97ed590df6f0773df08a1fd59b4bfd7771a755443d1c01f17d563b9999bdf",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x01c97ed590df6f0773df08a1fd59b4bfd7771a755443d1c01f17d563b9999bdf",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x01c97ed590df6f0773df08a1fd59b4bfd7771a755443d1c01f17d563b9999bdf",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61f9de5359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xf9e0"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xd61f",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff29d7",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a61f9de5359600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE8 63966 42) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +104,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte.json
index 602ab2819..514253424 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte.json
@@ -2,81 +2,99 @@
"mem64kb_singleByte" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByteFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x59bf1a3821d2430a3d3104bc474eb8937c974be0f1d730dd31afcb6993572d50",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61f9ff5359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xfa00"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xd62a",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff29cc",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x59bf1a3821d2430a3d3104bc474eb8937c974be0f1d730dd31afcb6993572d50",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x59bf1a3821d2430a3d3104bc474eb8937c974be0f1d730dd31afcb6993572d50",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x59bf1a3821d2430a3d3104bc474eb8937c974be0f1d730dd31afcb6993572d50",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x59bf1a3821d2430a3d3104bc474eb8937c974be0f1d730dd31afcb6993572d50",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x602a61f9ff5359600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0xfa00"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xd62a",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff29cc",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x602a61f9ff5359600055",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE8 63999 42) [[ 0 ]] (MSIZE) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +104,14 @@
""
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/memReturn.json b/GeneralStateTests/stMemoryTest/memReturn.json
index 4134cc6c1..a719de2be 100644
--- a/GeneralStateTests/stMemoryTest/memReturn.json
+++ b/GeneralStateTests/stMemoryTest/memReturn.json
@@ -2,81 +2,97 @@
"memReturn" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/memReturnFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x4ac120a0f842cd106b0b5affaec87476b7e0f14376ecb87bbefc001a695f3582",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x366000600037596000f3",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x672a",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff98cc",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x4ac120a0f842cd106b0b5affaec87476b7e0f14376ecb87bbefc001a695f3582",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x4ac120a0f842cd106b0b5affaec87476b7e0f14376ecb87bbefc001a695f3582",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x4ac120a0f842cd106b0b5affaec87476b7e0f14376ecb87bbefc001a695f3582",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x4ac120a0f842cd106b0b5affaec87476b7e0f14376ecb87bbefc001a695f3582",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x366000600037596000f3",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x672a",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff98cc",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x366000600037596000f3",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (CALLDATACOPY 0 0 (CALLDATASIZE)) (RETURN 0 (MSIZE)) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +102,14 @@
"0xff55883355001144bbccddffeeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
],
"gasLimit" : [
- "0x50001798"
+ "1342183320"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mload16bitBound.json b/GeneralStateTests/stMemoryTest/mload16bitBound.json
index 03e08d66d..d5a7649b9 100644
--- a/GeneralStateTests/stMemoryTest/mload16bitBound.json
+++ b/GeneralStateTests/stMemoryTest/mload16bitBound.json
@@ -2,81 +2,97 @@
"mload16bitBound" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mload16bitBoundFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x10000804025c",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "17592320524892",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x753bf8da2d26f11acfc8e3865eb40093071187f028ca996632d60b0af47a27a9",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x6201000051600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x9da4",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xa000502779ea",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x753bf8da2d26f11acfc8e3865eb40093071187f028ca996632d60b0af47a27a9",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x753bf8da2d26f11acfc8e3865eb40093071187f028ca996632d60b0af47a27a9",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x753bf8da2d26f11acfc8e3865eb40093071187f028ca996632d60b0af47a27a9",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x753bf8da2d26f11acfc8e3865eb40093071187f028ca996632d60b0af47a27a9",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x6201000051600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x9da4",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xa000502779ea",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x6201000051600155",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ [[ 1 ]] (MLOAD 65536) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0xa00050281798",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "175923205248920",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +102,14 @@
""
],
"gasLimit" : [
- "0x10000804025c"
+ "17592320524892"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mload8bitBound.json b/GeneralStateTests/stMemoryTest/mload8bitBound.json
index 61e4f28d6..982a5e52d 100644
--- a/GeneralStateTests/stMemoryTest/mload8bitBound.json
+++ b/GeneralStateTests/stMemoryTest/mload8bitBound.json
@@ -2,81 +2,97 @@
"mload8bitBound" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mload8bitBoundFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x68d0d02b58a7f988070b0e7f1a256be642aaccfd8bd91e18996c35611cfa054d",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x61010051600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x65b4",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff9a42",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x68d0d02b58a7f988070b0e7f1a256be642aaccfd8bd91e18996c35611cfa054d",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x68d0d02b58a7f988070b0e7f1a256be642aaccfd8bd91e18996c35611cfa054d",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x68d0d02b58a7f988070b0e7f1a256be642aaccfd8bd91e18996c35611cfa054d",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x68d0d02b58a7f988070b0e7f1a256be642aaccfd8bd91e18996c35611cfa054d",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x61010051600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x65b4",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff9a42",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x61010051600155",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ [[ 1 ]] (MLOAD 256) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +102,14 @@
""
],
"gasLimit" : [
- "0x035b60"
+ "220000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mload_dejavu.json b/GeneralStateTests/stMemoryTest/mload_dejavu.json
index c7eda2941..864f62216 100644
--- a/GeneralStateTests/stMemoryTest/mload_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/mload_dejavu.json
@@ -2,81 +2,97 @@
"mload_dejavu" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mload_dejavuFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0xf1d720915cb0fba8d8688069483837e45cb53d4cfb2f0496db2ce3bde64bf12f",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x630fffffff51",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0a00000000",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x5a00000000",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xf1d720915cb0fba8d8688069483837e45cb53d4cfb2f0496db2ce3bde64bf12f",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0xf1d720915cb0fba8d8688069483837e45cb53d4cfb2f0496db2ce3bde64bf12f",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0xf1d720915cb0fba8d8688069483837e45cb53d4cfb2f0496db2ce3bde64bf12f",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xf1d720915cb0fba8d8688069483837e45cb53d4cfb2f0496db2ce3bde64bf12f",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x630fffffff51",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0a00000000",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x5a00000000",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x630fffffff51",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x630FFFFFFF51",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +102,14 @@
""
],
"gasLimit" : [
- "0x0a00000000"
+ "42949672960"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mstore_dejavu.json b/GeneralStateTests/stMemoryTest/mstore_dejavu.json
index a582746e7..1168dc6f9 100644
--- a/GeneralStateTests/stMemoryTest/mstore_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/mstore_dejavu.json
@@ -2,81 +2,97 @@
"mstore_dejavu" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mstore_dejavuFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0xe2c1656a205e46816a957285a55655a1a039d5d65d3e02b6252f6e934573dae4",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x60f1630fffffff52",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0a00000000",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x5a00000000",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xe2c1656a205e46816a957285a55655a1a039d5d65d3e02b6252f6e934573dae4",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0xe2c1656a205e46816a957285a55655a1a039d5d65d3e02b6252f6e934573dae4",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0xe2c1656a205e46816a957285a55655a1a039d5d65d3e02b6252f6e934573dae4",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xe2c1656a205e46816a957285a55655a1a039d5d65d3e02b6252f6e934573dae4",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x60f1630fffffff52",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0a00000000",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x5a00000000",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x60f1630fffffff52",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x60F1630FFFFFFF52",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +102,14 @@
""
],
"gasLimit" : [
- "0x0a00000000"
+ "42949672960"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/mstroe8_dejavu.json b/GeneralStateTests/stMemoryTest/mstroe8_dejavu.json
index 0b777ee3c..6c1329077 100644
--- a/GeneralStateTests/stMemoryTest/mstroe8_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/mstroe8_dejavu.json
@@ -2,81 +2,97 @@
"mstroe8_dejavu" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/mstroe8_dejavuFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x1dec281f3d5384490d22a942941948d3d5453bf19a0855c81e60a722803f0043",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x60f1630fffffff53",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0a00000000",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x5a00000000",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x1dec281f3d5384490d22a942941948d3d5453bf19a0855c81e60a722803f0043",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x1dec281f3d5384490d22a942941948d3d5453bf19a0855c81e60a722803f0043",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x1dec281f3d5384490d22a942941948d3d5453bf19a0855c81e60a722803f0043",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x1dec281f3d5384490d22a942941948d3d5453bf19a0855c81e60a722803f0043",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x60f1630fffffff53",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0a00000000",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x5a00000000",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x60f1630fffffff53",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x60F1630FFFFFFF53",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +102,14 @@
""
],
"gasLimit" : [
- "0x0a00000000"
+ "42949672960"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/sha3_dejavu.json b/GeneralStateTests/stMemoryTest/sha3_dejavu.json
index 975f94749..fd00f7aa0 100644
--- a/GeneralStateTests/stMemoryTest/sha3_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/sha3_dejavu.json
@@ -2,81 +2,97 @@
"sha3_dejavu" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/sha3_dejavuFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x37302f4388dcbe3d2a8c109b8670bd595291270a170d76dea20460515d95909e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x60ff630fffffff20",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0a00000000",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x5a00000000",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x37302f4388dcbe3d2a8c109b8670bd595291270a170d76dea20460515d95909e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x37302f4388dcbe3d2a8c109b8670bd595291270a170d76dea20460515d95909e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x37302f4388dcbe3d2a8c109b8670bd595291270a170d76dea20460515d95909e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x37302f4388dcbe3d2a8c109b8670bd595291270a170d76dea20460515d95909e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x60ff630fffffff20",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0a00000000",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x5a00000000",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x60ff630fffffff20",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x60FF630FFFFFFF20",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +102,14 @@
""
],
"gasLimit" : [
- "0x0a00000000"
+ "42949672960"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/stackLimitGas_1023.json b/GeneralStateTests/stMemoryTest/stackLimitGas_1023.json
index e99862aa3..744e5e960 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitGas_1023.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitGas_1023.json
@@ -2,81 +2,97 @@
"stackLimitGas_1023" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1023Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x2e0e076db6976344c9662b3f3226fda27aff53e348bd5609e4a7154a2b20fd01",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x6103fd6000525b5a60016000510360005260005160065700",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xf19c",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff0e5a",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x2e0e076db6976344c9662b3f3226fda27aff53e348bd5609e4a7154a2b20fd01",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x2e0e076db6976344c9662b3f3226fda27aff53e348bd5609e4a7154a2b20fd01",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x2e0e076db6976344c9662b3f3226fda27aff53e348bd5609e4a7154a2b20fd01",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x2e0e076db6976344c9662b3f3226fda27aff53e348bd5609e4a7154a2b20fd01",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x6103fd6000525b5a60016000510360005260005160065700",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xf19c",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff0e5a",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x6103fd6000525b5a60016000510360005260005160065700",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "(asm 1021 0x00 MSTORE JUMPDEST GAS 0x01 0x00 MLOAD SUB 0x00 MSTORE 0x00 MLOAD 0x06 JUMPI STOP )",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +102,14 @@
""
],
"gasLimit" : [
- "0x0186a0"
+ "100000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/stackLimitGas_1024.json b/GeneralStateTests/stMemoryTest/stackLimitGas_1024.json
index 642170e6e..06e1e85b8 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitGas_1024.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitGas_1024.json
@@ -2,81 +2,97 @@
"stackLimitGas_1024" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1024Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0xa7c41770a298ad62de3c3216658fecaa16550b911fe62265c9cce6e3a55adad6",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x6103fe6000525b5a60016000510360005260005160065700",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xf1c4",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff0e32",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xa7c41770a298ad62de3c3216658fecaa16550b911fe62265c9cce6e3a55adad6",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0xa7c41770a298ad62de3c3216658fecaa16550b911fe62265c9cce6e3a55adad6",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0xa7c41770a298ad62de3c3216658fecaa16550b911fe62265c9cce6e3a55adad6",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xa7c41770a298ad62de3c3216658fecaa16550b911fe62265c9cce6e3a55adad6",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x6103fe6000525b5a60016000510360005260005160065700",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xf1c4",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff0e32",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x6103fe6000525b5a60016000510360005260005160065700",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "(asm 1022 0x00 MSTORE JUMPDEST GAS 0x01 0x00 MLOAD SUB 0x00 MSTORE 0x00 MLOAD 0x06 JUMPI STOP )",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +102,14 @@
""
],
"gasLimit" : [
- "0x0186a0"
+ "100000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/stackLimitGas_1025.json b/GeneralStateTests/stMemoryTest/stackLimitGas_1025.json
index 3b63b09de..8b5b0b4f2 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitGas_1025.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitGas_1025.json
@@ -2,81 +2,97 @@
"stackLimitGas_1025" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1025Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x0bf698140781a243586d4b8a3b5af5e3d9196a961215295e15d4a21fb9405983",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x6103ff6000525b5a60016000510360005260005160065700",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0186a0",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffe7960",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x0bf698140781a243586d4b8a3b5af5e3d9196a961215295e15d4a21fb9405983",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x0bf698140781a243586d4b8a3b5af5e3d9196a961215295e15d4a21fb9405983",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x0bf698140781a243586d4b8a3b5af5e3d9196a961215295e15d4a21fb9405983",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x0bf698140781a243586d4b8a3b5af5e3d9196a961215295e15d4a21fb9405983",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x6103ff6000525b5a60016000510360005260005160065700",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0186a0",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffe7960",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x6103ff6000525b5a60016000510360005260005160065700",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "(asm 1023 0x00 MSTORE JUMPDEST GAS 0x01 0x00 MLOAD SUB 0x00 MSTORE 0x00 MLOAD 0x06 JUMPI STOP )",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +102,14 @@
""
],
"gasLimit" : [
- "0x0186a0"
+ "100000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/stackLimitPush31_1023.json b/GeneralStateTests/stMemoryTest/stackLimitPush31_1023.json
index 06a043e39..4c3a35a7a 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitPush31_1023.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitPush31_1023.json
@@ -2,81 +2,97 @@
"stackLimitPush31_1023" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1023Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x012034963f12ba01a075eaf2399fe9903fce7de6875eb5b4060e722850743041",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x6103fd6000525b7e0102030405060708090a0102030405060708090a0102030405060708090a0160016000510360005260005160065700",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xf599",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff0a5d",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x012034963f12ba01a075eaf2399fe9903fce7de6875eb5b4060e722850743041",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x012034963f12ba01a075eaf2399fe9903fce7de6875eb5b4060e722850743041",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x012034963f12ba01a075eaf2399fe9903fce7de6875eb5b4060e722850743041",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x012034963f12ba01a075eaf2399fe9903fce7de6875eb5b4060e722850743041",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x6103fd6000525b7e0102030405060708090a0102030405060708090a0102030405060708090a0160016000510360005260005160065700",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xf599",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff0a5d",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x6103fd6000525b7e0102030405060708090a0102030405060708090a0102030405060708090a0160016000510360005260005160065700",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "(asm 1021 0x00 MSTORE JUMPDEST 0x0102030405060708090a0102030405060708090a0102030405060708090a01 0x01 0x00 MLOAD SUB 0x00 MSTORE 0x00 MLOAD 0x06 JUMPI STOP )",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +102,14 @@
""
],
"gasLimit" : [
- "0x0186a0"
+ "100000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/stackLimitPush31_1024.json b/GeneralStateTests/stMemoryTest/stackLimitPush31_1024.json
index fb00756e1..791f90990 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitPush31_1024.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitPush31_1024.json
@@ -2,81 +2,97 @@
"stackLimitPush31_1024" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1024Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x9c9fd8f67a6af918d96deccd3a0e96fc0a4496af936ec9f542be019f985ea528",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x6103fe6000525b7e0102030405060708090a0102030405060708090a0102030405060708090a0160016000510360005260005160065700",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xf5c2",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff0a34",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x9c9fd8f67a6af918d96deccd3a0e96fc0a4496af936ec9f542be019f985ea528",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x9c9fd8f67a6af918d96deccd3a0e96fc0a4496af936ec9f542be019f985ea528",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x9c9fd8f67a6af918d96deccd3a0e96fc0a4496af936ec9f542be019f985ea528",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x9c9fd8f67a6af918d96deccd3a0e96fc0a4496af936ec9f542be019f985ea528",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x6103fe6000525b7e0102030405060708090a0102030405060708090a0102030405060708090a0160016000510360005260005160065700",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xf5c2",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff0a34",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x6103fe6000525b7e0102030405060708090a0102030405060708090a0102030405060708090a0160016000510360005260005160065700",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "(asm 1022 0x00 MSTORE JUMPDEST 0x0102030405060708090a0102030405060708090a0102030405060708090a01 0x01 0x00 MLOAD SUB 0x00 MSTORE 0x00 MLOAD 0x06 JUMPI STOP )",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +102,14 @@
""
],
"gasLimit" : [
- "0x0186a0"
+ "100000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/stackLimitPush31_1025.json b/GeneralStateTests/stMemoryTest/stackLimitPush31_1025.json
index 66b968573..75dde400d 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitPush31_1025.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitPush31_1025.json
@@ -2,81 +2,97 @@
"stackLimitPush31_1025" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1025Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x4aac593c435cf2fa2b0ff6596215af980e85c185a6d115884cf7e4d7d9d36321",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x6103ff6000525b7e0102030405060708090a0102030405060708090a0102030405060708090a0160016000510360005260005160065700",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0186a0",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffe7960",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x4aac593c435cf2fa2b0ff6596215af980e85c185a6d115884cf7e4d7d9d36321",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x4aac593c435cf2fa2b0ff6596215af980e85c185a6d115884cf7e4d7d9d36321",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x4aac593c435cf2fa2b0ff6596215af980e85c185a6d115884cf7e4d7d9d36321",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x4aac593c435cf2fa2b0ff6596215af980e85c185a6d115884cf7e4d7d9d36321",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x6103ff6000525b7e0102030405060708090a0102030405060708090a0102030405060708090a0160016000510360005260005160065700",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0186a0",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffe7960",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x6103ff6000525b7e0102030405060708090a0102030405060708090a0102030405060708090a0160016000510360005260005160065700",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "(asm 1023 0x00 MSTORE JUMPDEST 0x0102030405060708090a0102030405060708090a0102030405060708090a01 0x01 0x00 MLOAD SUB 0x00 MSTORE 0x00 MLOAD 0x06 JUMPI STOP )",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +102,14 @@
""
],
"gasLimit" : [
- "0x0186a0"
+ "100000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/stackLimitPush32_1023.json b/GeneralStateTests/stMemoryTest/stackLimitPush32_1023.json
index 1e44a1e33..d060afd24 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitPush32_1023.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitPush32_1023.json
@@ -2,81 +2,97 @@
"stackLimitPush32_1023" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1023Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x0538c5873643505fc0ceb8f55945729bfadd0dde4bcc0a30a544162236b1a90b",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x6103fd6000525b7f0102030405060708090a0102030405060708090a0102030405060708090a010260016000510360005260005160065700",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xf599",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff0a5d",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x0538c5873643505fc0ceb8f55945729bfadd0dde4bcc0a30a544162236b1a90b",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x0538c5873643505fc0ceb8f55945729bfadd0dde4bcc0a30a544162236b1a90b",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x0538c5873643505fc0ceb8f55945729bfadd0dde4bcc0a30a544162236b1a90b",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x0538c5873643505fc0ceb8f55945729bfadd0dde4bcc0a30a544162236b1a90b",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x6103fd6000525b7f0102030405060708090a0102030405060708090a0102030405060708090a010260016000510360005260005160065700",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xf599",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff0a5d",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x6103fd6000525b7f0102030405060708090a0102030405060708090a0102030405060708090a010260016000510360005260005160065700",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "(asm 1021 0x00 MSTORE JUMPDEST 0x0102030405060708090a0102030405060708090a0102030405060708090a0102 0x01 0x00 MLOAD SUB 0x00 MSTORE 0x00 MLOAD 0x06 JUMPI STOP )",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +102,14 @@
""
],
"gasLimit" : [
- "0x0186a0"
+ "100000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/stackLimitPush32_1024.json b/GeneralStateTests/stMemoryTest/stackLimitPush32_1024.json
index fc2c5b1eb..37cdc2f40 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitPush32_1024.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitPush32_1024.json
@@ -2,81 +2,97 @@
"stackLimitPush32_1024" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1024Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x8c09fdc294863a6a0d8c06bf3346ed48f1794a4513c74d79d6010eedfca91c5f",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x6103fe6000525b7f0102030405060708090a0102030405060708090a0102030405060708090a010260016000510360005260005160065700",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xf5c2",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff0a34",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x8c09fdc294863a6a0d8c06bf3346ed48f1794a4513c74d79d6010eedfca91c5f",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x8c09fdc294863a6a0d8c06bf3346ed48f1794a4513c74d79d6010eedfca91c5f",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x8c09fdc294863a6a0d8c06bf3346ed48f1794a4513c74d79d6010eedfca91c5f",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x8c09fdc294863a6a0d8c06bf3346ed48f1794a4513c74d79d6010eedfca91c5f",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a764000a",
+ "code" : "0x6103fe6000525b7f0102030405060708090a0102030405060708090a0102030405060708090a010260016000510360005260005160065700",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xf5c2",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63ffff0a34",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x6103fe6000525b7f0102030405060708090a0102030405060708090a0102030405060708090a010260016000510360005260005160065700",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "(asm 1022 0x00 MSTORE JUMPDEST 0x0102030405060708090a0102030405060708090a0102030405060708090a0102 0x01 0x00 MLOAD SUB 0x00 MSTORE 0x00 MLOAD 0x06 JUMPI STOP )",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +102,14 @@
""
],
"gasLimit" : [
- "0x0186a0"
+ "100000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stMemoryTest/stackLimitPush32_1025.json b/GeneralStateTests/stMemoryTest/stackLimitPush32_1025.json
index 9143d51ea..2e486bfe9 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitPush32_1025.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitPush32_1025.json
@@ -2,81 +2,97 @@
"stackLimitPush32_1025" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1025Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0a00000000",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "42949672960",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x2b2c33348aabc10de2654557fe330f3d0d20ecf113613e7e016c3fdefcc610ef",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x6103ff6000525b7f0102030405060708090a0102030405060708090a0102030405060708090a010260016000510360005260005160065700",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0186a0",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffe7960",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x2b2c33348aabc10de2654557fe330f3d0d20ecf113613e7e016c3fdefcc610ef",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x2b2c33348aabc10de2654557fe330f3d0d20ecf113613e7e016c3fdefcc610ef",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x2b2c33348aabc10de2654557fe330f3d0d20ecf113613e7e016c3fdefcc610ef",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x2b2c33348aabc10de2654557fe330f3d0d20ecf113613e7e016c3fdefcc610ef",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x6103ff6000525b7f0102030405060708090a0102030405060708090a0102030405060708090a010260016000510360005260005160065700",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x0186a0",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63fffe7960",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x6103ff6000525b7f0102030405060708090a0102030405060708090a0102030405060708090a010260016000510360005260005160065700",
- "nonce" : "0x00",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "(asm 1023 0x00 MSTORE JUMPDEST 0x0102030405060708090a0102030405060708090a0102030405060708090a0102 0x01 0x00 MLOAD SUB 0x00 MSTORE 0x00 MLOAD 0x06 JUMPI STOP )",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x6400000000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "429496729600",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +102,14 @@
""
],
"gasLimit" : [
- "0x0186a0"
+ "100000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0a"
+ "10"
]
}
}