From 261ee4672354a5d92fa708cb76135c1206c491a4 Mon Sep 17 00:00:00 2001 From: mrmr1993 Date: Mon, 16 Dec 2024 19:00:02 +0000 Subject: [PATCH 1/3] Update snarky for removed 'field parameter --- src/lib/pickles/step_verifier.ml | 16 ++++++++++++---- src/lib/pickles/wrap_verifier.ml | 16 ++++++++++++---- src/lib/snarky | 2 +- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/src/lib/pickles/step_verifier.ml b/src/lib/pickles/step_verifier.ml index 7ef06a7bdbb..7a4070f81e1 100644 --- a/src/lib/pickles/step_verifier.ml +++ b/src/lib/pickles/step_verifier.ml @@ -11,15 +11,23 @@ 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' = + and type ( 'var + , 'value + , 'aux + , 'field + , 'checked ) + Impl.Internal_Basic.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 + Step_main_inputs.Impl.Internal_Basic.Typ.typ' + and type ('var, 'value, 'checked) Impl.Internal_Basic.Typ.typ = + ( 'var + , 'value + , 'checked ) + Step_main_inputs.Impl.Internal_Basic.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 9045c8d72cd..349971f219d 100644 --- a/src/lib/pickles/wrap_verifier.ml +++ b/src/lib/pickles/wrap_verifier.ml @@ -49,15 +49,23 @@ 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' = + and type ( 'var + , 'value + , 'aux + , 'field + , 'checked ) + Impl.Internal_Basic.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 + Wrap_main_inputs.Impl.Internal_Basic.Typ.typ' + and type ('var, 'value, 'checked) Impl.Internal_Basic.Typ.typ = + ( 'var + , 'value + , 'checked ) + Wrap_main_inputs.Impl.Internal_Basic.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 98805117bcc..a5aaca05882 160000 --- a/src/lib/snarky +++ b/src/lib/snarky @@ -1 +1 @@ -Subproject commit 98805117bcce13e09a6e7de0da24ed2e50e9b267 +Subproject commit a5aaca05882e0020839a054c0a7486773ab31774 From 7a1ff2c7e090d1c678d28159f12e047ab05c0cda Mon Sep 17 00:00:00 2001 From: mrmr1993 Date: Mon, 16 Dec 2024 19:09:33 +0000 Subject: [PATCH 2/3] Update snarky for further-refined types --- src/lib/pickles/step_verifier.ml | 18 ++++-------------- src/lib/pickles/wrap_verifier.ml | 18 ++++-------------- src/lib/snarky | 2 +- 3 files changed, 9 insertions(+), 29 deletions(-) diff --git a/src/lib/pickles/step_verifier.ml b/src/lib/pickles/step_verifier.ml index 7a4070f81e1..60e5e31cacb 100644 --- a/src/lib/pickles/step_verifier.ml +++ b/src/lib/pickles/step_verifier.ml @@ -11,23 +11,13 @@ 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.Internal_Basic.Typ.typ' = + and type ('var, 'value, 'aux) Impl.Internal_Basic.Typ.typ' = ( 'var , 'value - , 'aux - , 'field - , 'checked ) + , 'aux ) Step_main_inputs.Impl.Internal_Basic.Typ.typ' - and type ('var, 'value, 'checked) Impl.Internal_Basic.Typ.typ = - ( 'var - , 'value - , 'checked ) - Step_main_inputs.Impl.Internal_Basic.Typ.typ + and type ('var, 'value) Impl.Internal_Basic.Typ.typ = + ('var, 'value) Step_main_inputs.Impl.Internal_Basic.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 349971f219d..623c2800196 100644 --- a/src/lib/pickles/wrap_verifier.ml +++ b/src/lib/pickles/wrap_verifier.ml @@ -49,23 +49,13 @@ 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.Internal_Basic.Typ.typ' = + and type ('var, 'value, 'aux) Impl.Internal_Basic.Typ.typ' = ( 'var , 'value - , 'aux - , 'field - , 'checked ) + , 'aux ) Wrap_main_inputs.Impl.Internal_Basic.Typ.typ' - and type ('var, 'value, 'checked) Impl.Internal_Basic.Typ.typ = - ( 'var - , 'value - , 'checked ) - Wrap_main_inputs.Impl.Internal_Basic.Typ.typ + and type ('var, 'value) Impl.Internal_Basic.Typ.typ = + ('var, 'value) Wrap_main_inputs.Impl.Internal_Basic.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 a5aaca05882..3bbcbaff439 160000 --- a/src/lib/snarky +++ b/src/lib/snarky @@ -1 +1 @@ -Subproject commit a5aaca05882e0020839a054c0a7486773ab31774 +Subproject commit 3bbcbaff439084d2fa817697cb2e4c67ae6a43e7 From bc75f95d315c1f121f5d5eb8e0f66f4fa690ba38 Mon Sep 17 00:00:00 2001 From: mrmr1993 Date: Mon, 16 Dec 2024 19:59:49 +0000 Subject: [PATCH 3/3] Bump snarky for more abstraction changes --- src/lib/snarky | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/snarky b/src/lib/snarky index 3bbcbaff439..79768567d78 160000 --- a/src/lib/snarky +++ b/src/lib/snarky @@ -1 +1 @@ -Subproject commit 3bbcbaff439084d2fa817697cb2e4c67ae6a43e7 +Subproject commit 79768567d78b24b7e0a943a344bf25aff653a8ca