aboutsummaryrefslogtreecommitdiffstats
path: root/GeneralStateTests/stSolidityTest/ContractInheritance.json
diff options
context:
space:
mode:
Diffstat (limited to 'GeneralStateTests/stSolidityTest/ContractInheritance.json')
-rw-r--r--GeneralStateTests/stSolidityTest/ContractInheritance.json112
1 files changed, 77 insertions, 35 deletions
diff --git a/GeneralStateTests/stSolidityTest/ContractInheritance.json b/GeneralStateTests/stSolidityTest/ContractInheritance.json
index 982eed403..f4979ba38 100644
--- a/GeneralStateTests/stSolidityTest/ContractInheritance.json
+++ b/GeneralStateTests/stSolidityTest/ContractInheritance.json
@@ -6,45 +6,87 @@
"source" : "/src/GeneralStateTestsFiller/stSolidityTest/ContractInheritanceFiller.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
- },
- "network" : [
- "ALL"
- ],
- "result" : {
- "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "storage" : {
- "0x" : "0x01"
- }
- }
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0xef8d0a0e1452bcf2ec28e34e9945b26ae8cc833de5b2cec8b1306b70df6f2cbc",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0x296b2fd1997a528da5f325628fbc77260461bca622bab66caf85fb4d1321a009",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0xe7f84d674881d1cfd115be59e3e390271435c0b3474a482f7add54c3fe429d85",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0xe7f84d674881d1cfd115be59e3e390271435c0b3474a482f7add54c3fe429d85",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x296b2fd1997a528da5f325628fbc77260461bca622bab66caf85fb4d1321a009",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "//" : "}",
- "balance" : "100000",
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0186a0",
"code" : "0x7c010000000000000000000000000000000000000000000000000000000060003504633e0bca3b8114610039578063c0406226146100a857005b6100b55b600160008060456101ec8339604560006000f091508173ffffffffffffffffffffffffffffffffffffffff166381bda09b60206000827c010000000000000000000000000000000000000000000000000000000002600052600460006000866161da5a03f161011957005b6100bf60006100c961003d565b8060005260206000f35b8060005260206000f35b600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016919091179081905560ff16919050565b505060005163ffffffff166002141561019d575b5b505090565b505060005163ffffffff1660011415610194575b60456101a7600039604560006000f090508073ffffffffffffffffffffffffffffffffffffffff166381bda09b60206000827c010000000000000000000000000000000000000000000000000000000002600052600460006000866161da5a03f16100ff57005b60009250610114565b600092506101145600603980600c6000396000f3007c0100000000000000000000000000000000000000000000000000000000600035046381bda09b8114602d57005b60026000818152602090f3603980600c6000396000f3007c0100000000000000000000000000000000000000000000000000000000600035046381bda09b8114602d57005b60016000818152602090f3",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "50000000",
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x02faf080",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -54,14 +96,14 @@
"0xc0406226"
],
"gasLimit" : [
- "35000000"
+ "0x02160ec0"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "0"
+ "0x00"
]
}
}