From 81900ef03fa44d2a9472966430311f6ea6d162a8 Mon Sep 17 00:00:00 2001 From: Dimitry Date: Wed, 26 Apr 2017 21:52:12 +0300 Subject: refill tests with new transaction create rules on Metropolis --- .../createJS_ExampleContractFiller.json | 15 +++++++++++++++ .../createNameRegistratorPerTxsFiller.json | 14 ++++++++++++++ ...ATE_EContractCreateEContractInInit_TrFiller.json | 18 ++++++++++++++++++ ...EContractCreateNEContractInInitOOG_TrFiller.json | 21 +++++++++++++++++++++ ...TE_EContractCreateNEContractInInit_TrFiller.json | 21 +++++++++++++++++++++ ..._empty000CreateinInitCode_TransactionFiller.json | 21 +++++++++++++++++++++ .../stStackTests/stackOverflowM1DUPFiller.json | 15 ++++++++++++++- .../stStackTests/stackOverflowM1Filler.json | 15 ++++++++++++++- .../stStackTests/stackOverflowM1PUSHFiller.json | 15 ++++++++++++++- .../CreateTransactionSuccessFiller.json | 17 +++++++++++++++++ .../stWalletTest/dayLimitConstructionOOGFiller.json | 2 +- 11 files changed, 170 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_ExampleContractFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_ExampleContractFiller.json index 83230127e..52ad3b873 100644 --- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_ExampleContractFiller.json +++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_ExampleContractFiller.json @@ -23,6 +23,21 @@ } } } + }, + { + "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, + "network" : ["Metropolis" ], + "result" : { + "911d0b7a3d71943b292ab42d14865e7a1e21e6cf" : { + "storage" : { + "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x01" : "0x42", + "0x02" : "0x23", + "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x05" : "0x03e8" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsFiller.json index d9403746b..fdc96f087 100644 --- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsFiller.json +++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsFiller.json @@ -50,6 +50,20 @@ } } } + }, + { + "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, + "network" : ["Metropolis"], + "result" : { + "746e5505debcfbf945fca34bfb241878ca2a6193" : { + "balance" : "0x0186a0", + "code" : "0x396000f3006000355415600957005b60", + "nonce" : "0x01", + "storage" : { + "0x01" : "0x01" + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateEContractInInit_TrFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateEContractInInit_TrFiller.json index 4147446fb..60b64b5a0 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateEContractInInit_TrFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateEContractInInit_TrFiller.json @@ -27,6 +27,24 @@ } } }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ "Metropolis"], + "result" : { + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "12" + } + }, + "b5469acfebf441ecbe4cb959ccad5194fe8b068f" : { + "nonce" : "0x02" + } + } + }, { "indexes" : { "data" : -1, diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_TrFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_TrFiller.json index 54e46ecb2..23e386554 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_TrFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_TrFiller.json @@ -30,6 +30,27 @@ } } }, + { + "indexes" : { + "data" : -1, + "gas" : 0, + "value" : -1 + }, + "network" : ["Metropolis"], + "result" : { + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "0x0c" + } + }, + "3a66a37b996c100ed79602b8aed81d8849e05dff" : { + "nonce" : "0x02" + }, + "a42676447b7cedfa5fde894d1d3df24aab362701" : { + "shouldnotexist" : "1" + } + } + }, { "indexes" : { "data" : -1, diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInit_TrFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInit_TrFiller.json index 966d191e7..63679347e 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInit_TrFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInit_TrFiller.json @@ -30,6 +30,27 @@ } } }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["Metropolis"], + "result" : { + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "12" + } + }, + "3a66a37b996c100ed79602b8aed81d8849e05dff" : { + "nonce" : "0x02" + }, + "cd9f6a0226f5f41059425cb856d8f62ec75b804d" : { + "code" : "0x600c600055" + } + } + }, { "indexes" : { "data" : -1, diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_empty000CreateinInitCode_TransactionFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_empty000CreateinInitCode_TransactionFiller.json index b96c5d4bf..97956bab0 100644 --- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_empty000CreateinInitCode_TransactionFiller.json +++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_empty000CreateinInitCode_TransactionFiller.json @@ -30,6 +30,27 @@ } } }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["Metropolis"], + "result" : { + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "12" + } + }, + "2d54d3ffbc4cb1893dc3448ac6719ca59dc26a7b" : { + "nonce" : "0x02" + }, + "a42676447b7cedfa5fde894d1d3df24aab362701" : { + "shouldnotexist" : "1" + } + } + }, { "indexes" : { "data" : -1, diff --git a/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1DUPFiller.json b/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1DUPFiller.json index 06a07dc90..4c983b078 100644 --- a/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1DUPFiller.json +++ b/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1DUPFiller.json @@ -15,12 +15,25 @@ "gas" : -1, "value" : -1 }, - "network" : ["ALL"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "1" } } + }, + { + "indexes" : { + "data" : [11], + "gas" : -1, + "value" : -1 + }, + "network" : ["Metropolis"], + "result" : { + "1030cf6804a682ed06178f6b3b3028b3b626fff6" : { + "balance" : "1" + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1Filler.json b/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1Filler.json index f56de4424..8953b7c50 100644 --- a/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1Filler.json +++ b/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1Filler.json @@ -15,12 +15,25 @@ "gas" : -1, "value" : -1 }, - "network" : ["ALL"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "1" } } + }, + { + "indexes" : { + "data" : [1], + "gas" : -1, + "value" : -1 + }, + "network" : ["Metropolis"], + "result" : { + "2e26e9c9425cf4c48dd6c89248d85e62d71451a5" : { + "balance" : "1" + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1PUSHFiller.json b/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1PUSHFiller.json index ecc5d8cde..66ef680d7 100644 --- a/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1PUSHFiller.json +++ b/src/GeneralStateTestsFiller/stStackTests/stackOverflowM1PUSHFiller.json @@ -15,12 +15,25 @@ "gas" : -1, "value" : -1 }, - "network" : ["ALL"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "1" } } + }, + { + "indexes" : { + "data" : [6], + "gas" : -1, + "value" : -1 + }, + "network" : ["Metropolis"], + "result" : { + "97c43c428b03eaf8a03b15808635623a74a1959e" : { + "balance" : "1" + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stTransactionTest/CreateTransactionSuccessFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/CreateTransactionSuccessFiller.json index 9af761d71..27755dad7 100644 --- a/src/GeneralStateTestsFiller/stTransactionTest/CreateTransactionSuccessFiller.json +++ b/src/GeneralStateTestsFiller/stTransactionTest/CreateTransactionSuccessFiller.json @@ -59,6 +59,23 @@ } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["Metropolis"], + "result" : { + "4befb935223101d5011e1398eda7d09b69d0940d" : { + "balance" : "100", + "code" : "0x60e060020a600035048063f8a8fd6d14601457005b601a6020565b60006000f35b56", + "nonce" : "1", + "storage" : { + } + } + } } ], "pre" : { diff --git a/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionOOGFiller.json b/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionOOGFiller.json index 9981fd9e6..b72028b9f 100644 --- a/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionOOGFiller.json +++ b/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionOOGFiller.json @@ -39,7 +39,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Homestead", "EIP150", "EIP158"], + "network" : ["Homestead", "EIP150", "EIP158", "Metropolis"], "result" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { "balance" : "0x04661a", -- cgit v1.2.3