From c1696531a646309b2b286abb7552eb05f1278cd1 Mon Sep 17 00:00:00 2001 From: Christoph Jentzsch Date: Mon, 6 Oct 2014 21:17:09 +0200 Subject: [PATCH] corrected tests and different style for storage --- vmtests/vmArithmeticTest.json | 172 ++++----------- vmtests/vmBitwiseLogicOperationTest.json | 128 +++--------- vmtests/vmBlockInfoTest.json | 20 +- vmtests/vmEnvironmentalInfoTest.json | 92 ++------ vmtests/vmIOandFlowOperationsTest.json | 105 +++------- vmtests/vmPushDupSwapTest.json | 256 ++++++----------------- vmtests/vmSha3Test.json | 12 +- vmtests/vmSystemOperationsTest.json | 117 +++++------ 8 files changed, 253 insertions(+), 649 deletions(-) diff --git a/vmtests/vmArithmeticTest.json b/vmtests/vmArithmeticTest.json index 55e13dc788..3f431c7c91 100644 --- a/vmtests/vmArithmeticTest.json +++ b/vmtests/vmArithmeticTest.json @@ -28,9 +28,7 @@ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01600057", "nonce" : "0", "storage" : { - "0x" : [ - "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe" - ] + "0x" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe" } } }, @@ -73,9 +71,7 @@ "code" : "0x60047fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x03" - ] + "0x" : "0x03" } } }, @@ -244,9 +240,7 @@ "code" : "0x6002600504600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x02" - ] + "0x" : "0x02" } } }, @@ -373,9 +367,7 @@ "code" : "0x6001600104600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01" } } }, @@ -502,9 +494,7 @@ "code" : "0x600060000e600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01" } } }, @@ -547,9 +537,7 @@ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0e600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01" } } }, @@ -592,9 +580,7 @@ "code" : "0x6002600208600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x04" - ] + "0x" : "0x04" } } }, @@ -637,9 +623,7 @@ "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff08600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01" } } }, @@ -682,9 +666,7 @@ "code" : "0x637fffffff637fffffff08600057", "nonce" : "0", "storage" : { - "0x" : [ - "0xbc8cccccccc888888880000000aaaaaab00000000fffffffffffffff7fffffff" - ] + "0x" : "0xbc8cccccccc888888880000000aaaaaab00000000fffffffffffffff7fffffff" } } }, @@ -769,9 +751,7 @@ "code" : "0x6000637fffffff08600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01" } } }, @@ -814,9 +794,7 @@ "code" : "0x600161010108600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x0101" - ] + "0x" : "0x0101" } } }, @@ -859,9 +837,7 @@ "code" : "0x610101600108600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01" } } }, @@ -946,9 +922,7 @@ "code" : "0x600060026000030b600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01" } } }, @@ -1033,9 +1007,7 @@ "code" : "0x60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0b600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01" } } }, @@ -1162,9 +1134,7 @@ "code" : "0x600260000360000a600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01" } } }, @@ -1249,9 +1219,7 @@ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60000a600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01" } } }, @@ -1294,9 +1262,7 @@ "code" : "0x6003600206600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x02" - ] + "0x" : "0x02" } } }, @@ -1339,9 +1305,7 @@ "code" : "0x60027fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff06600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01" } } }, @@ -1468,9 +1432,7 @@ "code" : "0x6003600260000306600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x02" - ] + "0x" : "0x02" } } }, @@ -1513,9 +1475,7 @@ "code" : "0x6003600202600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x06" - ] + "0x" : "0x06" } } }, @@ -1558,9 +1518,7 @@ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff02600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01" } } }, @@ -1645,9 +1603,7 @@ "code" : "0x6001601702600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x17" - ] + "0x" : "0x17" } } }, @@ -1732,9 +1688,7 @@ "code" : "0x600209600057", "nonce" : "0", "storage" : { - "0x" : [ - "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe" - ] + "0x" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe" } } }, @@ -1777,9 +1731,7 @@ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff09600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01" } } }, @@ -1822,9 +1774,7 @@ "code" : "0x600260000309600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x02" - ] + "0x" : "0x02" } } }, @@ -1867,9 +1817,7 @@ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60000309600057", "nonce" : "0", "storage" : { - "0x" : [ - "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" - ] + "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" } } }, @@ -1996,9 +1944,7 @@ "code" : "0x60000f600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01" } } }, @@ -2041,9 +1987,7 @@ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60000305600057", "nonce" : "0", "storage" : { - "0x" : [ - "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" - ] + "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" } } }, @@ -2086,9 +2030,7 @@ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff05600057", "nonce" : "0", "storage" : { - "0x" : [ - "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" - ] + "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" } } }, @@ -2173,9 +2115,7 @@ "code" : "0x6002600003600405600057", "nonce" : "0", "storage" : { - "0x" : [ - "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe" - ] + "0x" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe" } } }, @@ -2344,9 +2284,7 @@ "code" : "0x600260000360000d600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01" } } }, @@ -2431,9 +2369,7 @@ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60000d600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01" } } }, @@ -2518,9 +2454,7 @@ "code" : "0x600060026000030c600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01" } } }, @@ -2605,9 +2539,7 @@ "code" : "0x60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0c600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01" } } }, @@ -2692,9 +2624,7 @@ "code" : "0x600360000360056000030c600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01" } } }, @@ -2737,9 +2667,7 @@ "code" : "0x6003600003600560000307600057", "nonce" : "0", "storage" : { - "0x" : [ - "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe" - ] + "0x" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe" } } }, @@ -2782,9 +2710,7 @@ "code" : "0x6003600003600507600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x02" - ] + "0x" : "0x02" } } }, @@ -2827,9 +2753,7 @@ "code" : "0x6003600560000307600057", "nonce" : "0", "storage" : { - "0x" : [ - "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe" - ] + "0x" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe" } } }, @@ -2998,9 +2922,7 @@ "code" : "0x6001601703600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x16" - ] + "0x" : "0x16" } } }, @@ -3043,9 +2965,7 @@ "code" : "0x6003600203600057", "nonce" : "0", "storage" : { - "0x" : [ - "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" - ] + "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" } } }, @@ -3088,9 +3008,7 @@ "code" : "0x6017600003600057", "nonce" : "0", "storage" : { - "0x" : [ - "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe9" - ] + "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe9" } } }, @@ -3133,9 +3051,7 @@ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600003600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01" } } }, @@ -3178,9 +3094,7 @@ "code" : "0x60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff03600057", "nonce" : "0", "storage" : { - "0x" : [ - "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" - ] + "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" } } }, diff --git a/vmtests/vmBitwiseLogicOperationTest.json b/vmtests/vmBitwiseLogicOperationTest.json index 883296981a..840c40a943 100644 --- a/vmtests/vmBitwiseLogicOperationTest.json +++ b/vmtests/vmBitwiseLogicOperationTest.json @@ -28,9 +28,7 @@ "code" : "0x60026002600114600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01" } } }, @@ -73,9 +71,7 @@ "code" : "0x60026002600003600160000314600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01" } } }, @@ -118,9 +114,7 @@ "code" : "0x60036001600660000314600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x02" - ] + "0x" : "0x02" } } }, @@ -205,9 +199,7 @@ "code" : "0x6003600160066000031460036005600003060e600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01" } } }, @@ -250,9 +242,7 @@ "code" : "0x60036000036001600414600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x05" - ] + "0x" : "0x05" } } }, @@ -337,9 +327,7 @@ "code" : "0x6002600210600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x02" - ] + "0x" : "0x02" } } }, @@ -424,9 +412,7 @@ "code" : "0x6001600310600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01" } } }, @@ -469,9 +455,7 @@ "code" : "0x7f0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff10600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef" - ] + "0x" : "0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef" } } }, @@ -514,9 +498,7 @@ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7feeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee10600057", "nonce" : "0", "storage" : { - "0x" : [ - "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" - ] + "0x" : "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" } } }, @@ -559,9 +541,7 @@ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7feeeeeeeeeeeeeeeeeeeeeeeeeeeeefeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee10600057", "nonce" : "0", "storage" : { - "0x" : [ - "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeefeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" - ] + "0x" : "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeefeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" } } }, @@ -604,9 +584,7 @@ "code" : "0x6780402010080402016000601f0313600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01" } } }, @@ -649,9 +627,7 @@ "code" : "0x6780402010080402016001601f0313600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x02" - ] + "0x" : "0x02" } } }, @@ -778,9 +754,7 @@ "code" : "0x6780402010080402016002601f0313600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x04" - ] + "0x" : "0x04" } } }, @@ -823,9 +797,7 @@ "code" : "0x6780402010080402016003601f0313600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x08" - ] + "0x" : "0x08" } } }, @@ -868,9 +840,7 @@ "code" : "0x6780402010080402016004601f0313600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x10" - ] + "0x" : "0x10" } } }, @@ -913,9 +883,7 @@ "code" : "0x6780402010080402016005601f0313600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x20" - ] + "0x" : "0x20" } } }, @@ -958,9 +926,7 @@ "code" : "0x6780402010080402016006601f0313600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x40" - ] + "0x" : "0x40" } } }, @@ -1003,9 +969,7 @@ "code" : "0x6780402010080402016007601f0313600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x80" - ] + "0x" : "0x80" } } }, @@ -1216,9 +1180,7 @@ "code" : "0x60036001600560000315600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x02" - ] + "0x" : "0x02" } } }, @@ -1303,9 +1265,7 @@ "code" : "0x6003600160056000031560036005600003060e600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01" } } }, @@ -1348,9 +1308,7 @@ "code" : "0x60036000036001600515600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x05" - ] + "0x" : "0x05" } } }, @@ -1435,9 +1393,7 @@ "code" : "0x6002600211600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x02" - ] + "0x" : "0x02" } } }, @@ -1480,9 +1436,7 @@ "code" : "0x6001600211600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x03" - ] + "0x" : "0x03" } } }, @@ -1525,9 +1479,7 @@ "code" : "0x6001600311600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x03" - ] + "0x" : "0x03" } } }, @@ -1570,9 +1522,7 @@ "code" : "0x7f0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff11600057", "nonce" : "0", "storage" : { - "0x" : [ - "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" - ] + "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" } } }, @@ -1615,9 +1565,7 @@ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7feeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee11600057", "nonce" : "0", "storage" : { - "0x" : [ - "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" - ] + "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" } } }, @@ -1660,9 +1608,7 @@ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7feeeeeeeeeeeeeeeeeeeeeeeeeeeeefeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee11600057", "nonce" : "0", "storage" : { - "0x" : [ - "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" - ] + "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" } } }, @@ -1747,9 +1693,7 @@ "code" : "0x6001600212600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x03" - ] + "0x" : "0x03" } } }, @@ -1792,9 +1736,7 @@ "code" : "0x6001600312600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x02" - ] + "0x" : "0x02" } } }, @@ -1837,9 +1779,7 @@ "code" : "0x7f0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff12600057", "nonce" : "0", "storage" : { - "0x" : [ - "0xfedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210" - ] + "0x" : "0xfedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210" } } }, @@ -1882,9 +1822,7 @@ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7feeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee12600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x1111111111111111111111111111111111111111111111111111111111111111" - ] + "0x" : "0x1111111111111111111111111111111111111111111111111111111111111111" } } }, @@ -1927,9 +1865,7 @@ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7feeeeeeeeeeeeeeeeeeeeeeeeeeeeefeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee12600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x1111111111111111111111111111101111111111111111111111111111111111" - ] + "0x" : "0x1111111111111111111111111111101111111111111111111111111111111111" } } }, diff --git a/vmtests/vmBlockInfoTest.json b/vmtests/vmBlockInfoTest.json index 72c1d7bb8c..f22060dd31 100644 --- a/vmtests/vmBlockInfoTest.json +++ b/vmtests/vmBlockInfoTest.json @@ -28,9 +28,7 @@ "code" : "0x41600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" - ] + "0x" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" } } }, @@ -73,9 +71,7 @@ "code" : "0x44600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x0100" - ] + "0x" : "0x0100" } } }, @@ -118,9 +114,7 @@ "code" : "0x45600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x0f4240" - ] + "0x" : "0x0f4240" } } }, @@ -205,9 +199,7 @@ "code" : "0x40600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" - ] + "0x" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" } } }, @@ -250,9 +242,7 @@ "code" : "0x42600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01" } } }, diff --git a/vmtests/vmEnvironmentalInfoTest.json b/vmtests/vmEnvironmentalInfoTest.json index a14e429f58..35ad5f8f10 100644 --- a/vmtests/vmEnvironmentalInfoTest.json +++ b/vmtests/vmEnvironmentalInfoTest.json @@ -28,9 +28,7 @@ "code" : "0x30600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" - ] + "0x" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" } } }, @@ -73,9 +71,7 @@ "code" : "0x30600057", "nonce" : "0", "storage" : { - "0x" : [ - "0xcd1722f3947def4cf144679da39c4c32bdc35681" - ] + "0x" : "0xcd1722f3947def4cf144679da39c4c32bdc35681" } } }, @@ -167,9 +163,7 @@ "code" : "0x730f572e5295c57f15886f9b263e2f6d2d6c7b5ec631600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x0de0b6b3a7640000" - ] + "0x" : "0x0de0b6b3a7640000" } } }, @@ -212,9 +206,7 @@ "code" : "0x3031730f572e5295c57f15886f9b263e2f6d2d6c7b5ec6310e600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01" } } }, @@ -257,9 +249,7 @@ "code" : "0x333173cd1722f3947def4cf144679da39c4c32bdc35681310e600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01" } }, "cd1722f3947def4cf144679da39c4c32bdc35681" : { @@ -309,9 +299,7 @@ "code" : "0x60026001600037600053600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x2345000000000000000000000000000000000000000000000000000000000000" - ] + "0x" : "0x2345000000000000000000000000000000000000000000000000000000000000" } } }, @@ -354,9 +342,7 @@ "code" : "0x60016001600037600053600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x2300000000000000000000000000000000000000000000000000000000000000" - ] + "0x" : "0x2300000000000000000000000000000000000000000000000000000000000000" } } }, @@ -441,9 +427,7 @@ "code" : "0x600035600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x0256000000000000000000000000000000000000000000000000000000000000" - ] + "0x" : "0x0256000000000000000000000000000000000000000000000000000000000000" } } }, @@ -486,9 +470,7 @@ "code" : "0x600135600057", "nonce" : "0", "storage" : { - "0x" : [ - "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff23" - ] + "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff23" } } }, @@ -531,9 +513,7 @@ "code" : "0x600535600057", "nonce" : "0", "storage" : { - "0x" : [ - "0xabcdef0000000000000000000000000000000000000000000000000024000000" - ] + "0x" : "0xabcdef0000000000000000000000000000000000000000000000000024000000" } } }, @@ -576,9 +556,7 @@ "code" : "0x36600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x02" - ] + "0x" : "0x02" } } }, @@ -621,9 +599,7 @@ "code" : "0x36600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x21" - ] + "0x" : "0x21" } } }, @@ -666,9 +642,7 @@ "code" : "0x36600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x21" - ] + "0x" : "0x21" } } }, @@ -711,9 +685,7 @@ "code" : "0x33600057", "nonce" : "0", "storage" : { - "0x" : [ - "0xcd1722f3947def4cf144679da39c4c32bdc35681" - ] + "0x" : "0xcd1722f3947def4cf144679da39c4c32bdc35681" } } }, @@ -756,9 +728,7 @@ "code" : "0x34600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x0de0b6b3a7640000" - ] + "0x" : "0x0de0b6b3a7640000" } } }, @@ -801,9 +771,7 @@ "code" : "0x60056000600039600053600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x6005600060000000000000000000000000000000000000000000000000000000" - ] + "0x" : "0x6005600060000000000000000000000000000000000000000000000000000000" } } }, @@ -846,9 +814,7 @@ "code" : "0x386000600039600053600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x3860006000396000536000570000000000000000000000000000000000000000" - ] + "0x" : "0x3860006000396000536000570000000000000000000000000000000000000000" } } }, @@ -891,9 +857,7 @@ "code" : "0x38600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x04" - ] + "0x" : "0x04" } } }, @@ -936,9 +900,7 @@ "code" : "0x333b60006000333c600053600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x6005600057000000000000000000000000000000000000000000000000000000" - ] + "0x" : "0x6005600057000000000000000000000000000000000000000000000000000000" } }, "cd1722f3947def4cf144679da39c4c32bdc35681" : { @@ -995,9 +957,7 @@ "code" : "0x38333b0e600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01" } }, "cd1722f3947def4cf144679da39c4c32bdc35681" : { @@ -1061,9 +1021,7 @@ "code" : "0x333b600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x04" - ] + "0x" : "0x04" } } }, @@ -1113,9 +1071,7 @@ "code" : "0x3a600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x075bcd15" - ] + "0x" : "0x075bcd15" } } }, @@ -1158,9 +1114,7 @@ "code" : "0x32600057", "nonce" : "0", "storage" : { - "0x" : [ - "0xcd1722f3947def4cf144679da39c4c32bdc35681" - ] + "0x" : "0xcd1722f3947def4cf144679da39c4c32bdc35681" } } }, diff --git a/vmtests/vmIOandFlowOperationsTest.json b/vmtests/vmIOandFlowOperationsTest.json index 4a7faa5dd8..c23fa85429 100644 --- a/vmtests/vmIOandFlowOperationsTest.json +++ b/vmtests/vmIOandFlowOperationsTest.json @@ -70,9 +70,7 @@ "code" : "0x64ffffffffff60005461eeee605a545c600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x2705" - ] + "0x" : "0x2705" } } }, @@ -115,9 +113,7 @@ "code" : "0x5c600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x270f" - ] + "0x" : "0x270f" } } }, @@ -160,9 +156,7 @@ "code" : "0x60236007586001600257", "nonce" : "0", "storage" : { - "0x02" : [ - "0x23" - ] + "0x02" : "0x23" } } }, @@ -247,9 +241,7 @@ "code" : "0x602360016009596001600257", "nonce" : "0", "storage" : { - "0x02" : [ - "0x23" - ] + "0x02" : "0x23" } } }, @@ -292,9 +284,7 @@ "code" : "0x602360006009596001600257", "nonce" : "0", "storage" : { - "0x02" : [ - "0x01" - ] + "0x02" : "0x01" } } }, @@ -463,9 +453,7 @@ "code" : "0x60ff6000545b600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x20" - ] + "0x" : "0x20" } } }, @@ -508,9 +496,7 @@ "code" : "0x64ffffffffff6000545b600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x20" - ] + "0x" : "0x20" } } }, @@ -553,9 +539,7 @@ "code" : "0x64ffffffffff60005461eeee6020545b600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x40" - ] + "0x" : "0x40" } } }, @@ -598,9 +582,7 @@ "code" : "0x64ffffffffff60005461eeee605a545b600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x80" - ] + "0x" : "0x80" } } }, @@ -643,9 +625,7 @@ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600154600153600157", "nonce" : "0", "storage" : { - "0x01" : [ - "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" - ] + "0x01" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" } } }, @@ -688,9 +668,7 @@ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600201600154600153600157", "nonce" : "0", "storage" : { - "0x01" : [ - "0x01" - ] + "0x01" : "0x01" } } }, @@ -775,9 +753,7 @@ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600155600153600157", "nonce" : "0", "storage" : { - "0x01" : [ - "0xff00000000000000000000000000000000000000000000000000000000000000" - ] + "0x01" : "0xff00000000000000000000000000000000000000000000000000000000000000" } } }, @@ -820,9 +796,7 @@ "code" : "0x60ff60015560ee600255600053600157", "nonce" : "0", "storage" : { - "0x01" : [ - "0xffee0000000000000000000000000000000000000000000000000000000000" - ] + "0x01" : "0xffee0000000000000000000000000000000000000000000000000000000000" } } }, @@ -907,9 +881,7 @@ "code" : "0x6017600054600053600157", "nonce" : "0", "storage" : { - "0x01" : [ - "0x17" - ] + "0x01" : "0x17" } } }, @@ -994,9 +966,7 @@ "code" : "0x60ff6000575a600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x05" - ] + "0x" : "0x05" } } }, @@ -1039,9 +1009,7 @@ "code" : "0x6002600360045057", "nonce" : "0", "storage" : { - "0x03" : [ - "0x02" - ] + "0x03" : "0x02" } } }, @@ -1126,15 +1094,9 @@ "code" : "0x60ff60005760ee600a57600056601457", "nonce" : "0", "storage" : { - "0x" : [ - "0xff" - ], - "0x0a" : [ - "0xee" - ], - "0x14" : [ - "0xff" - ] + "0x" : "0xff", + "0x0a" : "0xee", + "0x14" : "0xff" } } }, @@ -1177,12 +1139,8 @@ "code" : "0x60ff60005760ee600a57606456601457", "nonce" : "0", "storage" : { - "0x" : [ - "0xff" - ], - "0x0a" : [ - "0xee" - ] + "0x" : "0xff", + "0x0a" : "0xee" } } }, @@ -1225,22 +1183,11 @@ "code" : "0x60ff60005760ee60015760dd600257600156600a57600256601457", "nonce" : "0", "storage" : { - "0x" : [ - "0xff", - "0xee", - "0xdd", - 0, - 0, - 0, - 0, - 0, - 0, - 0, - "0xee" - ], - "0x14" : [ - "0xdd" - ] + "0x" : "0xff", + "0x01" : "0xee", + "0x02" : "0xdd", + "0x0a" : "0xee", + "0x14" : "0xdd" } } }, diff --git a/vmtests/vmPushDupSwapTest.json b/vmtests/vmPushDupSwapTest.json index dcc9e8a6e2..444ccc5d89 100644 --- a/vmtests/vmPushDupSwapTest.json +++ b/vmtests/vmPushDupSwapTest.json @@ -28,9 +28,7 @@ "code" : "0x7f10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff80600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff" - ] + "0x03" : "0x10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff" } } }, @@ -73,9 +71,7 @@ "code" : "0x600a60096008600760066005600460036002600189600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x0a" - ] + "0x03" : "0x0a" } } }, @@ -118,9 +114,7 @@ "code" : "0x600b600a6009600860076006600560046003600260018a600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x0b" - ] + "0x03" : "0x0b" } } }, @@ -163,9 +157,7 @@ "code" : "0x600c600b600a6009600860076006600560046003600260018b600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x0c" - ] + "0x03" : "0x0c" } } }, @@ -208,9 +200,7 @@ "code" : "0x600d600c600b600a6009600860076006600560046003600260018c600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x0d" - ] + "0x03" : "0x0d" } } }, @@ -253,9 +243,7 @@ "code" : "0x600e600d600c600b600a6009600860076006600560046003600260018d600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x0e" - ] + "0x03" : "0x0e" } } }, @@ -298,9 +286,7 @@ "code" : "0x600f600e600d600c600b600a6009600860076006600560046003600260018e600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x0f" - ] + "0x03" : "0x0f" } } }, @@ -343,9 +329,7 @@ "code" : "0x6010600f600e600d600c600b600a6009600860076006600560046003600260018f600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x10" - ] + "0x03" : "0x10" } } }, @@ -388,9 +372,7 @@ "code" : "0x6002600181600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x02" - ] + "0x03" : "0x02" } } }, @@ -475,9 +457,7 @@ "code" : "0x60036002600182600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x03" - ] + "0x03" : "0x03" } } }, @@ -520,9 +500,7 @@ "code" : "0x600460036002600183600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x04" - ] + "0x03" : "0x04" } } }, @@ -565,9 +543,7 @@ "code" : "0x6005600460036002600184600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x05" - ] + "0x03" : "0x05" } } }, @@ -610,9 +586,7 @@ "code" : "0x60066005600460036002600185600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x06" - ] + "0x03" : "0x06" } } }, @@ -655,9 +629,7 @@ "code" : "0x600760066005600460036002600186600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x07" - ] + "0x03" : "0x07" } } }, @@ -700,9 +672,7 @@ "code" : "0x6008600760066005600460036002600187600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x08" - ] + "0x03" : "0x08" } } }, @@ -745,9 +715,7 @@ "code" : "0x60096008600760066005600460036002600188600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x09" - ] + "0x03" : "0x09" } } }, @@ -790,9 +758,7 @@ "code" : "0x60ff600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0xff" - ] + "0x03" : "0xff" } } }, @@ -835,9 +801,7 @@ "code" : "0x6966778899aabbccddeeff600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x66778899aabbccddeeff" - ] + "0x03" : "0x66778899aabbccddeeff" } } }, @@ -880,9 +844,7 @@ "code" : "0x6a5566778899aabbccddeeff600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x5566778899aabbccddeeff" - ] + "0x03" : "0x5566778899aabbccddeeff" } } }, @@ -925,9 +887,7 @@ "code" : "0x6b445566778899aabbccddeeff600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x445566778899aabbccddeeff" - ] + "0x03" : "0x445566778899aabbccddeeff" } } }, @@ -970,9 +930,7 @@ "code" : "0x6c33445566778899aabbccddeeff600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x33445566778899aabbccddeeff" - ] + "0x03" : "0x33445566778899aabbccddeeff" } } }, @@ -1015,9 +973,7 @@ "code" : "0x6d2233445566778899aabbccddeeff600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x2233445566778899aabbccddeeff" - ] + "0x03" : "0x2233445566778899aabbccddeeff" } } }, @@ -1060,9 +1016,7 @@ "code" : "0x6e112233445566778899aabbccddeeff600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x112233445566778899aabbccddeeff" - ] + "0x03" : "0x112233445566778899aabbccddeeff" } } }, @@ -1105,9 +1059,7 @@ "code" : "0x6f10112233445566778899aabbccddeeff600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x10112233445566778899aabbccddeeff" - ] + "0x03" : "0x10112233445566778899aabbccddeeff" } } }, @@ -1150,9 +1102,7 @@ "code" : "0x70ff00112233445566778899aabbccddeeff600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0xff00112233445566778899aabbccddeeff" - ] + "0x03" : "0xff00112233445566778899aabbccddeeff" } } }, @@ -1195,9 +1145,7 @@ "code" : "0x71eeff00112233445566778899aabbccddeeff600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0xeeff00112233445566778899aabbccddeeff" - ] + "0x03" : "0xeeff00112233445566778899aabbccddeeff" } } }, @@ -1240,9 +1188,7 @@ "code" : "0x72ddeeff00112233445566778899aabbccddeeff600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0xddeeff00112233445566778899aabbccddeeff" - ] + "0x03" : "0xddeeff00112233445566778899aabbccddeeff" } } }, @@ -1285,9 +1231,7 @@ "code" : "0x61eeff600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0xeeff" - ] + "0x03" : "0xeeff" } } }, @@ -1330,9 +1274,7 @@ "code" : "0x73ccddeeff00112233445566778899aabbccddeeff600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0xccddeeff00112233445566778899aabbccddeeff" - ] + "0x03" : "0xccddeeff00112233445566778899aabbccddeeff" } } }, @@ -1375,9 +1317,7 @@ "code" : "0x74bbccddeeff00112233445566778899aabbccddeeff600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0xbbccddeeff00112233445566778899aabbccddeeff" - ] + "0x03" : "0xbbccddeeff00112233445566778899aabbccddeeff" } } }, @@ -1420,9 +1360,7 @@ "code" : "0x75aabbccddeeff00112233445566778899aabbccddeeff600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0xaabbccddeeff00112233445566778899aabbccddeeff" - ] + "0x03" : "0xaabbccddeeff00112233445566778899aabbccddeeff" } } }, @@ -1465,9 +1403,7 @@ "code" : "0x7699aabbccddeeff00112233445566778899aabbccddeeff600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x99aabbccddeeff00112233445566778899aabbccddeeff" - ] + "0x03" : "0x99aabbccddeeff00112233445566778899aabbccddeeff" } } }, @@ -1510,9 +1446,7 @@ "code" : "0x778899aabbccddeeff00112233445566778899aabbccddeeff600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x8899aabbccddeeff00112233445566778899aabbccddeeff" - ] + "0x03" : "0x8899aabbccddeeff00112233445566778899aabbccddeeff" } } }, @@ -1555,9 +1489,7 @@ "code" : "0x78778899aabbccddeeff00112233445566778899aabbccddeeff600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x778899aabbccddeeff00112233445566778899aabbccddeeff" - ] + "0x03" : "0x778899aabbccddeeff00112233445566778899aabbccddeeff" } } }, @@ -1600,9 +1532,7 @@ "code" : "0x7966778899aabbccddeeff00112233445566778899aabbccddeeff600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x66778899aabbccddeeff00112233445566778899aabbccddeeff" - ] + "0x03" : "0x66778899aabbccddeeff00112233445566778899aabbccddeeff" } } }, @@ -1645,9 +1575,7 @@ "code" : "0x7a5566778899aabbccddeeff00112233445566778899aabbccddeeff600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x5566778899aabbccddeeff00112233445566778899aabbccddeeff" - ] + "0x03" : "0x5566778899aabbccddeeff00112233445566778899aabbccddeeff" } } }, @@ -1690,9 +1618,7 @@ "code" : "0x7b445566778899aabbccddeeff00112233445566778899aabbccddeeff600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x445566778899aabbccddeeff00112233445566778899aabbccddeeff" - ] + "0x03" : "0x445566778899aabbccddeeff00112233445566778899aabbccddeeff" } } }, @@ -1735,9 +1661,7 @@ "code" : "0x7c33445566778899aabbccddeeff00112233445566778899aabbccddeeff600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x33445566778899aabbccddeeff00112233445566778899aabbccddeeff" - ] + "0x03" : "0x33445566778899aabbccddeeff00112233445566778899aabbccddeeff" } } }, @@ -1780,9 +1704,7 @@ "code" : "0x62ddeeff600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0xddeeff" - ] + "0x03" : "0xddeeff" } } }, @@ -1825,9 +1747,7 @@ "code" : "0x7d2233445566778899aabbccddeeff00112233445566778899aabbccddeeff600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x2233445566778899aabbccddeeff00112233445566778899aabbccddeeff" - ] + "0x03" : "0x2233445566778899aabbccddeeff00112233445566778899aabbccddeeff" } } }, @@ -1870,9 +1790,7 @@ "code" : "0x7e112233445566778899aabbccddeeff00112233445566778899aabbccddeeff600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x112233445566778899aabbccddeeff00112233445566778899aabbccddeeff" - ] + "0x03" : "0x112233445566778899aabbccddeeff00112233445566778899aabbccddeeff" } } }, @@ -1915,9 +1833,7 @@ "code" : "0x7f10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff" - ] + "0x03" : "0x10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff" } } }, @@ -2002,9 +1918,7 @@ "code" : "0x63ccddeeff600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0xccddeeff" - ] + "0x03" : "0xccddeeff" } } }, @@ -2047,9 +1961,7 @@ "code" : "0x64bbccddeeff600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0xbbccddeeff" - ] + "0x03" : "0xbbccddeeff" } } }, @@ -2092,9 +2004,7 @@ "code" : "0x65aabbccddeeff600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0xaabbccddeeff" - ] + "0x03" : "0xaabbccddeeff" } } }, @@ -2137,9 +2047,7 @@ "code" : "0x6699aabbccddeeff600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x99aabbccddeeff" - ] + "0x03" : "0x99aabbccddeeff" } } }, @@ -2182,9 +2090,7 @@ "code" : "0x678899aabbccddeeff600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x8899aabbccddeeff" - ] + "0x03" : "0x8899aabbccddeeff" } } }, @@ -2227,9 +2133,7 @@ "code" : "0x68778899aabbccddeeff600357", "nonce" : "0", "storage" : { - "0x03" : [ - "0x778899aabbccddeeff" - ] + "0x03" : "0x778899aabbccddeeff" } } }, @@ -2272,9 +2176,7 @@ "code" : "0x7f10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff60039057", "nonce" : "0", "storage" : { - "0x10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff" : [ - "0x03" - ] + "0x10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff" : "0x03" } } }, @@ -2317,9 +2219,7 @@ "code" : "0x600a60096008600760066005600460036002600160039957", "nonce" : "0", "storage" : { - "0x0a" : [ - "0x01" - ] + "0x0a" : "0x01" } } }, @@ -2362,9 +2262,7 @@ "code" : "0x600b600a60096008600760066005600460036002600160039a57", "nonce" : "0", "storage" : { - "0x0b" : [ - "0x01" - ] + "0x0b" : "0x01" } } }, @@ -2407,9 +2305,7 @@ "code" : "0x600c600b600a60096008600760066005600460036002600160039b57", "nonce" : "0", "storage" : { - "0x0c" : [ - "0x01" - ] + "0x0c" : "0x01" } } }, @@ -2452,9 +2348,7 @@ "code" : "0x600d600c600b600a60096008600760066005600460036002600160039c57", "nonce" : "0", "storage" : { - "0x0d" : [ - "0x01" - ] + "0x0d" : "0x01" } } }, @@ -2497,9 +2391,7 @@ "code" : "0x600e600d600c600b600a60096008600760066005600460036002600160039d57", "nonce" : "0", "storage" : { - "0x0e" : [ - "0x01" - ] + "0x0e" : "0x01" } } }, @@ -2542,9 +2434,7 @@ "code" : "0x600f600e600d600c600b600a60096008600760066005600460036002600160039e57", "nonce" : "0", "storage" : { - "0x0f" : [ - "0x01" - ] + "0x0f" : "0x01" } } }, @@ -2587,9 +2477,7 @@ "code" : "0x6010600f600e600d600c600b600a60096008600760066005600460036002600160039f57", "nonce" : "0", "storage" : { - "0x10" : [ - "0x01" - ] + "0x10" : "0x01" } } }, @@ -2632,9 +2520,7 @@ "code" : "0x6002600160039157", "nonce" : "0", "storage" : { - "0x02" : [ - "0x01" - ] + "0x02" : "0x01" } } }, @@ -2719,9 +2605,7 @@ "code" : "0x60036002600160039257", "nonce" : "0", "storage" : { - "0x03" : [ - "0x01" - ] + "0x03" : "0x01" } } }, @@ -2764,9 +2648,7 @@ "code" : "0x600460036002600160039357", "nonce" : "0", "storage" : { - "0x04" : [ - "0x01" - ] + "0x04" : "0x01" } } }, @@ -2809,9 +2691,7 @@ "code" : "0x6005600460036002600160039457", "nonce" : "0", "storage" : { - "0x05" : [ - "0x01" - ] + "0x05" : "0x01" } } }, @@ -2854,9 +2734,7 @@ "code" : "0x60066005600460036002600160039557", "nonce" : "0", "storage" : { - "0x06" : [ - "0x01" - ] + "0x06" : "0x01" } } }, @@ -2899,9 +2777,7 @@ "code" : "0x600760066005600460036002600160039657", "nonce" : "0", "storage" : { - "0x07" : [ - "0x01" - ] + "0x07" : "0x01" } } }, @@ -2944,9 +2820,7 @@ "code" : "0x6008600760066005600460036002600160039757", "nonce" : "0", "storage" : { - "0x08" : [ - "0x01" - ] + "0x08" : "0x01" } } }, @@ -2989,9 +2863,7 @@ "code" : "0x60096008600760066005600460036002600160039857", "nonce" : "0", "storage" : { - "0x09" : [ - "0x01" - ] + "0x09" : "0x01" } } }, diff --git a/vmtests/vmSha3Test.json b/vmtests/vmSha3Test.json index 0ea659b51b..54ba645a90 100644 --- a/vmtests/vmSha3Test.json +++ b/vmtests/vmSha3Test.json @@ -28,9 +28,7 @@ "code" : "0x6000600020600057", "nonce" : "0", "storage" : { - "0x" : [ - "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470" - ] + "0x" : "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470" } } }, @@ -73,9 +71,7 @@ "code" : "0x6005600420600057", "nonce" : "0", "storage" : { - "0x" : [ - "0xc41589e7559804ea4a2080dad19d876a024ccb05117835447d72ce08c1d020ec" - ] + "0x" : "0xc41589e7559804ea4a2080dad19d876a024ccb05117835447d72ce08c1d020ec" } } }, @@ -118,9 +114,7 @@ "code" : "0x600a600a20600057", "nonce" : "0", "storage" : { - "0x" : [ - "0x6bd2dd6bd408cbee33429358bf24fdc64612fbf8b1b4db604518f40ffd34b607" - ] + "0x" : "0x6bd2dd6bd408cbee33429358bf24fdc64612fbf8b1b4db604518f40ffd34b607" } } }, diff --git a/vmtests/vmSystemOperationsTest.json b/vmtests/vmSystemOperationsTest.json index c552c839d3..e0f64d763a 100644 --- a/vmtests/vmSystemOperationsTest.json +++ b/vmtests/vmSystemOperationsTest.json @@ -32,7 +32,7 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "19999977", "code" : "0x6000600060006000601773945304eb96065b2a98b57a48a06ae28d285a71b5620186a0f1", - "nonce" : "1", + "nonce" : "0", "storage" : { } }, @@ -41,10 +41,8 @@ "code" : "0x600160005601600057600060006000600060003060e05c03f1600157", "nonce" : "0", "storage" : { - "0x" : [ - "0x0118", - "0x01" - ] + "0x" : "0x0118", + "0x01" : "0x01" } } }, @@ -92,17 +90,15 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "100000" }, - "gas" : "9999999999525", + "gas" : "9999999999535", "out" : "0x", "post" : { "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "999999999999999977", "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546000604060406000601773945304eb96065b2a98b57a48a06ae28d285a71b5620f4240f1600057", - "nonce" : "1", + "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01" } }, "945304eb96065b2a98b57a48a06ae28d285a71b5" : { @@ -110,9 +106,7 @@ "code" : "0x600035560f6009590060203560003557", "nonce" : "0", "storage" : { - "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" : [ - "0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa" - ] + "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" : "0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa" } } }, @@ -160,17 +154,15 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "100000" }, - "gas" : "525", + "gas" : "535", "out" : "0x", "post" : { "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "999999999999999977", "code" : "0x7feeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff006000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546000620f120660406000601773945304eb96065b2a98b57a48a06ae28d285a71b56101f4f1600057", - "nonce" : "1", + "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01" } }, "945304eb96065b2a98b57a48a06ae28d285a71b5" : { @@ -178,9 +170,7 @@ "code" : "0x600035560f6009590060203560003557", "nonce" : "0", "storage" : { - "0xeeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00" : [ - "0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa" - ] + "0xeeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00" : "0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa" } } }, @@ -228,17 +218,15 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "100000" }, - "gas" : "625", + "gas" : "635", "out" : "0x", "post" : { "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "999999999999999977", "code" : "0x7feeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff006000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602054600060406000620f1206601773945304eb96065b2a98b57a48a06ae28d285a71b56101f4f1600057", - "nonce" : "1", + "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01" } }, "945304eb96065b2a98b57a48a06ae28d285a71b5" : { @@ -268,6 +256,12 @@ }, "CallToNameRegistratorOutOfGas" : { "callcreates" : [ + { + "data" : "0xeeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00aaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa", + "destination" : "945304eb96065b2a98b57a48a06ae28d285a71b5", + "gasLimit" : "100", + "value" : "23" + } ], "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -287,7 +281,7 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "100000" }, - "gas" : "764", + "gas" : "865", "out" : "0x", "post" : { "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { @@ -298,7 +292,7 @@ } }, "945304eb96065b2a98b57a48a06ae28d285a71b5" : { - "balance" : "23", + "balance" : "46", "code" : "0x600035560f6009590060203560003557", "nonce" : "0", "storage" : { @@ -517,17 +511,15 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "100000" }, - "gas" : "9999999999545", + "gas" : "9999999999555", "out" : "0x", "post" : { "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "999999999999999977", "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546002600060406000601773945304eb96065b2a98b57a48a06ae28d285a71b5620f4240f1600057", - "nonce" : "1", + "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01" } }, "945304eb96065b2a98b57a48a06ae28d285a71b5" : { @@ -535,9 +527,7 @@ "code" : "0x6001600157603760005560026000f2", "nonce" : "0", "storage" : { - "0x01" : [ - "0x01" - ] + "0x01" : "0x01" } } }, @@ -560,6 +550,12 @@ }, "PostToNameRegistrator0" : { "callcreates" : [ + { + "data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa", + "destination" : "945304eb96065b2a98b57a48a06ae28d285a71b5", + "gasLimit" : "1000000", + "value" : "23" + } ], "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -590,10 +586,11 @@ } }, "945304eb96065b2a98b57a48a06ae28d285a71b5" : { - "balance" : "23", + "balance" : "46", "code" : "0x600035560f6009590060203560003557", "nonce" : "0", "storage" : { + "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" : "0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa" } } }, @@ -616,6 +613,12 @@ }, "PostToReturn1" : { "callcreates" : [ + { + "data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa", + "destination" : "945304eb96065b2a98b57a48a06ae28d285a71b5", + "gasLimit" : "1000000", + "value" : "23" + } ], "env" : { "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -646,7 +649,7 @@ } }, "945304eb96065b2a98b57a48a06ae28d285a71b5" : { - "balance" : "23", + "balance" : "46", "code" : "0x603760005560026000f2", "nonce" : "0", "storage" : { @@ -699,9 +702,7 @@ "code" : "0x600035560f6009590060203560003557", "nonce" : "0", "storage" : { - "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa" : [ - "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa" - ] + "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa" } } }, @@ -742,17 +743,16 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "100000" }, - "gas" : "9999999999751", + "gas" : "9999999999535", "out" : "0x", "post" : { "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "1000000000000000000", "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546000604060406000601773945304eb96065b2a98b57a48a06ae28d285a71b5620f4240f4600057", - "nonce" : "1", + "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01", + "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" : "0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa" } }, "945304eb96065b2a98b57a48a06ae28d285a71b5" : { @@ -807,17 +807,16 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "100000" }, - "gas" : "9999999999751", + "gas" : "9999999999555", "out" : "0x", "post" : { "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "1000000000000000000", "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546002600060406000601773945304eb96065b2a98b57a48a06ae28d285a71b56101f4f4600057", - "nonce" : "1", + "nonce" : "0", "storage" : { - "0x" : [ - "0x01" - ] + "0x" : "0x01", + "0x01" : "0x01" } }, "945304eb96065b2a98b57a48a06ae28d285a71b5" : { @@ -849,7 +848,7 @@ "callcreates" : [ { "data" : "0x601080600c6000396000f200600035560f6009590060203560003557", - "destination" : "0000000000000000000000000000000000000000", + "destination" : "945304eb96065b2a98b57a48a06ae28d285a71b5", "gasLimit" : "9893", "value" : "23" } @@ -880,9 +879,7 @@ "code" : "0x7b601080600c6000396000f200600035560f6009590060203560003557600054601c60046017f0600057", "nonce" : "1", "storage" : { - "0x" : [ - "0x945304eb96065b2a98b57a48a06ae28d285a71b5" - ] + "0x" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5" } }, "945304eb96065b2a98b57a48a06ae28d285a71b5" : { @@ -922,7 +919,7 @@ "gas" : "10000", "gasPrice" : "100000000000000", "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", - "value" : "1000000000000000000" + "value" : "100" }, "gas" : "0", "out" : "0x", @@ -964,7 +961,7 @@ "gas" : "10000", "gasPrice" : "100000000000000", "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", - "value" : "1000000000000000000" + "value" : "100" }, "gas" : "0", "out" : "0x", @@ -1048,7 +1045,7 @@ "gas" : "1000", "gasPrice" : "100000000000000", "origin" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", - "value" : "100000" + "value" : "23" }, "gas" : "993", "out" : "0x37", @@ -1090,7 +1087,7 @@ "gas" : "1000", "gasPrice" : "100000000000000", "origin" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", - "value" : "100000" + "value" : "23" }, "gas" : "993", "out" : "0x3700", @@ -1132,7 +1129,7 @@ "gas" : "1000", "gasPrice" : "100000000000000", "origin" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", - "value" : "100000" + "value" : "23" }, "gas" : "992", "out" : "0x370000000000000000000000000000000000000000000000000000000000000000",