Merge remote-tracking branch 'origin/develop'PoC6

Conflicts:
	genesishashestest.json

1 files changed, 0 insertions, 799 deletions

diff --git a/vmtests.json b/vmtests.json
deleted file mode 100644
index 6e9467a11..000000000
--- a/vmtests.json
+++ /dev/null
@@ -1,799 +0,0 @@
-{
-	"arith" : {
-		"env" : {
-			"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-			"currentDifficulty" : "256",
-			"currentTimestamp" : 1,
-			"feeMultiplier" : 1,
-			"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-			"previousNonce" : "9c9c6567b5ec0c5f3f25df79be42707090f1e62e9db84cbb556ae2a2f6ccccae"
-		},
-		"exec" : [
-			{
-				"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-				"data" : [
-				],
-				"sender" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-				"value" : 1000000000000000000
-			}
-		],
-		"post" : {
-			"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-				"balance" : 999999999999999810,
-				"extroPrice" : 0,
-				"nonce" : 1,
-				"store" : {
-					"0" : [
-						48,
-						0,
-						48,
-						2,
-						48,
-						2,
-						1,
-						48,
-						4,
-						48,
-						4,
-						2,
-						48,
-						4,
-						2,
-						1,
-						48,
-						2,
-						48,
-						2,
-						4,
-						1,
-						48,
-						3,
-						48,
-						2,
-						6,
-						1,
-						48,
-						8,
-						48,
-						2,
-						3,
-						48,
-						2,
-						3,
-						1,
-						17,
-						61,
-						0
-					]
-				}
-			}
-		},
-		"pre" : {
-			"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-				"balance" : 1000000000000000000,
-				"extroPrice" : 0,
-				"nonce" : 0,
-				"store" : {
-					"0" : [
-						48,
-						0,
-						48,
-						2,
-						48,
-						2,
-						1,
-						48,
-						4,
-						48,
-						4,
-						2,
-						48,
-						4,
-						2,
-						1,
-						48,
-						2,
-						48,
-						2,
-						4,
-						1,
-						48,
-						3,
-						48,
-						2,
-						6,
-						1,
-						48,
-						8,
-						48,
-						2,
-						3,
-						48,
-						2,
-						3,
-						1,
-						17,
-						61
-					]
-				}
-			}
-		},
-		"txs" : [
-			{
-				"data" : [
-				],
-				"destination" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-				"value" : 79
-			}
-		]
-	},
-	"boolean" : {
-		"env" : {
-			"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-			"currentDifficulty" : "256",
-			"currentTimestamp" : 1,
-			"feeMultiplier" : 1,
-			"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-			"previousNonce" : "9c9c6567b5ec0c5f3f25df79be42707090f1e62e9db84cbb556ae2a2f6ccccae"
-		},
-		"exec" : [
-			{
-				"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-				"data" : [
-				],
-				"sender" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-				"value" : 1000000000000000000
-			}
-		],
-		"post" : {
-			"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-				"balance" : 999999999999999490,
-				"extroPrice" : 0,
-				"nonce" : 4,
-				"store" : {
-					"0" : [
-						48,
-						21,
-						48,
-						0,
-						48,
-						13,
-						48,
-						1,
-						15,
-						57,
-						49,
-						48,
-						1,
-						15,
-						57,
-						48,
-						0,
-						48,
-						2,
-						17,
-						61,
-						48,
-						42,
-						48,
-						0,
-						48,
-						34,
-						48,
-						1,
-						15,
-						57,
-						49,
-						48,
-						0,
-						15,
-						57,
-						48,
-						0,
-						48,
-						3,
-						17,
-						61,
-						48,
-						63,
-						48,
-						0,
-						48,
-						55,
-						48,
-						0,
-						15,
-						57,
-						49,
-						48,
-						1,
-						15,
-						57,
-						48,
-						0,
-						48,
-						4,
-						17,
-						61,
-						48,
-						84,
-						48,
-						0,
-						48,
-						76,
-						48,
-						0,
-						15,
-						57,
-						49,
-						48,
-						0,
-						15,
-						57,
-						48,
-						0,
-						48,
-						5,
-						17,
-						61,
-						48,
-						104,
-						48,
-						1,
-						48,
-						96,
-						48,
-						1,
-						57,
-						49,
-						48,
-						1,
-						15,
-						57,
-						48,
-						0,
-						48,
-						12,
-						17,
-						61,
-						48,
-						124,
-						48,
-						1,
-						48,
-						116,
-						48,
-						1,
-						57,
-						49,
-						48,
-						0,
-						15,
-						57,
-						48,
-						0,
-						48,
-						13,
-						17,
-						61,
-						48,
-						144,
-						48,
-						1,
-						48,
-						136,
-						48,
-						0,
-						57,
-						49,
-						48,
-						1,
-						15,
-						57,
-						48,
-						0,
-						48,
-						14,
-						17,
-						61,
-						48,
-						164,
-						48,
-						1,
-						48,
-						156,
-						48,
-						0,
-						57,
-						49,
-						48,
-						0,
-						15,
-						57,
-						48,
-						0,
-						48,
-						15,
-						17,
-						61,
-						0
-					]
-				}
-			}
-		},
-		"pre" : {
-			"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-				"balance" : 1000000000000000000,
-				"extroPrice" : 0,
-				"nonce" : 0,
-				"store" : {
-					"0" : [
-						48,
-						21,
-						48,
-						0,
-						48,
-						13,
-						48,
-						1,
-						15,
-						57,
-						49,
-						48,
-						1,
-						15,
-						57,
-						48,
-						0,
-						48,
-						2,
-						17,
-						61,
-						48,
-						42,
-						48,
-						0,
-						48,
-						34,
-						48,
-						1,
-						15,
-						57,
-						49,
-						48,
-						0,
-						15,
-						57,
-						48,
-						0,
-						48,
-						3,
-						17,
-						61,
-						48,
-						63,
-						48,
-						0,
-						48,
-						55,
-						48,
-						0,
-						15,
-						57,
-						49,
-						48,
-						1,
-						15,
-						57,
-						48,
-						0,
-						48,
-						4,
-						17,
-						61,
-						48,
-						84,
-						48,
-						0,
-						48,
-						76,
-						48,
-						0,
-						15,
-						57,
-						49,
-						48,
-						0,
-						15,
-						57,
-						48,
-						0,
-						48,
-						5,
-						17,
-						61,
-						48,
-						104,
-						48,
-						1,
-						48,
-						96,
-						48,
-						1,
-						57,
-						49,
-						48,
-						1,
-						15,
-						57,
-						48,
-						0,
-						48,
-						12,
-						17,
-						61,
-						48,
-						124,
-						48,
-						1,
-						48,
-						116,
-						48,
-						1,
-						57,
-						49,
-						48,
-						0,
-						15,
-						57,
-						48,
-						0,
-						48,
-						13,
-						17,
-						61,
-						48,
-						144,
-						48,
-						1,
-						48,
-						136,
-						48,
-						0,
-						57,
-						49,
-						48,
-						1,
-						15,
-						57,
-						48,
-						0,
-						48,
-						14,
-						17,
-						61,
-						48,
-						164,
-						48,
-						1,
-						48,
-						156,
-						48,
-						0,
-						57,
-						49,
-						48,
-						0,
-						15,
-						57,
-						48,
-						0,
-						48,
-						15,
-						17,
-						61
-					]
-				}
-			}
-		},
-		"txs" : [
-			{
-				"data" : [
-				],
-				"destination" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-				"value" : 2
-			},
-			{
-				"data" : [
-				],
-				"destination" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-				"value" : 12
-			},
-			{
-				"data" : [
-				],
-				"destination" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-				"value" : 13
-			},
-			{
-				"data" : [
-				],
-				"destination" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-				"value" : 14
-			}
-		]
-	},
-	"fan" : {
-		"env" : {
-			"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-			"currentDifficulty" : "256",
-			"currentTimestamp" : 1,
-			"feeMultiplier" : 1,
-			"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-			"previousNonce" : "9c9c6567b5ec0c5f3f25df79be42707090f1e62e9db84cbb556ae2a2f6ccccae"
-		},
-		"exec" : [
-			{
-				"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-				"data" : [
-					"0xcd1722f3947def4cf144679da39c4c32bdc35681",
-					"0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-				],
-				"sender" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-				"value" : 1000000000000000000
-			}
-		],
-		"post" : {
-			"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-				"balance" : "115792089237316195423570985008687907853269984665640564039456684007913129639415",
-				"extroPrice" : 0,
-				"nonce" : 2,
-				"store" : {
-					"0" : [
-						48,
-						8,
-						48,
-						100000000000000000,
-						18,
-						12,
-						57,
-						0,
-						19,
-						48,
-						100000000000000000,
-						18,
-						3,
-						4,
-						48,
-						"53545048851664692004060005546177757518248266694338929000325674008596820525056",
-						55,
-						48,
-						0,
-						48,
-						"47492849101242970779199036819969649705442767148016637594308774690745619578880",
-						55,
-						48,
-						53,
-						19,
-						48,
-						"47492849101242970779199036819969649705442767148016637594308774690745619578880",
-						54,
-						10,
-						15,
-						57,
-						48,
-						0,
-						48,
-						"53545048851664692004060005546177757518248266694338929000325674008596820525056",
-						54,
-						48,
-						"47492849101242970779199036819969649705442767148016637594308774690745619578880",
-						54,
-						20,
-						61,
-						48,
-						1,
-						48,
-						"47492849101242970779199036819969649705442767148016637594308774690745619578880",
-						54,
-						1,
-						48,
-						"47492849101242970779199036819969649705442767148016637594308774690745619578880",
-						55,
-						48,
-						22,
-						56,
-						0
-					],
-					"47492849101242970779199036819969649705442767148016637594308774690745619578880" : [
-						2
-					],
-					"53545048851664692004060005546177757518248266694338929000325674008596820525056" : [
-						450000000000000000
-					]
-				}
-			}
-		},
-		"pre" : {
-			"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-				"balance" : 0,
-				"extroPrice" : 0,
-				"nonce" : 0,
-				"store" : {
-					"0" : [
-						48,
-						8,
-						48,
-						100000000000000000,
-						18,
-						12,
-						57,
-						0,
-						19,
-						48,
-						100000000000000000,
-						18,
-						3,
-						4,
-						48,
-						"53545048851664692004060005546177757518248266694338929000325674008596820525056",
-						55,
-						48,
-						0,
-						48,
-						"47492849101242970779199036819969649705442767148016637594308774690745619578880",
-						55,
-						48,
-						53,
-						19,
-						48,
-						"47492849101242970779199036819969649705442767148016637594308774690745619578880",
-						54,
-						10,
-						15,
-						57,
-						48,
-						0,
-						48,
-						"53545048851664692004060005546177757518248266694338929000325674008596820525056",
-						54,
-						48,
-						"47492849101242970779199036819969649705442767148016637594308774690745619578880",
-						54,
-						20,
-						61,
-						48,
-						1,
-						48,
-						"47492849101242970779199036819969649705442767148016637594308774690745619578880",
-						54,
-						1,
-						48,
-						"47492849101242970779199036819969649705442767148016637594308774690745619578880",
-						55,
-						48,
-						22,
-						56
-					]
-				}
-			}
-		},
-		"txs" : [
-			{
-				"data" : [
-				],
-				"destination" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-				"value" : 450000000000000000
-			},
-			{
-				"data" : [
-				],
-				"destination" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-				"value" : 450000000000000000
-			}
-		]
-	},
-	"mktx" : {
-		"env" : {
-			"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-			"currentDifficulty" : "256",
-			"currentTimestamp" : 1,
-			"feeMultiplier" : 1,
-			"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-			"previousNonce" : "9c9c6567b5ec0c5f3f25df79be42707090f1e62e9db84cbb556ae2a2f6ccccae"
-		},
-		"exec" : [
-			{
-				"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-				"data" : [
-				],
-				"sender" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-				"value" : 1000000000000000000
-			}
-		],
-		"post" : {
-			"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-				"balance" : 499999999999999900,
-				"extroPrice" : 0,
-				"nonce" : 1,
-				"store" : {
-					"0" : [
-						48,
-						0,
-						48,
-						500000000000000000,
-						17,
-						61,
-						0
-					]
-				}
-			}
-		},
-		"pre" : {
-			"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-				"balance" : 1000000000000000000,
-				"extroPrice" : 0,
-				"nonce" : 0,
-				"store" : {
-					"0" : [
-						48,
-						0,
-						48,
-						500000000000000000,
-						17,
-						61
-					]
-				}
-			}
-		},
-		"txs" : [
-			{
-				"data" : [
-				],
-				"destination" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-				"value" : 500000000000000000
-			}
-		]
-	},
-	"suicide" : {
-		"env" : {
-			"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-			"currentDifficulty" : "256",
-			"currentTimestamp" : 1,
-			"feeMultiplier" : 1,
-			"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-			"previousNonce" : "9c9c6567b5ec0c5f3f25df79be42707090f1e62e9db84cbb556ae2a2f6ccccae"
-		},
-		"exec" : [
-			{
-				"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-				"data" : [
-				],
-				"sender" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-				"value" : 1000000000000000000
-			}
-		],
-		"post" : {
-			"cd1722f3947def4cf144679da39c4c32bdc35681" : {
-				"balance" : 1000000000000000010,
-				"extroPrice" : 0,
-				"nonce" : 0
-			}
-		},
-		"pre" : {
-			"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-				"balance" : 1000000000000000000,
-				"extroPrice" : 0,
-				"nonce" : 0,
-				"store" : {
-					"0" : [
-						17,
-						63
-					]
-				}
-			}
-		},
-		"txs" : [
-		]
-	}
-}