subcallReturnMoreThenExpected

2 files changed, 160 insertions, 0 deletions

diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stReturnDataTest/subcallReturnMoreThenExpected_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stReturnDataTest/subcallReturnMoreThenExpected_d0g0v0Filler.json
new file mode 100644
index 000000000..12305e6c3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stReturnDataTest/subcallReturnMoreThenExpected_d0g0v0Filler.json
@@ -0,0 +1,89 @@
+{
+    "subcallReturnMoreThenExpected_d0g0v0" : {
+        "_info" : {
+            "comment" : "https://github.com/ethereum/tests/issues/558 (subcall/opcode return more data then expected)"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x0f4240",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xae29a79903b187c6d075320f9834a330b5134244c7fb0476eba58cd87b175fd6",
+                        "s" : "0x27a8f85308f5f08f4e2f6b2e23d9dcfd740108f8f96517e50c9e1dc86288a673",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "balance" : "0x0de0b6b3a7640001",
+                        "storage" : {
+                            "0x00" : "0x1122334455667788991011120000000000000000000000000000000000000000",
+                            "0x01" : "0x1122334455667788991011120000000000000000000000000000000000000000",
+                            "0x02" : "0x1122334455667788991011120000000000000000000000000000000000000000",
+                            "0x03" : "0x1122334455667788991011120000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x600c600060006000600073194f5374fce5edbc8e2a8697c15331677e6ebf0b62030d40f150600051600055600c60006000600073194f5374fce5edbc8e2a8697c15331677e6ebf0b62030d40f450600051600155600c60006000600073194f5374fce5edbc8e2a8697c15331677e6ebf0b62030d40fa50600051600255600c600060006000600073194f5374fce5edbc8e2a8697c15331677e6ebf0b62030d40f250600051600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f11223344556677889910111213141516171819202122232425262728293031326000527f333435363738394041424344454647484950515253545556575859606162636460205260406000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x00",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/GeneralStateTestsFiller/stReturnDataTest/subcallReturnMoreThenExpectedFiller.yml b/src/GeneralStateTestsFiller/stReturnDataTest/subcallReturnMoreThenExpectedFiller.yml
new file mode 100644
index 000000000..30c9ad521
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stReturnDataTest/subcallReturnMoreThenExpectedFiller.yml
@@ -0,0 +1,71 @@
+# https://github.com/ethereum/tests/issues/558 (subcall/opcode return more data then expected)
+---
+subcallReturnMoreThenExpected:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: "1000000"
+    currentNumber: "1"
+    currentTimestamp: "1000"
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  _info:
+    comment: "https://github.com/ethereum/tests/issues/558 (subcall/opcode return more data then expected)"
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: '1000000000000000000'
+      code: |
+        {
+          ;; Get returndata from a subcall
+          (CALL 200000 0x194f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 12)
+          [[0]] (MLOAD 0)
+          (DELEGATECALL 200000 0x194f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 12)
+          [[1]] (MLOAD 0)
+          (STATICCALL 200000 0x194f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 12)
+          [[2]] (MLOAD 0)
+          (CALLCODE 200000 0x194f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 12)
+          [[3]] (MLOAD 0)
+        }
+      nonce: '0'
+      storage: {}
+    194f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: |
+        {
+          (MSTORE 0  0x1122334455667788991011121314151617181920212223242526272829303132)
+          (MSTORE 32 0x3334353637383940414243444546474849505152535455565758596061626364)
+          (RETURN 0 64)
+        }
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x00'
+      nonce: '0'
+      storage: {}
+  expect:
+    - indexes:
+        data: !!int -1
+        gas:  !!int -1
+        value: !!int -1
+      network:
+        - '>=Constantinople'
+      result:
+        095e7baea6a6c7c4c2dfeb977efac326af552d87:
+          balance: '1000000000000000001'
+          storage: {
+            0: '0x1122334455667788991011120000000000000000000000000000000000000000',
+            1: '0x1122334455667788991011120000000000000000000000000000000000000000',
+            2: '0x1122334455667788991011120000000000000000000000000000000000000000',
+            3: '0x1122334455667788991011120000000000000000000000000000000000000000'
+          }
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '1'