aboutsummaryrefslogtreecommitdiffstats
path: root/StateTests/RandomTests/st201503181431GO.json
diff options
context:
space:
mode:
Diffstat (limited to 'StateTests/RandomTests/st201503181431GO.json')
-rw-r--r--StateTests/RandomTests/st201503181431GO.json33
1 files changed, 33 insertions, 0 deletions
diff --git a/StateTests/RandomTests/st201503181431GO.json b/StateTests/RandomTests/st201503181431GO.json
index b146da065..5146d75df 100644
--- a/StateTests/RandomTests/st201503181431GO.json
+++ b/StateTests/RandomTests/st201503181431GO.json
@@ -13,6 +13,7 @@
"out" : "0x",
"post" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+<<<<<<< HEAD
"balance" : "1840771090",
"code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff417f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000006f776919a09fa7a00a9f590241209a705560005155",
"nonce" : "0",
@@ -22,24 +23,47 @@
},
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
"balance" : "47577",
+=======
+ "balance" : "1342850373",
+ "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001446f80843074698098f11701559a0205577260005155",
+ "nonce" : "0",
+ "storage" : {
+ "0x" : "0x80843074698098f11701559a02055772"
+ }
+ },
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "47951",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
"code" : "0x6000355415600957005b60203560003555",
"nonce" : "0",
"storage" : {
}
},
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+<<<<<<< HEAD
"balance" : "999999998159181379",
+=======
+ "balance" : "999999998657101722",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
"code" : "0x",
"nonce" : "1",
"storage" : {
}
}
},
+<<<<<<< HEAD
"postStateRoot" : "53f253d35435c07f0d9cec8e2085fdcb371716f86e16e9176b4ff6c85fbf407d",
"pre" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "0",
"code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff417f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000006f776919a09fa7a00a9f590241209a705560005155",
+=======
+ "postStateRoot" : "199adfe127ec742532fe535989391e153af526802a278c34da0a41fe5b2a6a24",
+ "pre" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0",
+ "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001446f80843074698098f11701559a0205577260005155",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
"nonce" : "0",
"storage" : {
}
@@ -60,13 +84,22 @@
}
},
"transaction" : {
+<<<<<<< HEAD
"data" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff417f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000006f776919a09fa7a00a9f590241209a70",
"gasLimit" : "0x76bf9b0b",
+=======
+ "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001446f80843074698098f11701559a02055772",
+ "gasLimit" : "0x64231469",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
"gasPrice" : "1",
"nonce" : "0",
"secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
"to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+<<<<<<< HEAD
"value" : "1840771090"
+=======
+ "value" : "1342850373"
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
}
}
}