aboutsummaryrefslogtreecommitdiffstats
path: root/StateTests/RandomTests/st201503181506GO.json
diff options
context:
space:
mode:
Diffstat (limited to 'StateTests/RandomTests/st201503181506GO.json')
-rw-r--r--StateTests/RandomTests/st201503181506GO.json33
1 files changed, 33 insertions, 0 deletions
diff --git a/StateTests/RandomTests/st201503181506GO.json b/StateTests/RandomTests/st201503181506GO.json
index 168dc6620..cf1dfbdf5 100644
--- a/StateTests/RandomTests/st201503181506GO.json
+++ b/StateTests/RandomTests/st201503181506GO.json
@@ -13,6 +13,7 @@
"out" : "0x",
"post" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+<<<<<<< HEAD
"balance" : "211396525",
"code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe827fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350850460005155",
"nonce" : "0",
@@ -22,24 +23,47 @@
},
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
"balance" : "47271",
+=======
+ "balance" : "1050332800",
+ "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f87586e06a364515083665688066b445560005155",
+ "nonce" : "0",
+ "storage" : {
+ "0x" : "0x87586e06a364515083665688066b4455"
+ }
+ },
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "54425",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
"code" : "0x6000355415600957005b60203560003555",
"nonce" : "0",
"storage" : {
}
},
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+<<<<<<< HEAD
"balance" : "999999999788556250",
+=======
+ "balance" : "999999998949612821",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
"code" : "0x",
"nonce" : "1",
"storage" : {
}
}
},
+<<<<<<< HEAD
"postStateRoot" : "6ecd33722a06a7d092e09ddfc9e05734e49c53290ba8882bb9f26f62ba430259",
"pre" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "0",
"code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe827fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350850460005155",
+=======
+ "postStateRoot" : "318640f7b1a63fba3dbb0b4d9eaf554b8e02d2b8bcb43815ec30af8dd20f104a",
+ "pre" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0",
+ "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f87586e06a364515083665688066b445560005155",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
"nonce" : "0",
"storage" : {
}
@@ -60,13 +84,22 @@
}
},
"transaction" : {
+<<<<<<< HEAD
"data" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe827fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3508504",
"gasLimit" : "0x696b13aa",
+=======
+ "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f87586e06a364515083665688066b44",
+ "gasLimit" : "0x09c5f2f7",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
"gasPrice" : "1",
"nonce" : "0",
"secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
"to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+<<<<<<< HEAD
"value" : "211396525"
+=======
+ "value" : "1050332800"
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
}
}
}