Merge commit '42a210b571b9358df16da148d9724c2ef9abbca5' into poc-9

This commit is contained in:
obscuren
2015-03-03 15:16:52 +01:00
12 changed files with 457 additions and 289 deletions
+7 -7
View File
@@ -27,7 +27,7 @@
}
}
},
"postStateRoot" : "9178d0f23c965d81f0834a4c72c6253ce6830f4022b1359aaebfc1ecba442d4e",
"postStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
"pre" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "100000",
@@ -83,7 +83,7 @@
}
}
},
"postStateRoot" : "9178d0f23c965d81f0834a4c72c6253ce6830f4022b1359aaebfc1ecba442d4e",
"postStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
"pre" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "100000",
@@ -139,7 +139,7 @@
}
}
},
"postStateRoot" : "9178d0f23c965d81f0834a4c72c6253ce6830f4022b1359aaebfc1ecba442d4e",
"postStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
"pre" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "100000",
@@ -195,7 +195,7 @@
}
}
},
"postStateRoot" : "9178d0f23c965d81f0834a4c72c6253ce6830f4022b1359aaebfc1ecba442d4e",
"postStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
"pre" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "100000",
@@ -258,7 +258,7 @@
}
}
},
"postStateRoot" : "8c7d34e15663dda0fa9e4667fedfe81cb0d048e52a8fbca85d1204f047f73437",
"postStateRoot" : "7d5742aed246f2483ad573d595588c4b032fb2bfd596ebe7e746274925bba18e",
"pre" : {
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "10000000",
@@ -314,7 +314,7 @@
}
}
},
"postStateRoot" : "9178d0f23c965d81f0834a4c72c6253ce6830f4022b1359aaebfc1ecba442d4e",
"postStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
"pre" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "1000000",
@@ -377,7 +377,7 @@
}
}
},
"postStateRoot" : "890f5564a8dac42e4d700e9055660c9b32bcb934e4e79b3f18e0f0953cb9d9cd",
"postStateRoot" : "cd8428d43b8b08e7ff22bdd2aecab32789c75aa9fd75d5d5b9e9742a7a79b72f",
"pre" : {
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "10000000000000000",