From 714770ffb3bb037e2daeaa37a6f4f4066387abe3 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Wed, 11 Jun 2014 11:32:42 +0100 Subject: [PATCH 1/5] Added Gav's new address. --- genesishashestest.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/genesishashestest.json b/genesishashestest.json index e792c1d28..bb878e60a 100644 --- a/genesishashestest.json +++ b/genesishashestest.json @@ -1,8 +1,8 @@ { - "genesis_rlp_hex": "f8abf8a7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a023b503734ff34ddb7bd5e478f1645680ec778ab3f90007cb1c854653693e5adc80834000008080830f4240808080a004994f67dc55b09e814ab7ffc8df3686b4afb2bb53e60eae97ef043fe03fb829c0c0", - "genesis_state_root": "23b503734ff34ddb7bd5e478f1645680ec778ab3f90007cb1c854653693e5adc", + "genesis_rlp_hex": "f8abf8a7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a011cc4aaa3b2f97cd6c858fcc0903b9b34b071e1798c91645f0e05e267028cb4a80834000008080830f4240808080a004994f67dc55b09e814ab7ffc8df3686b4afb2bb53e60eae97ef043fe03fb829c0c0", + "genesis_state_root": "11cc4aaa3b2f97cd6c858fcc0903b9b34b071e1798c91645f0e05e267028cb4a", "initial_alloc": { - "8a40bfaa73256b60764c1bf40675a99083efb075": "1606938044258990275541962092341162602522202993782792835301376", + "51ba59315b3a95761d0863b05ccc7a7f54703d99": "1606938044258990275541962092341162602522202993782792835301376", "e4157b34ea9615cfbde6b4fda419828124b70c78": "1606938044258990275541962092341162602522202993782792835301376", "1e12515ce3e0f817a4ddef9ca55788a1d66bd2df": "1606938044258990275541962092341162602522202993782792835301376", "6c386a4b26f73c802f34673f7248bb118f97424a": "1606938044258990275541962092341162602522202993782792835301376", @@ -11,5 +11,5 @@ "e6716f9544a56c530d868e4bfbacb172315bdead": "1606938044258990275541962092341162602522202993782792835301376", "1a26338f0d905e295fccb71fa9ea849ffa12aaf4": "1606938044258990275541962092341162602522202993782792835301376" }, - "genesis_hash": "77ef4fdaf389dca53236bcf7f72698e154eab2828f86fbc4fc6cd9225d285c89" + "genesis_hash": "56fff6ab5ef6f1ef8dafb7b4571b89a9ae1ab870e54197c59ea10ba6f2c7eb60" } From 4513623da1110e74a236abf0357ad00ff7a38126 Mon Sep 17 00:00:00 2001 From: Maran Date: Tue, 22 Jul 2014 12:24:46 +0200 Subject: [PATCH 2/5] Update keyaddrtest to be valid JSON --- keyaddrtest.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/keyaddrtest.json b/keyaddrtest.json index f48905037..eee6d5e08 100644 --- a/keyaddrtest.json +++ b/keyaddrtest.json @@ -4,9 +4,9 @@ "key": "c85ef7d79691fe79573b1a7064c19c1a9819ebdbd1faaab1a8ec92344438aaf4", "addr": "cd2a3d9f938e13cd947ec05abc7fe734df8dd826", "sig_of_emptystring": { - v: 27, - r: 55022946425863772466282515086640833500580355555249003729267710149987842051473, - s: 3021698389129950584349170550428805649435913935175976180112863059249983907949 + "v": 27, + "r": 55022946425863772466282515086640833500580355555249003729267710149987842051473, + "s": 3021698389129950584349170550428805649435913935175976180112863059249983907949 } }, { @@ -14,9 +14,9 @@ "key": "c87f65ff3f271bf5dc8643484f66b200109caffe4bf98c4cb393dc35740b28c0", "addr": "13978aee95f38490e9769c39b2773ed763d9cd5f", "sig_of_emptystring": { - v: 28, - r: 20570452350081260599473412372903969148670549754219103025003129053348571714359, - s: 76892551129780267788164835941580941601518827936179476514262023835864819088004 + "v": 28, + "r": 20570452350081260599473412372903969148670549754219103025003129053348571714359, + "s": 76892551129780267788164835941580941601518827936179476514262023835864819088004 } } ] From 8d38d62d1053ed7552211105e26b2e248a3db747 Mon Sep 17 00:00:00 2001 From: Nick Savers Date: Fri, 10 Oct 2014 18:09:41 +0200 Subject: [PATCH 3/5] INVALID stops the operation and doesn't cost gas --- vmtests/vmIOandFlowOperationsTest.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vmtests/vmIOandFlowOperationsTest.json b/vmtests/vmIOandFlowOperationsTest.json index c23fa8542..7505ba86c 100644 --- a/vmtests/vmIOandFlowOperationsTest.json +++ b/vmtests/vmIOandFlowOperationsTest.json @@ -20,7 +20,7 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "1000000000000000000" }, - "gas" : "9997", + "gas" : "9998", "out" : "0x", "post" : { "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { @@ -1222,7 +1222,7 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "1000000000000000000" }, - "gas" : "9997", + "gas" : "9998", "out" : "0x", "post" : { "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { @@ -1243,4 +1243,4 @@ } } } -} \ No newline at end of file +} From 7a7e198395f776d0a95d252ddc3b30492b9d3cff Mon Sep 17 00:00:00 2001 From: Christoph Jentzsch Date: Sat, 11 Oct 2014 13:11:59 +0200 Subject: [PATCH 4/5] Added some MUL tests --- vmtests/vmArithmeticTest.json | 128 ++++++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) diff --git a/vmtests/vmArithmeticTest.json b/vmtests/vmArithmeticTest.json index 3f431c7c9..5df9965b7 100644 --- a/vmtests/vmArithmeticTest.json +++ b/vmtests/vmArithmeticTest.json @@ -1617,6 +1617,134 @@ } } }, + "mul4" : { + "callcreates" : [ + ], + "env" : { + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "256", + "currentGasLimit" : "1000000", + "currentNumber" : "0", + "currentTimestamp" : "1", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "exec" : { + "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", + "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", + "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f800000000000000000000000000000000000000000000000000000000000000002600057", + "data" : "0x", + "gas" : "10000", + "gasPrice" : "100000000000000", + "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", + "value" : "1000000000000000000" + }, + "gas" : "9796", + "out" : "0x", + "post" : { + "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { + "balance" : "1000000000000000000", + "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f800000000000000000000000000000000000000000000000000000000000000002600057", + "nonce" : "0", + "storage" : { + "0x" : "0x8000000000000000000000000000000000000000000000000000000000000000" + } + } + }, + "pre" : { + "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { + "balance" : "1000000000000000000", + "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f800000000000000000000000000000000000000000000000000000000000000002600057", + "nonce" : "0", + "storage" : { + } + } + } + }, + "mul5" : { + "callcreates" : [ + ], + "env" : { + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "256", + "currentGasLimit" : "1000000", + "currentNumber" : "0", + "currentTimestamp" : "1", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "exec" : { + "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", + "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", + "code" : "0x7f80000000000000000000000000000000000000000000000000000000000000007f800000000000000000000000000000000000000000000000000000000000000002600057", + "data" : "0x", + "gas" : "10000", + "gasPrice" : "100000000000000", + "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", + "value" : "1000000000000000000" + }, + "gas" : "9896", + "out" : "0x", + "post" : { + "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { + "balance" : "1000000000000000000", + "code" : "0x7f80000000000000000000000000000000000000000000000000000000000000007f800000000000000000000000000000000000000000000000000000000000000002600057", + "nonce" : "0", + "storage" : { + } + } + }, + "pre" : { + "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { + "balance" : "1000000000000000000", + "code" : "0x7f80000000000000000000000000000000000000000000000000000000000000007f800000000000000000000000000000000000000000000000000000000000000002600057", + "nonce" : "0", + "storage" : { + } + } + } + }, + "mul6" : { + "callcreates" : [ + ], + "env" : { + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "256", + "currentGasLimit" : "1000000", + "currentNumber" : "0", + "currentTimestamp" : "1", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "exec" : { + "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", + "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", + "code" : "0x7f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff02600057", + "data" : "0x", + "gas" : "10000", + "gasPrice" : "100000000000000", + "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", + "value" : "1000000000000000000" + }, + "gas" : "9796", + "out" : "0x", + "post" : { + "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { + "balance" : "1000000000000000000", + "code" : "0x7f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff02600057", + "nonce" : "0", + "storage" : { + "0x" : "0x01" + } + } + }, + "pre" : { + "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { + "balance" : "1000000000000000000", + "code" : "0x7f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff02600057", + "nonce" : "0", + "storage" : { + } + } + } + }, "neg0" : { "callcreates" : [ ], From 0a76a3a312951e852509e2b378b2b5b3f87135b0 Mon Sep 17 00:00:00 2001 From: ethers Date: Mon, 13 Oct 2014 14:45:30 -0700 Subject: [PATCH 5/5] numbers should be strings #22 --- keyaddrtest.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/keyaddrtest.json b/keyaddrtest.json index eee6d5e08..c65b2ae33 100644 --- a/keyaddrtest.json +++ b/keyaddrtest.json @@ -4,9 +4,9 @@ "key": "c85ef7d79691fe79573b1a7064c19c1a9819ebdbd1faaab1a8ec92344438aaf4", "addr": "cd2a3d9f938e13cd947ec05abc7fe734df8dd826", "sig_of_emptystring": { - "v": 27, - "r": 55022946425863772466282515086640833500580355555249003729267710149987842051473, - "s": 3021698389129950584349170550428805649435913935175976180112863059249983907949 + "v": "27", + "r": "55022946425863772466282515086640833500580355555249003729267710149987842051473", + "s": "3021698389129950584349170550428805649435913935175976180112863059249983907949" } }, { @@ -14,9 +14,9 @@ "key": "c87f65ff3f271bf5dc8643484f66b200109caffe4bf98c4cb393dc35740b28c0", "addr": "13978aee95f38490e9769c39b2773ed763d9cd5f", "sig_of_emptystring": { - "v": 28, - "r": 20570452350081260599473412372903969148670549754219103025003129053348571714359, - "s": 76892551129780267788164835941580941601518827936179476514262023835864819088004 + "v": "28", + "r": "20570452350081260599473412372903969148670549754219103025003129053348571714359", + "s": "76892551129780267788164835941580941601518827936179476514262023835864819088004" } } ]