Lower gas value and use bool for call_succeeds ExpectedOutput

Store value in memory to load after the call for checking out of gas errors

Author: Stuart Reed

tests/istanbul/eip152_blake2/test_blake2.py

@@ -100,7 +100,7 @@ class ExpectedOutput(TestParameterGroup):
                 t_1="",
             ),
             ExpectedOutput(
-                call_succeeds="00",
+                call_succeeds=False,
                 data_1="0x00",
                 data_2="0x00",
             ),
@@ -116,7 +116,7 @@ class ExpectedOutput(TestParameterGroup):
                 t_1=0,
             ),
             ExpectedOutput(
-                call_succeeds="00",
+                call_succeeds=False,
                 data_1="0x00",
                 data_2="0x00",
             ),
@@ -132,7 +132,7 @@ class ExpectedOutput(TestParameterGroup):
                 t_1=0,
             ),
             ExpectedOutput(
-                call_succeeds="0x00",
+                call_succeeds=False,
                 data_1="0x00",
                 data_2="0x00",
             ),
@@ -148,7 +148,7 @@ class ExpectedOutput(TestParameterGroup):
                 f=2,
             ),
             ExpectedOutput(
-                call_succeeds="0x00",
+                call_succeeds=False,
                 data_1="0x00",
                 data_2="0x00",
             ),
@@ -163,7 +163,7 @@ class ExpectedOutput(TestParameterGroup):
                 t_1=0,
             ),
             ExpectedOutput(
-                call_succeeds="0x01",
+                call_succeeds=True,
                 data_1="0x08c9bcf367e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5",
                 data_2="0xd282e6ad7f520e511f6c3e2b8c68059b9442be0454267ce079217e1319cde05b",
             ),
@@ -178,7 +178,7 @@ class ExpectedOutput(TestParameterGroup):
                 t_1=0,
             ),
             ExpectedOutput(
-                call_succeeds="0x01",
+                call_succeeds=True,
                 data_1="0xba80a53f981c4d0d6a2797b69f12f6e94c212f14685ac4b74b12bb6fdbffa2d1",
                 data_2="0x7d87c5392aab792dc252d5de4533cc9518d38aa8dbf1925ab92386edd4009923",
             ),
@@ -194,7 +194,7 @@ class ExpectedOutput(TestParameterGroup):
                 f=False,
             ),
             ExpectedOutput(
-                call_succeeds="0x01",
+                call_succeeds=True,
                 data_1="0x75ab69d3190a562c51aef8d88f1c2775876944407270c42c9844252c26d28752",
                 data_2="0x98743e7f6d5ea2f2d3e8d226039cd31b4e426ac4f2d3d666a610c2116fde4735",
             ),
@@ -209,7 +209,7 @@ class ExpectedOutput(TestParameterGroup):
                 t_1=0,
             ),
             ExpectedOutput(
-                call_succeeds="0x01",
+                call_succeeds=True,
                 data_1="0xb63a380cb2897d521994a85234ee2c181b5f844d2c624c002677e9703449d2fb",
                 data_2="0xa551b3a8333bcdf5f2f7e08993d53923de3d64fcc68c034e717b9293fed7a421",
             ),
@@ -225,9 +225,9 @@ class ExpectedOutput(TestParameterGroup):
                 t_1=0,
             ),
             ExpectedOutput(
-                call_succeeds="0x00",
-                data_1="0x00",
-                data_2="0x00",
+                call_succeeds=False,
+                data_1="0x0",
+                data_2="0x0",
             ),
             id="EIP-152-case8",
         ),
@@ -241,7 +241,7 @@ class ExpectedOutput(TestParameterGroup):
                 t_1=0,
             ),
             ExpectedOutput(
-                call_succeeds="0x01",
+                call_succeeds=True,
                 data_1="0xf3e89a60ec4b0b1854744984e421d22b82f181bd4601fb9b1726b2662da61c29",
                 data_2="0xdff09e75814acb2639fd79e56616e55fc135f8476f0302b3dc8d44e082eb83a8",
             ),
@@ -256,7 +256,7 @@ class ExpectedOutput(TestParameterGroup):
                 t_1=0,
             ),
             ExpectedOutput(
-                call_succeeds="0x01",
+                call_succeeds=True,
                 data_1="0xa8ef8236e5f48a74af375df15681d128457891c1cc4706f30747b2d40300b2f4",
                 data_2="0x9d19f80fbd0945fd87736e1fc1ff10a80fd85a7aa5125154f3aaa3789ddff673",
             ),
