get test from remote fix
vmArithmeticTest.json pass load from local tests repo like cpp client vmArithmeticTest pass with new cpp head[278dc79] properties fix
This commit is contained in:
parent
bb1efc4aa5
commit
03a9afabfa
|
@ -46,6 +46,9 @@ public class SystemProperties {
|
|||
private static Boolean DEFAULT_VM_TRACE = false;
|
||||
private static String DEFAULT_VM_TRACE_DIR = "dmp";
|
||||
private static int DEFAULT_PEER_LISTEN_PORT = 30303;
|
||||
|
||||
/* Testing */
|
||||
private static Boolean DEFAULT_VMTEST_LOAD_LOCAL = false;
|
||||
|
||||
private static List<String> DEFAULT_PROTOCOL_LIST = Arrays.asList("eth", "shh");
|
||||
|
||||
|
@ -279,6 +282,16 @@ public class SystemProperties {
|
|||
}
|
||||
}
|
||||
|
||||
/*
|
||||
*
|
||||
* Testing
|
||||
*
|
||||
*/
|
||||
public boolean vmTestLoadLocal() {
|
||||
if (prop.isEmpty() || !prop.containsKey("GitHubTests.VMTest.loadLocal")) return DEFAULT_VMTEST_LOAD_LOCAL;
|
||||
return Boolean.parseBoolean(prop.getProperty("GitHubTests.VMTest.loadLocal"));
|
||||
}
|
||||
|
||||
public static void main(String args[]) {
|
||||
SystemProperties systemProperties = new SystemProperties();
|
||||
systemProperties.print();
|
||||
|
|
|
@ -3,27 +3,35 @@ package org.ethereum.jsontestsuite;
|
|||
import java.io.BufferedReader;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import java.net.HttpURLConnection;
|
||||
import java.net.URISyntaxException;
|
||||
import java.net.URL;
|
||||
import java.nio.file.Files;
|
||||
|
||||
import org.ethereum.config.SystemProperties;
|
||||
|
||||
public class JSONReader {
|
||||
|
||||
public static String loadJSON(String filename) {
|
||||
// return getFromLocal(filename);
|
||||
String json = getFromUrl("https://raw.githubusercontent.com/ethereum/tests/develop/" + filename);
|
||||
String json = "";
|
||||
if(!SystemProperties.CONFIG.vmTestLoadLocal())
|
||||
json = getFromUrl("https://raw.githubusercontent.com/ethereum/tests/develop/" + filename);
|
||||
return json == "" ? json = getFromLocal(filename) : json;
|
||||
}
|
||||
|
||||
public static String getFromLocal(String filename) {
|
||||
System.out.println("Loading local file: " + filename);
|
||||
try {
|
||||
URL vmtest = ClassLoader.getSystemResource("jsontestsuite/" + filename);
|
||||
File vmTestFile = new File(vmtest.toURI());
|
||||
if(System.getProperty("ETHEREUM_TEST_PATH") == null) {
|
||||
System.out.println("ETHEREUM_TEST_PATH is not passed as a VM argument, please make sure you pass it with the correct path");
|
||||
return "";
|
||||
}
|
||||
System.out.println("From: " + System.getProperty("ETHEREUM_TEST_PATH"));
|
||||
File vmTestFile = new File(System.getProperty("ETHEREUM_TEST_PATH") + filename);
|
||||
return new String(Files.readAllBytes(vmTestFile.toPath()));
|
||||
} catch (URISyntaxException | IOException e) {
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
return "";
|
||||
|
@ -39,8 +47,11 @@ public class JSONReader {
|
|||
url = new URL(urlToRead);
|
||||
conn = (HttpURLConnection) url.openConnection();
|
||||
conn.setRequestMethod("GET");
|
||||
conn.setConnectTimeout(3000);
|
||||
rd = new BufferedReader(new InputStreamReader(conn.getInputStream()));
|
||||
conn.setDoOutput(true);
|
||||
conn.connect();
|
||||
InputStream in = conn.getInputStream();
|
||||
rd = new BufferedReader(new InputStreamReader(in));
|
||||
System.out.println("Loading remote file: " + urlToRead);
|
||||
while ((line = rd.readLine()) != null) {
|
||||
result += line;
|
||||
}
|
||||
|
|
|
@ -99,7 +99,8 @@ public class TestRunner {
|
|||
/* 4. run VM */
|
||||
VM vm = new VM();
|
||||
Program program = new Program(exec.getCode(), programInvoke);
|
||||
vm.play(program);
|
||||
while(!program.isStopped())
|
||||
vm.step(program);
|
||||
|
||||
program.saveProgramTraceToFile(testCase.getName());
|
||||
|
||||
|
|
|
@ -176,7 +176,7 @@ public class VM {
|
|||
|
||||
DataWord exp = stack.get(stack.size()-2);
|
||||
int bytesOccupied = exp.bytesOccupied();
|
||||
gasCost = (bytesOccupied == 0) ? 0 : GasCost.EXP_GAS + GasCost.EXP_BYTE_GAS * bytesOccupied;
|
||||
gasCost = GasCost.EXP_GAS + GasCost.EXP_BYTE_GAS * bytesOccupied;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
|
|
@ -11,10 +11,9 @@ import org.junit.runners.MethodSorters;
|
|||
public class GitHubVMTest {
|
||||
|
||||
@Test // testing full suite
|
||||
@Ignore
|
||||
public void testArithmeticFromGitHub() throws ParseException {
|
||||
|
||||
String json = JSONReader.loadJSON("vmtests/vmArithmeticTest.json");
|
||||
String json = JSONReader.loadJSON("VMTests/vmArithmeticTest.json");
|
||||
GitHubJSONTestSuite.runGitHubJsonTest(json);
|
||||
}
|
||||
|
||||
|
@ -22,7 +21,7 @@ public class GitHubVMTest {
|
|||
@Ignore
|
||||
public void testBitwiseLogicOperationFromGitHub() throws ParseException {
|
||||
|
||||
String json = JSONReader.loadJSON("vmtests/vmBitwiseLogicOperationTest.json");
|
||||
String json = JSONReader.loadJSON("VMTests/vmBitwiseLogicOperationTest.json");
|
||||
GitHubJSONTestSuite.runGitHubJsonTest(json);
|
||||
}
|
||||
|
||||
|
|
|
@ -1,49 +0,0 @@
|
|||
{"arithm" : {
|
||||
"callcreates": [
|
||||
{
|
||||
"data": "0x",
|
||||
"destination": "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"gasLimit": 9770,
|
||||
"value": 74
|
||||
}
|
||||
],
|
||||
"env": {
|
||||
"currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
|
||||
"currentDifficulty": "256",
|
||||
"currentGasLimit": "1000000",
|
||||
"currentNumber": "0",
|
||||
"currentTimestamp": 1,
|
||||
"previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
|
||||
},
|
||||
"exec": {
|
||||
"address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
|
||||
"caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"code": "0x600060006000600060026002600803036002600306600260020460046004600402026002600201010101013360c85c03f1",
|
||||
"data": "0x",
|
||||
"gas": 10000,
|
||||
"gasPrice": 100000000000000,
|
||||
"origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"value": 1000000000000000000
|
||||
},
|
||||
"gas": 9949,
|
||||
"out": [
|
||||
],
|
||||
"post": {
|
||||
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
|
||||
"balance": 999999999999999926,
|
||||
"code": "0x600060006000600060026002600803036002600306600260020460046004600402026002600201010101013360c85c03f1",
|
||||
"nonce": 0,
|
||||
"storage": {
|
||||
}
|
||||
}
|
||||
},
|
||||
"pre": {
|
||||
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
|
||||
"balance": 1000000000000000000,
|
||||
"code": "0x600060006000600060026002600803036002600306600260020460046004600402026002600201010101013360c85c03f1",
|
||||
"nonce": 0,
|
||||
"storage": {
|
||||
}
|
||||
}
|
||||
}
|
||||
}}
|
|
@ -1,67 +0,0 @@
|
|||
{"boolean": {
|
||||
"callcreates": [
|
||||
{
|
||||
"data": "0x",
|
||||
"destination": "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"gasLimit": 9786,
|
||||
"value": 2
|
||||
},
|
||||
{
|
||||
"data": "0x",
|
||||
"destination": "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"gasLimit": 9732,
|
||||
"value": 12
|
||||
},
|
||||
{
|
||||
"data": "0x",
|
||||
"destination": "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"gasLimit": 9696,
|
||||
"value": 13
|
||||
},
|
||||
{
|
||||
"data": "0x",
|
||||
"destination": "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"gasLimit": 9660,
|
||||
"value": 14
|
||||
}
|
||||
],
|
||||
"env": {
|
||||
"currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
|
||||
"currentDifficulty": "256",
|
||||
"currentGasLimit": "1000000",
|
||||
"currentNumber": "0",
|
||||
"currentTimestamp": 1,
|
||||
"previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
|
||||
},
|
||||
"exec": {
|
||||
"address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
|
||||
"caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"code": "0x60016001100f601a59600060006000600060023360c85c03f15060006001100f603459600060006000600060033360c85c03f15060016000100f604e59600060006000600060043360c85c03f15060006000100f606859600060006000600060053360c85c03f15060016001110f6082596000600060006000600c3360c85c03f15060006001110f609c596000600060006000600d3360c85c03f15060016000110f60b6596000600060006000600e3360c85c03f15060006000110f60d0596000600060006000600f3360c85c03f150",
|
||||
"data": "0x",
|
||||
"gas": 10000,
|
||||
"gasPrice": 100000000000000,
|
||||
"origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"value": 1000000000000000000
|
||||
},
|
||||
"gas": 9832,
|
||||
"out": [
|
||||
],
|
||||
"post": {
|
||||
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
|
||||
"balance": 999999999999999959,
|
||||
"code": "0x60016001100f601a59600060006000600060023360c85c03f15060006001100f603459600060006000600060033360c85c03f15060016000100f604e59600060006000600060043360c85c03f15060006000100f606859600060006000600060053360c85c03f15060016001110f6082596000600060006000600c3360c85c03f15060006001110f609c596000600060006000600d3360c85c03f15060016000110f60b6596000600060006000600e3360c85c03f15060006000110f60d0596000600060006000600f3360c85c03f150",
|
||||
"nonce": 0,
|
||||
"storage": {
|
||||
}
|
||||
}
|
||||
},
|
||||
"pre": {
|
||||
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
|
||||
"balance": 1000000000000000000,
|
||||
"code": "0x60016001100f601a59600060006000600060023360c85c03f15060006001100f603459600060006000600060033360c85c03f15060016000100f604e59600060006000600060043360c85c03f15060006000100f606859600060006000600060053360c85c03f15060016001110f6082596000600060006000600c3360c85c03f15060006001110f609c596000600060006000600d3360c85c03f15060016000110f60b6596000600060006000600e3360c85c03f15060006000110f60d0596000600060006000600f3360c85c03f150",
|
||||
"nonce": 0,
|
||||
"storage": {
|
||||
}
|
||||
}
|
||||
}
|
||||
}}
|
|
@ -1,49 +0,0 @@
|
|||
{"mktx": {
|
||||
"callcreates": [
|
||||
{
|
||||
"data": "0x",
|
||||
"destination": "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"gasLimit": 9792,
|
||||
"value": 500000000000000000
|
||||
}
|
||||
],
|
||||
"env": {
|
||||
"currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
|
||||
"currentDifficulty": "256",
|
||||
"currentGasLimit": "1000000",
|
||||
"currentNumber": "0",
|
||||
"currentTimestamp": 1,
|
||||
"previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
|
||||
},
|
||||
"exec": {
|
||||
"address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
|
||||
"caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"code": "0x60006000600060006706f05b59d3b200003360c85c03f1",
|
||||
"data": "0x",
|
||||
"gas": 10000,
|
||||
"gasPrice": 100000000000000,
|
||||
"origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"value": 1000000000000000000
|
||||
},
|
||||
"gas": 9971,
|
||||
"out": [
|
||||
],
|
||||
"post": {
|
||||
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
|
||||
"balance": 500000000000000000,
|
||||
"code": "0x60006000600060006706f05b59d3b200003360c85c03f1",
|
||||
"nonce": 0,
|
||||
"storage": {
|
||||
}
|
||||
}
|
||||
},
|
||||
"pre": {
|
||||
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
|
||||
"balance": 1000000000000000000,
|
||||
"code": "0x60006000600060006706f05b59d3b200003360c85c03f1",
|
||||
"nonce": 0,
|
||||
"storage": {
|
||||
}
|
||||
}
|
||||
}
|
||||
}}
|
|
@ -1,45 +0,0 @@
|
|||
{
|
||||
"suicide" : {
|
||||
"callcreates" : [
|
||||
],
|
||||
"env" : {
|
||||
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
|
||||
"currentDifficulty" : "256",
|
||||
"currentGasLimit" : "1000000",
|
||||
"currentNumber" : "0",
|
||||
"currentTimestamp" : 1,
|
||||
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
|
||||
},
|
||||
"exec" : {
|
||||
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
|
||||
"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"code" : "0x33ff",
|
||||
"data" : "0x",
|
||||
"gas" : 10000,
|
||||
"gasPrice" : 100000000000000,
|
||||
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"value" : 1000000000000000000
|
||||
},
|
||||
"gas" : 9999,
|
||||
"out" : [
|
||||
],
|
||||
"post" : {
|
||||
"cd1722f3947def4cf144679da39c4c32bdc35681" : {
|
||||
"balance" : 1000000000000000000,
|
||||
"code" : "0x",
|
||||
"nonce" : 0,
|
||||
"storage" : {
|
||||
}
|
||||
}
|
||||
},
|
||||
"pre" : {
|
||||
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
|
||||
"balance" : 1000000000000000000,
|
||||
"code" : "0x33ff",
|
||||
"nonce" : 0,
|
||||
"storage" : {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1,67 +0,0 @@
|
|||
{
|
||||
"namecoin": {
|
||||
"pre": {
|
||||
"0000000000000000000000000000000000000000": {
|
||||
"nonce": 0,
|
||||
"balance": 1500000000000000000,
|
||||
"storage": {},
|
||||
"code": ""
|
||||
},
|
||||
"82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
|
||||
"nonce": 1,
|
||||
"balance": 1000000000000000000,
|
||||
"storage": {},
|
||||
"code": ""
|
||||
},
|
||||
"c305c901078781c232a2a521c2af7980f8385ee9": {
|
||||
"nonce": 0,
|
||||
"balance": 0,
|
||||
"storage": {},
|
||||
"code": "0x600035560f601559600060605460206060f260265860203560003557600160405460206040f2"
|
||||
}
|
||||
},
|
||||
"exec": {
|
||||
"origin": "82a978b3f5962a5b0957d9ee9eef472ee55b42f1",
|
||||
"code": "0x600035560f601559600060605460206060f260265860203560003557600160405460206040f2",
|
||||
"value": 0,
|
||||
"address": "c305c901078781c232a2a521c2af7980f8385ee9",
|
||||
"gas": 10000,
|
||||
"caller": "82a978b3f5962a5b0957d9ee9eef472ee55b42f1",
|
||||
"data": "0x000000000000000000000000000000000000000000000000000000000000002d000000000000000000000000000000000000000000000000000000000000004e",
|
||||
"gasPrice": 1000000000000
|
||||
},
|
||||
"callcreates": [],
|
||||
"gas": 9762,
|
||||
"env": {
|
||||
"currentTimestamp": 1405011413,
|
||||
"currentGasLimit": 999023,
|
||||
"previousHash": "dd9c9abf3aba9a813870dad3addac510dfc98362b9d44206a21865c4c059e38d",
|
||||
"currentCoinbase": "82a978b3f5962a5b0957d9ee9eef472ee55b42f1",
|
||||
"currentDifficulty": 4190208,
|
||||
"currentNumber": 1
|
||||
},
|
||||
"post": {
|
||||
"0000000000000000000000000000000000000000": {
|
||||
"nonce": 0,
|
||||
"balance": 1500000000000000000,
|
||||
"storage": {},
|
||||
"code": "0x"
|
||||
},
|
||||
"82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
|
||||
"nonce": 1,
|
||||
"balance": 1000000000000000000,
|
||||
"storage": {},
|
||||
"code": "0x"
|
||||
},
|
||||
"c305c901078781c232a2a521c2af7980f8385ee9": {
|
||||
"nonce": 0,
|
||||
"balance": 0,
|
||||
"storage": {
|
||||
"0x2d": "0x4e"
|
||||
},
|
||||
"code": "0x600035560f601559600060605460206060f260265860203560003557600160405460206040f2"
|
||||
}
|
||||
},
|
||||
"out": "0x0000000000000000000000000000000000000000000000000000000000000001"
|
||||
}
|
||||
}
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -1,259 +0,0 @@
|
|||
{
|
||||
"coinbase" : {
|
||||
"callcreates" : [
|
||||
],
|
||||
"env" : {
|
||||
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
|
||||
"currentDifficulty" : "256",
|
||||
"currentGasLimit" : "1000000",
|
||||
"currentNumber" : "0",
|
||||
"currentTimestamp" : "1",
|
||||
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
|
||||
},
|
||||
"exec" : {
|
||||
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
|
||||
"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"code" : "0x41600057",
|
||||
"data" : "0x",
|
||||
"gas" : "10000",
|
||||
"gasPrice" : "100000000000000",
|
||||
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"value" : "1000000000000000000"
|
||||
},
|
||||
"gas" : "9798",
|
||||
"out" : "0x",
|
||||
"post" : {
|
||||
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
|
||||
"balance" : "1000000000000000000",
|
||||
"code" : "0x41600057",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
"0x" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
|
||||
}
|
||||
}
|
||||
},
|
||||
"pre" : {
|
||||
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
|
||||
"balance" : "1000000000000000000",
|
||||
"code" : "0x41600057",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"difficulty" : {
|
||||
"callcreates" : [
|
||||
],
|
||||
"env" : {
|
||||
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
|
||||
"currentDifficulty" : "256",
|
||||
"currentGasLimit" : "1000000",
|
||||
"currentNumber" : "0",
|
||||
"currentTimestamp" : "1",
|
||||
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
|
||||
},
|
||||
"exec" : {
|
||||
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
|
||||
"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"code" : "0x44600057",
|
||||
"data" : "0x",
|
||||
"gas" : "10000",
|
||||
"gasPrice" : "100000000000000",
|
||||
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"value" : "1000000000000000000"
|
||||
},
|
||||
"gas" : "9798",
|
||||
"out" : "0x",
|
||||
"post" : {
|
||||
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
|
||||
"balance" : "1000000000000000000",
|
||||
"code" : "0x44600057",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
"0x" : "0x0100"
|
||||
}
|
||||
}
|
||||
},
|
||||
"pre" : {
|
||||
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
|
||||
"balance" : "1000000000000000000",
|
||||
"code" : "0x44600057",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"gaslimit" : {
|
||||
"callcreates" : [
|
||||
],
|
||||
"env" : {
|
||||
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
|
||||
"currentDifficulty" : "256",
|
||||
"currentGasLimit" : "1000000",
|
||||
"currentNumber" : "0",
|
||||
"currentTimestamp" : "1",
|
||||
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
|
||||
},
|
||||
"exec" : {
|
||||
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
|
||||
"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"code" : "0x45600057",
|
||||
"data" : "0x",
|
||||
"gas" : "10000",
|
||||
"gasPrice" : "100000000000000",
|
||||
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"value" : "1000000000000000000"
|
||||
},
|
||||
"gas" : "9798",
|
||||
"out" : "0x",
|
||||
"post" : {
|
||||
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
|
||||
"balance" : "1000000000000000000",
|
||||
"code" : "0x45600057",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
"0x" : "0x0f4240"
|
||||
}
|
||||
}
|
||||
},
|
||||
"pre" : {
|
||||
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
|
||||
"balance" : "1000000000000000000",
|
||||
"code" : "0x45600057",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"number" : {
|
||||
"callcreates" : [
|
||||
],
|
||||
"env" : {
|
||||
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
|
||||
"currentDifficulty" : "256",
|
||||
"currentGasLimit" : "1000000",
|
||||
"currentNumber" : "0",
|
||||
"currentTimestamp" : "1",
|
||||
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
|
||||
},
|
||||
"exec" : {
|
||||
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
|
||||
"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"code" : "0x43600057",
|
||||
"data" : "0x",
|
||||
"gas" : "10000",
|
||||
"gasPrice" : "100000000000000",
|
||||
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"value" : "1000000000000000000"
|
||||
},
|
||||
"gas" : "9898",
|
||||
"out" : "0x",
|
||||
"post" : {
|
||||
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
|
||||
"balance" : "1000000000000000000",
|
||||
"code" : "0x43600057",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
}
|
||||
}
|
||||
},
|
||||
"pre" : {
|
||||
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
|
||||
"balance" : "1000000000000000000",
|
||||
"code" : "0x43600057",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"prevhash" : {
|
||||
"callcreates" : [
|
||||
],
|
||||
"env" : {
|
||||
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
|
||||
"currentDifficulty" : "256",
|
||||
"currentGasLimit" : "1000000",
|
||||
"currentNumber" : "0",
|
||||
"currentTimestamp" : "1",
|
||||
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
|
||||
},
|
||||
"exec" : {
|
||||
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
|
||||
"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"code" : "0x40600057",
|
||||
"data" : "0x",
|
||||
"gas" : "10000",
|
||||
"gasPrice" : "100000000000000",
|
||||
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"value" : "1000000000000000000"
|
||||
},
|
||||
"gas" : "9798",
|
||||
"out" : "0x",
|
||||
"post" : {
|
||||
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
|
||||
"balance" : "1000000000000000000",
|
||||
"code" : "0x40600057",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
"0x" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
|
||||
}
|
||||
}
|
||||
},
|
||||
"pre" : {
|
||||
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
|
||||
"balance" : "1000000000000000000",
|
||||
"code" : "0x40600057",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"timestamp" : {
|
||||
"callcreates" : [
|
||||
],
|
||||
"env" : {
|
||||
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
|
||||
"currentDifficulty" : "256",
|
||||
"currentGasLimit" : "1000000",
|
||||
"currentNumber" : "0",
|
||||
"currentTimestamp" : "1",
|
||||
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
|
||||
},
|
||||
"exec" : {
|
||||
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
|
||||
"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"code" : "0x42600057",
|
||||
"data" : "0x",
|
||||
"gas" : "10000",
|
||||
"gasPrice" : "100000000000000",
|
||||
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"value" : "1000000000000000000"
|
||||
},
|
||||
"gas" : "9798",
|
||||
"out" : "0x",
|
||||
"post" : {
|
||||
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
|
||||
"balance" : "1000000000000000000",
|
||||
"code" : "0x42600057",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
"0x" : "0x01"
|
||||
}
|
||||
}
|
||||
},
|
||||
"pre" : {
|
||||
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
|
||||
"balance" : "1000000000000000000",
|
||||
"code" : "0x42600057",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -1,173 +0,0 @@
|
|||
{
|
||||
"sha3_0" : {
|
||||
"callcreates" : [
|
||||
],
|
||||
"env" : {
|
||||
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
|
||||
"currentDifficulty" : "256",
|
||||
"currentGasLimit" : "1000000",
|
||||
"currentNumber" : "0",
|
||||
"currentTimestamp" : "1",
|
||||
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
|
||||
},
|
||||
"exec" : {
|
||||
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
|
||||
"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"code" : "0x6000600020600057",
|
||||
"data" : "0x",
|
||||
"gas" : "100000000000",
|
||||
"gasPrice" : "1000000000",
|
||||
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"value" : "1000000000000000000"
|
||||
},
|
||||
"gas" : "99999999777",
|
||||
"out" : "0x",
|
||||
"post" : {
|
||||
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
|
||||
"balance" : "1000000000000000000",
|
||||
"code" : "0x6000600020600057",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
"0x" : "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
|
||||
}
|
||||
}
|
||||
},
|
||||
"pre" : {
|
||||
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
|
||||
"balance" : "1000000000000000000",
|
||||
"code" : "0x6000600020600057",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"sha3_1" : {
|
||||
"callcreates" : [
|
||||
],
|
||||
"env" : {
|
||||
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
|
||||
"currentDifficulty" : "256",
|
||||
"currentGasLimit" : "1000000",
|
||||
"currentNumber" : "0",
|
||||
"currentTimestamp" : "1",
|
||||
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
|
||||
},
|
||||
"exec" : {
|
||||
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
|
||||
"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"code" : "0x6005600420600057",
|
||||
"data" : "0x",
|
||||
"gas" : "10000",
|
||||
"gasPrice" : "100000000000000",
|
||||
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"value" : "1000000000000000000"
|
||||
},
|
||||
"gas" : "9776",
|
||||
"out" : "0x",
|
||||
"post" : {
|
||||
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
|
||||
"balance" : "1000000000000000000",
|
||||
"code" : "0x6005600420600057",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
"0x" : "0xc41589e7559804ea4a2080dad19d876a024ccb05117835447d72ce08c1d020ec"
|
||||
}
|
||||
}
|
||||
},
|
||||
"pre" : {
|
||||
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
|
||||
"balance" : "1000000000000000000",
|
||||
"code" : "0x6005600420600057",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"sha3_2" : {
|
||||
"callcreates" : [
|
||||
],
|
||||
"env" : {
|
||||
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
|
||||
"currentDifficulty" : "256",
|
||||
"currentGasLimit" : "1000000",
|
||||
"currentNumber" : "0",
|
||||
"currentTimestamp" : "1",
|
||||
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
|
||||
},
|
||||
"exec" : {
|
||||
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
|
||||
"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"code" : "0x600a600a20600057",
|
||||
"data" : "0x",
|
||||
"gas" : "10000",
|
||||
"gasPrice" : "100000000000000",
|
||||
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"value" : "1000000000000000000"
|
||||
},
|
||||
"gas" : "9776",
|
||||
"out" : "0x",
|
||||
"post" : {
|
||||
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
|
||||
"balance" : "1000000000000000000",
|
||||
"code" : "0x600a600a20600057",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
"0x" : "0x6bd2dd6bd408cbee33429358bf24fdc64612fbf8b1b4db604518f40ffd34b607"
|
||||
}
|
||||
}
|
||||
},
|
||||
"pre" : {
|
||||
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
|
||||
"balance" : "1000000000000000000",
|
||||
"code" : "0x600a600a20600057",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"sha3_3" : {
|
||||
"callcreates" : [
|
||||
],
|
||||
"env" : {
|
||||
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
|
||||
"currentDifficulty" : "256",
|
||||
"currentGasLimit" : "1000000",
|
||||
"currentNumber" : "0",
|
||||
"currentTimestamp" : "1",
|
||||
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
|
||||
},
|
||||
"exec" : {
|
||||
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
|
||||
"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"code" : "0x6064640fffffffff20600057",
|
||||
"data" : "0x",
|
||||
"gas" : "10000",
|
||||
"gasPrice" : "100000000000000",
|
||||
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"value" : "1000000000000000000"
|
||||
},
|
||||
"gas" : "0",
|
||||
"out" : "0x",
|
||||
"post" : {
|
||||
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
|
||||
"balance" : "1000000000000000000",
|
||||
"code" : "0x6064640fffffffff20600057",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
}
|
||||
}
|
||||
},
|
||||
"pre" : {
|
||||
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
|
||||
"balance" : "1000000000000000000",
|
||||
"code" : "0x6064640fffffffff20600057",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
File diff suppressed because it is too large
Load Diff
|
@ -19,7 +19,7 @@ log4j.logger.peermonitor = ERROR
|
|||
log4j.logger.java.nio = ERROR
|
||||
log4j.logger.io.netty = ERROR
|
||||
log4j.logger.wire = ERROR
|
||||
log4j.logger.VM = ERROR
|
||||
log4j.logger.VM = ALL
|
||||
log4j.logger.main = ERROR
|
||||
log4j.logger.trie = ERROR
|
||||
log4j.logger.state = INFO
|
||||
|
|
|
@ -136,4 +136,7 @@ hello.phrase = Dev
|
|||
# but any manual hash this property will help.
|
||||
# values [-1] - load from db
|
||||
# [hex hash 32 bytes] root hash
|
||||
root.hash.start = -1
|
||||
root.hash.start = -1
|
||||
|
||||
# if set true, json tests will be loaded from local repository
|
||||
GitHubTests.VMTest.loadLocal = true
|
Loading…
Reference in New Issue