diff options
Diffstat (limited to 'src')
19 files changed, 177 insertions, 19 deletions
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stExample/add11_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stExample/add11_d0g0v0Filler.json index 8fafc6603..539c0b5ae 100644 --- a/src/BlockchainTestsFiller/GeneralStateTests/stExample/add11_d0g0v0Filler.json +++ b/src/BlockchainTestsFiller/GeneralStateTests/stExample/add11_d0g0v0Filler.json @@ -10,7 +10,7 @@ }, "transactions" : [ { - "data" : "", + "data" : "0x", "gasLimit" : "0x061a80", "gasPrice" : "0x01", "nonce" : "0x00", @@ -25,6 +25,164 @@ ] } ], + "expect" : [ + { + "network" : "Frontier", + "result" : { + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x0de0b6b3a76586a0", + "code" : "0x6001600101600055", + "storage" : { + "0x00" : "0x02" + } + }, + "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0x4563918244f4a034", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + }, + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0de0b6b3a761d92c", + "code" : "", + "nonce" : "0x01", + "storage" : { + } + } + } + }, + { + "network" : "Homestead", + "result" : { + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x0de0b6b3a76586a0", + "code" : "0x6001600101600055", + "storage" : { + "0x00" : "0x02" + } + }, + "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0x4563918244f4a034", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + }, + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0de0b6b3a761d92c", + "code" : "", + "nonce" : "0x01", + "storage" : { + } + } + } + }, + { + "network" : "EIP150", + "result" : { + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x0de0b6b3a76586a0", + "code" : "0x6001600101600055", + "storage" : { + "0x00" : "0x02" + } + }, + "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0x4563918244f4a034", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + }, + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0de0b6b3a761d92c", + "code" : "", + "nonce" : "0x01", + "storage" : { + } + } + } + }, + { + "network" : "EIP158", + "result" : { + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x0de0b6b3a76586a0", + "code" : "0x6001600101600055", + "storage" : { + "0x00" : "0x02" + } + }, + "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0x4563918244f4a034", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + }, + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0de0b6b3a761d92c", + "code" : "", + "nonce" : "0x01", + "storage" : { + } + } + } + }, + { + "network" : "Byzantium", + "result" : { + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x0de0b6b3a76586a0", + "code" : "0x6001600101600055", + "storage" : { + "0x00" : "0x02" + } + }, + "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0x29a2241af62ca034", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + }, + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0de0b6b3a761d92c", + "code" : "", + "nonce" : "0x01", + "storage" : { + } + } + } + }, + { + "network" : "Constantinople", + "result" : { + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x0de0b6b3a76586a0", + "code" : "0x6001600101600055", + "storage" : { + "0x00" : "0x02" + } + }, + "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0x29a2241af62ca034", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + }, + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0de0b6b3a761d92c", + "code" : "", + "nonce" : "0x01", + "storage" : { + } + } + } + } + ], "genesisBlockHeader" : { "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractAndCallItOOGFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractAndCallItOOGFiller.json index 8c511bf66..378e6ef63 100644 --- a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractAndCallItOOGFiller.json +++ b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractAndCallItOOGFiller.json @@ -41,7 +41,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP158"], + "network" : [">=EIP158"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "nonce" : "1", diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractNoCashFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractNoCashFiller.json index a0533aa3c..23235daea 100644 --- a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractNoCashFiller.json +++ b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractNoCashFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier","Homestead", "EIP158", "EIP150"], + "network" : [">=Frontier"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "nonce" : "0" diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractOOGBonusGasFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractOOGBonusGasFiller.json index dfbf80289..d9dd98316 100644 --- a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractOOGBonusGasFiller.json +++ b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractOOGBonusGasFiller.json @@ -41,7 +41,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP158"], + "network" : [">=EIP158"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "nonce" : "1", diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractOOGFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractOOGFiller.json index 9ef2ab604..702d76714 100644 --- a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractOOGFiller.json +++ b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractOOGFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier","Homestead", "EIP158", "EIP150"], + "network" : [">=Frontier"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "nonce" : "0" diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json index e799477b6..8d8583f7c 100644 --- a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json +++ b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json @@ -44,7 +44,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP158"], + "network" : [">=EIP158"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "nonce" : "1", diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCodeFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCodeFiller.json index 160863992..53cb74532 100644 --- a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCodeFiller.json +++ b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCodeFiller.json @@ -41,7 +41,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP158"], + "network" : [">=EIP158"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1", diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/CallRecursiveContractFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/CallRecursiveContractFiller.json index 90558c260..075c1bfa8 100644 --- a/src/GeneralStateTestsFiller/stInitCodeTest/CallRecursiveContractFiller.json +++ b/src/GeneralStateTestsFiller/stInitCodeTest/CallRecursiveContractFiller.json @@ -44,7 +44,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP158"], + "network" : [">=EIP158"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1", diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/CallTheContractToCreateEmptyContractFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/CallTheContractToCreateEmptyContractFiller.json index e776ab58b..7e0692ba0 100644 --- a/src/GeneralStateTestsFiller/stInitCodeTest/CallTheContractToCreateEmptyContractFiller.json +++ b/src/GeneralStateTestsFiller/stInitCodeTest/CallTheContractToCreateEmptyContractFiller.json @@ -39,7 +39,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP158"], + "network" : [">=EIP158"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1", diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/NotEnoughCashContractCreationFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/NotEnoughCashContractCreationFiller.json index 416a9e580..acee81b7d 100644 --- a/src/GeneralStateTestsFiller/stInitCodeTest/NotEnoughCashContractCreationFiller.json +++ b/src/GeneralStateTestsFiller/stInitCodeTest/NotEnoughCashContractCreationFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier","Homestead", "EIP158", "EIP150"], + "network" : [">=Frontier"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "22177" diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasContractCreationFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasContractCreationFiller.json index 7e6de73af..086e0ec2b 100644 --- a/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasContractCreationFiller.json +++ b/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasContractCreationFiller.json @@ -28,7 +28,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Homestead", "EIP158", "EIP150"], + "network" : [">=Homestead"], "result" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1000000" diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasPrefundedContractCreationFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasPrefundedContractCreationFiller.json index fb4cf51e0..59a0e33e9 100644 --- a/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasPrefundedContractCreationFiller.json +++ b/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasPrefundedContractCreationFiller.json @@ -35,7 +35,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Homestead", "EIP158", "EIP150"], + "network" : [">=Homestead"], "result" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { "shouldnotexist" : "1" diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/ReturnTest2Filler.json b/src/GeneralStateTestsFiller/stInitCodeTest/ReturnTest2Filler.json index be99819c0..db135a323 100644 --- a/src/GeneralStateTestsFiller/stInitCodeTest/ReturnTest2Filler.json +++ b/src/GeneralStateTestsFiller/stInitCodeTest/ReturnTest2Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier","Homestead", "EIP158", "EIP150"], + "network" : [">=Frontier"], "result" : { "194f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "storage" : { diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/ReturnTestFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/ReturnTestFiller.json index 487d2173c..a028ed499 100644 --- a/src/GeneralStateTestsFiller/stInitCodeTest/ReturnTestFiller.json +++ b/src/GeneralStateTestsFiller/stInitCodeTest/ReturnTestFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier","Homestead", "EIP158", "EIP150"], + "network" : [">=Frontier"], "result" : { "194f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "storage" : { diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/StackUnderFlowContractCreationFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/StackUnderFlowContractCreationFiller.json index d263532e4..34d733b26 100644 --- a/src/GeneralStateTestsFiller/stInitCodeTest/StackUnderFlowContractCreationFiller.json +++ b/src/GeneralStateTestsFiller/stInitCodeTest/StackUnderFlowContractCreationFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier","Homestead", "EIP158", "EIP150"], + "network" : [">=Frontier"], "result" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { "balance" : "72000" diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateAutoSuicideContractFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateAutoSuicideContractFiller.json index e9522b400..e3208b6fc 100644 --- a/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateAutoSuicideContractFiller.json +++ b/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateAutoSuicideContractFiller.json @@ -28,7 +28,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP158", "EIP150"], + "network" : [">=EIP150"], "result" : { "0000000000000000000000000000000000000000" : { "shouldnotexist" : "1" diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateRandomInitCodeFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateRandomInitCodeFiller.json index 700d303f4..cc75f56d0 100644 --- a/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateRandomInitCodeFiller.json +++ b/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateRandomInitCodeFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier","Homestead", "EIP158", "EIP150"], + "network" : [">=Frontier"], "result" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { "balance" : "64599" diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateStopInInitcodeFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateStopInInitcodeFiller.json index 5f06d44a6..0d213d32b 100644 --- a/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateStopInInitcodeFiller.json +++ b/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateStopInInitcodeFiller.json @@ -31,7 +31,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Byzantium"], + "network" : [">=Byzantium"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "1" diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateSuicideInInitcodeFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateSuicideInInitcodeFiller.json index 7e3429c17..b850e24e2 100644 --- a/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateSuicideInInitcodeFiller.json +++ b/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateSuicideInInitcodeFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier","Homestead", "EIP158", "EIP150"], + "network" : [">=Frontier"], "result" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { "balance" : "55000" |