aboutsummaryrefslogtreecommitdiffstats
path: root/StateTests/RandomTests/st201503181814GO.json
diff options
context:
space:
mode:
Diffstat (limited to 'StateTests/RandomTests/st201503181814GO.json')
-rw-r--r--StateTests/RandomTests/st201503181814GO.json33
1 files changed, 33 insertions, 0 deletions
diff --git a/StateTests/RandomTests/st201503181814GO.json b/StateTests/RandomTests/st201503181814GO.json
index f04af1053..69f275f37 100644
--- a/StateTests/RandomTests/st201503181814GO.json
+++ b/StateTests/RandomTests/st201503181814GO.json
@@ -13,6 +13,17 @@
"out" : "0x",
"post" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+<<<<<<< HEAD
+ "balance" : "1971145748",
+ "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000000417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3506f12f058976015a275417a020a10928b5560005155",
+ "nonce" : "0",
+ "storage" : {
+ "0x" : "0x12f058976015a275417a020a10928b55"
+ }
+ },
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "49241",
+=======
"balance" : "219362165",
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000457f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe046798156d1a5560005155",
"nonce" : "0",
@@ -22,24 +33,37 @@
},
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
"balance" : "49126",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
"code" : "0x6000355415600957005b60203560003555",
"nonce" : "0",
"storage" : {
}
},
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+<<<<<<< HEAD
+ "balance" : "999999998028805057",
+=======
"balance" : "999999999780588755",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
"code" : "0x",
"nonce" : "1",
"storage" : {
}
}
},
+<<<<<<< HEAD
+ "postStateRoot" : "c88aa50a84160a8942ac23769212af37536d369fceb9a64a115ed0d398dfe8e3",
+ "pre" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0",
+ "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000000417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3506f12f058976015a275417a020a10928b5560005155",
+=======
"postStateRoot" : "eee4181f3ddd1d320217c57d1b88fdcea8985d166b7457873d08aaffc9075d68",
"pre" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "0",
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000457f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe046798156d1a5560005155",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
"nonce" : "0",
"storage" : {
}
@@ -60,13 +84,22 @@
}
},
"transaction" : {
+<<<<<<< HEAD
+ "data" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000000417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3506f12f058976015a275417a020a10928b",
+ "gasLimit" : "0x5d1dd257",
+=======
"data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000457f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe046798156d1a",
"gasLimit" : "0x5b4efcb2",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
"gasPrice" : "1",
"nonce" : "0",
"secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
"to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+<<<<<<< HEAD
+ "value" : "1971145748"
+=======
"value" : "219362165"
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
}
}
}