From bc09d2e0904fc9fef88ed9921b588593df4cf839 Mon Sep 17 00:00:00 2001 From: CJentzsch Date: Wed, 18 Mar 2015 19:22:27 +0000 Subject: merge --- StateTests/RandomTests/st201503181402GO.json | 25 +++++++++++++++++++++ StateTests/RandomTests/st201503181404GO.json | 25 +++++++++++++++++++++ StateTests/RandomTests/st201503181408CPPJIT.json | 28 ++++++++++++++++++++++++ StateTests/RandomTests/st201503181418GO.json | 25 +++++++++++++++++++++ StateTests/RandomTests/st201503181423GO.json | 25 +++++++++++++++++++++ StateTests/RandomTests/st201503181427GO.json | 28 ++++++++++++++++++++++++ 6 files changed, 156 insertions(+) diff --git a/StateTests/RandomTests/st201503181402GO.json b/StateTests/RandomTests/st201503181402GO.json index 4bfebe889..dfe103f10 100644 --- a/StateTests/RandomTests/st201503181402GO.json +++ b/StateTests/RandomTests/st201503181402GO.json @@ -13,6 +13,7 @@ "out" : "0x", "post" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { +<<<<<<< Updated upstream <<<<<<< Updated upstream "balance" : "135064676", "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000010000000000000000000000000000000000000000417f00000000000000000000000100000000000000000000000000000000000000006f410464647b786344d593a36a7d6c37740760005155", @@ -24,6 +25,8 @@ "945304eb96065b2a98b57a48a06ae28d285a71b5" : { "balance" : "45592", ======= +======= +>>>>>>> Stashed changes "balance" : "360204830", "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000001000000000000000000000000000000000000000045437fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506f34809b4507a374a46b750ba2f174765560005155", "nonce" : "0", @@ -33,6 +36,9 @@ }, "945304eb96065b2a98b57a48a06ae28d285a71b5" : { "balance" : "48344", +<<<<<<< Updated upstream +>>>>>>> Stashed changes +======= >>>>>>> Stashed changes "code" : "0x6000355415600957005b60203560003555", "nonce" : "0", @@ -40,8 +46,12 @@ } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { +<<<<<<< Updated upstream <<<<<<< Updated upstream "balance" : "999999999864889778", +======= + "balance" : "999999999639746872", +>>>>>>> Stashed changes ======= "balance" : "999999999639746872", >>>>>>> Stashed changes @@ -51,6 +61,7 @@ } } }, +<<<<<<< Updated upstream <<<<<<< Updated upstream "postStateRoot" : "9bf681c8ac3e3d9947b5547fde3975e4ab5357002593818a0667b7cb8502e521", "pre" : { @@ -58,11 +69,16 @@ "balance" : "0", "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000010000000000000000000000000000000000000000417f00000000000000000000000100000000000000000000000000000000000000006f410464647b786344d593a36a7d6c37740760005155", ======= +======= +>>>>>>> Stashed changes "postStateRoot" : "ddc721471702c65e93e9e92ae00bed5b508ed56a70a9a8d3ab534446bea0dbd9", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0", "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000001000000000000000000000000000000000000000045437fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506f34809b4507a374a46b750ba2f174765560005155", +<<<<<<< Updated upstream +>>>>>>> Stashed changes +======= >>>>>>> Stashed changes "nonce" : "0", "storage" : { @@ -84,9 +100,14 @@ } }, "transaction" : { +<<<<<<< Updated upstream <<<<<<< Updated upstream "data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000010000000000000000000000000000000000000000417f00000000000000000000000100000000000000000000000000000000000000006f410464647b786344d593a36a7d6c377407", "gasLimit" : "0x49d64c79", +======= + "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000001000000000000000000000000000000000000000045437fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506f34809b4507a374a46b750ba2f17476", + "gasLimit" : "0x5c2076dc", +>>>>>>> Stashed changes ======= "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000001000000000000000000000000000000000000000045437fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506f34809b4507a374a46b750ba2f17476", "gasLimit" : "0x5c2076dc", @@ -95,8 +116,12 @@ "nonce" : "0", "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", +<<<<<<< Updated upstream <<<<<<< Updated upstream "value" : "135064676" +======= + "value" : "360204830" +>>>>>>> Stashed changes ======= "value" : "360204830" >>>>>>> Stashed changes diff --git a/StateTests/RandomTests/st201503181404GO.json b/StateTests/RandomTests/st201503181404GO.json index 653fb77d3..cbcdedb78 100644 --- a/StateTests/RandomTests/st201503181404GO.json +++ b/StateTests/RandomTests/st201503181404GO.json @@ -13,6 +13,7 @@ "out" : "0x", "post" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { +<<<<<<< Updated upstream <<<<<<< Updated upstream "balance" : "2040397341", "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff40377f000000000000000000000001000000000000000000000000000000000000000060005155", @@ -24,6 +25,8 @@ "945304eb96065b2a98b57a48a06ae28d285a71b5" : { "balance" : "60027", ======= +======= +>>>>>>> Stashed changes "balance" : "23792258", "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000006f525b5bf07e8f846b985011063c7c365560005155", "nonce" : "0", @@ -33,6 +36,9 @@ }, "945304eb96065b2a98b57a48a06ae28d285a71b5" : { "balance" : "51161", +<<<<<<< Updated upstream +>>>>>>> Stashed changes +======= >>>>>>> Stashed changes "code" : "0x6000355415600957005b60203560003555", "nonce" : "0", @@ -40,8 +46,12 @@ } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { +<<<<<<< Updated upstream <<<<<<< Updated upstream "balance" : "999999997959542678", +======= + "balance" : "999999999976156627", +>>>>>>> Stashed changes ======= "balance" : "999999999976156627", >>>>>>> Stashed changes @@ -51,6 +61,7 @@ } } }, +<<<<<<< Updated upstream <<<<<<< Updated upstream "postStateRoot" : "17fb8d70cbce6fe703a3d7609051dc79b2148cae6511ad68b003a5096b5f44c1", "pre" : { @@ -58,11 +69,16 @@ "balance" : "0", "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff40377f000000000000000000000001000000000000000000000000000000000000000060005155", ======= +======= +>>>>>>> Stashed changes "postStateRoot" : "a019925eaec5608c4a534f7fa40925789fb91dd8eeb38816b42bfaa4b29d53fa", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0", "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000006f525b5bf07e8f846b985011063c7c365560005155", +<<<<<<< Updated upstream +>>>>>>> Stashed changes +======= >>>>>>> Stashed changes "nonce" : "0", "storage" : { @@ -84,9 +100,14 @@ } }, "transaction" : { +<<<<<<< Updated upstream <<<<<<< Updated upstream "data" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff40377f0000000000000000000000010000000000000000000000000000000000000000", "gasLimit" : "0x489c0c39", +======= + "data" : "0x7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000006f525b5bf07e8f846b985011063c7c36", + "gasLimit" : "0x4b5d9bea", +>>>>>>> Stashed changes ======= "data" : "0x7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000006f525b5bf07e8f846b985011063c7c36", "gasLimit" : "0x4b5d9bea", @@ -95,8 +116,12 @@ "nonce" : "0", "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", +<<<<<<< Updated upstream <<<<<<< Updated upstream "value" : "2040397341" +======= + "value" : "23792258" +>>>>>>> Stashed changes ======= "value" : "23792258" >>>>>>> Stashed changes diff --git a/StateTests/RandomTests/st201503181408CPPJIT.json b/StateTests/RandomTests/st201503181408CPPJIT.json index ec2fa1876..1b56ef042 100644 --- a/StateTests/RandomTests/st201503181408CPPJIT.json +++ b/StateTests/RandomTests/st201503181408CPPJIT.json @@ -9,6 +9,7 @@ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "logs" : [ +<<<<<<< Updated upstream <<<<<<< Updated upstream { "address" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", @@ -20,11 +21,14 @@ ] } ======= +>>>>>>> Stashed changes +======= >>>>>>> Stashed changes ], "out" : "0x", "post" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { +<<<<<<< Updated upstream <<<<<<< Updated upstream "balance" : "1731252879", "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000005a20960005155", @@ -36,6 +40,8 @@ "945304eb96065b2a98b57a48a06ae28d285a71b5" : { "balance" : "48789", ======= +======= +>>>>>>> Stashed changes "balance" : "1045066974", "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff095560005155", "nonce" : "0", @@ -46,6 +52,9 @@ }, "945304eb96065b2a98b57a48a06ae28d285a71b5" : { "balance" : "70147", +<<<<<<< Updated upstream +>>>>>>> Stashed changes +======= >>>>>>> Stashed changes "code" : "0x6000355415600957005b60203560003555", "nonce" : "0", @@ -53,8 +62,12 @@ } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { +<<<<<<< Updated upstream <<<<<<< Updated upstream "balance" : "999999998268698378", +======= + "balance" : "999999998954862925", +>>>>>>> Stashed changes ======= "balance" : "999999998954862925", >>>>>>> Stashed changes @@ -64,6 +77,7 @@ } } }, +<<<<<<< Updated upstream <<<<<<< Updated upstream "postStateRoot" : "0f5a9cb02e1188b463b6fe0aa3ced9af6618de967a11be6dc4cd1cd9d5d5f663", "pre" : { @@ -71,11 +85,16 @@ "balance" : "0", "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000005a20960005155", ======= +======= +>>>>>>> Stashed changes "postStateRoot" : "2908724b3e5164d4b9021b0ad2501b98861ef8af83748c5ea3af5f712edad1c3", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0", "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff095560005155", +<<<<<<< Updated upstream +>>>>>>> Stashed changes +======= >>>>>>> Stashed changes "nonce" : "0", "storage" : { @@ -97,9 +116,14 @@ } }, "transaction" : { +<<<<<<< Updated upstream <<<<<<< Updated upstream "data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000005a209", "gasLimit" : "0x32748414", +======= + "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09", + "gasLimit" : "0x535c5400", +>>>>>>> Stashed changes ======= "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09", "gasLimit" : "0x535c5400", @@ -108,8 +132,12 @@ "nonce" : "0", "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", +<<<<<<< Updated upstream <<<<<<< Updated upstream "value" : "1731252879" +======= + "value" : "1045066974" +>>>>>>> Stashed changes ======= "value" : "1045066974" >>>>>>> Stashed changes diff --git a/StateTests/RandomTests/st201503181418GO.json b/StateTests/RandomTests/st201503181418GO.json index 1e44b9a27..fd31b0073 100644 --- a/StateTests/RandomTests/st201503181418GO.json +++ b/StateTests/RandomTests/st201503181418GO.json @@ -13,6 +13,7 @@ "out" : "0x", "post" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { +<<<<<<< Updated upstream <<<<<<< Updated upstream "balance" : "1371008423", "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000006fa2777c07bd95193720580bae178f0b5560005155", @@ -24,6 +25,8 @@ "945304eb96065b2a98b57a48a06ae28d285a71b5" : { "balance" : "47706", ======= +======= +>>>>>>> Stashed changes "balance" : "1441436953", "code" : "0x7f0000000000000000000000000000000000000000000000000000000000000000447f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe017f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff406f0a714216688e937176f21942967d455560005155", "nonce" : "0", @@ -33,6 +36,9 @@ }, "945304eb96065b2a98b57a48a06ae28d285a71b5" : { "balance" : "47594", +<<<<<<< Updated upstream +>>>>>>> Stashed changes +======= >>>>>>> Stashed changes "code" : "0x6000355415600957005b60203560003555", "nonce" : "0", @@ -40,8 +46,12 @@ } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { +<<<<<<< Updated upstream <<<<<<< Updated upstream "balance" : "999999998628943917", +======= + "balance" : "999999998558515499", +>>>>>>> Stashed changes ======= "balance" : "999999998558515499", >>>>>>> Stashed changes @@ -51,6 +61,7 @@ } } }, +<<<<<<< Updated upstream <<<<<<< Updated upstream "postStateRoot" : "39510e504bd3a26582af0a0c716d4551656c8254ffb1d44c052acc38be98f325", "pre" : { @@ -58,11 +69,16 @@ "balance" : "0", "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000006fa2777c07bd95193720580bae178f0b5560005155", ======= +======= +>>>>>>> Stashed changes "postStateRoot" : "d9226b7b6e4f6a005361cd6dee63a715284bde69b4cfcba980ec5d858ad42c07", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0", "code" : "0x7f0000000000000000000000000000000000000000000000000000000000000000447f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe017f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff406f0a714216688e937176f21942967d455560005155", +<<<<<<< Updated upstream +>>>>>>> Stashed changes +======= >>>>>>> Stashed changes "nonce" : "0", "storage" : { @@ -84,9 +100,14 @@ } }, "transaction" : { +<<<<<<< Updated upstream <<<<<<< Updated upstream "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000006fa2777c07bd95193720580bae178f0b", "gasLimit" : "0x5f174682", +======= + "data" : "0x7f0000000000000000000000000000000000000000000000000000000000000000447f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe017f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff406f0a714216688e937176f21942967d45", + "gasLimit" : "0x6156c653", +>>>>>>> Stashed changes ======= "data" : "0x7f0000000000000000000000000000000000000000000000000000000000000000447f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe017f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff406f0a714216688e937176f21942967d45", "gasLimit" : "0x6156c653", @@ -95,8 +116,12 @@ "nonce" : "0", "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", +<<<<<<< Updated upstream <<<<<<< Updated upstream "value" : "1371008423" +======= + "value" : "1441436953" +>>>>>>> Stashed changes ======= "value" : "1441436953" >>>>>>> Stashed changes diff --git a/StateTests/RandomTests/st201503181423GO.json b/StateTests/RandomTests/st201503181423GO.json index 110b492b9..ebc914b84 100644 --- a/StateTests/RandomTests/st201503181423GO.json +++ b/StateTests/RandomTests/st201503181423GO.json @@ -9,6 +9,7 @@ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "logs" : [ +<<<<<<< Updated upstream <<<<<<< Updated upstream { "address" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", @@ -33,6 +34,8 @@ "945304eb96065b2a98b57a48a06ae28d285a71b5" : { "balance" : "457370", ======= +======= +>>>>>>> Stashed changes ], "out" : "0x", "post" : { @@ -46,6 +49,9 @@ }, "945304eb96065b2a98b57a48a06ae28d285a71b5" : { "balance" : "51340", +<<<<<<< Updated upstream +>>>>>>> Stashed changes +======= >>>>>>> Stashed changes "code" : "0x6000355415600957005b60203560003555", "nonce" : "0", @@ -53,8 +59,12 @@ } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { +<<<<<<< Updated upstream <<<<<<< Updated upstream "balance" : "999999999368594097", +======= + "balance" : "999999999557382927", +>>>>>>> Stashed changes ======= "balance" : "999999999557382927", >>>>>>> Stashed changes @@ -64,6 +74,7 @@ } } }, +<<<<<<< Updated upstream <<<<<<< Updated upstream "postStateRoot" : "5cbe2d4811cc7a3e1474e637cbafc3b2f7fa1a93f3cdb4fa977d58224e795fb5", "pre" : { @@ -71,11 +82,16 @@ "balance" : "0", "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350a3f305205bf156207259573055", ======= +======= +>>>>>>> Stashed changes "postStateRoot" : "1251ea927bb30f821a9dc4db5a791b94b9a47cc5327167616b128f161eb022e6", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0", "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f327f9c6e3b4241f09f01335017f26c5560005155", +<<<<<<< Updated upstream +>>>>>>> Stashed changes +======= >>>>>>> Stashed changes "nonce" : "0", "storage" : { @@ -97,9 +113,14 @@ } }, "transaction" : { +<<<<<<< Updated upstream <<<<<<< Updated upstream "data" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350a3f305205bf1562072595730", "gasLimit" : "0x2e64c884", +======= + "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f327f9c6e3b4241f09f01335017f26c", + "gasLimit" : "0x1f455129", +>>>>>>> Stashed changes ======= "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f327f9c6e3b4241f09f01335017f26c", "gasLimit" : "0x1f455129", @@ -108,8 +129,12 @@ "nonce" : "0", "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", +<<<<<<< Updated upstream <<<<<<< Updated upstream "value" : "630948579" +======= + "value" : "442565779" +>>>>>>> Stashed changes ======= "value" : "442565779" >>>>>>> Stashed changes diff --git a/StateTests/RandomTests/st201503181427GO.json b/StateTests/RandomTests/st201503181427GO.json index f1e4eea3b..ce711e6d7 100644 --- a/StateTests/RandomTests/st201503181427GO.json +++ b/StateTests/RandomTests/st201503181427GO.json @@ -9,6 +9,7 @@ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "logs" : [ +<<<<<<< Updated upstream <<<<<<< Updated upstream { "address" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", @@ -18,11 +19,14 @@ ] } ======= +>>>>>>> Stashed changes +======= >>>>>>> Stashed changes ], "out" : "0x", "post" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { +<<<<<<< Updated upstream <<<<<<< Updated upstream "balance" : "713661428", "code" : "0x7f0000000000000000000000000000000000000000000000000000000000000001427f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350437f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000000000000000000000000000000000000000000001645002187d550a5b59627a6a973aa07a5560005155", @@ -33,6 +37,8 @@ "945304eb96065b2a98b57a48a06ae28d285a71b5" : { "balance" : "187722450", ======= +======= +>>>>>>> Stashed changes "balance" : "245554995", "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff147f0000000000000000000000010000000000000000000000000000000000000000207f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe046d9f8174a23542680bf0835505527355", "nonce" : "0", @@ -42,6 +48,9 @@ }, "945304eb96065b2a98b57a48a06ae28d285a71b5" : { "balance" : "49201", +<<<<<<< Updated upstream +>>>>>>> Stashed changes +======= >>>>>>> Stashed changes "code" : "0x6000355415600957005b60203560003555", "nonce" : "0", @@ -49,8 +58,12 @@ } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { +<<<<<<< Updated upstream <<<<<<< Updated upstream "balance" : "999999999098616168", +======= + "balance" : "999999999754395850", +>>>>>>> Stashed changes ======= "balance" : "999999999754395850", >>>>>>> Stashed changes @@ -60,6 +73,7 @@ } } }, +<<<<<<< Updated upstream <<<<<<< Updated upstream "postStateRoot" : "f88a1ac891d601058b95ee3d86ca70cb5fbd2e084339d4b50d1fced8f6e7153b", "pre" : { @@ -67,11 +81,16 @@ "balance" : "0", "code" : "0x7f0000000000000000000000000000000000000000000000000000000000000001427f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350437f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000000000000000000000000000000000000000000001645002187d550a5b59627a6a973aa07a5560005155", ======= +======= +>>>>>>> Stashed changes "postStateRoot" : "06563de0a560de7a47b650b0c27bdbb9b00243ffa63c570633fea5881923a5d3", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0", "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff147f0000000000000000000000010000000000000000000000000000000000000000207f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe046d9f8174a23542680bf0835505527355", +<<<<<<< Updated upstream +>>>>>>> Stashed changes +======= >>>>>>> Stashed changes "nonce" : "0", "storage" : { @@ -93,9 +112,14 @@ } }, "transaction" : { +<<<<<<< Updated upstream <<<<<<< Updated upstream "data" : "0x7f0000000000000000000000000000000000000000000000000000000000000001427f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350437f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000000000000000000000000000000000000000000001645002187d550a5b59627a6a973aa07a", "gasLimit" : "0x44965985", +======= + "data" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff147f0000000000000000000000010000000000000000000000000000000000000000207f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe046d9f8174a23542680bf08355055273", + "gasLimit" : "0x03f8e7f6", +>>>>>>> Stashed changes ======= "data" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff147f0000000000000000000000010000000000000000000000000000000000000000207f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe046d9f8174a23542680bf08355055273", "gasLimit" : "0x03f8e7f6", @@ -104,8 +128,12 @@ "nonce" : "0", "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", +<<<<<<< Updated upstream <<<<<<< Updated upstream "value" : "713661428" +======= + "value" : "245554995" +>>>>>>> Stashed changes ======= "value" : "245554995" >>>>>>> Stashed changes -- cgit v1.2.3