From 78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43 Mon Sep 17 00:00:00 2001 From: Dimitry Date: Tue, 1 Aug 2017 11:04:30 +0300 Subject: update general tests --- .../stZeroKnowledge/pointAddTrunc.json | 752 ++++++++++++++------- 1 file changed, 525 insertions(+), 227 deletions(-) (limited to 'GeneralStateTests/stZeroKnowledge/pointAddTrunc.json') diff --git a/GeneralStateTests/stZeroKnowledge/pointAddTrunc.json b/GeneralStateTests/stZeroKnowledge/pointAddTrunc.json index d3ac46507..72385f4ea 100644 --- a/GeneralStateTests/stZeroKnowledge/pointAddTrunc.json +++ b/GeneralStateTests/stZeroKnowledge/pointAddTrunc.json @@ -6,239 +6,537 @@ "source" : "/src/GeneralStateTestsFiller/stZeroKnowledge/pointAddTruncFiller.json" }, "env" : { - "currentCoinbase" : "68795C4AA09D6f4Ed3E5DeDDf8c2AD3049A601da", + "currentCoinbase" : "0x68795C4AA09D6f4Ed3E5DeDDf8c2AD3049A601da", "currentDifficulty" : "0x020000", - "currentGasLimit" : "4012015", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x3d37ef", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead", - "EIP150", - "EIP158" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x01", - "0x01" : "0x00", - "0x02" : "0x00" - } - } - } - }, - { - "indexes" : { - "data" : [ - 0 - ], - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Metropolis" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x01", - "0x01" : "0x01", - "0x02" : "0x02" - } - } - } - }, - { - "indexes" : { - "data" : [ - 1 - ], - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Metropolis" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x01", - "0x01" : "0x00", - "0x02" : "0x00" - } - } - } - }, - { - "indexes" : { - "data" : [ - 2 - ], - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Metropolis" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x01", - "0x01" : "0x0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd2", - "0x02" : "0x16da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba" - } - } - } - }, - { - "indexes" : { - "data" : [ - 5, - 6 - ], - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Metropolis" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x00", - "0x01" : "0x00", - "0x02" : "0x00" - } - } - } - }, - { - "indexes" : { - "data" : [ - 3 - ], - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Metropolis" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x01", - "0x01" : "0x0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd2", - "0x02" : "0x16da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba" - } - } + "post" : { + "EIP150" : [ + { + "hash" : "0x77db8deafc5b606f2bcee660c34a5d9c2a329c2220767c9424f8d82eeb093e7a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x257433ff3f8192afcdba0a058109fb1f38209eb42d51cba4f6785637a7e93a7c", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x8f5cf03ee422dd3b1b3963a54aa2defdab39caa826902cd2bba54220580681d2", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xccccf31592768397d73aef5b4fcc022f318b50c446e2c170106b8292c70cb11a", + "indexes" : { + "data" : 3, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xccccf31592768397d73aef5b4fcc022f318b50c446e2c170106b8292c70cb11a", + "indexes" : { + "data" : 4, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x8f5cf03ee422dd3b1b3963a54aa2defdab39caa826902cd2bba54220580681d2", + "indexes" : { + "data" : 5, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x8f5cf03ee422dd3b1b3963a54aa2defdab39caa826902cd2bba54220580681d2", + "indexes" : { + "data" : 6, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x8f5cf03ee422dd3b1b3963a54aa2defdab39caa826902cd2bba54220580681d2", + "indexes" : { + "data" : 7, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xe71b04b6636a77260982da8e238fe6c0738c0dc3eef695dc49f8b9d18d46d4b2", + "indexes" : { + "data" : 8, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xfe61d36b921f8002f7123210a7b141b749d2648c179a0fdaf8a17b056392ee4e", + "indexes" : { + "data" : 9, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : [ - 4 - ], - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Metropolis" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x01", - "0x01" : "0x00", - "0x02" : "0x00" - } - } + ], + "EIP158" : [ + { + "hash" : "0x77db8deafc5b606f2bcee660c34a5d9c2a329c2220767c9424f8d82eeb093e7a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x257433ff3f8192afcdba0a058109fb1f38209eb42d51cba4f6785637a7e93a7c", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x8f5cf03ee422dd3b1b3963a54aa2defdab39caa826902cd2bba54220580681d2", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xccccf31592768397d73aef5b4fcc022f318b50c446e2c170106b8292c70cb11a", + "indexes" : { + "data" : 3, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xccccf31592768397d73aef5b4fcc022f318b50c446e2c170106b8292c70cb11a", + "indexes" : { + "data" : 4, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x8f5cf03ee422dd3b1b3963a54aa2defdab39caa826902cd2bba54220580681d2", + "indexes" : { + "data" : 5, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x8f5cf03ee422dd3b1b3963a54aa2defdab39caa826902cd2bba54220580681d2", + "indexes" : { + "data" : 6, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x8f5cf03ee422dd3b1b3963a54aa2defdab39caa826902cd2bba54220580681d2", + "indexes" : { + "data" : 7, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xe71b04b6636a77260982da8e238fe6c0738c0dc3eef695dc49f8b9d18d46d4b2", + "indexes" : { + "data" : 8, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xfe61d36b921f8002f7123210a7b141b749d2648c179a0fdaf8a17b056392ee4e", + "indexes" : { + "data" : 9, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : [ - 7 - ], - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Metropolis" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x01", - "0x01" : "0x0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd2", - "0x02" : "0x16da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba" - } - } + ], + "Frontier" : [ + { + "hash" : "0xbc2a5065f1ea98490a6f357e52cc825dc107a28bd3a2b4079f9ec01efb0d1bd1", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x849467386e020945ba35864662789d426ecd300a5b9be8d28726a1059e2cffca", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x14f2e00014c7336278d10099c859b16ce25935f0c96b76b85b165416763c1c80", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x628fa5c8cd0469b704b791baffb3a7acba0086ede79c6852c0b29ddd4ca0bf0c", + "indexes" : { + "data" : 3, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x628fa5c8cd0469b704b791baffb3a7acba0086ede79c6852c0b29ddd4ca0bf0c", + "indexes" : { + "data" : 4, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x14f2e00014c7336278d10099c859b16ce25935f0c96b76b85b165416763c1c80", + "indexes" : { + "data" : 5, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x14f2e00014c7336278d10099c859b16ce25935f0c96b76b85b165416763c1c80", + "indexes" : { + "data" : 6, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x14f2e00014c7336278d10099c859b16ce25935f0c96b76b85b165416763c1c80", + "indexes" : { + "data" : 7, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x8521d2ff3780ff6c54d5b87fe45983d0fc8caad5cc14e52d1477bce88aa7a58c", + "indexes" : { + "data" : 8, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x89536d28ed4140093f7418b831b868d037def35509a896948e7e45a9e2d0d7b6", + "indexes" : { + "data" : 9, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : [ - 8 - ], - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Metropolis" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x01", - "0x01" : "0x0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd2", - "0x02" : "0x16da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba" - } - } + ], + "Homestead" : [ + { + "hash" : "0xbc2a5065f1ea98490a6f357e52cc825dc107a28bd3a2b4079f9ec01efb0d1bd1", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x849467386e020945ba35864662789d426ecd300a5b9be8d28726a1059e2cffca", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x14f2e00014c7336278d10099c859b16ce25935f0c96b76b85b165416763c1c80", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x628fa5c8cd0469b704b791baffb3a7acba0086ede79c6852c0b29ddd4ca0bf0c", + "indexes" : { + "data" : 3, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x628fa5c8cd0469b704b791baffb3a7acba0086ede79c6852c0b29ddd4ca0bf0c", + "indexes" : { + "data" : 4, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x14f2e00014c7336278d10099c859b16ce25935f0c96b76b85b165416763c1c80", + "indexes" : { + "data" : 5, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x14f2e00014c7336278d10099c859b16ce25935f0c96b76b85b165416763c1c80", + "indexes" : { + "data" : 6, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x14f2e00014c7336278d10099c859b16ce25935f0c96b76b85b165416763c1c80", + "indexes" : { + "data" : 7, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x8521d2ff3780ff6c54d5b87fe45983d0fc8caad5cc14e52d1477bce88aa7a58c", + "indexes" : { + "data" : 8, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x89536d28ed4140093f7418b831b868d037def35509a896948e7e45a9e2d0d7b6", + "indexes" : { + "data" : 9, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : [ - 9 - ], - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Metropolis" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x01", - "0x01" : "0x0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd2", - "0x02" : "0x16da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba" - } - } + ], + "Metropolis" : [ + { + "hash" : "0xc707641fdc57ec1a99e3261e2865c59e568d9036ef7398045d9b111de7ccfabc", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xdbf20365b5afc1402c45e18a233287c9d6c39bf14b05e8a4c99ec30950ae2f9b", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xb0ce5de9aa369fccb35e86235eacdfa70334b275be7182c3b4c5ed73efa59cc8", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x540b3cb4e6d2da68541718289f83ca5455212cf1908d9f7da66d839cc30afaee", + "indexes" : { + "data" : 3, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x80d730d2af4077a0dfe2ef3202e517747c0cf83d180b22a5c4c14c02811cfe60", + "indexes" : { + "data" : 4, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x4b2005438899b130472dab32ccef12b8ff23541108d03368493fafcc2aa07574", + "indexes" : { + "data" : 5, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x4b2005438899b130472dab32ccef12b8ff23541108d03368493fafcc2aa07574", + "indexes" : { + "data" : 6, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xb0ce5de9aa369fccb35e86235eacdfa70334b275be7182c3b4c5ed73efa59cc8", + "indexes" : { + "data" : 7, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x37d3404202ed5a50740d558adfb076df81bf29db807d26aa6d33866594782180", + "indexes" : { + "data" : 8, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x712f5d3c6b0dcb3d52252c331cf6803f87d9f73b5c69e7930993faaadb70d3d5", + "indexes" : { + "data" : 9, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0de0b6b3a7640000", "code" : "", - "nonce" : "1", + "nonce" : "0x01", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "", - "code" : "{(MSTORE 0 (CALLDATALOAD 0)) (MSTORE 32 (CALLDATALOAD 32)) (MSTORE 64 (CALLDATALOAD 64)) (MSTORE 96 (CALLDATALOAD 96)) [[0]](CALLCODE 500000 6 0 0 64 200 64) [[1]] (MLOAD 200) [[2]] (MLOAD 232) }", - "nonce" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", + "code" : "0x600035600052602035602052604035604052606035606052604060c860406000600060066207a120f260005560c85160015560e851600255", + "nonce" : "0x00", "storage" : { } } @@ -257,14 +555,14 @@ "0x0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002" ], "gasLimit" : [ - "1000000" + "0x0f4240" ], - "gasPrice" : "1", - "nonce" : "1", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x01", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } -- cgit