aboutsummaryrefslogtreecommitdiffstats
path: root/StateTests/RandomTests/st201503181919GO.json
diff options
context:
space:
mode:
Diffstat (limited to 'StateTests/RandomTests/st201503181919GO.json')
-rw-r--r--StateTests/RandomTests/st201503181919GO.json36
1 files changed, 36 insertions, 0 deletions
diff --git a/StateTests/RandomTests/st201503181919GO.json b/StateTests/RandomTests/st201503181919GO.json
index a6d4fd50a..d251ee514 100644
--- a/StateTests/RandomTests/st201503181919GO.json
+++ b/StateTests/RandomTests/st201503181919GO.json
@@ -9,6 +9,8 @@
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
"logs" : [
+<<<<<<< HEAD
+=======
{
"address" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"bloom" : "00000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000040000000000000000000000000000000000000000000000000000000",
@@ -17,10 +19,22 @@
"0000000000000000000000000000000000000000000000000000000000000001"
]
}
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
],
"out" : "0x",
"post" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+<<<<<<< HEAD
+ "balance" : "907150802",
+ "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350437f00000000000000000000000000000000000000000000000000000000000000006f7f94206431346b79a261d8ff1a510b5560005155",
+ "nonce" : "0",
+ "storage" : {
+ "0x" : "0x7f94206431346b79a261d8ff1a510b55"
+ }
+ },
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "49514",
+=======
"balance" : "1579124913",
"code" : "0x7f000000000000000000000000000000000000000000000000000000000000000034577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000426259cb6142a1196e3168c986758aa4",
"nonce" : "0",
@@ -29,24 +43,37 @@
},
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
"balance" : "113713443",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
"code" : "0x6000355415600957005b60203560003555",
"nonce" : "0",
"storage" : {
}
},
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+<<<<<<< HEAD
+ "balance" : "999999999092799730",
+=======
"balance" : "999999998307161690",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
"code" : "0x",
"nonce" : "1",
"storage" : {
}
}
},
+<<<<<<< HEAD
+ "postStateRoot" : "5e6424cf3f370bee5e84691100834d237f1f3fad920e008389d5b33cf517d91b",
+ "pre" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0",
+ "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350437f00000000000000000000000000000000000000000000000000000000000000006f7f94206431346b79a261d8ff1a510b5560005155",
+=======
"postStateRoot" : "634fc8a01590172b79cba0ea677dd15e0c634dc950a9e7a4199148cd6cd749a8",
"pre" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "0",
"code" : "0x7f000000000000000000000000000000000000000000000000000000000000000034577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000426259cb6142a1196e3168c986758aa4",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
"nonce" : "0",
"storage" : {
}
@@ -67,13 +94,22 @@
}
},
"transaction" : {
+<<<<<<< HEAD
+ "data" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350437f00000000000000000000000000000000000000000000000000000000000000006f7f94206431346b79a261d8ff1a510b",
+ "gasLimit" : "0x670e1461",
+=======
"data" : "0x7f000000000000000000000000000000000000000000000000000000000000000034577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000426259cb6142a1196e3168c986758aa4",
"gasLimit" : "0x16bc578c",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
"gasPrice" : "1",
"nonce" : "0",
"secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
"to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+<<<<<<< HEAD
+ "value" : "907150802"
+=======
"value" : "1579124913"
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
}
}
}