From ed6eba7c8ebc0cbb65ccd45b047823f9acc1471b Mon Sep 17 00:00:00 2001 From: Christoph Jentzsch Date: Wed, 8 Oct 2014 19:08:48 +0200 Subject: [PATCH] Update + ABA recursive bomb which needs maximum recursion limit of 1024 --- vmtests/vmIOandFlowOperationsTest.json | 5 +- vmtests/vmSystemOperationsTest.json | 66 +++++++++++++++++++++++++- vmtests/vmtests.json | 30 +++++++++--- 3 files changed, 92 insertions(+), 9 deletions(-) diff --git a/vmtests/vmIOandFlowOperationsTest.json b/vmtests/vmIOandFlowOperationsTest.json index 48040a2be9..008707941e 100644 --- a/vmtests/vmIOandFlowOperationsTest.json +++ b/vmtests/vmIOandFlowOperationsTest.json @@ -190,7 +190,7 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "1000000000000000000" }, - "gas" : "9997", + "gas" : "0", "out" : "0x", "post" : { "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { @@ -274,7 +274,7 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "1000000000000000000" }, - "gas" : "9996", + "gas" : "9794", "out" : "0x", "post" : { "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { @@ -282,6 +282,7 @@ "code" : "0x602360006009596001600257", "nonce" : "0", "storage" : { + "0x02" : "0x01" } } }, diff --git a/vmtests/vmSystemOperationsTest.json b/vmtests/vmSystemOperationsTest.json index c593487491..aa9685e6dd 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" : [ { diff --git a/vmtests/vmtests.json b/vmtests/vmtests.json index c959f503da..a8803992e1 100644 --- a/vmtests/vmtests.json +++ b/vmtests/vmtests.json @@ -52,8 +52,26 @@ { "data" : "0x", "destination" : "cd1722f3947def4cf144679da39c4c32bdc35681", - "gasLimit" : "9770", + "gasLimit" : "9786", "value" : "2" + }, + { + "data" : "0x", + "destination" : "cd1722f3947def4cf144679da39c4c32bdc35681", + "gasLimit" : "9731", + "value" : "12" + }, + { + "data" : "0x", + "destination" : "cd1722f3947def4cf144679da39c4c32bdc35681", + "gasLimit" : "9694", + "value" : "13" + }, + { + "data" : "0x", + "destination" : "cd1722f3947def4cf144679da39c4c32bdc35681", + "gasLimit" : "9657", + "value" : "14" } ], "env" : { @@ -67,19 +85,19 @@ "exec" : { "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", - "code" : "0x601a5d60345d604e5d60685d60825d609c5d60b65d60d05d60016001100f601a59600060006000600060023360c85c03f15060006001100f603459600060006000600060033360c85c03f15060016000100f604e59600060006000600060043360c85c03f15060006000100f606859600060006000600060053360c85c03f15060016001110f6082596000600060006000600c3360c85c03f15060006001110f609c596000600060006000600d3360c85c03f15060016000110f60b6596000600060006000600e3360c85c03f15060006000110f60d0596000600060006000600f3360c85c03f150", + "code" : "0x60016001100f601b59600060006000600060023360c85c03f1505d60006001100f603659600060006000600060033360c85c03f1505d60016000100f605159600060006000600060043360c85c03f1505d60006000100f606c59600060006000600060053360c85c03f1505d60016001110f6087596000600060006000600c3360c85c03f1505d60006001110f60a2596000600060006000600d3360c85c03f1505d60016000110f60bd596000600060006000600e3360c85c03f1505d60006000110f60d8596000600060006000600f3360c85c03f1505d", "data" : "0x", "gas" : "10000", "gasPrice" : "100000000000000", "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "1000000000000000000" }, - "gas" : "9940", + "gas" : "9828", "out" : "0x", "post" : { "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "balance" : "999999999999999998", - "code" : "0x601a5d60345d604e5d60685d60825d609c5d60b65d60d05d60016001100f601a59600060006000600060023360c85c03f15060006001100f603459600060006000600060033360c85c03f15060016000100f604e59600060006000600060043360c85c03f15060006000100f606859600060006000600060053360c85c03f15060016001110f6082596000600060006000600c3360c85c03f15060006001110f609c596000600060006000600d3360c85c03f15060016000110f60b6596000600060006000600e3360c85c03f15060006000110f60d0596000600060006000600f3360c85c03f150", + "balance" : "999999999999999959", + "code" : "0x60016001100f601b59600060006000600060023360c85c03f1505d60006001100f603659600060006000600060033360c85c03f1505d60016000100f605159600060006000600060043360c85c03f1505d60006000100f606c59600060006000600060053360c85c03f1505d60016001110f6087596000600060006000600c3360c85c03f1505d60006001110f60a2596000600060006000600d3360c85c03f1505d60016000110f60bd596000600060006000600e3360c85c03f1505d60006000110f60d8596000600060006000600f3360c85c03f1505d", "nonce" : "0", "storage" : { } @@ -88,7 +106,7 @@ "pre" : { "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "1000000000000000000", - "code" : "0x601a5d60345d604e5d60685d60825d609c5d60b65d60d05d60016001100f601a59600060006000600060023360c85c03f15060006001100f603459600060006000600060033360c85c03f15060016000100f604e59600060006000600060043360c85c03f15060006000100f606859600060006000600060053360c85c03f15060016001110f6082596000600060006000600c3360c85c03f15060006001110f609c596000600060006000600d3360c85c03f15060016000110f60b6596000600060006000600e3360c85c03f15060006000110f60d0596000600060006000600f3360c85c03f150", + "code" : "0x60016001100f601b59600060006000600060023360c85c03f1505d60006001100f603659600060006000600060033360c85c03f1505d60016000100f605159600060006000600060043360c85c03f1505d60006000100f606c59600060006000600060053360c85c03f1505d60016001110f6087596000600060006000600c3360c85c03f1505d60006001110f60a2596000600060006000600d3360c85c03f1505d60016000110f60bd596000600060006000600e3360c85c03f1505d60006000110f60d8596000600060006000600f3360c85c03f1505d", "nonce" : "0", "storage" : { }