aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--genesishashestest.json2
-rw-r--r--index.js23
-rw-r--r--package.json23
-rw-r--r--vmtests/vmEnvironmentalInfoTest.json4
-rw-r--r--vmtests/vmIOandFlowOperationsTest.json134
-rw-r--r--vmtests/vmSystemOperationsTest.json289
-rw-r--r--vmtests/vmtests.json14
7 files changed, 413 insertions, 76 deletions
diff --git a/genesishashestest.json b/genesishashestest.json
index 06b97e6bd..083d0700e 100644
--- a/genesishashestest.json
+++ b/genesishashestest.json
@@ -11,5 +11,5 @@
"e6716f9544a56c530d868e4bfbacb172315bdead": "1606938044258990275541962092341162602522202993782792835301376",
"1a26338f0d905e295fccb71fa9ea849ffa12aaf4": "1606938044258990275541962092341162602522202993782792835301376"
},
- "genesis_hash": "08436a4d33c77e6acf013e586a3333ad152f25d31df8b68749d85046810e1f4b"
+ "genesis_hash": "f68067286ddb7245c2203b18135456de1fc4ed6a24a2d9014195faa7900025bf"
}
diff --git a/index.js b/index.js
new file mode 100644
index 000000000..84615a482
--- /dev/null
+++ b/index.js
@@ -0,0 +1,23 @@
+module.exports = {
+ blockgenesis: require('./blockgenesistest'),
+ genesishashes: require('./genesishashestest'),
+ hexencode: require('./hexencodetest'),
+ keyaddrtests: require('./keyaddrtest'),
+ namecoin: require('./namecoin'),
+ rlptest: require('./rlptest'),
+ trietest: require('./trietest'),
+ trietestnextprev: require('./trietestnextprev'),
+ txtest: require('./txtest'),
+ vmtests: {
+ random: require('./vmtests/random'),
+ vmArithmeticTest: require('./vmtests/vmArithmeticTest'),
+ vmBitwiseLogicOperationTest: require('./vmtests/vmBitwiseLogicOperationTest'),
+ vmBlockInfoTest: require('./vmtests/vmBlockInfoTest'),
+ vmEnvironmentalInfoTest: require('./vmtests/vmEnvironmentalInfoTest'),
+ vmIOandFlowOperationsTest: require('./vmtests/vmIOandFlowOperationsTest'),
+ vmPushDupSwapTest: require('./vmtests/vmPushDupSwapTest'),
+ vmSha3Test: require('./vmtests/vmSha3Test'),
+ vmSystemOperationsTest: require('./vmtests/vmSystemOperationsTest'),
+ vmtests: require('./vmtests/vmtests')
+ }
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000000000..5a58a4579
--- /dev/null
+++ b/package.json
@@ -0,0 +1,23 @@
+{
+ "name": "ethrereum-tests",
+ "version": "0.0.0",
+ "description": "tests for ethereum",
+ "main": "index.js",
+ "scripts": {
+ "test": "echo \"There are no tests for there tests\" && exit 1"
+ },
+ "repository": {
+ "type": "git",
+ "url": "https://github.com/ethereum/tests"
+ },
+ "keywords": [
+ "tests",
+ "ethereum"
+ ],
+ "author": "",
+ "license": "MIT",
+ "bugs": {
+ "url": "https://github.com/ethereum/tests/issues"
+ },
+ "homepage": "https://github.com/ethereum/tests"
+}
diff --git a/vmtests/vmEnvironmentalInfoTest.json b/vmtests/vmEnvironmentalInfoTest.json
index 35ad5f8f1..1405d48bf 100644
--- a/vmtests/vmEnvironmentalInfoTest.json
+++ b/vmtests/vmEnvironmentalInfoTest.json
@@ -159,7 +159,7 @@
"out" : "0x",
"post" : {
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "1000000000000000000",
+ "balance" : "2000000000000000000",
"code" : "0x730f572e5295c57f15886f9b263e2f6d2d6c7b5ec631600057",
"nonce" : "0",
"storage" : {
@@ -1128,4 +1128,4 @@
}
}
}
-} \ No newline at end of file
+}
diff --git a/vmtests/vmIOandFlowOperationsTest.json b/vmtests/vmIOandFlowOperationsTest.json
index 7505ba86c..74d63649e 100644
--- a/vmtests/vmIOandFlowOperationsTest.json
+++ b/vmtests/vmIOandFlowOperationsTest.json
@@ -148,7 +148,7 @@
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
"value" : "1000000000000000000"
},
- "gas" : "9796",
+ "gas" : "9997",
"out" : "0x",
"post" : {
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -156,7 +156,6 @@
"code" : "0x60236007586001600257",
"nonce" : "0",
"storage" : {
- "0x02" : "0x23"
}
}
},
@@ -212,6 +211,91 @@
}
}
},
+ "jump0_jumpdest0" : {
+ "callcreates" : [
+ ],
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "256",
+ "currentGasLimit" : "1000000",
+ "currentNumber" : "0",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "exec" : {
+ "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+ "code" : "0x602360085860015d600257",
+ "data" : "0x",
+ "gas" : "10000",
+ "gasPrice" : "100000000000000",
+ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+ "value" : "1000000000000000000"
+ },
+ "gas" : "9796",
+ "out" : "0x",
+ "post" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x602360085860015d600257",
+ "nonce" : "0",
+ "storage" : {
+ "0x02" : "0x23"
+ }
+ }
+ },
+ "pre" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x602360085860015d600257",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ }
+ },
+ "jump0_jumpdest1" : {
+ "callcreates" : [
+ ],
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "256",
+ "currentGasLimit" : "1000000",
+ "currentNumber" : "0",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "exec" : {
+ "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+ "code" : "0x602360075860015d600257",
+ "data" : "0x",
+ "gas" : "10000",
+ "gasPrice" : "100000000000000",
+ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+ "value" : "1000000000000000000"
+ },
+ "gas" : "9997",
+ "out" : "0x",
+ "post" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x602360075860015d600257",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "pre" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x602360075860015d600257",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ }
+ },
"jumpi0" : {
"callcreates" : [
],
@@ -233,7 +317,7 @@
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
"value" : "1000000000000000000"
},
- "gas" : "9795",
+ "gas" : "9996",
"out" : "0x",
"post" : {
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -241,7 +325,6 @@
"code" : "0x602360016009596001600257",
"nonce" : "0",
"storage" : {
- "0x02" : "0x23"
}
}
},
@@ -298,6 +381,49 @@
}
}
},
+ "jumpi1_jumpdest" : {
+ "callcreates" : [
+ ],
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "256",
+ "currentGasLimit" : "1000000",
+ "currentNumber" : "0",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "exec" : {
+ "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+ "code" : "0x60236001600a5960015d600257",
+ "data" : "0x",
+ "gas" : "10000",
+ "gasPrice" : "100000000000000",
+ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+ "value" : "1000000000000000000"
+ },
+ "gas" : "9795",
+ "out" : "0x",
+ "post" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x60236001600a5960015d600257",
+ "nonce" : "0",
+ "storage" : {
+ "0x02" : "0x23"
+ }
+ }
+ },
+ "pre" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x60236001600a5960015d600257",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ }
+ },
"mloadError0" : {
"callcreates" : [
],
diff --git a/vmtests/vmSystemOperationsTest.json b/vmtests/vmSystemOperationsTest.json
index c3e339f24..920cb2331 100644
--- a/vmtests/vmSystemOperationsTest.json
+++ b/vmtests/vmSystemOperationsTest.json
@@ -1,5 +1,5 @@
{
- "ABAcalls" : {
+ "ABAcalls0" : {
"callcreates" : [
{
"data" : "0x",
@@ -63,6 +63,70 @@
}
}
},
+ "ABAcalls1" : {
+ "callcreates" : [
+ {
+ "data" : "0x",
+ "destination" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+ "gasLimit" : "9999999998992",
+ "value" : "24"
+ }
+ ],
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "0",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "exec" : {
+ "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+ "code" : "0x6000600060006000601873945304eb96065b2a98b57a48a06ae28d285a71b56103e85c03f15a57",
+ "data" : "0x",
+ "gas" : "10000000000000",
+ "gasPrice" : "100000000000000",
+ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+ "value" : "100000"
+ },
+ "gas" : "898727",
+ "out" : "0x",
+ "post" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "999999999999999488",
+ "code" : "0x6000600060006000601873945304eb96065b2a98b57a48a06ae28d285a71b56103e85c03f15a57",
+ "nonce" : "0",
+ "storage" : {
+ "0x25" : "0x01"
+ }
+ },
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "535",
+ "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e85c03f16001015a57",
+ "nonce" : "0",
+ "storage" : {
+ "0x28" : "0x02"
+ }
+ }
+ },
+ "pre" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x6000600060006000601873945304eb96065b2a98b57a48a06ae28d285a71b56103e85c03f15a57",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "23",
+ "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e85c03f16001015a57",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ }
+ },
"ABAcallsSuicide0" : {
"callcreates" : [
{
@@ -279,7 +343,7 @@
},
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
"balance" : "46",
- "code" : "0x600035560f6009590060203560003557",
+ "code" : "0x600035560f600a59005d60203560003557",
"nonce" : "0",
"storage" : {
"0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" : "0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa"
@@ -296,7 +360,7 @@
},
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
"balance" : "23",
- "code" : "0x600035560f6009590060203560003557",
+ "code" : "0x600035560f600a59005d60203560003557",
"nonce" : "0",
"storage" : {
}
@@ -343,7 +407,7 @@
},
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
"balance" : "46",
- "code" : "0x600035560f6009590060203560003557",
+ "code" : "0x600035560f600a59005d60203560003557",
"nonce" : "0",
"storage" : {
"0xeeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00" : "0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa"
@@ -360,7 +424,7 @@
},
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
"balance" : "23",
- "code" : "0x600035560f6009590060203560003557",
+ "code" : "0x600035560f600a59005d60203560003557",
"nonce" : "0",
"storage" : {
}
@@ -407,7 +471,7 @@
},
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
"balance" : "46",
- "code" : "0x600035560f6009590060203560003557",
+ "code" : "0x600035560f600a59005d60203560003557",
"nonce" : "0",
"storage" : {
}
@@ -423,7 +487,7 @@
},
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
"balance" : "23",
- "code" : "0x600035560f6009590060203560003557",
+ "code" : "0x600035560f600a59005d60203560003557",
"nonce" : "0",
"storage" : {
}
@@ -469,7 +533,7 @@
},
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
"balance" : "46",
- "code" : "0x600035560f6009590060203560003557",
+ "code" : "0x600035560f600a59005d60203560003557",
"nonce" : "0",
"storage" : {
}
@@ -485,7 +549,7 @@
},
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
"balance" : "23",
- "code" : "0x600035560f6009590060203560003557",
+ "code" : "0x600035560f600a59005d60203560003557",
"nonce" : "0",
"storage" : {
}
@@ -525,7 +589,7 @@
},
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
"balance" : "23",
- "code" : "0x600035560f6009590060203560003557",
+ "code" : "0x600035560f600a59005d60203560003557",
"nonce" : "0",
"storage" : {
}
@@ -541,7 +605,7 @@
},
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
"balance" : "23",
- "code" : "0x600035560f6009590060203560003557",
+ "code" : "0x600035560f600a59005d60203560003557",
"nonce" : "0",
"storage" : {
}
@@ -581,7 +645,7 @@
},
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
"balance" : "23",
- "code" : "0x600035560f6009590060203560003557",
+ "code" : "0x600035560f600a59005d60203560003557",
"nonce" : "0",
"storage" : {
}
@@ -597,7 +661,7 @@
},
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
"balance" : "23",
- "code" : "0x600035560f6009590060203560003557",
+ "code" : "0x600035560f600a59005d60203560003557",
"nonce" : "0",
"storage" : {
}
@@ -637,7 +701,7 @@
},
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
"balance" : "23",
- "code" : "0x600035560f6009590060203560003557",
+ "code" : "0x600035560f600a59005d60203560003557",
"nonce" : "0",
"storage" : {
}
@@ -653,7 +717,7 @@
},
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
"balance" : "23",
- "code" : "0x600035560f6009590060203560003557",
+ "code" : "0x600035560f600a59005d60203560003557",
"nonce" : "0",
"storage" : {
}
@@ -726,12 +790,6 @@
},
"PostToNameRegistrator0" : {
"callcreates" : [
- {
- "data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa",
- "destination" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
- "gasLimit" : "1000000",
- "value" : "23"
- }
],
"env" : {
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -744,43 +802,42 @@
"exec" : {
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
- "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa60205460406000601773945304eb96065b2a98b57a48a06ae28d285a71b5620f4240f3",
+ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546080",
"data" : "0x",
"gas" : "10000000000000",
"gasPrice" : "100000000000000",
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
"value" : "100000"
},
- "gas" : "9999998999967",
+ "gas" : "9999999999991",
"out" : "0x",
"post" : {
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "999999999999999977",
- "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa60205460406000601773945304eb96065b2a98b57a48a06ae28d285a71b5620f4240f3",
+ "balance" : "1000000000000000000",
+ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546080",
"nonce" : "0",
"storage" : {
}
},
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "46",
- "code" : "0x600035560f6009590060203560003557",
+ "balance" : "23",
+ "code" : "0x600035560f600a59005d60203560003557",
"nonce" : "0",
"storage" : {
- "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" : "0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa"
}
}
},
"pre" : {
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
"balance" : "1000000000000000000",
- "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa60205460406000601773945304eb96065b2a98b57a48a06ae28d285a71b5620f4240f3",
+ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546080",
"nonce" : "0",
"storage" : {
}
},
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
"balance" : "23",
- "code" : "0x600035560f6009590060203560003557",
+ "code" : "0x600035560f600a59005d60203560003557",
"nonce" : "0",
"storage" : {
}
@@ -789,12 +846,6 @@
},
"PostToReturn1" : {
"callcreates" : [
- {
- "data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa",
- "destination" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
- "gasLimit" : "1000000",
- "value" : "23"
- }
],
"env" : {
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -807,25 +858,25 @@
"exec" : {
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
- "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa60205460406000601773945304eb96065b2a98b57a48a06ae28d285a71b5620f4240f3",
+ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546080",
"data" : "0x",
"gas" : "10000000000000",
"gasPrice" : "100000000000000",
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
"value" : "100000"
},
- "gas" : "9999998999967",
+ "gas" : "9999999999991",
"out" : "0x",
"post" : {
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "999999999999999977",
- "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa60205460406000601773945304eb96065b2a98b57a48a06ae28d285a71b5620f4240f3",
+ "balance" : "1000000000000000000",
+ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546080",
"nonce" : "0",
"storage" : {
}
},
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "46",
+ "balance" : "23",
"code" : "0x603760005560026000f2",
"nonce" : "0",
"storage" : {
@@ -835,7 +886,7 @@
"pre" : {
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
"balance" : "1000000000000000000",
- "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa60205460406000601773945304eb96065b2a98b57a48a06ae28d285a71b5620f4240f3",
+ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546080",
"nonce" : "0",
"storage" : {
}
@@ -863,7 +914,7 @@
"exec" : {
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
- "code" : "0x600035560f6009590060203560003557",
+ "code" : "0x600035560f600a59005d60203560003557",
"data" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffafffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa",
"gas" : "10000",
"gasPrice" : "100000000000000",
@@ -875,7 +926,7 @@
"post" : {
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
"balance" : "1000000000000000000",
- "code" : "0x600035560f6009590060203560003557",
+ "code" : "0x600035560f600a59005d60203560003557",
"nonce" : "0",
"storage" : {
"0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa"
@@ -885,14 +936,14 @@
"pre" : {
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
"balance" : "1000000000000000000",
- "code" : "0x600035560f6009590060203560003557",
+ "code" : "0x600035560f600a59005d60203560003557",
"nonce" : "0",
"storage" : {
}
}
}
},
- "callstatelessToNameRegistrator0" : {
+ "callcodeToNameRegistrator0" : {
"callcreates" : [
{
"data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa",
@@ -912,7 +963,7 @@
"exec" : {
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
- "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546000604060406000601773945304eb96065b2a98b57a48a06ae28d285a71b5620f4240f4600057",
+ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546000604060406000601773945304eb96065b2a98b57a48a06ae28d285a71b5620f4240f3600057",
"data" : "0x",
"gas" : "10000000000000",
"gasPrice" : "100000000000000",
@@ -924,7 +975,7 @@
"post" : {
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
"balance" : "1000000000000000000",
- "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546000604060406000601773945304eb96065b2a98b57a48a06ae28d285a71b5620f4240f4600057",
+ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546000604060406000601773945304eb96065b2a98b57a48a06ae28d285a71b5620f4240f3600057",
"nonce" : "0",
"storage" : {
"0x" : "0x01",
@@ -933,7 +984,7 @@
},
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
"balance" : "23",
- "code" : "0x600035560f6009590060203560003557",
+ "code" : "0x600035560f600a59005d60203560003557",
"nonce" : "0",
"storage" : {
}
@@ -942,21 +993,21 @@
"pre" : {
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
"balance" : "1000000000000000000",
- "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546000604060406000601773945304eb96065b2a98b57a48a06ae28d285a71b5620f4240f4600057",
+ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546000604060406000601773945304eb96065b2a98b57a48a06ae28d285a71b5620f4240f3600057",
"nonce" : "0",
"storage" : {
}
},
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
"balance" : "23",
- "code" : "0x600035560f6009590060203560003557",
+ "code" : "0x600035560f600a59005d60203560003557",
"nonce" : "0",
"storage" : {
}
}
}
},
- "callstatelessToReturn1" : {
+ "callcodeToReturn1" : {
"callcreates" : [
{
"data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa",
@@ -976,7 +1027,7 @@
"exec" : {
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
- "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546002600060406000601773945304eb96065b2a98b57a48a06ae28d285a71b56101f4f4600057",
+ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546002600060406000601773945304eb96065b2a98b57a48a06ae28d285a71b56101f4f3600057",
"data" : "0x",
"gas" : "10000000000000",
"gasPrice" : "100000000000000",
@@ -988,7 +1039,7 @@
"post" : {
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
"balance" : "1000000000000000000",
- "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546002600060406000601773945304eb96065b2a98b57a48a06ae28d285a71b56101f4f4600057",
+ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546002600060406000601773945304eb96065b2a98b57a48a06ae28d285a71b56101f4f3600057",
"nonce" : "0",
"storage" : {
"0x" : "0x01",
@@ -1006,7 +1057,121 @@
"pre" : {
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
"balance" : "1000000000000000000",
- "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546002600060406000601773945304eb96065b2a98b57a48a06ae28d285a71b56101f4f4600057",
+ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546002600060406000601773945304eb96065b2a98b57a48a06ae28d285a71b56101f4f3600057",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "23",
+ "code" : "0x6001600157603760005560026000f2",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ }
+ },
+ "callstatelessToNameRegistrator0" : {
+ "callcreates" : [
+ ],
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "0",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "exec" : {
+ "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546080600057",
+ "data" : "0x",
+ "gas" : "10000000000000",
+ "gasPrice" : "100000000000000",
+ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+ "value" : "100000"
+ },
+ "gas" : "9999999999790",
+ "out" : "0x",
+ "post" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546080600057",
+ "nonce" : "0",
+ "storage" : {
+ "0x" : "0x80"
+ }
+ },
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "23",
+ "code" : "0x600035560f600a59005d60203560003557",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "pre" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546080600057",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "23",
+ "code" : "0x600035560f600a59005d60203560003557",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ }
+ },
+ "callstatelessToReturn1" : {
+ "callcreates" : [
+ ],
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "0",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "exec" : {
+ "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546080600057",
+ "data" : "0x",
+ "gas" : "10000000000000",
+ "gasPrice" : "100000000000000",
+ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+ "value" : "100000"
+ },
+ "gas" : "9999999999790",
+ "out" : "0x",
+ "post" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546080600057",
+ "nonce" : "0",
+ "storage" : {
+ "0x" : "0x80"
+ }
+ },
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "23",
+ "code" : "0x6001600157603760005560026000f2",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "pre" : {
+ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546080600057",
"nonce" : "0",
"storage" : {
}
@@ -1354,7 +1519,7 @@
"post" : {
"cd1722f3947def4cf144679da39c4c32bdc35681" : {
"balance" : "1000000000000000023",
- "code" : "0x600035560f6009590060203560003557",
+ "code" : "0x600035560f600a59005d60203560003557",
"nonce" : "0",
"storage" : {
}
@@ -1370,7 +1535,7 @@
},
"cd1722f3947def4cf144679da39c4c32bdc35681" : {
"balance" : "23",
- "code" : "0x600035560f6009590060203560003557",
+ "code" : "0x600035560f600a59005d60203560003557",
"nonce" : "0",
"storage" : {
}
@@ -1410,7 +1575,7 @@
},
"cd1722f3947def4cf144679da39c4c32bdc35681" : {
"balance" : "23",
- "code" : "0x600035560f6009590060203560003557",
+ "code" : "0x600035560f600a59005d60203560003557",
"nonce" : "0",
"storage" : {
}
@@ -1426,7 +1591,7 @@
},
"cd1722f3947def4cf144679da39c4c32bdc35681" : {
"balance" : "23",
- "code" : "0x600035560f6009590060203560003557",
+ "code" : "0x600035560f600a59005d60203560003557",
"nonce" : "0",
"storage" : {
}
@@ -1459,7 +1624,7 @@
"post" : {
"cd1722f3947def4cf144679da39c4c32bdc35681" : {
"balance" : "23",
- "code" : "0x600035560f6009590060203560003557",
+ "code" : "0x600035560f600a59005d60203560003557",
"nonce" : "0",
"storage" : {
}
@@ -1475,11 +1640,11 @@
},
"cd1722f3947def4cf144679da39c4c32bdc35681" : {
"balance" : "23",
- "code" : "0x600035560f6009590060203560003557",
+ "code" : "0x600035560f600a59005d60203560003557",
"nonce" : "0",
"storage" : {
}
}
}
}
-}
+} \ No newline at end of file
diff --git a/vmtests/vmtests.json b/vmtests/vmtests.json
index 8673ba2d2..a8803992e 100644
--- a/vmtests/vmtests.json
+++ b/vmtests/vmtests.json
@@ -58,19 +58,19 @@
{
"data" : "0x",
"destination" : "cd1722f3947def4cf144679da39c4c32bdc35681",
- "gasLimit" : "9732",
+ "gasLimit" : "9731",
"value" : "12"
},
{
"data" : "0x",
"destination" : "cd1722f3947def4cf144679da39c4c32bdc35681",
- "gasLimit" : "9696",
+ "gasLimit" : "9694",
"value" : "13"
},
{
"data" : "0x",
"destination" : "cd1722f3947def4cf144679da39c4c32bdc35681",
- "gasLimit" : "9660",
+ "gasLimit" : "9657",
"value" : "14"
}
],
@@ -85,19 +85,19 @@
"exec" : {
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
- "code" : "0x60016001100f601a59600060006000600060023360c85c03f15060006001100f603459600060006000600060033360c85c03f15060016000100f604e59600060006000600060043360c85c03f15060006000100f606859600060006000600060053360c85c03f15060016001110f6082596000600060006000600c3360c85c03f15060006001110f609c596000600060006000600d3360c85c03f15060016000110f60b6596000600060006000600e3360c85c03f15060006000110f60d0596000600060006000600f3360c85c03f150",
+ "code" : "0x60016001100f601b59600060006000600060023360c85c03f1505d60006001100f603659600060006000600060033360c85c03f1505d60016000100f605159600060006000600060043360c85c03f1505d60006000100f606c59600060006000600060053360c85c03f1505d60016001110f6087596000600060006000600c3360c85c03f1505d60006001110f60a2596000600060006000600d3360c85c03f1505d60016000110f60bd596000600060006000600e3360c85c03f1505d60006000110f60d8596000600060006000600f3360c85c03f1505d",
"data" : "0x",
"gas" : "10000",
"gasPrice" : "100000000000000",
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
"value" : "1000000000000000000"
},
- "gas" : "9832",
+ "gas" : "9828",
"out" : "0x",
"post" : {
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
"balance" : "999999999999999959",
- "code" : "0x60016001100f601a59600060006000600060023360c85c03f15060006001100f603459600060006000600060033360c85c03f15060016000100f604e59600060006000600060043360c85c03f15060006000100f606859600060006000600060053360c85c03f15060016001110f6082596000600060006000600c3360c85c03f15060006001110f609c596000600060006000600d3360c85c03f15060016000110f60b6596000600060006000600e3360c85c03f15060006000110f60d0596000600060006000600f3360c85c03f150",
+ "code" : "0x60016001100f601b59600060006000600060023360c85c03f1505d60006001100f603659600060006000600060033360c85c03f1505d60016000100f605159600060006000600060043360c85c03f1505d60006000100f606c59600060006000600060053360c85c03f1505d60016001110f6087596000600060006000600c3360c85c03f1505d60006001110f60a2596000600060006000600d3360c85c03f1505d60016000110f60bd596000600060006000600e3360c85c03f1505d60006000110f60d8596000600060006000600f3360c85c03f1505d",
"nonce" : "0",
"storage" : {
}
@@ -106,7 +106,7 @@
"pre" : {
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
"balance" : "1000000000000000000",
- "code" : "0x60016001100f601a59600060006000600060023360c85c03f15060006001100f603459600060006000600060033360c85c03f15060016000100f604e59600060006000600060043360c85c03f15060006000100f606859600060006000600060053360c85c03f15060016001110f6082596000600060006000600c3360c85c03f15060006001110f609c596000600060006000600d3360c85c03f15060016000110f60b6596000600060006000600e3360c85c03f15060006000110f60d0596000600060006000600f3360c85c03f150",
+ "code" : "0x60016001100f601b59600060006000600060023360c85c03f1505d60006001100f603659600060006000600060033360c85c03f1505d60016000100f605159600060006000600060043360c85c03f1505d60006000100f606c59600060006000600060053360c85c03f1505d60016001110f6087596000600060006000600c3360c85c03f1505d60006001110f60a2596000600060006000600d3360c85c03f1505d60016000110f60bd596000600060006000600e3360c85c03f1505d60006000110f60d8596000600060006000600f3360c85c03f1505d",
"nonce" : "0",
"storage" : {
}