aboutsummaryrefslogtreecommitdiffstats
path: root/StateTests/RandomTests/st201503181404GO.json
diff options
context:
space:
mode:
Diffstat (limited to 'StateTests/RandomTests/st201503181404GO.json')
-rw-r--r--StateTests/RandomTests/st201503181404GO.json33
1 files changed, 33 insertions, 0 deletions
diff --git a/StateTests/RandomTests/st201503181404GO.json b/StateTests/RandomTests/st201503181404GO.json
index eecaecc0c..653fb77d3 100644
--- a/StateTests/RandomTests/st201503181404GO.json
+++ b/StateTests/RandomTests/st201503181404GO.json
@@ -13,6 +13,7 @@
"out" : "0x",
"post" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+<<<<<<< Updated upstream
"balance" : "2040397341",
"code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff40377f000000000000000000000001000000000000000000000000000000000000000060005155",
"nonce" : "0",
@@ -22,24 +23,47 @@
},
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
"balance" : "60027",
+=======
+ "balance" : "23792258",
+ "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000006f525b5bf07e8f846b985011063c7c365560005155",
+ "nonce" : "0",
+ "storage" : {
+ "0x" : "0x525b5bf07e8f846b985011063c7c3655"
+ }
+ },
+ "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "balance" : "51161",
+>>>>>>> Stashed changes
"code" : "0x6000355415600957005b60203560003555",
"nonce" : "0",
"storage" : {
}
},
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+<<<<<<< Updated upstream
"balance" : "999999997959542678",
+=======
+ "balance" : "999999999976156627",
+>>>>>>> Stashed changes
"code" : "0x",
"nonce" : "1",
"storage" : {
}
}
},
+<<<<<<< Updated upstream
"postStateRoot" : "17fb8d70cbce6fe703a3d7609051dc79b2148cae6511ad68b003a5096b5f44c1",
"pre" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "0",
"code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff40377f000000000000000000000001000000000000000000000000000000000000000060005155",
+=======
+ "postStateRoot" : "a019925eaec5608c4a534f7fa40925789fb91dd8eeb38816b42bfaa4b29d53fa",
+ "pre" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0",
+ "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000006f525b5bf07e8f846b985011063c7c365560005155",
+>>>>>>> Stashed changes
"nonce" : "0",
"storage" : {
}
@@ -60,13 +84,22 @@
}
},
"transaction" : {
+<<<<<<< Updated upstream
"data" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff40377f0000000000000000000000010000000000000000000000000000000000000000",
"gasLimit" : "0x489c0c39",
+=======
+ "data" : "0x7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000006f525b5bf07e8f846b985011063c7c36",
+ "gasLimit" : "0x4b5d9bea",
+>>>>>>> Stashed changes
"gasPrice" : "1",
"nonce" : "0",
"secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
"to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+<<<<<<< Updated upstream
"value" : "2040397341"
+=======
+ "value" : "23792258"
+>>>>>>> Stashed changes
}
}
}