test revert operations on second level OOG with double call

2 files changed, 191 insertions, 0 deletions

diff --git a/StateTests/EIP158/stEIP158SpecificTest.json b/StateTests/EIP158/stEIP158SpecificTest.json
index 488edc94d..99a12208b 100644
--- a/StateTests/EIP158/stEIP158SpecificTest.json
+++ b/StateTests/EIP158/stEIP158SpecificTest.json
@@ -656,6 +656,110 @@
             "value" : "0x00"
         }
     },
+    "chfastRevertDepth2" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x989680",
+            "currentNumber" : "0x28d138",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "logs" : [
+        ],
+        "out" : "0x",
+        "post" : {
+            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x029abd",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000546001016000556000600060006000600073b000000000000000000000000000000000000000620249f0f16001556000600060006000600073d000000000000000000000000000000000000000620249f0f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a27543",
+                "code" : "0x",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "b000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000546001016000556000600060006000600073c00000000000000000000000000000000000000061c350f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "c000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600054600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "d000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000546001016000556000600060006000600073c00000000000000000000000000000000000000061c350f16001555a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "postStateRoot" : "04ce8d06e26daf0ede58650a21e93c2abf8ea7a15e97695e2f3916ce6ff78f50",
+        "pre" : {
+            "a000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000546001016000556000600060006000600073b000000000000000000000000000000000000000620249f0f16001556000600060006000600073d000000000000000000000000000000000000000620249f0f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "b000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000546001016000556000600060006000600073c00000000000000000000000000000000000000061c350f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "c000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600054600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "d000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000546001016000556000600060006000600073c00000000000000000000000000000000000000061c350f16001555a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : "",
+            "gasLimit" : "0x029abd",
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "a000000000000000000000000000000000000000",
+            "value" : "0x00"
+        }
+    },
     "vitalikTransactionTest" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/StateTestsFiller/EIP158/stEIP158SpecificTestFiller.json b/src/StateTestsFiller/EIP158/stEIP158SpecificTestFiller.json
index 7e7c289dc..18a7fce16 100644
--- a/src/StateTestsFiller/EIP158/stEIP158SpecificTestFiller.json
+++ b/src/StateTestsFiller/EIP158/stEIP158SpecificTestFiller.json
@@ -542,5 +542,92 @@
             "data": "0x6000607f5359610043806100135939610056566c010000000000000000000000007fee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4d53532071d6cd0cb86facd5605ff6100008061003f60003961003f565b6000f35b816000f0905050596100718061006c59396100dd5661005f8061000e60003961006d566000603f5359610043806100135939610056566c010000000000000000000000007fee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4d53532071d6cd0cb86facd5605ff6100008061003f60003961003f565b6000f35b816000f0905050fe5b6000f35b816000f0905060405260006000600060006000604051620249f0f15061000080610108600039610108565b6000f3", 
             "gasPrice": "0x01"
         }
+    },
+
+    "chfastRevertDepth2": {
+	"env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "45678256",
+            "currentGasLimit" : "10000000",
+            "currentNumber" : "2675000",
+            "currentTimestamp" : "1",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+	"expect" : {
+            "a000000000000000000000000000000000000000" : {
+                "storage" : {
+                    "0x00" : "0x00",
+                    "0x01" : "0x00",
+                    "0x02" : "0x00"
+                }
+            },
+            "b000000000000000000000000000000000000000" : {
+                "storage" : {
+                    "0x00" : "0x00",
+                    "0x01" : "0x00"
+                }
+            },
+            "c000000000000000000000000000000000000000" : {
+                "storage" : {
+                    "0x00" : "0x00"
+                }
+            },
+            "d000000000000000000000000000000000000000" : {
+                "storage" : {
+                    "0x00" : "0x00",
+                    "0x01" : "0x00",
+                    "0x02" : "0x00"
+                }
+            }
+        },
+        "pre" :
+        {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "a000000000000000000000000000000000000000" : {
+                "balance" : "",
+                "code" : "{ [[0]] (ADD 1 (SLOAD 0)) [[1]] (CALL 150000 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[2]] (CALL 150000 0xd000000000000000000000000000000000000000 0 0 0 0 0)}",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "b000000000000000000000000000000000000000" : {
+                "balance" : "",
+                "code" : "{ [[0]] (ADD 1 (SLOAD 0)) [[1]] (CALL 50000 0xc000000000000000000000000000000000000000 0 0 0 0 0)}",
+                "nonce" : "",
+                "storage" : {
+                }
+            },
+	    "c000000000000000000000000000000000000000" : {
+                "balance" : "",
+                "code" : "{ [[0]] (ADD 1 (SLOAD 0)) }",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "d000000000000000000000000000000000000000" : {
+                "balance" : "",
+                "code" : "{ [[0]] (ADD 1 (SLOAD 0)) [[1]] (CALL 50000 0xc000000000000000000000000000000000000000 0 0 0 0 0) [[2]] (GAS)}",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" :
+        {
+	    "data" : "In transaction T to A, A call B call C, then A call D calls C, D fails after calling C.",
+            "data" : "",
+            "gasLimit" : "170685",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "a000000000000000000000000000000000000000",
+            "value" : "0"
+        }
     }
 }