aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--GeneralStateTests/stBadOpcode/badOpcodeSLOADBYTES.json123
-rw-r--r--GeneralStateTests/stBadOpcode/badOpcodeSSIZE.json123
-rw-r--r--GeneralStateTests/stExample/add11.json2
-rw-r--r--src/GeneralStateTestsFiller/stBadOpcode/badOpcodeSLOADBYTESFiller.json65
-rw-r--r--src/GeneralStateTestsFiller/stBadOpcode/badOpcodeSSIZEFiller.json (renamed from src/GeneralStateTestsFiller/stBadOpcode/badOpcodeFiller.json)3
5 files changed, 313 insertions, 3 deletions
diff --git a/GeneralStateTests/stBadOpcode/badOpcodeSLOADBYTES.json b/GeneralStateTests/stBadOpcode/badOpcodeSLOADBYTES.json
new file mode 100644
index 000000000..773747bc0
--- /dev/null
+++ b/GeneralStateTests/stBadOpcode/badOpcodeSLOADBYTES.json
@@ -0,0 +1,123 @@
+{
+ "badOpcodeSLOADBYTES" : {
+ "_info" : {
+ "comment" : "",
+ "filledwith" : "cpp-1.3.0+commit.5b7f5e90.Linux.g++",
+ "source" : "/src/GeneralStateTestsFiller/stBadOpcode/badOpcodeSLOADBYTESFiller.json"
+ },
+ "env" : {
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x20000",
+ "currentGasLimit" : "0x0f4240",
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "post" : {
+ "Byzantium" : [
+ {
+ "hash" : "0x2d8a45dd7d6462558957dea03cab348db012f3b09b3798fc4656a2e9c5417c88",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Constantinople" : [
+ {
+ "hash" : "0x2d8a45dd7d6462558957dea03cab348db012f3b09b3798fc4656a2e9c5417c88",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "EIP150" : [
+ {
+ "hash" : "0x2d8a45dd7d6462558957dea03cab348db012f3b09b3798fc4656a2e9c5417c88",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0x2d8a45dd7d6462558957dea03cab348db012f3b09b3798fc4656a2e9c5417c88",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x2d8a45dd7d6462558957dea03cab348db012f3b09b3798fc4656a2e9c5417c88",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x2d8a45dd7d6462558957dea03cab348db012f3b09b3798fc4656a2e9c5417c88",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
+ "pre" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x600160006001e16001600255",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "0x061a80"
+ ],
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "value" : [
+ "0x0186a0"
+ ]
+ }
+ }
+} \ No newline at end of file
diff --git a/GeneralStateTests/stBadOpcode/badOpcodeSSIZE.json b/GeneralStateTests/stBadOpcode/badOpcodeSSIZE.json
new file mode 100644
index 000000000..86cb38851
--- /dev/null
+++ b/GeneralStateTests/stBadOpcode/badOpcodeSSIZE.json
@@ -0,0 +1,123 @@
+{
+ "badOpcodeSSIZE" : {
+ "_info" : {
+ "comment" : "",
+ "filledwith" : "cpp-1.3.0+commit.5b7f5e90.Linux.g++",
+ "source" : "/src/GeneralStateTestsFiller/stBadOpcode/badOpcodeSSIZEFiller.json"
+ },
+ "env" : {
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x20000",
+ "currentGasLimit" : "0x0f4240",
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "post" : {
+ "Byzantium" : [
+ {
+ "hash" : "0x18e2b3978b235f437aad7b69c5c7aa2881f9b643b0054106b8f88793e504e9e7",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Constantinople" : [
+ {
+ "hash" : "0x18e2b3978b235f437aad7b69c5c7aa2881f9b643b0054106b8f88793e504e9e7",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "EIP150" : [
+ {
+ "hash" : "0x18e2b3978b235f437aad7b69c5c7aa2881f9b643b0054106b8f88793e504e9e7",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0x18e2b3978b235f437aad7b69c5c7aa2881f9b643b0054106b8f88793e504e9e7",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0x18e2b3978b235f437aad7b69c5c7aa2881f9b643b0054106b8f88793e504e9e7",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0x18e2b3978b235f437aad7b69c5c7aa2881f9b643b0054106b8f88793e504e9e7",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
+ "pre" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x6001600155e36001600255",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "0x061a80"
+ ],
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "value" : [
+ "0x0186a0"
+ ]
+ }
+ }
+} \ No newline at end of file
diff --git a/GeneralStateTests/stExample/add11.json b/GeneralStateTests/stExample/add11.json
index b9a3ef104..870e7bb28 100644
--- a/GeneralStateTests/stExample/add11.json
+++ b/GeneralStateTests/stExample/add11.json
@@ -2,7 +2,7 @@
"add11" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.5b7f5e90.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stExample/add11Filler.json"
},
"env" : {
diff --git a/src/GeneralStateTestsFiller/stBadOpcode/badOpcodeSLOADBYTESFiller.json b/src/GeneralStateTestsFiller/stBadOpcode/badOpcodeSLOADBYTESFiller.json
new file mode 100644
index 000000000..b4fb5560f
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stBadOpcode/badOpcodeSLOADBYTESFiller.json
@@ -0,0 +1,65 @@
+{
+ "badOpcodeSLOADBYTES" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x20000",
+ "currentGasLimit" : "1000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : 0,
+ "value" : -1
+ },
+ "network" : ["Byzantium"],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "code": "SLOADBYTES: key, mstart, msize",
+ "code" : "0x 6001 6000 6001 e1 6001 6002 55",
+ "code": "0x600160006001e16001600255",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x600160006001e16001600255",
+ "nonce" : "0",
+ "storage" : {
+ "0x01": "0x01"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "code": "0x",
+ "nonce": "0",
+ "storage": {
+
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "400000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "value" : [
+ "100000"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stBadOpcode/badOpcodeFiller.json b/src/GeneralStateTestsFiller/stBadOpcode/badOpcodeSSIZEFiller.json
index a27117e4e..5d1f45be2 100644
--- a/src/GeneralStateTestsFiller/stBadOpcode/badOpcodeFiller.json
+++ b/src/GeneralStateTestsFiller/stBadOpcode/badOpcodeSSIZEFiller.json
@@ -1,6 +1,5 @@
-
{
- "badOpcode" : {
+ "badOpcodeSSIZE" : {
"env" : {
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",