@@ -271,7 +271,7 @@ class ExpectedOutput(TestParameterGroup):
                 t_1=0,
             ),
             ExpectedOutput(
-                call_succeeds="0x01",
+                call_succeeds=True,
                 data_1="0xbc5e888ed71b546da7b1506179bdd6c184a6410c40de33f9c330207417797889",
                 data_2="0x5dbe74144468aefe5c2afce693c62dbca99e5e076dd467fe90a41278b16d691e",
             ),
@@ -286,7 +286,7 @@ class ExpectedOutput(TestParameterGroup):
                 t_1=0,
             ),
             ExpectedOutput(
-                call_succeeds="0x01",
+                call_succeeds=True,
                 data_1="0x74097ae7b16ffd18c742aee5c55dc89d54b6f1a8a19e6139ccfb38afba56b6b0",
                 data_2="0x2cc35c441c19c21194fefb6841e72202f7c9d05eb9c3cfd8f94c67aa77d473c1",
             ),
@@ -301,7 +301,7 @@ class ExpectedOutput(TestParameterGroup):
                 t_1=0,
             ),
             ExpectedOutput(
-                call_succeeds="0x01",
+                call_succeeds=True,
                 data_1="0xd82c6a670dc90af9d7f77644eacbeddfed91b760c65c927871784abceaab3f81",
                 data_2="0x3759733a1736254fb1cfc515dbfee467930955af56e27ee435f836fc3e65969f",
             ),
@@ -316,7 +316,7 @@ class ExpectedOutput(TestParameterGroup):
                 t_1=0,
             ),
             ExpectedOutput(
-                call_succeeds="0x01",
+                call_succeeds=True,
                 data_1="0x5d6ff04d5ebaee5687d634613ab21e9a7d36f782033c74f91d562669aaf9d592",
                 data_2="0xc86346cb2df390243a952834306b389e656876a67934e2c023bce4918a016d4e",
             ),
@@ -331,7 +331,7 @@ class ExpectedOutput(TestParameterGroup):
                 t_1=0,
             ),
             ExpectedOutput(
-                call_succeeds="0x01",
+                call_succeeds=True,
                 data_1="0xa2c1eb780a6e1249156fe0751e5d4687ea9357b0651c78df660ab004cb477363",
                 data_2="0x6298bbbc683e4a0261574b6d857a6a99e06b2eea50b16f86343d2625ff222b98",
             ),
@@ -346,7 +346,7 @@ class ExpectedOutput(TestParameterGroup):
                 t_1=0,
             ),
             ExpectedOutput(
-                call_succeeds="0x01",
+                call_succeeds=True,
                 data_1="0x689419d2bf32b5a9901a2c733b9946727026a60d8773117eabb35f04a52cdcf1",
                 data_2="0xb8fb4473454cf03d46c36a10b3f784aae4dc80a24424960e66a8ad5a8c2bfb30",
             ),
@@ -361,7 +361,7 @@ class ExpectedOutput(TestParameterGroup):
                 t_1=0,
             ),
             ExpectedOutput(
-                call_succeeds="0x01",
+                call_succeeds=True,
                 data_1="0x4ab6df9d1f57140bbd27b5e164f42102d9e2b0bf4d53da501273f81a37e505c7",
                 data_2="0xf6e136f9ca4b693aa6e990b04c6412296dc09540c23c395f183011a0c5d7392e",
             ),
@@ -376,7 +376,7 @@ class ExpectedOutput(TestParameterGroup):
                 t_1=0,
             ),
             ExpectedOutput(
-                call_succeeds="0x01",
+                call_succeeds=True,
                 data_1="0x7af9b4f9c25ba3e3fd4fcb957e703b7b2e648990fe8e24c6ca2a2dfac4ce76e6",
                 data_2="0x18acffc26913d6759843362adeb4c95299777baaa977b5d94dd219d1777e4cb",
             ),
@@ -391,7 +391,7 @@ class ExpectedOutput(TestParameterGroup):
                 t_1=0,
             ),
             ExpectedOutput(
-                call_succeeds="0x01",
+                call_succeeds=True,
                 data_1="0x97eb79f7abc085a3da64d6e8643d196cbf522a51985ba2cc6a7ca14289b59df0",
                 data_2="0x73366eb68e41966eb8b33ab5bd6078d0de2fa4edc986b1d2afc4c92f2fc30cda",
             ),
@@ -406,7 +406,7 @@ class ExpectedOutput(TestParameterGroup):
                 t_1=0,
             ),
             ExpectedOutput(
-                call_succeeds="0x01",
+                call_succeeds=True,
                 data_1="0x5ef3d6ee148936390a9053e91ab5a92f4de4dfc62ebb95d71485be26d9b78c8d",
                 data_2="0x8989dfe319f2fb5f11784174db63a7bcfc50de04e13fad57bea159e46e8811df",
             ),
@@ -421,7 +421,7 @@ class ExpectedOutput(TestParameterGroup):
                 t_1=0,
             ),
             ExpectedOutput(
-                call_succeeds="0x01",
+                call_succeeds=True,
                 data_1="0xa36be13275fec9a91779f0c9b06b1b40d8c8a13ab0786d0764c2eb708cc8eb81",
                 data_2="0xf1acb2a3c7abd2ff5a9fdfe88b81f6f56288dc5260a9c810f023ae83b9b64a1a",
             ),
@@ -436,7 +436,7 @@ class ExpectedOutput(TestParameterGroup):
                 t_1=0,
             ),
             ExpectedOutput(
-                call_succeeds="0x01",
+                call_succeeds=True,
                 data_1="0xc987e560e3f90833c0d10ae1282bd9d35a7ba06d8abaa13a994d0962ed2bbaa9",
                 data_2="0xf69c1e1e7c9aedb75e72d1b46e9f1b2ad8f8c2f7f858a04ed8aec16f964a96da",
             ),
@@ -451,7 +451,7 @@ class ExpectedOutput(TestParameterGroup):
                 t_1=0,
             ),
             ExpectedOutput(
-                call_succeeds="0x01",
+                call_succeeds=True,
                 data_1="0x224138a6afa847230ff09c23e2ca66522e22d26884b09d7740e2dd127cb61057",
                 data_2="0x90cecbd4de6a52a733ca4a59583c064ad6ec7653d5d457b681de332f16f3d45",
             ),
@@ -466,7 +466,7 @@ class ExpectedOutput(TestParameterGroup):
                 t_1=0,
             ),
             ExpectedOutput(
-                call_succeeds="0x01",
+                call_succeeds=True,
                 data_1="0xabcd200f2962ede252fc455ea70d12b236ad2f4046b91e17558a7741d9da39a2",
                 data_2="0x548083b610bb8591ca50418eabd15b6489a936b178a435b4c182ffa475eba4d8",
             ),
@@ -481,7 +481,7 @@ class ExpectedOutput(TestParameterGroup):
                 t_1=0,
             ),
             ExpectedOutput(
-                call_succeeds="0x01",
+                call_succeeds=True,
                 data_1="0x39fc2077154fba422b3d628d10908c596beebea8dfd90f14566aec4f60bdb2bc",
                 data_2="0xa75d73ab2b224d58c3568cbc7fc8905cc849f10745f00addef02384032d53729",
             ),
@@ -496,7 +496,7 @@ class ExpectedOutput(TestParameterGroup):
                 t_1=0,
             ),
             ExpectedOutput(
-                call_succeeds="0x01",
+                call_succeeds=True,
                 data_1="0x5bb981381beb687d5fdbe5e7c096fbd1ce193b780948c1d74ebbb7c58db364c7",
                 data_2="0xb7695d32f918444dbdcbdcff476fc70a926e228c4cbb7d05473711d3b56e5b33",
             ),
@@ -513,7 +513,7 @@ class ExpectedOutput(TestParameterGroup):
                 f=0,
             ),
             ExpectedOutput(
-                call_succeeds="00",
+                call_succeeds=False,
                 data_1="0x00",
                 data_2="0x00",
             ),
@@ -533,6 +533,7 @@ def test_blake2b(
     account = pre.deploy_contract(
         # Store all CALLDATA into memory (offset 0)
         Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE())
+        + Op.MSTORE(0x1000, 0xDEADBEEF)
         # Store the returned CALL status (success = 1, fail = 0) into slot 0:
         + Op.SSTORE(
             0,
@@ -543,6 +544,7 @@ def test_blake2b(
                 args_size=Op.CALLDATASIZE(),
                 ret_offset=0x200,
                 ret_size=0x40,
+                gas_limit=1_000_000,
             ),
         )
         + Op.SSTORE(
@@ -553,6 +555,10 @@ def test_blake2b(
             2,
             Op.MLOAD(0x220),
         )
+        + Op.SSTORE(
+            3,
+            Op.MLOAD(0x1000),
+        )
         + Op.STOP(),
     )
     sender = pre.fund_eoa()
@@ -567,13 +573,13 @@ def test_blake2b(
         value=100000,
     )
 
-    post = {}
     post = {
         account: Account(
             storage={
-                0: output.call_succeeds,
+                0: 0x1 if output.call_succeeds else 0x0,
                 1: output.data_1,
                 2: output.data_2,
+                3: 0xDEADBEEF if output.call_succeeds else 0x0,
             }
         )
     }