From aeb76da831b79fa50b2f14e480db0e665cb10606 Mon Sep 17 00:00:00 2001
From: mrmr1993 <mr_1993@hotmail.co.uk>
Date: Wed, 20 Nov 2024 13:05:31 +0000
Subject: [PATCH] Differentiate snarky `Typ.t`s between instances

---
 src/lib/pickles/step_verifier.ml | 9 +++++++++
 src/lib/pickles/wrap_verifier.ml | 9 +++++++++
 src/lib/snarky                   | 2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/lib/pickles/step_verifier.ml b/src/lib/pickles/step_verifier.ml
index f7163a99197..7ef06a7bdbb 100644
--- a/src/lib/pickles/step_verifier.ml
+++ b/src/lib/pickles/step_verifier.ml
@@ -11,6 +11,15 @@ module Make
     (Inputs : Intf.Step_main_inputs.S
                 with type Impl.field = Backend.Tick.Field.t
                  and type Impl.Bigint.t = Backend.Tick.Bigint.t
+                 and type ('var, 'value, 'aux, 'field, 'checked) Impl.Typ.typ' =
+                  ( 'var
+                  , 'value
+                  , 'aux
+                  , 'field
+                  , 'checked )
+                  Step_main_inputs.Impl.Typ.typ'
+                 and type ('var, 'value, 'field, 'checked) Impl.Typ.typ =
+                  ('var, 'value, 'field, 'checked) Step_main_inputs.Impl.Typ.typ
                  and type Inner_curve.Constant.Scalar.t = Backend.Tock.Field.t) =
 struct
   open Inputs
diff --git a/src/lib/pickles/wrap_verifier.ml b/src/lib/pickles/wrap_verifier.ml
index 6f996c096d3..da7a3fb4d1b 100644
--- a/src/lib/pickles/wrap_verifier.ml
+++ b/src/lib/pickles/wrap_verifier.ml
@@ -49,6 +49,15 @@ module Make
     (Inputs : Intf.Wrap_main_inputs.S
                 with type Impl.field = Backend.Tock.Field.t
                  and type Impl.Bigint.t = Backend.Tock.Bigint.t
+                 and type ('var, 'value, 'aux, 'field, 'checked) Impl.Typ.typ' =
+                  ( 'var
+                  , 'value
+                  , 'aux
+                  , 'field
+                  , 'checked )
+                  Wrap_main_inputs.Impl.Typ.typ'
+                 and type ('var, 'value, 'field, 'checked) Impl.Typ.typ =
+                  ('var, 'value, 'field, 'checked) Wrap_main_inputs.Impl.Typ.typ
                  and type Inner_curve.Constant.Scalar.t = Backend.Tick.Field.t) =
 struct
   open Inputs
diff --git a/src/lib/snarky b/src/lib/snarky
index 44e86744ac2..ceff57333ac 160000
--- a/src/lib/snarky
+++ b/src/lib/snarky
@@ -1 +1 @@
-Subproject commit 44e86744ac24037d2e76d715af1739e72fac6421
+Subproject commit ceff57333acddbf969524b9836e711ac832187a3