aboutsummaryrefslogtreecommitdiffstats
path: root/GeneralStateTests/stSystemOperationsTest
diff options
context:
space:
mode:
Diffstat (limited to 'GeneralStateTests/stSystemOperationsTest')
-rw-r--r--GeneralStateTests/stSystemOperationsTest/ABAcalls0.json118
-rw-r--r--GeneralStateTests/stSystemOperationsTest/ABAcalls1.json118
-rw-r--r--GeneralStateTests/stSystemOperationsTest/ABAcalls2.json138
-rw-r--r--GeneralStateTests/stSystemOperationsTest/ABAcalls3.json138
-rw-r--r--GeneralStateTests/stSystemOperationsTest/ABAcallsSuicide0.json113
-rw-r--r--GeneralStateTests/stSystemOperationsTest/ABAcallsSuicide1.json182
-rw-r--r--GeneralStateTests/stSystemOperationsTest/Call10.json106
-rw-r--r--GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb0.json136
-rw-r--r--GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb0_OOG_atMaxCallDepth.json122
-rw-r--r--GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb1.json122
-rw-r--r--GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb2.json122
-rw-r--r--GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb3.json120
-rw-r--r--GeneralStateTests/stSystemOperationsTest/CallRecursiveBombLog.json136
-rw-r--r--GeneralStateTests/stSystemOperationsTest/CallRecursiveBombLog2.json136
-rw-r--r--GeneralStateTests/stSystemOperationsTest/CallToNameRegistrator0.json112
-rw-r--r--GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorAddressTooBigLeft.json111
-rw-r--r--GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorAddressTooBigRight.json112
-rw-r--r--GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorMemOOGAndInsufficientBalance.json111
-rw-r--r--GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory0.json111
-rw-r--r--GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory1.json111
-rw-r--r--GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorOutOfGas.json111
-rw-r--r--GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory0.json111
-rw-r--r--GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory1.json111
-rw-r--r--GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory2.json111
-rw-r--r--GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorZeorSizeMemExpansion.json111
-rw-r--r--GeneralStateTests/stSystemOperationsTest/CallToReturn1.json111
-rw-r--r--GeneralStateTests/stSystemOperationsTest/CallToReturn1ForDynamicJump0.json109
-rw-r--r--GeneralStateTests/stSystemOperationsTest/CallToReturn1ForDynamicJump1.json109
-rw-r--r--GeneralStateTests/stSystemOperationsTest/CalltoReturn2.json112
-rw-r--r--GeneralStateTests/stSystemOperationsTest/CreateHashCollision.json139
-rw-r--r--GeneralStateTests/stSystemOperationsTest/PostToReturn1.json112
-rw-r--r--GeneralStateTests/stSystemOperationsTest/TestNameRegistrator.json103
-rw-r--r--GeneralStateTests/stSystemOperationsTest/balanceInputAddressTooBig.json105
-rw-r--r--GeneralStateTests/stSystemOperationsTest/callValue.json105
-rw-r--r--GeneralStateTests/stSystemOperationsTest/callcodeTo0.json106
-rw-r--r--GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistrator0.json110
-rw-r--r--GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigLeft.json110
-rw-r--r--GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigRight.json111
-rw-r--r--GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorZeroMemExpanion.json110
-rw-r--r--GeneralStateTests/stSystemOperationsTest/callcodeToReturn1.json113
-rw-r--r--GeneralStateTests/stSystemOperationsTest/callerAccountBalance.json105
-rw-r--r--GeneralStateTests/stSystemOperationsTest/createNameRegistrator.json106
-rw-r--r--GeneralStateTests/stSystemOperationsTest/createNameRegistratorOOG_MemExpansionOOV.json105
-rw-r--r--GeneralStateTests/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds0.json105
-rw-r--r--GeneralStateTests/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds1.json105
-rw-r--r--GeneralStateTests/stSystemOperationsTest/createNameRegistratorValueTooHigh.json103
-rw-r--r--GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMem.json106
-rw-r--r--GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMem2.json106
-rw-r--r--GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMemExpansion.json106
-rw-r--r--GeneralStateTests/stSystemOperationsTest/createWithInvalidOpcode.json103
-rw-r--r--GeneralStateTests/stSystemOperationsTest/currentAccountBalance.json105
-rw-r--r--GeneralStateTests/stSystemOperationsTest/extcodecopy.json130
-rw-r--r--GeneralStateTests/stSystemOperationsTest/return0.json103
-rw-r--r--GeneralStateTests/stSystemOperationsTest/return1.json103
-rw-r--r--GeneralStateTests/stSystemOperationsTest/return2.json103
-rw-r--r--GeneralStateTests/stSystemOperationsTest/suicideAddress.json122
-rw-r--r--GeneralStateTests/stSystemOperationsTest/suicideCaller.json124
-rw-r--r--GeneralStateTests/stSystemOperationsTest/suicideCallerAddresTooBigLeft.json124
-rw-r--r--GeneralStateTests/stSystemOperationsTest/suicideCallerAddresTooBigRight.json103
-rw-r--r--GeneralStateTests/stSystemOperationsTest/suicideCoinbase.json118
-rw-r--r--GeneralStateTests/stSystemOperationsTest/suicideNotExistingAccount.json103
-rw-r--r--GeneralStateTests/stSystemOperationsTest/suicideOrigin.json122
-rw-r--r--GeneralStateTests/stSystemOperationsTest/suicideSendEtherPostDeath.json110
-rw-r--r--GeneralStateTests/stSystemOperationsTest/suicideSendEtherToMe.json124
-rw-r--r--GeneralStateTests/stSystemOperationsTest/testRandomTest.json106
65 files changed, 2880 insertions, 4565 deletions
diff --git a/GeneralStateTests/stSystemOperationsTest/ABAcalls0.json b/GeneralStateTests/stSystemOperationsTest/ABAcalls0.json
index a58b5295f..eca6057f9 100644
--- a/GeneralStateTests/stSystemOperationsTest/ABAcalls0.json
+++ b/GeneralStateTests/stSystemOperationsTest/ABAcalls0.json
@@ -2,88 +2,60 @@
"ABAcalls0" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcalls0Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x5796cb04ad6f6035a06b2d18a0e8dc887d88ef5e789184520abfdd054699edd1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ "0x24" : "0x01"
+ }
+ },
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "storage" : {
+ "0x26" : "0x01"
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x5796cb04ad6f6035a06b2d18a0e8dc887d88ef5e789184520abfdd054699edd1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x87367b5145ca4bda38bc61975ee9eade836743157861dcce20b65a73b4eecfb9",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x87367b5145ca4bda38bc61975ee9eade836743157861dcce20b65a73b4eecfb9",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x5796cb04ad6f6035a06b2d18a0e8dc887d88ef5e789184520abfdd054699edd1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x6000600060006000601873945304eb96065b2a98b57a48a06ae28d285a71b5620186a0f15855",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ [[ (PC) ]] (CALL 100000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "0x17",
- "code" : "0x6000600060006000601773095e7baea6a6c7c4c2dfeb977efac326af552d8761c350f16001015855",
- "nonce" : "0x00",
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "23",
+ "code" : " { [[ (PC) ]] (ADD 1 (CALL 50000 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 23 0 0 0 0)) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -93,14 +65,14 @@
""
],
"gasLimit" : [
- "0x0f4240"
+ "1000000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/ABAcalls1.json b/GeneralStateTests/stSystemOperationsTest/ABAcalls1.json
index ad73fed82..c3b4e6524 100644
--- a/GeneralStateTests/stSystemOperationsTest/ABAcalls1.json
+++ b/GeneralStateTests/stSystemOperationsTest/ABAcalls1.json
@@ -2,88 +2,60 @@
"ABAcalls1" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcalls1Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x3b9aca00",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "1000000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x51baf4bca305018889c0d025b7a4234a7cb8cd7735e9f08e218ef5fcc285b6e9",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ "0x26" : "0x01"
+ }
+ },
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "storage" : {
+ "0x29" : "0x02"
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x51baf4bca305018889c0d025b7a4234a7cb8cd7735e9f08e218ef5fcc285b6e9",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0xe8067df280ac7ed8735e56e774be8670df78ab00d2b8acba9c5dd6ae0d0dfe81",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0xe8067df280ac7ed8735e56e774be8670df78ab00d2b8acba9c5dd6ae0d0dfe81",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x51baf4bca305018889c0d025b7a4234a7cb8cd7735e9f08e218ef5fcc285b6e9",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x6000600060006000601873945304eb96065b2a98b57a48a06ae28d285a71b5620186a05a03f15855",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ [[ (PC) ]] (CALL (- (GAS) 100000) 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "0x17",
- "code" : "0x6000600060006000601773095e7baea6a6c7c4c2dfeb977efac326af552d87620186a05a03f16001015855",
- "nonce" : "0x00",
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "23",
+ "code" : " { [[ (PC) ]] (ADD 1 (CALL (- (GAS) 100000) 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 23 0 0 0 0)) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -93,14 +65,14 @@
""
],
"gasLimit" : [
- "0x3b9aca00"
+ "1000000000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/ABAcalls2.json b/GeneralStateTests/stSystemOperationsTest/ABAcalls2.json
index 4bf9e9c8e..a3db1578f 100644
--- a/GeneralStateTests/stSystemOperationsTest/ABAcalls2.json
+++ b/GeneralStateTests/stSystemOperationsTest/ABAcalls2.json
@@ -2,88 +2,84 @@
"ABAcalls2" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcalls2Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x3b9aca00",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "1000000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0xa963ff4f5827ec055e38eef98962c7bad2360f6ffa3b3946e55ce73933774509",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Frontier",
+ "Homestead"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ "0x" : "0x0201"
+ }
+ },
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "storage" : {
+ "0x" : "0x0200"
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xa963ff4f5827ec055e38eef98962c7bad2360f6ffa3b3946e55ce73933774509",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x753cb4109def037eecfcb5c1812a6c92888f604e00f5bb117baee07633b958d5",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x753cb4109def037eecfcb5c1812a6c92888f604e00f5bb117baee07633b958d5",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xa963ff4f5827ec055e38eef98962c7bad2360f6ffa3b3946e55ce73933774509",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ "0x" : "0xbf"
+ }
+ },
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "storage" : {
+ "0x" : "0xbf"
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x6001600054016000556000600060006000600173945304eb96065b2a98b57a48a06ae28d285a71b5620186a05a03f1",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ [[ 0 ]] (ADD (SLOAD 0) 1) (CALL (- (GAS) 100000) 0x945304eb96065b2a98b57a48a06ae28d285a71b5 1 0 0 0 0) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "0x00",
- "code" : "0x6001600054016000556000600060006000600073095e7baea6a6c7c4c2dfeb977efac326af552d87620186a05a03f1",
- "nonce" : "0x00",
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "0",
+ "code" : " { [[ 0 ]] (ADD (SLOAD 0) 1) (CALL (- (GAS) 100000) 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 0 0 0 0 0) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -93,14 +89,14 @@
""
],
"gasLimit" : [
- "0x3b9aca00"
+ "1000000000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/ABAcalls3.json b/GeneralStateTests/stSystemOperationsTest/ABAcalls3.json
index d0741dcc1..94ea30b1c 100644
--- a/GeneralStateTests/stSystemOperationsTest/ABAcalls3.json
+++ b/GeneralStateTests/stSystemOperationsTest/ABAcalls3.json
@@ -2,88 +2,84 @@
"ABAcalls3" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcalls3Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x09e82844213a8def06f6229a225e914aec1c92627fbe8fcad05e919f704ce9d6",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Frontier",
+ "Homestead"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ "0x" : "0x30"
+ }
+ },
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "storage" : {
+ "0x" : "0x2f"
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x09e82844213a8def06f6229a225e914aec1c92627fbe8fcad05e919f704ce9d6",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x540614948e21200990b88bb4f3ad01403719fb790977421ac846c6f8de8e53f3",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x540614948e21200990b88bb4f3ad01403719fb790977421ac846c6f8de8e53f3",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x09e82844213a8def06f6229a225e914aec1c92627fbe8fcad05e919f704ce9d6",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ "0x" : "0x2e"
+ }
+ },
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "storage" : {
+ "0x" : "0x2d"
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0fa3e8",
- "code" : "0x6001600054016000556000600060006000600173945304eb96065b2a98b57a48a06ae28d285a71b5620186a05a03f1",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1025000",
+ "code" : "{ [[ 0 ]] (ADD (SLOAD 0) 1) (CALL (- (GAS) 100000) 0x945304eb96065b2a98b57a48a06ae28d285a71b5 1 0 0 0 0) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "0x00",
- "code" : "0x6001600054016000556000600060006000600073095e7baea6a6c7c4c2dfeb977efac326af552d87620186a05a03f1",
- "nonce" : "0x00",
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "0",
+ "code" : " { [[ 0 ]] (ADD (SLOAD 0) 1) (CALL (- (GAS) 100000) 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 0 0 0 0 0) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -93,14 +89,14 @@
""
],
"gasLimit" : [
- "0x989680"
+ "10000000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/ABAcallsSuicide0.json b/GeneralStateTests/stSystemOperationsTest/ABAcallsSuicide0.json
index c93a2abc8..0818d4e05 100644
--- a/GeneralStateTests/stSystemOperationsTest/ABAcallsSuicide0.json
+++ b/GeneralStateTests/stSystemOperationsTest/ABAcallsSuicide0.json
@@ -2,88 +2,55 @@
"ABAcallsSuicide0" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcallsSuicide0Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x2e14eec7d1536948fe9178d51bd42473842e07642b282de14e84d8e557ec89a1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "storage" : {
+ "0x26" : "0x01"
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x2e14eec7d1536948fe9178d51bd42473842e07642b282de14e84d8e557ec89a1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x6b0588ab878e51a66fe7b82d84b908718863d566750ceeb33970c29ed40cacab",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x6b0588ab878e51a66fe7b82d84b908718863d566750ceeb33970c29ed40cacab",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x2e14eec7d1536948fe9178d51bd42473842e07642b282de14e84d8e557ec89a1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x6000600060006000601873945304eb96065b2a98b57a48a06ae28d285a71b5620186a0f1585573945304eb96065b2a98b57a48a06ae28d285a71b5ff",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ [[ (PC) ]] (CALL 100000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) (SELFDESTRUCT 0x945304eb96065b2a98b57a48a06ae28d285a71b5) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "0x17",
- "code" : "0x6000600060006000601773095e7baea6a6c7c4c2dfeb977efac326af552d8761c350f16001015855",
- "nonce" : "0x00",
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "23",
+ "code" : "{ [[ (PC) ]] (ADD 1 (CALL 50000 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 23 0 0 0 0)) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -93,14 +60,14 @@
""
],
"gasLimit" : [
- "0x989680"
+ "10000000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/ABAcallsSuicide1.json b/GeneralStateTests/stSystemOperationsTest/ABAcallsSuicide1.json
index 4adbc8f6a..0ca371f09 100644
--- a/GeneralStateTests/stSystemOperationsTest/ABAcallsSuicide1.json
+++ b/GeneralStateTests/stSystemOperationsTest/ABAcallsSuicide1.json
@@ -2,128 +2,92 @@
"ABAcallsSuicide1" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcallsSuicide1Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0xbe50a6f4e845efa14809756058b00ed7b483958a0eb621b52a828d5076677d02",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- },
- {
- "hash" : "0xb28dd9adc2e2eca9b6f0d68bf2e50c0e06b58fbae1124fd98308a17c43b82481",
- "indexes" : {
- "data" : 1,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "EIP158" : [
- {
- "hash" : "0xbe50a6f4e845efa14809756058b00ed7b483958a0eb621b52a828d5076677d02",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- },
- {
- "hash" : "0xb28dd9adc2e2eca9b6f0d68bf2e50c0e06b58fbae1124fd98308a17c43b82481",
- "indexes" : {
- "data" : 1,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0xc6b0ac700c04e246da5a195f673a67d1a45e22559e7bba5f07e3cedf0aced222",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : 0,
+ "gas" : -1,
+ "value" : -1
},
- {
- "hash" : "0xf45819cae66ae9d55e4dec220d4e0a3bddf9205fbfe83026636f76b6f0ded04e",
- "indexes" : {
- "data" : 1,
- "gas" : 0,
- "value" : 0
+ "network" : [
+ "Frontier",
+ "Homestead"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ "0x29" : "0x01"
+ }
+ },
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "47",
+ "storage" : {
+ }
+ },
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "shouldnotexist" : "1"
}
}
- ],
- "Homestead" : [
- {
- "hash" : "0xc6b0ac700c04e246da5a195f673a67d1a45e22559e7bba5f07e3cedf0aced222",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- },
- {
- "hash" : "0xf45819cae66ae9d55e4dec220d4e0a3bddf9205fbfe83026636f76b6f0ded04e",
- "indexes" : {
- "data" : 1,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xbe50a6f4e845efa14809756058b00ed7b483958a0eb621b52a828d5076677d02",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
+ },
+ {
+ "indexes" : {
+ "data" : 1,
+ "gas" : -1,
+ "value" : -1
},
- {
- "hash" : "0xb28dd9adc2e2eca9b6f0d68bf2e50c0e06b58fbae1124fd98308a17c43b82481",
- "indexes" : {
- "data" : 1,
- "gas" : 0,
- "value" : 0
+ "network" : [
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ }
+ },
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "shouldnotexist" : "1"
+ },
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "23",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x6000356000526000600060206000601873945304eb96065b2a98b57a48a06ae28d285a71b5600035f15855",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 0 (CALLDATALOAD 0)) [[ (PC) ]] (CALL (CALLDATALOAD 0) 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 32 0 0) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "0x17",
- "code" : "0x6000356000526000600060206000601773095e7baea6a6c7c4c2dfeb977efac326af552d8761c35060003503f16001015855730f572e5295c57f15886f9b263e2f6d2d6c7b5ec6ff",
- "nonce" : "0x00",
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "23",
+ "code" : "{ (MSTORE 0 (CALLDATALOAD 0)) [[ (PC) ]] (ADD 1 (CALL (SUB (CALLDATALOAD 0) 50000) 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 23 0 32 0 0)) (SELFDESTRUCT 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -134,14 +98,14 @@
"0x00000000000000000000000000000000000000000000000000000000000486a0"
],
"gasLimit" : [
- "0x989680"
+ "10000000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/Call10.json b/GeneralStateTests/stSystemOperationsTest/Call10.json
index e696d03cf..82dbe2025 100644
--- a/GeneralStateTests/stSystemOperationsTest/Call10.json
+++ b/GeneralStateTests/stSystemOperationsTest/Call10.json
@@ -2,88 +2,56 @@
"Call10" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/Call10Filler.json"
},
"env" : {
- "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x026e5ea19dfeeff7685ce1be9a0cb9d7b5853e96dd7ea9b1d56f6ac4c627ae25",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x" : "0x01",
+ "0x01" : "0x0a"
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x026e5ea19dfeeff7685ce1be9a0cb9d7b5853e96dd7ea9b1d56f6ac4c627ae25",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x19466b703b0b113fbbf2bb7a64bb86c8b79184d23c92030326c67b7c11cb14f3",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x19466b703b0b113fbbf2bb7a64bb86c8b79184d23c92030326c67b7c11cb14f3",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x026e5ea19dfeeff7685ce1be9a0cb9d7b5853e96dd7ea9b1d56f6ac4c627ae25",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xffffffffffffffffffffffffffffffff",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
},
- "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x1b58",
+ "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "7000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
},
- "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x03e8",
- "code" : "0x5b600a60805110156042576000600061c3506000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff16000556001608051016080526000565b608051600155",
- "nonce" : "0x00",
+ "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000",
+ "code" : "{ (def 'i 0x80) (for {} (< @i 10) [i](+ @i 1) [[ 0 ]](CALL 0xfffffffffff 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 50000 0 0) ) [[ 1 ]] @i}",
+ "nonce" : "0",
"storage" : {
}
}
@@ -95,12 +63,12 @@
"gasLimit" : [
"0x7ffffffffffffff0"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "gasPrice" : "1",
+ "nonce" : "",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
"value" : [
- "0x0a"
+ "10"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb0.json b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb0.json
index 9331386d7..e4c1ad83b 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb0.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb0.json
@@ -2,88 +2,82 @@
"CallRecursiveBomb0" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb0Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x02540be400",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x219bd65c25b94774d65430b0164c5df1be2981f9f763ca98c2b60da4054d5116",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Frontier",
+ "Homestead"
+ ],
+ "result" : {
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "storage" : {
+ "0x00" : "0x0400",
+ "0x01" : "0x01"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x219bd65c25b94774d65430b0164c5df1be2981f9f763ca98c2b60da4054d5116",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x3e652c292bfd5dd0681e75760d44c4252cf7afee71b0db1510fb7ffa170960f8",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x3e652c292bfd5dd0681e75760d44c4252cf7afee71b0db1510fb7ffa170960f8",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x219bd65c25b94774d65430b0164c5df1be2981f9f763ca98c2b60da4054d5116",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "storage" : {
+ "0x00" : "0x011b",
+ "0x01" : "0x01"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x77359400",
- "code" : "0x6000600060006000601773945304eb96065b2a98b57a48a06ae28d285a71b56305f5e100f1",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "2000000000",
+ "code" : "{ (CALL 100000000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 0 0 0) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x6001600054016000556000600060006000600030612af85a03f1600155",
- "nonce" : "0x00",
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ [[ 0 ]] (+ (SLOAD 0) 1) [[ 1 ]] (CALL (- (GAS) 11000) (ADDRESS) 0 0 0 0 0) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -93,14 +87,14 @@
""
],
"gasLimit" : [
- "0x02540be400"
+ "10000000000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb0_OOG_atMaxCallDepth.json b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb0_OOG_atMaxCallDepth.json
index 52138727d..4f000c78d 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb0_OOG_atMaxCallDepth.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb0_OOG_atMaxCallDepth.json
@@ -2,81 +2,69 @@
"CallRecursiveBomb0_OOG_atMaxCallDepth" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb0_OOG_atMaxCallDepthFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x174876e800",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "100000000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0xfdd02999985c68e61b47f621f101fea9f2fea1c3408a4fb0a7bfa57d08e1f2e9",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Frontier",
+ "Homestead"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ "0x" : "0x0401",
+ "0x01" : "0x01"
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xfdd02999985c68e61b47f621f101fea9f2fea1c3408a4fb0a7bfa57d08e1f2e9",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x8849583b8a73d4b6d08341d49aff6ed729855038bc446b3010a9b87837d5dbb2",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x8849583b8a73d4b6d08341d49aff6ed729855038bc446b3010a9b87837d5dbb2",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xfdd02999985c68e61b47f621f101fea9f2fea1c3408a4fb0a7bfa57d08e1f2e9",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ "0x00" : "0x02c1",
+ "0x01" : "0x01"
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x01312d00",
- "code" : "0x600160005401600055690fffffffffffffffffff610402600054040260025560006000690fffffffffffffffffff610402600054040260006000306104005a03f1600155",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "20000000",
+ "code" : "{ [[ 0 ]] (+ (SLOAD 0) 1) [[ 2 ]] (MUL (DIV @@0 0x0402) 0xfffffffffffffffffff) [[ 1 ]] (CALL (- (GAS) 1024) (ADDRESS) 0 0 (MUL (DIV @@0 0x0402) 0xfffffffffffffffffff) 0 0) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +74,14 @@
""
],
"gasLimit" : [
- "0x174876e800"
+ "100000000000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb1.json b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb1.json
index 16279c15e..370e1a9e2 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb1.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb1.json
@@ -2,81 +2,69 @@
"CallRecursiveBomb1" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb1Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x05f5e100",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "100000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x37cef75527fc899040e0e54f6ae45468e7d7d5216f1fe687b125d08bfba10ec2",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Frontier",
+ "Homestead"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ "0x00" : "0x0401",
+ "0x01" : "0x01"
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x37cef75527fc899040e0e54f6ae45468e7d7d5216f1fe687b125d08bfba10ec2",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x6bc13ccf0b46b1a59f08e3b1fe6f3d6699615e665c3cc91b54a59774c8fef6fb",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x6bc13ccf0b46b1a59f08e3b1fe6f3d6699615e665c3cc91b54a59774c8fef6fb",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x37cef75527fc899040e0e54f6ae45468e7d7d5216f1fe687b125d08bfba10ec2",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ "0x00" : "0xde",
+ "0x01" : "0x01"
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x01312d00",
- "code" : "0x6001600054016000556000600060006000600030613a985a03f1600155",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "20000000",
+ "code" : "{ [[ 0 ]] (+ (SLOAD 0) 1) [[ 1 ]] (CALL (- (GAS) 15000) (ADDRESS) 0 0 0 0 0) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +74,14 @@
""
],
"gasLimit" : [
- "0x013aab14"
+ "20622100"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb2.json b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb2.json
index ecbe7754f..3e5a3ee5e 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb2.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb2.json
@@ -2,81 +2,69 @@
"CallRecursiveBomb2" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb2Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x05f5e100",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "100000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x37cef75527fc899040e0e54f6ae45468e7d7d5216f1fe687b125d08bfba10ec2",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Frontier",
+ "Homestead"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ "0x00" : "0x0400",
+ "0x01" : "0x01"
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x37cef75527fc899040e0e54f6ae45468e7d7d5216f1fe687b125d08bfba10ec2",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x39c4e8eb67a73086760ba36ff7d36b834b8c6d782cac9ddacf7db280b35b70df",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x39c4e8eb67a73086760ba36ff7d36b834b8c6d782cac9ddacf7db280b35b70df",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x37cef75527fc899040e0e54f6ae45468e7d7d5216f1fe687b125d08bfba10ec2",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ "0x00" : "0xde",
+ "0x01" : "0x01"
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x01312d00",
- "code" : "0x6001600054016000556000600060006000600030613a985a03f1600155",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "20000000",
+ "code" : "{ [[ 0 ]] (+ (SLOAD 0) 1) [[ 1 ]] (CALL (- (GAS) 15000) (ADDRESS) 0 0 0 0 0) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +74,14 @@
""
],
"gasLimit" : [
- "0x013aab13"
+ "20622099"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb3.json b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb3.json
index 0896f1cbf..fae6010e0 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb3.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb3.json
@@ -2,81 +2,67 @@
"CallRecursiveBomb3" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb3Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x1e61fde6e363035616e868e9c0e6d60031924b2d4a7a6942b9cb71d453253322",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Frontier",
+ "Homestead"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x1e61fde6e363035616e868e9c0e6d60031924b2d4a7a6942b9cb71d453253322",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x59a13349c9c49fff8c389ed3d19b476d5726a841cfe93f6d5f882cdfc97da07d",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x59a13349c9c49fff8c389ed3d19b476d5726a841cfe93f6d5f882cdfc97da07d",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x1e61fde6e363035616e868e9c0e6d60031924b2d4a7a6942b9cb71d453253322",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ "0x00" : "0x08",
+ "0x01" : "0x01"
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x01312d00",
- "code" : "0x600160005401600055600060006000600060003060e05a03f1600155",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "20000000",
+ "code" : "{ [[ 0 ]] (+ (SLOAD 0) 1) [[ 1 ]] (CALL (- (GAS) 224) (ADDRESS) 0 0 0 0 0) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +72,14 @@
""
],
"gasLimit" : [
- "0x0f4240"
+ "1000000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBombLog.json b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBombLog.json
index 30de9d154..7ca9dff6b 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBombLog.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBombLog.json
@@ -2,88 +2,82 @@
"CallRecursiveBombLog" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBombLogFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x02540be400",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x376d0956c6353512c7f5aa80a2016b6989bb797cb1b7e78639d0793ff3ce719e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Frontier",
+ "Homestead"
+ ],
+ "result" : {
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "storage" : {
+ "0x00" : "0x0400",
+ "0x01" : "0x01"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x376d0956c6353512c7f5aa80a2016b6989bb797cb1b7e78639d0793ff3ce719e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0xfa16ac1bac3f2e0d6bfdc7f8042a1aaa7389aa5ab6f374af1b6db2d0f376e51f",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0xfa16ac1bac3f2e0d6bfdc7f8042a1aaa7389aa5ab6f374af1b6db2d0f376e51f",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x376d0956c6353512c7f5aa80a2016b6989bb797cb1b7e78639d0793ff3ce719e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "storage" : {
+ "0x00" : "0x012b",
+ "0x01" : "0x01"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x01312d00",
- "code" : "0x6000600060006000601773945304eb96065b2a98b57a48a06ae28d285a71b56305f5e100f1",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "20000000",
+ "code" : "{ (CALL 100000000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 0 0 0) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000a060016000540160005560006000600060006000306161a85a03f1600155",
- "nonce" : "0x00",
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG0 0 32) [[ 0 ]] (+ (SLOAD 0) 1) [[ 1 ]] (CALL (- (GAS) 25000) (ADDRESS) 0 0 0 0 0) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -93,14 +87,14 @@
""
],
"gasLimit" : [
- "0x02540be400"
+ "10000000000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBombLog2.json b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBombLog2.json
index 9d9b94553..db3e983cb 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBombLog2.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBombLog2.json
@@ -2,88 +2,82 @@
"CallRecursiveBombLog2" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBombLog2Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x02540be400",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x9a1219b89ffffc7167820ff79b5d947da2ad09313623197ea5149d1413c4660d",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Frontier",
+ "Homestead"
+ ],
+ "result" : {
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "storage" : {
+ "0x00" : "0x0400",
+ "0x01" : "0x01"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x9a1219b89ffffc7167820ff79b5d947da2ad09313623197ea5149d1413c4660d",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0xe43d7768f201c46d78540a2c3115175605c9dd120209930331d2b41244e69c30",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0xe43d7768f201c46d78540a2c3115175605c9dd120209930331d2b41244e69c30",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x9a1219b89ffffc7167820ff79b5d947da2ad09313623197ea5149d1413c4660d",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "storage" : {
+ "0x00" : "0x012b",
+ "0x01" : "0x01"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x01312d00",
- "code" : "0x6000600060006000601773945304eb96065b2a98b57a48a06ae28d285a71b56305f5e100f1",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "20000000",
+ "code" : "{ (CALL 100000000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 0 0 0) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x5a60005260206000a060016000540160005560006000600060006000306161a85a03f1600155",
- "nonce" : "0x00",
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 0 (GAS)) (LOG0 0 32) [[ 0 ]] (+ (SLOAD 0) 1) [[ 1 ]] (CALL (- (GAS) 25000) (ADDRESS) 0 0 0 0 0) } ",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -93,14 +87,14 @@
""
],
"gasLimit" : [
- "0x02540be400"
+ "10000000000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistrator0.json b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistrator0.json
index 60fa6d808..2471b67ca 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistrator0.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistrator0.json
@@ -2,88 +2,56 @@
"CallToNameRegistrator0" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistrator0Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0xb2a7123db510a0b001ef635da54f29a08ac85299238171be5b9f54abc1d970c1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "nonce" : "0",
+ "storage" : {
+ "0x" : "0x01"
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xb2a7123db510a0b001ef635da54f29a08ac85299238171be5b9f54abc1d970c1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0xce9a0abf5dcc1a842397982c00be7ac19df241d90fc4d353aa8a9f5f7db25ef4",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0xce9a0abf5dcc1a842397982c00be7ac19df241d90fc4d353aa8a9f5f7db25ef4",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xb2a7123db510a0b001ef635da54f29a08ac85299238171be5b9f54abc1d970c1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000604060406000601773945304eb96065b2a98b57a48a06ae28d285a71b5620186a0f1600055",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 100000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 64 0) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "0x17",
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "23",
"code" : "0x6000355415600957005b60203560003555",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -93,14 +61,14 @@
""
],
"gasLimit" : [
- "0x0493e0"
+ "300000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorAddressTooBigLeft.json b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorAddressTooBigLeft.json
index b176cff41..93976d5c2 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorAddressTooBigLeft.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorAddressTooBigLeft.json
@@ -2,88 +2,55 @@
"CallToNameRegistratorAddressTooBigLeft" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorAddressTooBigLeftFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0xf20b4586ddad843f851a34d69a2b34dab11ca15ff8614822f87b6c24656fe85e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "nonce" : "0",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xf20b4586ddad843f851a34d69a2b34dab11ca15ff8614822f87b6c24656fe85e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x4caf17de3d39b4c9cf02ce6d9d4345775b2a7ba7c1d80e346bf1cec5f3673f52",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x4caf17de3d39b4c9cf02ce6d9d4345775b2a7ba7c1d80e346bf1cec5f3673f52",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xf20b4586ddad843f851a34d69a2b34dab11ca15ff8614822f87b6c24656fe85e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000604060406000601774aa945304eb96065b2a98b57a48a06ae28d285a71b56103e8f1600055",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 1000 0xaa945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 64 0) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "0x17",
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "23",
"code" : "0x6000355415600957005b60203560003555",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -93,14 +60,14 @@
""
],
"gasLimit" : [
- "0x0493e0"
+ "300000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorAddressTooBigRight.json b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorAddressTooBigRight.json
index c3d49ebf9..4637297ce 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorAddressTooBigRight.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorAddressTooBigRight.json
@@ -2,88 +2,56 @@
"CallToNameRegistratorAddressTooBigRight" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorAddressTooBigRightFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0xe1600f478012c6e0fa7ce6c3d0e9eccee0863844281254ddd18288bbb7e4cc3e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "nonce" : "0",
+ "storage" : {
+ "0x" : "0x01"
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xe1600f478012c6e0fa7ce6c3d0e9eccee0863844281254ddd18288bbb7e4cc3e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x3755afff282738f4c79362abf2900f9c9e06ac6607a3f87f80fcf9c0ea598559",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x3755afff282738f4c79362abf2900f9c9e06ac6607a3f87f80fcf9c0ea598559",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xe1600f478012c6e0fa7ce6c3d0e9eccee0863844281254ddd18288bbb7e4cc3e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000604060406000601774945304eb96065b2a98b57a48a06ae28d285a71b5aa6103e8f1600055",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 1000 0x945304eb96065b2a98b57a48a06ae28d285a71b5aa 23 0 64 64 0) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "0x17",
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "23",
"code" : "0x6000355415600957005b60203560003555",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -93,14 +61,14 @@
""
],
"gasLimit" : [
- "0x0493e0"
+ "300000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorMemOOGAndInsufficientBalance.json b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorMemOOGAndInsufficientBalance.json
index 7a6af3c09..f1efedad9 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorMemOOGAndInsufficientBalance.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorMemOOGAndInsufficientBalance.json
@@ -2,88 +2,55 @@
"CallToNameRegistratorMemOOGAndInsufficientBalance" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorMemOOGAndInsufficientBalanceFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x114f58e07a1c64cb56b5a025c92e7f90330439ad43c939bd53b0fc366c2261d9",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "nonce" : "0",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x114f58e07a1c64cb56b5a025c92e7f90330439ad43c939bd53b0fc366c2261d9",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x114f58e07a1c64cb56b5a025c92e7f90330439ad43c939bd53b0fc366c2261d9",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x114f58e07a1c64cb56b5a025c92e7f90330439ad43c939bd53b0fc366c2261d9",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x114f58e07a1c64cb56b5a025c92e7f90330439ad43c939bd53b0fc366c2261d9",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000604065ffffffffffff6000601773945304eb96065b2a98b57a48a06ae28d285a71b564fffffffffff1600055",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 0xffffffffff 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 0xffffffffffff 64 0) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "0x17",
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "23",
"code" : "0x6000355415600957005b60203560003555",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -93,14 +60,14 @@
""
],
"gasLimit" : [
- "0x0493e0"
+ "300000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory0.json b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory0.json
index 78249a7b7..0e6d1c773 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory0.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory0.json
@@ -2,88 +2,55 @@
"CallToNameRegistratorNotMuchMemory0" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory0Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0xd694c2d97091570d8bbc35f90e5ad8156dfdfee8c07d1801802233eeb85962b8",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "nonce" : "0",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xd694c2d97091570d8bbc35f90e5ad8156dfdfee8c07d1801802233eeb85962b8",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0xf4fc7d23582ad6e92195cf959b2e8d8802ccf5738269ffd3016c4ebbb7f0f95f",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0xf4fc7d23582ad6e92195cf959b2e8d8802ccf5738269ffd3016c4ebbb7f0f95f",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xd694c2d97091570d8bbc35f90e5ad8156dfdfee8c07d1801802233eeb85962b8",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x7feeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff006000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000620f120660406000601773945304eb96065b2a98b57a48a06ae28d285a71b56101f4f1600055",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 0 0xeeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 500 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 987654 0) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "0x17",
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "23",
"code" : "0x6000355415600957005b60203560003555",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -93,14 +60,14 @@
""
],
"gasLimit" : [
- "0x0493e0"
+ "300000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory1.json b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory1.json
index 93d270179..acd6304af 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory1.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory1.json
@@ -2,88 +2,55 @@
"CallToNameRegistratorNotMuchMemory1" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory1Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x09f6d23e7a13df4afe992c46a87006acc67ff4d173a4331e4ec179f5d8b9cd53",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "nonce" : "0",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x09f6d23e7a13df4afe992c46a87006acc67ff4d173a4331e4ec179f5d8b9cd53",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x57a6ed152d0450751d70b6bced7c126b1e01e0131609c80a1b65531af88082d1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x57a6ed152d0450751d70b6bced7c126b1e01e0131609c80a1b65531af88082d1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x09f6d23e7a13df4afe992c46a87006acc67ff4d173a4331e4ec179f5d8b9cd53",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x7feeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff006000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600060406000620f1206601773945304eb96065b2a98b57a48a06ae28d285a71b56101f4f1600055",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 0 0xeeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 500 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 987654 0 64 0) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "0x17",
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "23",
"code" : "0x6000355415600957005b60203560003555",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -93,14 +60,14 @@
""
],
"gasLimit" : [
- "0x0493e0"
+ "300000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorOutOfGas.json b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorOutOfGas.json
index c0a7bbc25..8e4ed33c6 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorOutOfGas.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorOutOfGas.json
@@ -2,88 +2,55 @@
"CallToNameRegistratorOutOfGas" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorOutOfGasFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x517efad1eb1e2970819211696d148a34dbdc0dc1c3700f17409601bac40d1f8e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "nonce" : "0",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x517efad1eb1e2970819211696d148a34dbdc0dc1c3700f17409601bac40d1f8e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x2b988b2663cbc833b242180bda87a075471856f4c49c67cd60d0425fb3cb03d4",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x2b988b2663cbc833b242180bda87a075471856f4c49c67cd60d0425fb3cb03d4",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x517efad1eb1e2970819211696d148a34dbdc0dc1c3700f17409601bac40d1f8e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x7feeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff006000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000604060406000601773945304eb96065b2a98b57a48a06ae28d285a71b56064f1600055",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 0 0xeeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 100 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 64 0) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "0x17",
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "23",
"code" : "0x6000355415600957005b60203560003555",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -93,14 +60,14 @@
""
],
"gasLimit" : [
- "0x0493e0"
+ "300000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory0.json b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory0.json
index e5460acb5..3818418ca 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory0.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory0.json
@@ -2,88 +2,55 @@
"CallToNameRegistratorTooMuchMemory0" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory0Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x5d4b6ab2f2501fa3ec033514e65f89fa2294ff2a5eea7161071d77f4fe71f8ba",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "nonce" : "0",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x5d4b6ab2f2501fa3ec033514e65f89fa2294ff2a5eea7161071d77f4fe71f8ba",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x5d4b6ab2f2501fa3ec033514e65f89fa2294ff2a5eea7161071d77f4fe71f8ba",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x5d4b6ab2f2501fa3ec033514e65f89fa2294ff2a5eea7161071d77f4fe71f8ba",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x5d4b6ab2f2501fa3ec033514e65f89fa2294ff2a5eea7161071d77f4fe71f8ba",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x7feeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff006000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600060406040633ade68b1601773945304eb96065b2a98b57a48a06ae28d285a71b56101f4f1600055",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 0 0xeeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 500 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 987654321 64 64 0) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "0x17",
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "23",
"code" : "0x6000355415600957005b60203560003555",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -93,14 +60,14 @@
""
],
"gasLimit" : [
- "0x0493e0"
+ "300000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory1.json b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory1.json
index ab11c4c79..0d3ff3565 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory1.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory1.json
@@ -2,88 +2,55 @@
"CallToNameRegistratorTooMuchMemory1" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory1Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x195fb9b7e5616bb930b792075f4b1596b8df9bf468f8f33af87e573a4d227beb",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "nonce" : "0",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x195fb9b7e5616bb930b792075f4b1596b8df9bf468f8f33af87e573a4d227beb",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x195fb9b7e5616bb930b792075f4b1596b8df9bf468f8f33af87e573a4d227beb",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x195fb9b7e5616bb930b792075f4b1596b8df9bf468f8f33af87e573a4d227beb",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x195fb9b7e5616bb930b792075f4b1596b8df9bf468f8f33af87e573a4d227beb",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x7feeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff006000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa60205260006040629688d86000601773945304eb96065b2a98b57a48a06ae28d285a71b56101f4f1600055",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 0 0xeeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 500 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 9865432 64 0) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "0x17",
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "23",
"code" : "0x6000355415600957005b60203560003555",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -93,14 +60,14 @@
""
],
"gasLimit" : [
- "0x0493e0"
+ "300000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory2.json b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory2.json
index d3bb856f4..4c59de757 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory2.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory2.json
@@ -2,88 +2,55 @@
"CallToNameRegistratorTooMuchMemory2" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory2Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x4993da42139940634e711366fdaa07b684fa3b3d8a7a8cd9b2274b27e753913e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "nonce" : "0",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x4993da42139940634e711366fdaa07b684fa3b3d8a7a8cd9b2274b27e753913e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x4993da42139940634e711366fdaa07b684fa3b3d8a7a8cd9b2274b27e753913e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x4993da42139940634e711366fdaa07b684fa3b3d8a7a8cd9b2274b27e753913e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x4993da42139940634e711366fdaa07b684fa3b3d8a7a8cd9b2274b27e753913e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x7feeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff006000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526001620f120660406000601773945304eb96065b2a98b57a48a06ae28d285a71b56101f4f1600055",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 0 0xeeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 500 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 987654 1) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "0x17",
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "23",
"code" : "0x6000355415600957005b60203560003555",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -93,14 +60,14 @@
""
],
"gasLimit" : [
- "0x0493e0"
+ "300000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorZeorSizeMemExpansion.json b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorZeorSizeMemExpansion.json
index 8c1b2add2..685a19a20 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorZeorSizeMemExpansion.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorZeorSizeMemExpansion.json
@@ -2,88 +2,55 @@
"CallToNameRegistratorZeorSizeMemExpansion" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorZeorSizeMemExpansionFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x520ddd540224004110028b9d223f966e4a7cf4db78ffc3114abfe70d1f6b38db",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "nonce" : "0",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x520ddd540224004110028b9d223f966e4a7cf4db78ffc3114abfe70d1f6b38db",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0xbd23d5466a70c39a332b0201f8f56837b02c172e5e60295e7221e5d8668f39e0",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0xbd23d5466a70c39a332b0201f8f56837b02c172e5e60295e7221e5d8668f39e0",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x520ddd540224004110028b9d223f966e4a7cf4db78ffc3114abfe70d1f6b38db",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000600060006000601773945304eb96065b2a98b57a48a06ae28d285a71b56103e8f1600055",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 1000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 0 0 0) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "0x17",
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "23",
"code" : "0x6000355415600957005b60203560003555",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -93,14 +60,14 @@
""
],
"gasLimit" : [
- "0x0493e0"
+ "300000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToReturn1.json b/GeneralStateTests/stSystemOperationsTest/CallToReturn1.json
index 9f160d0a8..9ccac0201 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToReturn1.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToReturn1.json
@@ -2,88 +2,55 @@
"CallToReturn1" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToReturn1Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0xd524736625e1632152bad1b87b2e226e176c6181cde3a844dcb1dd0eeaf300a9",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "nonce" : "0",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xd524736625e1632152bad1b87b2e226e176c6181cde3a844dcb1dd0eeaf300a9",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x17272b576fb7b4b74a5305080e983036905199834abeb29756991089bd61c912",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x17272b576fb7b4b74a5305080e983036905199834abeb29756991089bd61c912",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xd524736625e1632152bad1b87b2e226e176c6181cde3a844dcb1dd0eeaf300a9",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x6001601f60006000601773945304eb96065b2a98b57a48a06ae28d285a71b56103e8f1600055600051600155",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ [[ 0 ]] (CALL 1000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 0 31 1) [[ 1 ]] @0 }",
+ "nonce" : "0",
"storage" : {
}
},
- "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "0x17",
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "23",
"code" : "0x6001600155602a601f536001601ff3",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -93,14 +60,14 @@
""
],
"gasLimit" : [
- "0x0493e0"
+ "300000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToReturn1ForDynamicJump0.json b/GeneralStateTests/stSystemOperationsTest/CallToReturn1ForDynamicJump0.json
index 47ed6782a..0ca7c88bd 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToReturn1ForDynamicJump0.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToReturn1ForDynamicJump0.json
@@ -2,88 +2,55 @@
"CallToReturn1ForDynamicJump0" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToReturn1ForDynamicJump0Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x11bf0d0d8648c8a47dea0a2e55bdb51240010da4f0b41f577a1f23543eeb0c96",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "nonce" : "0",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x11bf0d0d8648c8a47dea0a2e55bdb51240010da4f0b41f577a1f23543eeb0c96",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x11bf0d0d8648c8a47dea0a2e55bdb51240010da4f0b41f577a1f23543eeb0c96",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x11bf0d0d8648c8a47dea0a2e55bdb51240010da4f0b41f577a1f23543eeb0c96",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x11bf0d0d8648c8a47dea0a2e55bdb51240010da4f0b41f577a1f23543eeb0c96",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
"code" : "0x6001601f60006000601773945304eb96065b2a98b57a48a06ae28d285a71b56103e8f1600055600051565b6023602355",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
},
- "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "0x17",
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "23",
"code" : "0x6001600155602a601f536001601ff3",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -93,14 +60,14 @@
""
],
"gasLimit" : [
- "0x0493e0"
+ "300000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToReturn1ForDynamicJump1.json b/GeneralStateTests/stSystemOperationsTest/CallToReturn1ForDynamicJump1.json
index de3afcb90..ca1af1bb9 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToReturn1ForDynamicJump1.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToReturn1ForDynamicJump1.json
@@ -2,88 +2,55 @@
"CallToReturn1ForDynamicJump1" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToReturn1ForDynamicJump1Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x19678aec516eda46d75c60db0ae2c97c0600eb95b7aac31fb6e3d4ede3cf43f9",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "nonce" : "0",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x19678aec516eda46d75c60db0ae2c97c0600eb95b7aac31fb6e3d4ede3cf43f9",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x19678aec516eda46d75c60db0ae2c97c0600eb95b7aac31fb6e3d4ede3cf43f9",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x19678aec516eda46d75c60db0ae2c97c0600eb95b7aac31fb6e3d4ede3cf43f9",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x19678aec516eda46d75c60db0ae2c97c0600eb95b7aac31fb6e3d4ede3cf43f9",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
"code" : "0x6001601f60006000601773945304eb96065b2a98b57a48a06ae28d285a71b56103e8f160005560005156605b6023602355",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
},
- "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "0x17",
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "23",
"code" : "0x6001600155602b601f536001601ff3",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -93,14 +60,14 @@
""
],
"gasLimit" : [
- "0x0493e0"
+ "300000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/CalltoReturn2.json b/GeneralStateTests/stSystemOperationsTest/CalltoReturn2.json
index ac83b23da..7fc4c7cc9 100644
--- a/GeneralStateTests/stSystemOperationsTest/CalltoReturn2.json
+++ b/GeneralStateTests/stSystemOperationsTest/CalltoReturn2.json
@@ -2,88 +2,56 @@
"CalltoReturn2" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/CalltoReturn2Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0xf65269d7b5b7facf1b99aec76e8adfe34906a3493068790b9d52193211815b21",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "nonce" : "0",
+ "storage" : {
+ "0x" : "0x00"
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xf65269d7b5b7facf1b99aec76e8adfe34906a3493068790b9d52193211815b21",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x6971f4dd72e63426d4ae977723404b9822e13339e65386187b746a9a368e459f",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x6971f4dd72e63426d4ae977723404b9822e13339e65386187b746a9a368e459f",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xf65269d7b5b7facf1b99aec76e8adfe34906a3493068790b9d52193211815b21",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526002600060406000601773945304eb96065b2a98b57a48a06ae28d285a71b5611388f1600055",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 5000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 0 2 ) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "0x17",
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "23",
"code" : "0x6001600155603760005360026000f2",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -93,14 +61,14 @@
""
],
"gasLimit" : [
- "0x0493e0"
+ "300000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/CreateHashCollision.json b/GeneralStateTests/stSystemOperationsTest/CreateHashCollision.json
index d56dc054a..7e959962d 100644
--- a/GeneralStateTests/stSystemOperationsTest/CreateHashCollision.json
+++ b/GeneralStateTests/stSystemOperationsTest/CreateHashCollision.json
@@ -2,88 +2,87 @@
"CreateHashCollision" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/CreateHashCollisionFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x9ad1ffb51fe6f7a2dca6fd17ab366990af3f875137c82d2dc64ff6e8b1b9161e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Frontier",
+ "Homestead",
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ "0x" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
+ }
+ },
+ "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+ "balance" : "65",
+ "code" : "0x6000355415600957005b602035600035",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xd73594e1cf8108b5cb811ece843511874fea2a4536d12d08e92258b46be8f7f4",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x9ad1ffb51fe6f7a2dca6fd17ab366990af3f875137c82d2dc64ff6e8b1b9161e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x9ad1ffb51fe6f7a2dca6fd17ab366990af3f875137c82d2dc64ff6e8b1b9161e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xed83cfbd371641f3a30d68735ef254d558e8751dbc237d721b5704fa91e58e7f",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Metropolis"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ "0x00" : "0x00"
+ }
+ },
+ "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+ "balance" : "42",
+ "code" : "0x60016001016055",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x7c601080600c6000396000f3006000355415600957005b60203560003555600052601d60036017f0600055",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 0 0x601080600c6000396000f3006000355415600957005b60203560003555) [[ 0 ]] (CREATE 23 3 29) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
},
- "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
- "balance" : "0x2a",
+ "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+ "balance" : "42",
"code" : "0x60016001016055",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -93,14 +92,14 @@
""
],
"gasLimit" : [
- "0x989680"
+ "10000000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/PostToReturn1.json b/GeneralStateTests/stSystemOperationsTest/PostToReturn1.json
index d77dbc79e..481ec10ae 100644
--- a/GeneralStateTests/stSystemOperationsTest/PostToReturn1.json
+++ b/GeneralStateTests/stSystemOperationsTest/PostToReturn1.json
@@ -2,88 +2,56 @@
"PostToReturn1" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/PostToReturn1Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0xd7e921c9f8fa1dcc2daa5c823c5e4e63b5f2cf80c85bd18f896167ffa49e43c5",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x01"
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xd7e921c9f8fa1dcc2daa5c823c5e4e63b5f2cf80c85bd18f896167ffa49e43c5",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x9f7a93654e2c5b63c54ab0c0946d7df6c9f0966b4bb8763085cc3e7a33ded7b4",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x9f7a93654e2c5b63c54ab0c0946d7df6c9f0966b4bb8763085cc3e7a33ded7b4",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xd7e921c9f8fa1dcc2daa5c823c5e4e63b5f2cf80c85bd18f896167ffa49e43c5",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000600060406000601773945304eb96065b2a98b57a48a06ae28d285a71b5617530f16001556001600255",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[1]](CALL 30000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 0 0 ) [[2]] 1 }",
+ "nonce" : "0",
"storage" : {
}
},
- "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "0x17",
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "23",
"code" : "0x603760005360026000f2",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -93,14 +61,14 @@
""
],
"gasLimit" : [
- "0x0493e0"
+ "300000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/TestNameRegistrator.json b/GeneralStateTests/stSystemOperationsTest/TestNameRegistrator.json
index d1cab468e..689d8bd95 100644
--- a/GeneralStateTests/stSystemOperationsTest/TestNameRegistrator.json
+++ b/GeneralStateTests/stSystemOperationsTest/TestNameRegistrator.json
@@ -2,81 +2,48 @@
"TestNameRegistrator" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/TestNameRegistratorFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0f4240",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "1000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0xcedee0855a8063f17b379084d252572d4f4949b14787f120f7dec66ae516fd2b",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa"
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xcedee0855a8063f17b379084d252572d4f4949b14787f120f7dec66ae516fd2b",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x00f4b821448a5251d87c19e12ec783941c018048afc48c2afe4e9ce9c7d843d2",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x00f4b821448a5251d87c19e12ec783941c018048afc48c2afe4e9ce9c7d843d2",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xcedee0855a8063f17b379084d252572d4f4949b14787f120f7dec66ae516fd2b",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
"code" : "0x6000355415600957005b60203560003555",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +53,14 @@
"0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffafffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa"
],
"gasLimit" : [
- "0x0f4240"
+ "1000000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/balanceInputAddressTooBig.json b/GeneralStateTests/stSystemOperationsTest/balanceInputAddressTooBig.json
index 879c59292..b8a8e356d 100644
--- a/GeneralStateTests/stSystemOperationsTest/balanceInputAddressTooBig.json
+++ b/GeneralStateTests/stSystemOperationsTest/balanceInputAddressTooBig.json
@@ -2,81 +2,48 @@
"balanceInputAddressTooBig" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/balanceInputAddressTooBigFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0f4240",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "1000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x498e32033ce67f3f9a89601d7c9d615ba9a8128ddb17f04e1d6427d165d4a8be",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "nonce" : "0",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x498e32033ce67f3f9a89601d7c9d615ba9a8128ddb17f04e1d6427d165d4a8be",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x0cd184d79d2fe8bc7d5d565abd8223ddbbf6a74884b03dba907114a50c1e4194",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x0cd184d79d2fe8bc7d5d565abd8223ddbbf6a74884b03dba907114a50c1e4194",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x498e32033ce67f3f9a89601d7c9d615ba9a8128ddb17f04e1d6427d165d4a8be",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x74a94f5374fce5edbc8e2a8697c15331677e6ebf0baa31600055",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ [[ 0 ]] (BALANCE 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0baa ) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +53,14 @@
""
],
"gasLimit" : [
- "0x0493e0"
+ "300000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/callValue.json b/GeneralStateTests/stSystemOperationsTest/callValue.json
index a0b6e4b30..8ed0b74ee 100644
--- a/GeneralStateTests/stSystemOperationsTest/callValue.json
+++ b/GeneralStateTests/stSystemOperationsTest/callValue.json
@@ -2,81 +2,48 @@
"callValue" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/callValueFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0xea5a2e542032a38dc4c5b8a35af97c8aec0478e44ce2578257d5e2ba877c2ff3",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ "0x" : "0x0186a0"
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xea5a2e542032a38dc4c5b8a35af97c8aec0478e44ce2578257d5e2ba877c2ff3",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0xea5a2e542032a38dc4c5b8a35af97c8aec0478e44ce2578257d5e2ba877c2ff3",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0xea5a2e542032a38dc4c5b8a35af97c8aec0478e44ce2578257d5e2ba877c2ff3",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xea5a2e542032a38dc4c5b8a35af97c8aec0478e44ce2578257d5e2ba877c2ff3",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x34600055",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ [[0]] (CALLVALUE) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +53,14 @@
""
],
"gasLimit" : [
- "0x989680"
+ "10000000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/callcodeTo0.json b/GeneralStateTests/stSystemOperationsTest/callcodeTo0.json
index 1a1222f0e..95e695981 100644
--- a/GeneralStateTests/stSystemOperationsTest/callcodeTo0.json
+++ b/GeneralStateTests/stSystemOperationsTest/callcodeTo0.json
@@ -2,81 +2,49 @@
"callcodeTo0" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/callcodeTo0Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x01c9c380",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "30000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x19f9a922972fe0537d83f56f5959862d5ad2124a228380ae9f47ac5618fc8037",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "nonce" : "0",
+ "storage" : {
+ "0x" : "0x01"
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x19f9a922972fe0537d83f56f5959862d5ad2124a228380ae9f47ac5618fc8037",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0xf2b28acfc1a870888ce8bec91ba864a29d474f8c112c6d95febdfc398bf51a87",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0xf2b28acfc1a870888ce8bec91ba864a29d474f8c112c6d95febdfc398bf51a87",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x19f9a922972fe0537d83f56f5959862d5ad2124a228380ae9f47ac5618fc8037",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x60006000600060006001600061c350f2600055",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ [[ 0 ]] (CALLCODE 50000 0 1 0 0 0 0) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +54,14 @@
""
],
"gasLimit" : [
- "0x2dc6c0"
+ "3000000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistrator0.json b/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistrator0.json
index 22175bb40..c121ba277 100644
--- a/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistrator0.json
+++ b/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistrator0.json
@@ -2,88 +2,54 @@
"callcodeToNameRegistrator0" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/callcodeToNameRegistrator0Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x80a99db610de9d5f0becc55ff0d92519481297b4ac066d473c19d47cd41d5daf",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x80a99db610de9d5f0becc55ff0d92519481297b4ac066d473c19d47cd41d5daf",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x7134711778196126bf70632019459d9139f5fd61ec1902b8ad932dbf2dc4f271",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x7134711778196126bf70632019459d9139f5fd61ec1902b8ad932dbf2dc4f271",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x80a99db610de9d5f0becc55ff0d92519481297b4ac066d473c19d47cd41d5daf",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000604060406000601773945304eb96065b2a98b57a48a06ae28d285a71b56103e8f2600055",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALLCODE 1000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 64 0) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "0x17",
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "23",
"code" : "0x6000355415600957005b60203560003555",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -93,14 +59,14 @@
""
],
"gasLimit" : [
- "0x0f4240"
+ "1000000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigLeft.json b/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigLeft.json
index 32326c8ca..60fe4bb30 100644
--- a/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigLeft.json
+++ b/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigLeft.json
@@ -2,88 +2,54 @@
"callcodeToNameRegistratorAddresTooBigLeft" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigLeftFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x01c79efbe5d2bcf9a3f4e7996901cdc5546fe582aadede40602c24b9cffe5268",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x01c79efbe5d2bcf9a3f4e7996901cdc5546fe582aadede40602c24b9cffe5268",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x593b3eef5051e2c75739cdd3228252d08672b2e647c592bbe1e9fb8c0acb3f87",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x593b3eef5051e2c75739cdd3228252d08672b2e647c592bbe1e9fb8c0acb3f87",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x01c79efbe5d2bcf9a3f4e7996901cdc5546fe582aadede40602c24b9cffe5268",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000604060406000601774aa945304eb96065b2a98b57a48a06ae28d285a71b56103e8f2600055",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALLCODE 1000 0xaa945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 64 0) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "0x17",
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "23",
"code" : "0x6000355415600957005b60203560003555",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -93,14 +59,14 @@
""
],
"gasLimit" : [
- "0x0f4240"
+ "1000000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigRight.json b/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigRight.json
index dd66298a4..36991fee6 100644
--- a/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigRight.json
+++ b/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigRight.json
@@ -2,88 +2,55 @@
"callcodeToNameRegistratorAddresTooBigRight" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigRightFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x6a14904644464966f58ab919f626b0cfa28e92476bf966c1dbf5205985ebab13",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ "0x" : "0x01"
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x6a14904644464966f58ab919f626b0cfa28e92476bf966c1dbf5205985ebab13",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x4026a08c4d682101cf0f13e53e36a03554d8e61fbe39b81bd7802dfc40301368",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x4026a08c4d682101cf0f13e53e36a03554d8e61fbe39b81bd7802dfc40301368",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x6a14904644464966f58ab919f626b0cfa28e92476bf966c1dbf5205985ebab13",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000604060406000601774945304eb96065b2a98b57a48a06ae28d285a71b5aa6103e8f2600055",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALLCODE 1000 0x945304eb96065b2a98b57a48a06ae28d285a71b5aa 23 0 64 64 0) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "0x17",
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "23",
"code" : "0x6000355415600957005b60203560003555",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -93,14 +60,14 @@
""
],
"gasLimit" : [
- "0x0f4240"
+ "1000000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorZeroMemExpanion.json b/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorZeroMemExpanion.json
index d08aa6cc9..a71c8ca66 100644
--- a/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorZeroMemExpanion.json
+++ b/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorZeroMemExpanion.json
@@ -2,88 +2,54 @@
"callcodeToNameRegistratorZeroMemExpanion" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/callcodeToNameRegistratorZeroMemExpanionFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x153fcad07dc3b3c9650fae069eb7726c29f6d407b1a7f2c1efc458855c7f8e06",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x153fcad07dc3b3c9650fae069eb7726c29f6d407b1a7f2c1efc458855c7f8e06",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x3f1a9d1c69c51b03762bb2e8bdc7529a9ac07b37c9e68afb9ccbfe3158542645",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x3f1a9d1c69c51b03762bb2e8bdc7529a9ac07b37c9e68afb9ccbfe3158542645",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x153fcad07dc3b3c9650fae069eb7726c29f6d407b1a7f2c1efc458855c7f8e06",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000600060006000601773945304eb96065b2a98b57a48a06ae28d285a71b56103e8f2600055",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALLCODE 1000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 0 0 0) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "0x17",
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "23",
"code" : "0x6000355415600957005b60203560003555",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -93,14 +59,14 @@
""
],
"gasLimit" : [
- "0x0f4240"
+ "1000000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/callcodeToReturn1.json b/GeneralStateTests/stSystemOperationsTest/callcodeToReturn1.json
index c9e39f0bd..aecdd3cea 100644
--- a/GeneralStateTests/stSystemOperationsTest/callcodeToReturn1.json
+++ b/GeneralStateTests/stSystemOperationsTest/callcodeToReturn1.json
@@ -2,88 +2,57 @@
"callcodeToReturn1" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/callcodeToReturn1Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x01c9c380",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "30000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0xfee86436f44e3e9f5ac0ba17a93cfce472a98a0472d61cc37b90c8e202d3036a",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "nonce" : "0",
+ "storage" : {
+ "0x" : "0x01",
+ "0x01" : "0x01"
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xfee86436f44e3e9f5ac0ba17a93cfce472a98a0472d61cc37b90c8e202d3036a",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x24a5ee7c7e8184fcdc16f247f6fcd4e2e9f8b2859fd5bf2d08b982f31ab3193d",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x24a5ee7c7e8184fcdc16f247f6fcd4e2e9f8b2859fd5bf2d08b982f31ab3193d",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xfee86436f44e3e9f5ac0ba17a93cfce472a98a0472d61cc37b90c8e202d3036a",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526002600060406000601773945304eb96065b2a98b57a48a06ae28d285a71b561c350f2600055",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALLCODE 50000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 0 2 ) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "0x17",
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "23",
"code" : "0x6001600155603760005360026000f3",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -93,14 +62,14 @@
""
],
"gasLimit" : [
- "0x2dc6c0"
+ "3000000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/callerAccountBalance.json b/GeneralStateTests/stSystemOperationsTest/callerAccountBalance.json
index 36630e87a..b1e897646 100644
--- a/GeneralStateTests/stSystemOperationsTest/callerAccountBalance.json
+++ b/GeneralStateTests/stSystemOperationsTest/callerAccountBalance.json
@@ -2,81 +2,48 @@
"callerAccountBalance" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/callerAccountBalanceFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x710a9fb9288bf74ee9432386b671bf6749744934cb9b2a2925353560957d7d2e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ "0x" : "0x0de0b6b3a6c9e2e0"
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x710a9fb9288bf74ee9432386b671bf6749744934cb9b2a2925353560957d7d2e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0xb280489f0c73c0193849da3c965ce2437f3eef1a2b68152630a844e903c57bde",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0xb280489f0c73c0193849da3c965ce2437f3eef1a2b68152630a844e903c57bde",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x710a9fb9288bf74ee9432386b671bf6749744934cb9b2a2925353560957d7d2e",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x3331600055",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ [[0]] (balance (caller)) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +53,14 @@
""
],
"gasLimit" : [
- "0x989680"
+ "10000000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/createNameRegistrator.json b/GeneralStateTests/stSystemOperationsTest/createNameRegistrator.json
index a53a8ea95..024be652f 100644
--- a/GeneralStateTests/stSystemOperationsTest/createNameRegistrator.json
+++ b/GeneralStateTests/stSystemOperationsTest/createNameRegistrator.json
@@ -2,81 +2,49 @@
"createNameRegistrator" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x05f5e100",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "100000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x5c10031877a1bb9d9a87739caa56232f09aecd78b7b4bc00930ca3f5c1144275",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "nonce" : "1",
+ "storage" : {
+ "0x" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xf1770913799fff90a6dc218afa00ef98bb9ed6cecbbe5a8e31943c9edce09332",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x5c10031877a1bb9d9a87739caa56232f09aecd78b7b4bc00930ca3f5c1144275",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x5c10031877a1bb9d9a87739caa56232f09aecd78b7b4bc00930ca3f5c1144275",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xf1770913799fff90a6dc218afa00ef98bb9ed6cecbbe5a8e31943c9edce09332",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x7c601080600c6000396000f3006000355415600957005b60203560003555600052601d60036017f0600055",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 0 0x601080600c6000396000f3006000355415600957005b60203560003555) [[ 0 ]] (CREATE 23 3 29) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +54,14 @@
""
],
"gasLimit" : [
- "0x0493e0"
+ "300000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOOG_MemExpansionOOV.json b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOOG_MemExpansionOOV.json
index a697761e9..c898429ac 100644
--- a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOOG_MemExpansionOOV.json
+++ b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOOG_MemExpansionOOV.json
@@ -2,81 +2,48 @@
"createNameRegistratorOOG_MemExpansionOOV" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorOOG_MemExpansionOOVFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0f4240",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "1000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x1445168607eec4569321c8c3ed83f04298957bb89ca90ff1c2663f194f14d3ad",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "nonce" : "0",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x1445168607eec4569321c8c3ed83f04298957bb89ca90ff1c2663f194f14d3ad",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x1445168607eec4569321c8c3ed83f04298957bb89ca90ff1c2663f194f14d3ad",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x1445168607eec4569321c8c3ed83f04298957bb89ca90ff1c2663f194f14d3ad",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x1445168607eec4569321c8c3ed83f04298957bb89ca90ff1c2663f194f14d3ad",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x2710",
- "code" : "0x7c601080600c6000396000f3006000355415600957005b602035600035556000526affffffffffffffffffffff6003612af8f0600055",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "10000",
+ "code" : "{ (MSTORE 0 0x601080600c6000396000f3006000355415600957005b60203560003555) [[ 0 ]] (CREATE 11000 3 0xffffffffffffffffffffff) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +53,14 @@
""
],
"gasLimit" : [
- "0x0493e0"
+ "300000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds0.json b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds0.json
index e8e43a69e..2681f60aa 100644
--- a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds0.json
+++ b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds0.json
@@ -2,81 +2,48 @@
"createNameRegistratorOutOfMemoryBonds0" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds0Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0f4240",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "1000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x2516c1bbc89361b6de0cf1a0dd37c29eb1fb5443e6b61d30995c582b1f382ba7",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "nonce" : "0",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x2516c1bbc89361b6de0cf1a0dd37c29eb1fb5443e6b61d30995c582b1f382ba7",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x2516c1bbc89361b6de0cf1a0dd37c29eb1fb5443e6b61d30995c582b1f382ba7",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x2516c1bbc89361b6de0cf1a0dd37c29eb1fb5443e6b61d30995c582b1f382ba7",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x2516c1bbc89361b6de0cf1a0dd37c29eb1fb5443e6b61d30995c582b1f382ba7",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x7c601080600c6000396000f3006000355415600957005b60203560003555600052601d650fffffffffff6017f0600055",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 0 0x601080600c6000396000f3006000355415600957005b60203560003555) [[ 0 ]] (CREATE 23 0xfffffffffff 29) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +53,14 @@
""
],
"gasLimit" : [
- "0x0493e0"
+ "300000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds1.json b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds1.json
index 6b59936d3..d72029fa9 100644
--- a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds1.json
+++ b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds1.json
@@ -2,81 +2,48 @@
"createNameRegistratorOutOfMemoryBonds1" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds1Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0f4240",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "1000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0xb3e49d40bee33d67c1805b9016d7166c327d4a0e0e886e3b8ff8775adfdd7909",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "nonce" : "0",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xb3e49d40bee33d67c1805b9016d7166c327d4a0e0e886e3b8ff8775adfdd7909",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0xb3e49d40bee33d67c1805b9016d7166c327d4a0e0e886e3b8ff8775adfdd7909",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0xb3e49d40bee33d67c1805b9016d7166c327d4a0e0e886e3b8ff8775adfdd7909",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xb3e49d40bee33d67c1805b9016d7166c327d4a0e0e886e3b8ff8775adfdd7909",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x7c601080600c6000396000f3006000355415600957005b60203560003555600052650fffffffffff60036017f0600055",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 0 0x601080600c6000396000f3006000355415600957005b60203560003555) [[ 0 ]] (CREATE 23 3 0xfffffffffff) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +53,14 @@
""
],
"gasLimit" : [
- "0x0493e0"
+ "300000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorValueTooHigh.json b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorValueTooHigh.json
index 8246fe5af..deba3d9ea 100644
--- a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorValueTooHigh.json
+++ b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorValueTooHigh.json
@@ -2,81 +2,46 @@
"createNameRegistratorValueTooHigh" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorValueTooHighFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0f4240",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "1000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x92152a14da785d61543ce9241c8562e55b97dd1f4af60190a30f7d045d8014b1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+ "shouldnotexist" : "1"
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x92152a14da785d61543ce9241c8562e55b97dd1f4af60190a30f7d045d8014b1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x92152a14da785d61543ce9241c8562e55b97dd1f4af60190a30f7d045d8014b1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x92152a14da785d61543ce9241c8562e55b97dd1f4af60190a30f7d045d8014b1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x92152a14da785d61543ce9241c8562e55b97dd1f4af60190a30f7d045d8014b1",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x7c601080600c6000396000f3006000355415600957005b60203560003555600052601d6003670de0b6b3a7640001f0600055",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 0 0x601080600c6000396000f3006000355415600957005b60203560003555) [[ 0 ]] (CREATE 1000000000000000001 3 29) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0f4240",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +51,14 @@
""
],
"gasLimit" : [
- "0x0493e0"
+ "300000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x00"
+ "0"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMem.json b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMem.json
index 4f1235630..e7307bc96 100644
--- a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMem.json
+++ b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMem.json
@@ -2,81 +2,49 @@
"createNameRegistratorZeroMem" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorZeroMemFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0f4240",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "1000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x534c4ab86305a6e229b8e02dc82bcbdadbf0181384643b14ee0ed128a3a30764",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "nonce" : "1",
+ "storage" : {
+ "0x" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xd9804558d3cf4692b46acf3d314718d66552150ecb7c8cde1057d366fe1fd3dd",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x534c4ab86305a6e229b8e02dc82bcbdadbf0181384643b14ee0ed128a3a30764",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x534c4ab86305a6e229b8e02dc82bcbdadbf0181384643b14ee0ed128a3a30764",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xd9804558d3cf4692b46acf3d314718d66552150ecb7c8cde1057d366fe1fd3dd",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x7c601080600c6000396000f3006000355415600957005b60203560003555600052600060036017f0600055",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 0 0x601080600c6000396000f3006000355415600957005b60203560003555) [[ 0 ]] (CREATE 23 3 0) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +54,14 @@
""
],
"gasLimit" : [
- "0x0493e0"
+ "300000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMem2.json b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMem2.json
index f29462e8b..4b694b06f 100644
--- a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMem2.json
+++ b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMem2.json
@@ -2,81 +2,49 @@
"createNameRegistratorZeroMem2" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorZeroMem2Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0f4240",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "1000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x9315ff98ac078dee73c02ba0caf0432a65f4907d717c97f7939f6f1337aba928",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "nonce" : "1",
+ "storage" : {
+ "0x" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x7b9b9903aff8d72bc0f37ce4a4d93abaf13224c67f4929bb7db407c0ad20fc6f",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x9315ff98ac078dee73c02ba0caf0432a65f4907d717c97f7939f6f1337aba928",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x9315ff98ac078dee73c02ba0caf0432a65f4907d717c97f7939f6f1337aba928",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x7b9b9903aff8d72bc0f37ce4a4d93abaf13224c67f4929bb7db407c0ad20fc6f",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x7c601080600c6000396000f3006000355415600957005b6020356000355560005260007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6017f0600055",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 0 0x601080600c6000396000f3006000355415600957005b60203560003555) [[ 0 ]] (CREATE 23 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +54,14 @@
""
],
"gasLimit" : [
- "0x0493e0"
+ "300000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMemExpansion.json b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMemExpansion.json
index 32456ad8c..8e1bb2fcd 100644
--- a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMemExpansion.json
+++ b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMemExpansion.json
@@ -2,81 +2,49 @@
"createNameRegistratorZeroMemExpansion" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorZeroMemExpansionFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x0f4240",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "1000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x77d89db4fefd45c31e64ecd2fb991651c5ce1a1b3e3cf3171395f571bc9b9417",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "nonce" : "1",
+ "storage" : {
+ "0x" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x91f70b0f7060391efb1037b8f590f310eefe601db4ec9915e1af5b451efdf8c4",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x77d89db4fefd45c31e64ecd2fb991651c5ce1a1b3e3cf3171395f571bc9b9417",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x77d89db4fefd45c31e64ecd2fb991651c5ce1a1b3e3cf3171395f571bc9b9417",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x91f70b0f7060391efb1037b8f590f310eefe601db4ec9915e1af5b451efdf8c4",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x7c601080600c6000396000f3006000355415600957005b60203560003555600052600060006017f0600055",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 0 0x601080600c6000396000f3006000355415600957005b60203560003555) [[ 0 ]] (CREATE 23 0 0) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +54,14 @@
""
],
"gasLimit" : [
- "0x0493e0"
+ "300000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/createWithInvalidOpcode.json b/GeneralStateTests/stSystemOperationsTest/createWithInvalidOpcode.json
index ce160d598..9e122a224 100644
--- a/GeneralStateTests/stSystemOperationsTest/createWithInvalidOpcode.json
+++ b/GeneralStateTests/stSystemOperationsTest/createWithInvalidOpcode.json
@@ -2,81 +2,48 @@
"createWithInvalidOpcode" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/createWithInvalidOpcodeFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
- "currentGasLimit" : "0x0f4240",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "1000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x36a506299d0982a91b9bf1d7f1f1415300eef03b33597d4d05b85c7db2854ccf",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "nonce" : "1",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x36a506299d0982a91b9bf1d7f1f1415300eef03b33597d4d05b85c7db2854ccf",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x15fba448e5949b4f68452110f29013eb1fbe319463ea33a64e1485a6c526ee82",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x15fba448e5949b4f68452110f29013eb1fbe319463ea33a64e1485a6c526ee82",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x36a506299d0982a91b9bf1d7f1f1415300eef03b33597d4d05b85c7db2854ccf",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
"code" : "0x444242424245434253f0",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +53,14 @@
""
],
"gasLimit" : [
- "0x0493e0"
+ "300000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/currentAccountBalance.json b/GeneralStateTests/stSystemOperationsTest/currentAccountBalance.json
index 48401843c..e809877da 100644
--- a/GeneralStateTests/stSystemOperationsTest/currentAccountBalance.json
+++ b/GeneralStateTests/stSystemOperationsTest/currentAccountBalance.json
@@ -2,81 +2,48 @@
"currentAccountBalance" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/currentAccountBalanceFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0xe406da1a46079816711c71e26a7b47a2865a87ed03ab12df7dc2317f651a3fd8",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ "0x" : "0x0de0b6b3a76586a0"
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xe406da1a46079816711c71e26a7b47a2865a87ed03ab12df7dc2317f651a3fd8",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0xda6372df6637d722d7cbe4b808111af5ae8aefa80dbc8396f55030cf1a56d624",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0xda6372df6637d722d7cbe4b808111af5ae8aefa80dbc8396f55030cf1a56d624",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xe406da1a46079816711c71e26a7b47a2865a87ed03ab12df7dc2317f651a3fd8",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x3031600055",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ [[0]] (balance (address)) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +53,14 @@
""
],
"gasLimit" : [
- "0x989680"
+ "10000000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/extcodecopy.json b/GeneralStateTests/stSystemOperationsTest/extcodecopy.json
index 1bd35a39f..05ddeb32a 100644
--- a/GeneralStateTests/stSystemOperationsTest/extcodecopy.json
+++ b/GeneralStateTests/stSystemOperationsTest/extcodecopy.json
@@ -2,87 +2,99 @@
"extcodecopy" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/extcodecopyFiller.json"
},
"env" : {
- "currentCoinbase" : "0x4401fcaf7d64d53fb1cfc5c9045c32aa919a8c82",
+ "currentCoinbase" : "4401fcaf7d64d53fb1cfc5c9045c32aa919a8c82",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x58272e28",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0xd30f77155de00f207ad60109897e790f73e9f3431be25717bf3651d91949f041"
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "d30f77155de00f207ad60109897e790f73e9f3431be25717bf3651d91949f041"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x32c08fc32999efafc4aed330782b49171c3caf851285f65c06182baa0d8f4aa4",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Frontier",
+ "Homestead"
+ ],
+ "result" : {
+ "00000000002147c39fd6b5c19b7b89fc003e6b16" : {
+ "balance" : "0x2a6bb607",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "4401fcaf7d64d53fb1cfc5c9045c32aa919a8c82" : {
+ "balance" : "0x06c5a7f85ff0",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x4f6ca0f3404f688d",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x32c08fc32999efafc4aed330782b49171c3caf851285f65c06182baa0d8f4aa4",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x19cf4c2d1e51b64210c6fe4b0094f8e592a5ac333234495a948f6a3c694453e3",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x19cf4c2d1e51b64210c6fe4b0094f8e592a5ac333234495a948f6a3c694453e3",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x32c08fc32999efafc4aed330782b49171c3caf851285f65c06182baa0d8f4aa4",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "00000000002147c39fd6b5c19b7b89fc003e6b16" : {
+ "balance" : "0x2a6bb607",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "4401fcaf7d64d53fb1cfc5c9045c32aa919a8c82" : {
+ "balance" : "18122589774504",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "5723115516504122837",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "0x05c81eb0",
"code" : "0x7f15688566a82f5f946c68028bf626b349e495daa43e33529a76437ac416cd1b7d6e7dae7454bb193b1c28e64a6a935bc373cea0c5cc171fa61277e5604a3bc8aef4de3d38820658600b80797ada6e82e95f6520383f95f5c7dae56b4dc13b6f22ecabfce07c3cff51",
"nonce" : "0xfe",
"storage" : {
}
},
- "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
"balance" : "0x4d6769f8",
"code" : "0x5a60106017601160116018601c600f601b601d5f60026013600f601a8d5a5b7679177b5dd41a23db52998c4dcd14e88390dcc9f3ed5783601660145f6013600d601f60016011600e600c600d601f60138c7a58f20fd882eb51408a52e569ce80e93270ab53ae9de3fec5498a5c72ce1fcd11bb1553736959df779a616b738c1f407c12459490afe302da311a673488d09e71041d0761dee4829e3c38e0b1b1787810f2e11e2289983c1ab47cf5ebd38c12f1719232b5f3a7b27a9ea8858a071c4169392ec725646311235cbd9534e5d7cd8cb5e2287738a43f803384f4e62fe6629ea2e609a71759edab5c3a58b87e94c95f710aa6059b0663c9f374ce6ea0a000c5d594c41252d4a74d64896a987cc57c24df2ce8ffb85adcc27dce2d19f7006fbc1c5a7b79a319418fd6c27ddebcf170192262d82c1053333f6115c8b258b81e2e84d723c98dbd4535de7f922723a15827bbcfd07f9e2c5027c7736ed68c61b332059d7ec1bae1c1fd41a361d35b996d9740a588b6abf3293236afb927717328c014846148ce67eaf2b33d90672366dafeaae0714eb39e7fd5076a831d8eb4a3546288a3e1a0087aebe80b6bbfa4041330b05d094a697236fe7654d8a7ce630f83a832620125d781666e898f7fdcfd0031",
"nonce" : "0xdd",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0x4f6ca7b90ceb5fd4",
- "code" : "",
+ "code" : "0x",
"nonce" : "0x00",
"storage" : {
}
@@ -97,8 +109,8 @@
],
"gasPrice" : "0x1cd49878",
"nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
"0x24a39757"
]
diff --git a/GeneralStateTests/stSystemOperationsTest/return0.json b/GeneralStateTests/stSystemOperationsTest/return0.json
index fc47fa4c4..2e3889b07 100644
--- a/GeneralStateTests/stSystemOperationsTest/return0.json
+++ b/GeneralStateTests/stSystemOperationsTest/return0.json
@@ -2,81 +2,46 @@
"return0" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/return0Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0xa7c787bf470808896308c215e22c7a580a0087bb6db6e8695fb4759537283a83",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "21018"
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xa7c787bf470808896308c215e22c7a580a0087bb6db6e8695fb4759537283a83",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0xa7c787bf470808896308c215e22c7a580a0087bb6db6e8695fb4759537283a83",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0xa7c787bf470808896308c215e22c7a580a0087bb6db6e8695fb4759537283a83",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xa7c787bf470808896308c215e22c7a580a0087bb6db6e8695fb4759537283a83",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x17",
- "code" : "0x603760005360016000f3",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "23",
+ "code" : "{ (MSTORE8 0 55) (RETURN 0 1)}",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +51,14 @@
""
],
"gasLimit" : [
- "0x0f4240"
+ "1000000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/return1.json b/GeneralStateTests/stSystemOperationsTest/return1.json
index 87d087ab8..65a1d244c 100644
--- a/GeneralStateTests/stSystemOperationsTest/return1.json
+++ b/GeneralStateTests/stSystemOperationsTest/return1.json
@@ -2,81 +2,46 @@
"return1" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/return1Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x5da89a7173f6b194b2ef83c7cd2f29e943718cba518db29ec7b9b2b92ccbb50a",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "21018"
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x5da89a7173f6b194b2ef83c7cd2f29e943718cba518db29ec7b9b2b92ccbb50a",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x5da89a7173f6b194b2ef83c7cd2f29e943718cba518db29ec7b9b2b92ccbb50a",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x5da89a7173f6b194b2ef83c7cd2f29e943718cba518db29ec7b9b2b92ccbb50a",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x5da89a7173f6b194b2ef83c7cd2f29e943718cba518db29ec7b9b2b92ccbb50a",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x17",
- "code" : "0x603760005360026000f3",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "23",
+ "code" : "{ (MSTORE8 0 55) (RETURN 0 2)}",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +51,14 @@
""
],
"gasLimit" : [
- "0x0f4240"
+ "1000000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/return2.json b/GeneralStateTests/stSystemOperationsTest/return2.json
index 46b7a6ad7..cdf8b9b2b 100644
--- a/GeneralStateTests/stSystemOperationsTest/return2.json
+++ b/GeneralStateTests/stSystemOperationsTest/return2.json
@@ -2,81 +2,46 @@
"return2" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/return2Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x9e8b9b791e28d533bc6acbafdb895c6b1708daf9580c0d5671507b667906efee",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "21021"
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x9e8b9b791e28d533bc6acbafdb895c6b1708daf9580c0d5671507b667906efee",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x9e8b9b791e28d533bc6acbafdb895c6b1708daf9580c0d5671507b667906efee",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x9e8b9b791e28d533bc6acbafdb895c6b1708daf9580c0d5671507b667906efee",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x9e8b9b791e28d533bc6acbafdb895c6b1708daf9580c0d5671507b667906efee",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x17",
- "code" : "0x603760005360216000f3",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "23",
+ "code" : "{ (MSTORE8 0 55) (RETURN 0 33)}",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +51,14 @@
""
],
"gasLimit" : [
- "0x0f4240"
+ "1000000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/suicideAddress.json b/GeneralStateTests/stSystemOperationsTest/suicideAddress.json
index d834b4482..e9b0cff1b 100644
--- a/GeneralStateTests/stSystemOperationsTest/suicideAddress.json
+++ b/GeneralStateTests/stSystemOperationsTest/suicideAddress.json
@@ -2,81 +2,69 @@
"suicideAddress" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideAddressFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x518390cc204dd02fd071a3d9f81dfac8916abb6d0302c84a106e60af7f38fc2c",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Frontier",
+ "Homestead"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "shouldnotexist" : "1"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "999999999999879496"
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x518390cc204dd02fd071a3d9f81dfac8916abb6d0302c84a106e60af7f38fc2c",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x0db310830a928b7de2a28ec1946219efb4ff64af40820004f8abacf1228b4234",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x0db310830a928b7de2a28ec1946219efb4ff64af40820004f8abacf1228b4234",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x518390cc204dd02fd071a3d9f81dfac8916abb6d0302c84a106e60af7f38fc2c",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "shouldnotexist" : "1"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "999999999999876996"
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x3060005530ff",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ [[0]] (ADDRESS) (SELFDESTRUCT (ADDRESS))}",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +74,14 @@
""
],
"gasLimit" : [
- "0x0f4240"
+ "1000000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/suicideCaller.json b/GeneralStateTests/stSystemOperationsTest/suicideCaller.json
index ecaff58c4..0d7b1edfc 100644
--- a/GeneralStateTests/stSystemOperationsTest/suicideCaller.json
+++ b/GeneralStateTests/stSystemOperationsTest/suicideCaller.json
@@ -2,81 +2,71 @@
"suicideCaller" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x576dcd5dcb6162373e6ba62f6c42c2fb2c1f47f34987e1acab5a90cea6f717ee",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Frontier",
+ "Homestead"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "shouldnotexist" : "1"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1999999999999979496",
+ "nonce" : "1"
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x576dcd5dcb6162373e6ba62f6c42c2fb2c1f47f34987e1acab5a90cea6f717ee",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0xdf4f742ceccd065ac87e1f9628aefe26e48df34162c43ca000153edf036eb72c",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0xdf4f742ceccd065ac87e1f9628aefe26e48df34162c43ca000153edf036eb72c",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x576dcd5dcb6162373e6ba62f6c42c2fb2c1f47f34987e1acab5a90cea6f717ee",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "shouldnotexist" : "1"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1999999999999976996",
+ "nonce" : "1"
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x3360005533ff",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ [[0]] (CALLER) (SELFDESTRUCT (CALLER))}",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +76,14 @@
""
],
"gasLimit" : [
- "0x0f4240"
+ "1000000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/suicideCallerAddresTooBigLeft.json b/GeneralStateTests/stSystemOperationsTest/suicideCallerAddresTooBigLeft.json
index 5bfcca322..ad9fea6c5 100644
--- a/GeneralStateTests/stSystemOperationsTest/suicideCallerAddresTooBigLeft.json
+++ b/GeneralStateTests/stSystemOperationsTest/suicideCallerAddresTooBigLeft.json
@@ -2,81 +2,71 @@
"suicideCallerAddresTooBigLeft" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerAddresTooBigLeftFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x576dcd5dcb6162373e6ba62f6c42c2fb2c1f47f34987e1acab5a90cea6f717ee",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Frontier",
+ "Homestead"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "shouldnotexist" : "1"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1999999999999979496",
+ "nonce" : "1"
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x576dcd5dcb6162373e6ba62f6c42c2fb2c1f47f34987e1acab5a90cea6f717ee",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0xdf4f742ceccd065ac87e1f9628aefe26e48df34162c43ca000153edf036eb72c",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0xdf4f742ceccd065ac87e1f9628aefe26e48df34162c43ca000153edf036eb72c",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x576dcd5dcb6162373e6ba62f6c42c2fb2c1f47f34987e1acab5a90cea6f717ee",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "shouldnotexist" : "1"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1999999999999976996",
+ "nonce" : "1"
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x3360005574aaa94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ [[0]] (CALLER) (SELFDESTRUCT 0xaaa94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +76,14 @@
""
],
"gasLimit" : [
- "0x0f4240"
+ "1000000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/suicideCallerAddresTooBigRight.json b/GeneralStateTests/stSystemOperationsTest/suicideCallerAddresTooBigRight.json
index 5436ed487..3f8833f87 100644
--- a/GeneralStateTests/stSystemOperationsTest/suicideCallerAddresTooBigRight.json
+++ b/GeneralStateTests/stSystemOperationsTest/suicideCallerAddresTooBigRight.json
@@ -2,81 +2,46 @@
"suicideCallerAddresTooBigRight" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerAddresTooBigRightFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x86e5b16db62bb628d4758fc198b131a72cad91c42e5b7ba6e34f7dd0040a4c4f",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "4f5374fce5edbc8e2a8697c15331677e6ebf0baa" : {
+ "balance" : "1000000000000100000"
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x86e5b16db62bb628d4758fc198b131a72cad91c42e5b7ba6e34f7dd0040a4c4f",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x95b1e818532526bdad03840e613d548f511f71b773bcc151be7c1df5aec55bb0",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x95b1e818532526bdad03840e613d548f511f71b773bcc151be7c1df5aec55bb0",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x86e5b16db62bb628d4758fc198b131a72cad91c42e5b7ba6e34f7dd0040a4c4f",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x3360005574a94f5374fce5edbc8e2a8697c15331677e6ebf0baaff",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ [[0]] (CALLER) (SELFDESTRUCT 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0baa)}",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +51,14 @@
""
],
"gasLimit" : [
- "0x0f4240"
+ "1000000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/suicideCoinbase.json b/GeneralStateTests/stSystemOperationsTest/suicideCoinbase.json
index 4fde91a5b..4b59444f8 100644
--- a/GeneralStateTests/stSystemOperationsTest/suicideCoinbase.json
+++ b/GeneralStateTests/stSystemOperationsTest/suicideCoinbase.json
@@ -2,81 +2,65 @@
"suicideCoinbase" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCoinbaseFiller.json"
},
"env" : {
- "currentCoinbase" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "currentCoinbase" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x6f0998481c651b0b5fe26d002bfd4b3759de8aafa7273b0f458ec594ffb39c51",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Frontier",
+ "Homestead"
+ ],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1999999999999989498",
+ "nonce" : "1"
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x6f0998481c651b0b5fe26d002bfd4b3759de8aafa7273b0f458ec594ffb39c51",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0xd250e0dc5c48a99a23e6a7fbca13303df995c2f8a049aef6fc3afa0e34df4ed4",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0xd250e0dc5c48a99a23e6a7fbca13303df995c2f8a049aef6fc3afa0e34df4ed4",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x6f0998481c651b0b5fe26d002bfd4b3759de8aafa7273b0f458ec594ffb39c51",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1999999999999986998",
+ "nonce" : "1"
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x73a94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (SELFDESTRUCT 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +70,14 @@
""
],
"gasLimit" : [
- "0x0f4240"
+ "1000000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/suicideNotExistingAccount.json b/GeneralStateTests/stSystemOperationsTest/suicideNotExistingAccount.json
index cb7dd2779..3906f1399 100644
--- a/GeneralStateTests/stSystemOperationsTest/suicideNotExistingAccount.json
+++ b/GeneralStateTests/stSystemOperationsTest/suicideNotExistingAccount.json
@@ -2,81 +2,46 @@
"suicideNotExistingAccount" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideNotExistingAccountFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x0a255239a39dd83c975355c293c59afee89ec53443261f213be77c9fcd3517f7",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "aa1722f3947def4cf144679da39c4c32bdc35681" : {
+ "balance" : "1000000000000100000"
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x0a255239a39dd83c975355c293c59afee89ec53443261f213be77c9fcd3517f7",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0xc98d1cc9c8cac043798aba14849c7a9bdff792fd178a331004cf8ac6b4eeaee6",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0xc98d1cc9c8cac043798aba14849c7a9bdff792fd178a331004cf8ac6b4eeaee6",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x0a255239a39dd83c975355c293c59afee89ec53443261f213be77c9fcd3517f7",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x73aa1722f3947def4cf144679da39c4c32bdc35681ff",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (SELFDESTRUCT 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +51,14 @@
""
],
"gasLimit" : [
- "0x0f4240"
+ "1000000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/suicideOrigin.json b/GeneralStateTests/stSystemOperationsTest/suicideOrigin.json
index f9269e3d0..fe4bbede2 100644
--- a/GeneralStateTests/stSystemOperationsTest/suicideOrigin.json
+++ b/GeneralStateTests/stSystemOperationsTest/suicideOrigin.json
@@ -2,81 +2,69 @@
"suicideOrigin" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideOriginFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x576dcd5dcb6162373e6ba62f6c42c2fb2c1f47f34987e1acab5a90cea6f717ee",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Frontier",
+ "Homestead"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "shouldnotexist" : "1"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1999999999999979496"
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x576dcd5dcb6162373e6ba62f6c42c2fb2c1f47f34987e1acab5a90cea6f717ee",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0xdf4f742ceccd065ac87e1f9628aefe26e48df34162c43ca000153edf036eb72c",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0xdf4f742ceccd065ac87e1f9628aefe26e48df34162c43ca000153edf036eb72c",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x576dcd5dcb6162373e6ba62f6c42c2fb2c1f47f34987e1acab5a90cea6f717ee",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "shouldnotexist" : "1"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1999999999999976996"
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x3260005532ff",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ [[0]] (ORIGIN) (SELFDESTRUCT (ORIGIN))}",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +74,14 @@
""
],
"gasLimit" : [
- "0x0f4240"
+ "1000000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/suicideSendEtherPostDeath.json b/GeneralStateTests/stSystemOperationsTest/suicideSendEtherPostDeath.json
index be7fa274e..e50a97fd8 100644
--- a/GeneralStateTests/stSystemOperationsTest/suicideSendEtherPostDeath.json
+++ b/GeneralStateTests/stSystemOperationsTest/suicideSendEtherPostDeath.json
@@ -2,80 +2,76 @@
"suicideSendEtherPostDeath" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideSendEtherPostDeathFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x989680",
"currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0xc53f10f790e3881fb81df07ff8b29693aa11f87177378494b81ee7d437a77468",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Frontier",
+ "Homestead"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "shouldnotexist" : "1"
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "10920"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "999999999999889080",
+ "nonce" : "1"
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xc53f10f790e3881fb81df07ff8b29693aa11f87177378494b81ee7d437a77468",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x9f3c63ff818c14e4b56e5fa1fc03a76725f598bcac256668185ec51dfc1d7f5f",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x9f3c63ff818c14e4b56e5fa1fc03a76725f598bcac256668185ec51dfc1d7f5f",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xc53f10f790e3881fb81df07ff8b29693aa11f87177378494b81ee7d437a77468",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "shouldnotexist" : "1"
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "14270"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "999999999999885730",
+ "nonce" : "1"
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "0x0de0b6b3a7640000",
"code" : "0x60606040526000357c01000000000000000000000000000000000000000000000000000000009004806335f46994146100445780634d536fe31461005157610042565b005b61004f600450610072565b005b61005c60045061008d565b6040518082815260200191505060405180910390f35b3073ffffffffffffffffffffffffffffffffffffffff16ff5b565b600060003073ffffffffffffffffffffffffffffffffffffffff166335f46994604051817c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f115610002575050503073ffffffffffffffffffffffffffffffffffffffff163190503373ffffffffffffffffffffffffffffffffffffffff16600082604051809050600060405180830381858888f1935050505050809150610147565b509056",
"nonce" : "0x00",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0x0de0b6b3a7640000",
- "code" : "",
+ "code" : "0x",
"nonce" : "0x00",
"storage" : {
}
@@ -90,8 +86,8 @@
],
"gasPrice" : "0x01",
"nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
"0x0186a0"
]
diff --git a/GeneralStateTests/stSystemOperationsTest/suicideSendEtherToMe.json b/GeneralStateTests/stSystemOperationsTest/suicideSendEtherToMe.json
index 99af4e26b..f2ddebffd 100644
--- a/GeneralStateTests/stSystemOperationsTest/suicideSendEtherToMe.json
+++ b/GeneralStateTests/stSystemOperationsTest/suicideSendEtherToMe.json
@@ -2,81 +2,71 @@
"suicideSendEtherToMe" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideSendEtherToMeFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
- "currentGasLimit" : "0x989680",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0xb7fc4d877fa862ab30973e1cbfe88f8a09d502983844e4d5d4f5ff0bcb388b45",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "Frontier",
+ "Homestead"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "shouldnotexist" : "1"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "999999999999889499",
+ "nonce" : "1"
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0xb7fc4d877fa862ab30973e1cbfe88f8a09d502983844e4d5d4f5ff0bcb388b45",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x9eb527b54a972a8566c46d406fa86b6d8d4efeeb7ba102713b58fec7f0e34f45",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x9eb527b54a972a8566c46d406fa86b6d8d4efeeb7ba102713b58fec7f0e34f45",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xb7fc4d877fa862ab30973e1cbfe88f8a09d502983844e4d5d4f5ff0bcb388b45",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "EIP150",
+ "EIP158"
+ ],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "shouldnotexist" : "1"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "999999999999886999",
+ "nonce" : "1"
}
}
- ]
- },
+ }
+ ],
"pre" : {
- "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "0x30ff",
- "nonce" : "0x00",
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (SELFDESTRUCT (ADDRESS) )}",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +76,14 @@
""
],
"gasLimit" : [
- "0x0f4240"
+ "1000000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}
diff --git a/GeneralStateTests/stSystemOperationsTest/testRandomTest.json b/GeneralStateTests/stSystemOperationsTest/testRandomTest.json
index 88405b30a..9cee74392 100644
--- a/GeneralStateTests/stSystemOperationsTest/testRandomTest.json
+++ b/GeneralStateTests/stSystemOperationsTest/testRandomTest.json
@@ -2,81 +2,49 @@
"testRandomTest" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stSystemOperationsTest/testRandomTestFiller.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
- "currentGasLimit" : "0x0f4240",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentGasLimit" : "1000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0x3a214e481c7334bd0d5e649795d955ec52badbf5df4988c47c9de6266257a932",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "nonce" : "2",
+ "storage" : {
+ "0xebcce5f60530275ee9318ce1eff9e4bfee810172" : "0x03e8"
+ }
}
}
- ],
- "EIP158" : [
- {
- "hash" : "0x574a120dbb90647527d2be3cb7de28a73a7eaced54d64994d5d53636ac27f403",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0x3a214e481c7334bd0d5e649795d955ec52badbf5df4988c47c9de6266257a932",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Homestead" : [
- {
- "hash" : "0x3a214e481c7334bd0d5e649795d955ec52badbf5df4988c47c9de6266257a932",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0x574a120dbb90647527d2be3cb7de28a73a7eaced54d64994d5d53636ac27f403",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "0x0de0b6b3a7640000",
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
"code" : "0x424443444243434383f0155af055",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "0x0de0b6b3a7640000",
- "code" : "",
- "nonce" : "0x00",
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x",
+ "nonce" : "0",
"storage" : {
}
}
@@ -86,14 +54,14 @@
""
],
"gasLimit" : [
- "0x0493e0"
+ "300000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0x0186a0"
+ "100000"
]
}
}