add revert in subcall scenario

2 files changed, 45 insertions, 3 deletions

diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stReturnDataTest/subcallReturnMoreThenExpected_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stReturnDataTest/subcallReturnMoreThenExpected_d0g0v0Filler.json
index 12305e6c3..ff730cc75 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stReturnDataTest/subcallReturnMoreThenExpected_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stReturnDataTest/subcallReturnMoreThenExpected_d0g0v0Filler.json
@@ -38,7 +38,11 @@
                             "0x00" : "0x1122334455667788991011120000000000000000000000000000000000000000",
                             "0x01" : "0x1122334455667788991011120000000000000000000000000000000000000000",
                             "0x02" : "0x1122334455667788991011120000000000000000000000000000000000000000",
-                            "0x03" : "0x1122334455667788991011120000000000000000000000000000000000000000"
+                            "0x03" : "0x1122334455667788991011120000000000000000000000000000000000000000",
+                            "0x04" : "0x1122334455667788991011120000000000000000000000000000000000000000",
+                            "0x05" : "0x1122334455667788991011120000000000000000000000000000000000000000",
+                            "0x06" : "0x1122334455667788991011120000000000000000000000000000000000000000",
+                            "0x07" : "0x1122334455667788991011120000000000000000000000000000000000000000"
                         }
                     }
                 }
@@ -64,7 +68,7 @@
         "pre" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x600c600060006000600073194f5374fce5edbc8e2a8697c15331677e6ebf0b62030d40f150600051600055600c60006000600073194f5374fce5edbc8e2a8697c15331677e6ebf0b62030d40f450600051600155600c60006000600073194f5374fce5edbc8e2a8697c15331677e6ebf0b62030d40fa50600051600255600c600060006000600073194f5374fce5edbc8e2a8697c15331677e6ebf0b62030d40f250600051600355",
+                "code" : "0x600c600060006000600073194f5374fce5edbc8e2a8697c15331677e6ebf0b62030d40f1506000516000556000600052600c60006000600073194f5374fce5edbc8e2a8697c15331677e6ebf0b62030d40f4506000516001556000600052600c60006000600073194f5374fce5edbc8e2a8697c15331677e6ebf0b62030d40fa506000516002556000600052600c600060006000600073194f5374fce5edbc8e2a8697c15331677e6ebf0b62030d40f2506000516003556000600052600c600060006000600073294f5374fce5edbc8e2a8697c15331677e6ebf0b62030d40f1506000516004556000600052600c60006000600073294f5374fce5edbc8e2a8697c15331677e6ebf0b62030d40f4506000516005556000600052600c60006000600073294f5374fce5edbc8e2a8697c15331677e6ebf0b62030d40fa506000516006556000600052600c600060006000600073294f5374fce5edbc8e2a8697c15331677e6ebf0b62030d40f250600051600755",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -76,6 +80,13 @@
                 "storage" : {
                 }
             },
+            "0x294f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f11223344556677889910111213141516171819202122232425262728293031326000527f333435363738394041424344454647484950515253545556575859606162636460205260406000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x00",
diff --git a/src/GeneralStateTestsFiller/stReturnDataTest/subcallReturnMoreThenExpectedFiller.yml b/src/GeneralStateTestsFiller/stReturnDataTest/subcallReturnMoreThenExpectedFiller.yml
index 30c9ad521..d3d8810ea 100644
--- a/src/GeneralStateTestsFiller/stReturnDataTest/subcallReturnMoreThenExpectedFiller.yml
+++ b/src/GeneralStateTestsFiller/stReturnDataTest/subcallReturnMoreThenExpectedFiller.yml
@@ -18,12 +18,29 @@ subcallReturnMoreThenExpected:
           ;; Get returndata from a subcall
           (CALL 200000 0x194f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 12)
           [[0]] (MLOAD 0)
+          (MSTORE 0 0x0000000000000000000000000000000000000000000000000000000000000000)
           (DELEGATECALL 200000 0x194f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 12)
           [[1]] (MLOAD 0)
+          (MSTORE 0 0x0000000000000000000000000000000000000000000000000000000000000000)
           (STATICCALL 200000 0x194f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 12)
           [[2]] (MLOAD 0)
+          (MSTORE 0 0x0000000000000000000000000000000000000000000000000000000000000000)
           (CALLCODE 200000 0x194f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 12)
           [[3]] (MLOAD 0)
+          (MSTORE 0 0x0000000000000000000000000000000000000000000000000000000000000000)
+
+          ;; Get revert data from a subcall
+          (CALL 200000 0x294f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 12)
+          [[4]] (MLOAD 0)
+          (MSTORE 0 0x0000000000000000000000000000000000000000000000000000000000000000)
+          (DELEGATECALL 200000 0x294f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 12)
+          [[5]] (MLOAD 0)
+          (MSTORE 0 0x0000000000000000000000000000000000000000000000000000000000000000)
+          (STATICCALL 200000 0x294f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 12)
+          [[6]] (MLOAD 0)
+          (MSTORE 0 0x0000000000000000000000000000000000000000000000000000000000000000)
+          (CALLCODE 200000 0x294f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 12)
+          [[7]] (MLOAD 0)
         }
       nonce: '0'
       storage: {}
@@ -37,6 +54,16 @@ subcallReturnMoreThenExpected:
         }
       nonce: '0'
       storage: {}
+    294f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: |
+        {
+          (MSTORE 0  0x1122334455667788991011121314151617181920212223242526272829303132)
+          (MSTORE 32 0x3334353637383940414243444546474849505152535455565758596061626364)
+          (REVERT 0 64)
+        }
+      nonce: '0'
+      storage: {} 
     a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
       balance: '1000000000000000000'
       code: '0x00'
@@ -56,7 +83,11 @@ subcallReturnMoreThenExpected:
             0: '0x1122334455667788991011120000000000000000000000000000000000000000',
             1: '0x1122334455667788991011120000000000000000000000000000000000000000',
             2: '0x1122334455667788991011120000000000000000000000000000000000000000',
-            3: '0x1122334455667788991011120000000000000000000000000000000000000000'
+            3: '0x1122334455667788991011120000000000000000000000000000000000000000',
+            4: '0x1122334455667788991011120000000000000000000000000000000000000000',
+            5: '0x1122334455667788991011120000000000000000000000000000000000000000',
+            6: '0x1122334455667788991011120000000000000000000000000000000000000000',
+            7: '0x1122334455667788991011120000000000000000000000000000000000000000'
           }
   transaction:
     data: