Merge pull request #2 from ramonamela/feature-read-input-challenge

Feature read input challenge

Dockerfile

@@ -18,9 +18,10 @@ RUN pip install -r /tmp/requirements/base.txt
 
 ## We need to install it manually due to the existent bug
 
-#RUN pip install --no-cache-dir git+https://github.com/karask/python-bitcoin-utils.git@65a4a49c84a4e1c23b08c0527f8b2d0000e5d5ca
+#RUN pip install --no-cache-dir git+https://github.com/karask/python-bitcoin-utils.git@0c99998136e21f4ec055f2842bdf674aae611c18
 #RUN pip install --no-cache-dir git+https://github.com/ramonamela/python-bitcoin-utils.git@5392fec4f6b149cf7d913d65640b619727e976ef
 RUN pip install --no-cache-dir git+https://github.com/ramonamela/python-bitcoin-utils.git@3e8c2a0bf1b080ed5f80f4e78f71005f42eb52c5
+#RUN pip install --no-cache-dir git+https://github.com/ramonamela/python-bitcoin-utils.git@5b213cb10a6fe810fb9c0606608bfbc05789cd3a
 
 RUN pip install --no-cache-dir git+https://github.com/ramonamela/pybitvmbinding.git@2cb13f79fca1e0da47305a102eeb66fc5982a9e1
 

bitvmx_protocol_library/bitvmx_execution/services/bitvmx_wrapper.py

@@ -2,13 +2,27 @@
 import os
 import re
 import subprocess
+from enum import Enum
 from typing import Optional
 
+import pandas as pd
+
 
 def _tweak_input(input_hex: str):
     return input_hex[:-1] + hex(15 - int(input_hex[-1], 16))[2:]
 
 
+class ReadErrorType(Enum):
+    BEFORE = "before"
+    SAME = "same"
+    AFTERWARDS = "afterwards"
+
+
+class ReadErrorPosition(Enum):
+    ONE = "one"
+    TWO = "two"
+
+
 class BitVMXWrapper:
 
     def __init__(self, base_path: str):
@@ -21,7 +35,7 @@ def __init__(self, base_path: str):
         self.fail_step = None
         self.fail_type = "--fail-execute"
         # self.fail_type = "--fail-hash"
-        self.fail_input = True
+        self.fail_input = False
         self.fail_actor_input = "prover"
         self.contains_fail = (
             self.fail_actor is not None
@@ -35,6 +49,26 @@ def __init__(self, base_path: str):
             and self.fail_input
         )
 
+        self.fail_read = True
+        self.fail_actor_read = "prover"
+        self.fail_read_type = ReadErrorType.SAME
+        self.fail_read_position = ReadErrorPosition.ONE
+        # DO NOT CHANGE THIS AS OF NOW (WE HARDCODE THE EXAMPLE)
+        self.fail_read_step = 14
+        # read1_add       4026531872
+        # read1_val       3766484992
+        # read1_last_step 4
+        # read2_add       3766484972
+        # read2_val       2852126720
+        # read2_last_step 7
+        self.contains_read_fail = (
+            self.fail_read_type is not None
+            and self.fail_read_position is not None
+            and self.fail_actor_read in self.base_path
+            and self.fail_read
+            and self.fail_read_step is not None
+        )
+
     # def get_static_addresses(self, elf_file: str):
     #     directory = self.base_path
     #     command = [
@@ -65,7 +99,9 @@ def __init__(self, base_path: str):
     #         print("Errors:\n", e.stderr)
     #         raise Exception("Some problem with the computation")
 
-    def get_execution_trace(self, setup_uuid: str, index: int, input_hex: Optional[str] = None):
+    def get_execution_trace(
+        self, setup_uuid: str, index: int, input_hex: Optional[str] = None, fail_read=True
+    ):
         base_point = (
             math.floor((index - 1) / self.execution_checkpoint_interval)
             * self.execution_checkpoint_interval
@@ -109,6 +145,30 @@ def get_execution_trace(self, setup_uuid: str, index: int, input_hex: Optional[s
         if self.contains_fail and int(self.fail_step) <= index:
             command.extend([self.fail_type, self.fail_step])
 
+        if self.contains_read_fail and int(self.fail_read_step) <= index and fail_read:
+            if self.fail_read_position == ReadErrorPosition.ONE:
+                command.append("--fail-read-1")
+                command.append(str(self.fail_read_step))
+                command.append(str(4026531872))
+                command.append(str(3766484992 + 1))
+                command.append(str(4026531872))
+                base_last_step = 4
+            elif self.fail_read_position == ReadErrorPosition.TWO:
+                command.append("--fail-read-2")
+                command.append(str(self.fail_read_step))
+                command.append(str(3766484972))
+                command.append(str(2852126720 + 1))
+                command.append(str(3766484972))
+                base_last_step = 7
+            else:
+                raise Exception("Fail read not recognized")
+            if self.fail_read_type == ReadErrorType.SAME:
+                command.append(str(base_last_step))
+            elif self.fail_read_type == ReadErrorType.AFTERWARDS:
+                command.append(str(base_last_step + 1))
+            elif self.fail_read_type == ReadErrorType.BEFORE:
+                command.append(str(base_last_step - 1))
+
         execution_directory = self.base_path + setup_uuid
 
         try:
@@ -171,6 +231,31 @@ def generate_execution_checkpoints(
                 )
             if self.contains_fail:
                 command.extend([self.fail_type, self.fail_step])
+
+            if self.contains_read_fail:
+                if self.fail_read_position == ReadErrorPosition.ONE:
+                    command.append("--fail-read-1")
+                    command.append(str(self.fail_read_step))
+                    command.append(str(4026531872))
+                    command.append(str(3766484992 + 1))
+                    command.append(str(4026531872))
+                    base_last_step = 4
+                elif self.fail_read_position == ReadErrorPosition.TWO:
+                    command.append("--fail-read-2")
+                    command.append(str(self.fail_read_step))
+                    command.append(str(3766484972))
+                    command.append(str(2852126720 + 1))
+                    command.append(str(3766484972))
+                    base_last_step = 7
+                else:
+                    raise Exception("Fail read not recognized")
+                if self.fail_read_type == ReadErrorType.SAME:
+                    command.append(str(base_last_step))
+                elif self.fail_read_type == ReadErrorType.AFTERWARDS:
+                    command.append(str(base_last_step + 1))
+                elif self.fail_read_type == ReadErrorType.BEFORE:
+                    command.append(str(base_last_step - 1))
+
             execution_directory = self.base_path + setup_uuid
 
             try: