aboutsummaryrefslogtreecommitdiffstats
path: root/StateTests/RandomTests/st201503181651GO.json
diff options
context:
space:
mode:
Diffstat (limited to 'StateTests/RandomTests/st201503181651GO.json')
-rw-r--r--StateTests/RandomTests/st201503181651GO.json33
1 files changed, 33 insertions, 0 deletions
diff --git a/StateTests/RandomTests/st201503181651GO.json b/StateTests/RandomTests/st201503181651GO.json
index 42f21a0b9..3a6e916ee 100644
--- a/StateTests/RandomTests/st201503181651GO.json
+++ b/StateTests/RandomTests/st201503181651GO.json
@@ -13,6 +13,7 @@
"out" : "0x",
"post" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+<<<<<<< HEAD
"balance" : "1477721351",
"code" : "0x427f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f9982356ba11d06163167626080013c5560005155",
"nonce" : "0",
@@ -22,24 +23,47 @@
},
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
"balance" : "51225",
+=======
+ "balance" : "23818682",
+ "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000010000000000000000000000000000000000000000417f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f1256071216368e060933568c9ba3948860005155",
+ "nonce" : "0",
+ "storage" : {
+ "0x" : "0x1256071216368e060933568c9ba39488"
+ }
+ },
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "46805",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
"code" : "0x6000355415600957005b60203560003555",
"nonce" : "0",
"storage" : {
}
},
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+<<<<<<< HEAD
"balance" : "999999998522227470",
+=======
+ "balance" : "999999999976134559",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
"code" : "0x",
"nonce" : "1",
"storage" : {
}
}
},
+<<<<<<< HEAD
"postStateRoot" : "e4b8b474c9d1e177333ca2bd90c77d6125979313382155e83abf92f7720200ca",
"pre" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "0",
"code" : "0x427f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f9982356ba11d06163167626080013c5560005155",
+=======
+ "postStateRoot" : "9266382435259e1b55f3aec9eaacad1f82ca2373f5932ebad9fe0ed87ff6dd34",
+ "pre" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0",
+ "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000010000000000000000000000000000000000000000417f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f1256071216368e060933568c9ba3948860005155",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
"nonce" : "0",
"storage" : {
}
@@ -60,13 +84,22 @@
}
},
"transaction" : {
+<<<<<<< HEAD
"data" : "0x427f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f9982356ba11d06163167626080013c",
"gasLimit" : "0x32bcb53a",
+=======
+ "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000010000000000000000000000000000000000000000417f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f1256071216368e060933568c9ba39488",
+ "gasLimit" : "0x52ca78c9",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
"gasPrice" : "1",
"nonce" : "0",
"secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
"to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+<<<<<<< HEAD
"value" : "1477721351"
+=======
+ "value" : "23818682"
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
}
}
}