aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_Call1024BalanceTooLow2Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_Call1024BalanceTooLowFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callToDelCallOpCodeCheckFiller.json4
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_callToStaticOpCodeCheckFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_call_value_inheritFiller.json70
-rw-r--r--src/GeneralStateTestsFiller/stStaticCall/static_call_value_inherit_from_callFiller.json76
6 files changed, 151 insertions, 5 deletions
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_Call1024BalanceTooLow2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_Call1024BalanceTooLow2Filler.json
index 7aff2173a..784bebd69 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_Call1024BalanceTooLow2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_Call1024BalanceTooLow2Filler.json
@@ -40,7 +40,7 @@
"1000000000000000000000000000000000000000" : {
"storage" : {
"0x00" : "0x01",
- "0x01" : "0x1000001848dd"
+ "0x01" : "0x0ffffff458dd"
}
}
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_Call1024BalanceTooLowFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_Call1024BalanceTooLowFiller.json
index afd42b8c9..ade86c359 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_Call1024BalanceTooLowFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_Call1024BalanceTooLowFiller.json
@@ -48,7 +48,7 @@
"1000000000000000000000000000000000000000" : {
"storage" : {
"0x00" : "0x01",
- "0x01" : "0x1000001848dd"
+ "0x01" : "0x0ffffff458dd"
}
}
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callToDelCallOpCodeCheckFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callToDelCallOpCodeCheckFiller.json
index 21b6484a8..6a041c17f 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callToDelCallOpCodeCheckFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callToDelCallOpCodeCheckFiller.json
@@ -24,7 +24,7 @@
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000000000000000",
- "code" : "Static call success",
+ "code" : "Static call succeed",
"code" : "{ [[ 0 ]] (STATICCALL 100000 (CALLDATALOAD 0) 0 0 0 0) }",
"nonce" : "0",
"storage" : {
@@ -40,7 +40,7 @@
},
"1000000000000000000000000000000000000002" : {
"balance" : "1000000000000000000",
- "code" : "{ (if (= 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x1000000000000000000000000000000000000000 (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x1000000000000000000000000000000000000001 (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x0186a0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }",
+ "code" : "{ (if (= 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x1000000000000000000000000000000000000000 (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x1000000000000000000000000000000000000001 (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callToStaticOpCodeCheckFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callToStaticOpCodeCheckFiller.json
index 4e1bf5c1b..7c8537f05 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callToStaticOpCodeCheckFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callToStaticOpCodeCheckFiller.json
@@ -40,7 +40,7 @@
},
"1000000000000000000000000000000000000002" : {
"balance" : "1000000000000000000",
- "code" : "{ (if (= 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x1000000000000000000000000000000000000001 (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x1000000000000000000000000000000000000002 (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x0186a0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }",
+ "code" : "{ (if (= 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x1000000000000000000000000000000000000001 (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x1000000000000000000000000000000000000002 (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_call_value_inheritFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_call_value_inheritFiller.json
new file mode 100644
index 000000000..09c9a9748
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_call_value_inheritFiller.json
@@ -0,0 +1,70 @@
+{
+ "static_call_value_inherit" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x020000",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Metropolis"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x0" : "0x1",
+ "0x1" : "0x0"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1",
+ "code" : "{ [[0]] (STATICCALL 50000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 32) [[1]] (MLOAD 0) }",
+ "nonce" : "0",
+ "storage" : {
+ "0x1": "1"
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1",
+ "code" : "{ (MSTORE 0 (CALLVALUE)) (RETURN 0 32) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "460000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "094f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "10"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_call_value_inherit_from_callFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_call_value_inherit_from_callFiller.json
new file mode 100644
index 000000000..43183da30
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_call_value_inherit_from_callFiller.json
@@ -0,0 +1,76 @@
+{
+ "static_call_value_inherit_from_call" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x020000",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Metropolis"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x0" : "0x1",
+ "0x1" : "0x0"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1",
+ "code" : "{ [[0]] (STATICCALL 50000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 32) [[1]] (MLOAD 0) }",
+ "nonce" : "0",
+ "storage" : {
+ "0x1": "1"
+ }
+ },
+ "c8b90f8d999d9d9988209481999a9889098a89a0" : {
+ "balance" : "0",
+ "code" : "{ (CALL 100000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 10 0 0 0 0) }",
+ "nonce" : "0",
+ "storage" : {}
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1",
+ "code" : "{ (MSTORE 0 (CALLVALUE)) (RETURN 0 32) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "460000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "c8b90f8d999d9d9988209481999a9889098a89a0",
+ "value" : [
+ "10"
+ ]
+ }
+ }
+}