Fix consensus diff function to incldue cus

Author: mjain-jump

src/test_suite/fuzz_context.py

@@ -24,7 +24,6 @@
     context_human_encode_fn=instr_codec.encode_input,
     context_human_decode_fn=instr_codec.decode_input,
     effects_human_encode_fn=instr_codec.encode_output,
-    ignore_fields_for_consensus=["custom_err", "cu_avail"],
     consensus_diff_effect_fn=instr_diff.consensus_instr_diff_effects,
 )
 
@@ -33,18 +32,23 @@
     fixture_desc=vm_pb.SyscallFixture.DESCRIPTOR,
     context_human_encode_fn=syscall_codec.encode_input,
     effects_human_encode_fn=syscall_codec.encode_output,
+    context_human_decode_fn=syscall_codec.decode_input,
 )
 
 CpiHarness = HarnessCtx(
     fuzz_fn_name="sol_compat_vm_cpi_syscall_v1",
     fixture_desc=vm_pb.SyscallFixture.DESCRIPTOR,
+    context_human_encode_fn=syscall_codec.encode_input,
     effects_human_encode_fn=syscall_codec.encode_output,
+    context_human_decode_fn=syscall_codec.decode_input,
 )
 
 VmInterpHarness = HarnessCtx(
     fuzz_fn_name="sol_compat_vm_interp_v1",
     fixture_desc=vm_pb.SyscallFixture.DESCRIPTOR,
+    context_human_encode_fn=syscall_codec.encode_input,
     effects_human_encode_fn=syscall_codec.encode_output,
+    context_human_decode_fn=syscall_codec.decode_input,
 )
 
 VmValidateHarness = HarnessCtx(

src/test_suite/fuzz_interface.py

@@ -1,6 +1,7 @@
 from typing import Callable, Type, TypeVar
 from google.protobuf import message, descriptor, message_factory
 from dataclasses import dataclass, InitVar, field
+import re
 
 msg_factory = message_factory.MessageFactory()
 
@@ -13,7 +14,6 @@
 
 The following defines the interface:
 - fuzz_fn_name: The name of the harness function to call in the fuzz target
-- ignore_fields_for_consensus: A list of fields to ignore when comparing effects during --consensus mode
 - fixture_desc: The protobuf descriptor for the fixture message.
     - A fixture message is a message that contains an input and output message.
     - input: The fuzz target Context
@@ -27,17 +27,32 @@
 """
 
 
-def encode_hex_compact(buf):
+def decode_hex_compact(encoded):
+    res = bytearray()
+    parts = re.split(r"\.\.\.(\d+) zeros\.\.\.", encoded.decode("ascii"))
+
+    for i, part in enumerate(parts):
+        if i % 2 == 0:
+            # Regular hex part
+            res.extend(bytes.fromhex(part))
+        else:
+            # Skipped zeros part
+            res.extend(b"\x00" * int(part))
+
+    return bytes(res)
+
+
+def encode_hex_compact(buf, gap=16):
     res = ""
     skipped = 0
-    for i in range(0, len(buf), 16):
-        row = buf[i : i + 16]
+    for i in range(0, len(buf), gap):
+        row = buf[i : i + gap]
         if row == bytes([0] * len(row)):
             skipped += len(row)
         else:
             if skipped > 0:
                 res += f"...{skipped} zeros..."
-            res += "".join([f"{b:0>2x}" for b in buf[i : i + 16]])
+            res += "".join([f"{b:0>2x}" for b in buf[i : i + gap]])
             skipped = 0
     if skipped > 0:
         res += f"...{skipped} zeros..."
@@ -69,7 +84,6 @@ class HarnessCtx:
     fuzz_fn_name: str
     fixture_desc: InitVar[descriptor.Descriptor]
     result_field_name: str | None = "result"
-    ignore_fields_for_consensus: list[str] = field(default_factory=list)
     diff_effect_fn: Callable[[EffectsType, EffectsType], bool] = generic_effects_diff
     consensus_diff_effect_fn: Callable[[EffectsType, EffectsType], bool] = (
         generic_effects_diff

src/test_suite/instr/diff_utils.py

@@ -7,11 +7,13 @@ def consensus_instr_diff_effects(a: invoke_pb.InstrEffects, b: invoke_pb.InstrEf
     b_san = invoke_pb.InstrEffects()
     b_san.CopyFrom(b)
 
-    # Normalize error codes
+    # Normalize error codes and cus
     a_san.result = 0
     a_san.custom_err = 0
+    a_san.cu_avail = 0
 
     b_san.result = 0
     b_san.custom_err = 0
+    b_san.cu_avail = 0
 
     return a_san == b_san

src/test_suite/syscall/codec_utils.py

@@ -3,6 +3,7 @@
 import test_suite.vm_pb2 as vm_pb
 from test_suite.fuzz_interface import encode_hex_compact
 from test_suite.instr.codec_utils import encode_input as instr_encode_input
+from test_suite.instr.codec_utils import decode_input as instr_decode_input
 
 
 def encode_input(input: vm_pb.SyscallContext):
@@ -23,3 +24,10 @@ def encode_output(effects: vm_pb.SyscallEffects):
     effects.heap = encode_hex_compact(effects.heap)
     effects.stack = encode_hex_compact(effects.stack)
     effects.rodata = encode_hex_compact(effects.rodata)
+
+
+def decode_input(input: vm_pb.SyscallContext):
+    instr_ctx = invoke_pb.InstrContext()
+    instr_ctx.CopyFrom(input.instr_ctx)
+    instr_decode_input(instr_ctx)
+    input.instr_ctx.CopyFrom(instr_ctx)