From a1bb428f291e4db6a7ee5d704266d7a8ede4eaeb Mon Sep 17 00:00:00 2001 From: Barrie Byron Date: Thu, 5 Oct 2023 14:43:56 -0400 Subject: [PATCH 01/11] Update README.md to fix docs repo busted link --- docs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/README.md b/docs/README.md index e12901ca674..d17bf44dcfd 100644 --- a/docs/README.md +++ b/docs/README.md @@ -2,4 +2,4 @@ The docs for the Mina Protocol website are published on [docs.minaprotocol.com](https://docs.minaprotocol.com/). -The docs repository is [https://github.com/o1-labs/docs2/)https://github.com/o1-labs/docs2/](https://github.com/o1-labs/docs2/)https://github.com/o1-labs/docs2/). +The docs repository is [https://github.com/o1-labs/docs2/)https://github.com/o1-labs/docs2/](https://github.com/o1-labs/docs2/). From 7c7290f9cfd776a427bf68fca5ad7d86c17b7cd8 Mon Sep 17 00:00:00 2001 From: Barrie Byron Date: Thu, 5 Oct 2023 14:45:41 -0400 Subject: [PATCH 02/11] Update README.md --- docs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/README.md b/docs/README.md index d17bf44dcfd..b617246d2e7 100644 --- a/docs/README.md +++ b/docs/README.md @@ -2,4 +2,4 @@ The docs for the Mina Protocol website are published on [docs.minaprotocol.com](https://docs.minaprotocol.com/). -The docs repository is [https://github.com/o1-labs/docs2/)https://github.com/o1-labs/docs2/](https://github.com/o1-labs/docs2/). +The docs repository is [https://github.com/o1-labs/docs2/](https://github.com/o1-labs/docs2/](https://github.com/o1-labs/docs2/). From a3a3c865598d885c9d8e971af5d9bf9d32a062bc Mon Sep 17 00:00:00 2001 From: dkijania Date: Mon, 16 Oct 2023 11:30:04 +0200 Subject: [PATCH 03/11] Add timeout to check-compatibility bootstrap phase --- buildkite/scripts/check-compatibility.sh | 35 +++++++++++++++++------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/buildkite/scripts/check-compatibility.sh b/buildkite/scripts/check-compatibility.sh index 1c9c33d59b2..14ddf77fd09 100755 --- a/buildkite/scripts/check-compatibility.sh +++ b/buildkite/scripts/check-compatibility.sh @@ -82,22 +82,37 @@ function boot_and_sync { # allow time to boot sleep 20 + attempt_num=0 + + # 30 minutes + attempt_max=120 + SYNCED=0 + REST_SERVER="http://127.0.0.1:$REST_PORT/graphql" - while [ $SYNCED -eq 0 ]; do - SYNC_STATUS=$(docker container exec -it $DAEMON_CONTAINER \ - curl -g -X POST -H "Content-Type: application/json" -d '{"query":"query { syncStatus }"}' ${REST_SERVER}) + while [[ $SYNCED -eq 0 && $attempt_num -lt $attempt_max ]]; do + SYNC_STATUS=$(docker container exec -it $DAEMON_CONTAINER \ + curl -g -X POST -H "Content-Type: application/json" -d '{"query":"query { syncStatus }"}' ${REST_SERVER}) - # "connection refused" until GraphQL server up - GOT_SYNC_STATUS=$(echo ${SYNC_STATUS} | grep "syncStatus") - if [ ! -z $GOT_SYNC_STATUS ]; then - echo "Sync status:" $GOT_SYNC_STATUS - fi + # print logs + docker container logs $DAEMON_CONTAINER --tail 10 - SYNCED=$(echo ${SYNC_STATUS} | grep -c "SYNCED") - sleep 5 + # "connection refused" until GraphQL server up + GOT_SYNC_STATUS=$(echo ${SYNC_STATUS} | grep "syncStatus") + if [ ! -z $GOT_SYNC_STATUS ]; then + echo $(date +'%Y-%m-%d %H:%M:%S') ". Sync status:" $GOT_SYNC_STATUS + fi + + SYNCED=$(echo ${SYNC_STATUS} | grep -c "SYNCED") + sleep 5 + attempt_num=$((attempt_num+1)) done + + if [ $SYNCED -eq 0 ]; then + echo "Hit timeout for $IMAGE_ID to sync. exiting..." + exit 1 + fi } function rm_docker_container { From 833ead28299f6e98b166e6f3353f4517895e1b23 Mon Sep 17 00:00:00 2001 From: dkijania Date: Mon, 16 Oct 2023 14:49:05 +0200 Subject: [PATCH 04/11] update dirtyWhen --- buildkite/src/Constants/DebianVersions.dhall | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/buildkite/src/Constants/DebianVersions.dhall b/buildkite/src/Constants/DebianVersions.dhall index 6f9bbb30803..64b6ca9a8eb 100644 --- a/buildkite/src/Constants/DebianVersions.dhall +++ b/buildkite/src/Constants/DebianVersions.dhall @@ -66,7 +66,8 @@ let minimalDirtyWhen = [ S.strictlyStart (S.contains "dockerfiles/stages"), S.exactly "scripts/rebuild-deb" "sh", S.exactly "scripts/release-docker" "sh", - S.exactly "buildkite/scripts/build-artifact" "sh" + S.exactly "buildkite/scripts/build-artifact" "sh", + S.exactly "buildkite/scripts/check-compatibility" "sh" ] -- The default debian version (Bullseye) is used in all downstream CI jobs From 089adc60d26036387abbb0dab2b0efde6c42dc60 Mon Sep 17 00:00:00 2001 From: dkijania Date: Mon, 16 Oct 2023 19:35:07 +0200 Subject: [PATCH 05/11] Revert "Add timeout to check-compatibility bootstrap phase" This reverts commit a3a3c865598d885c9d8e971af5d9bf9d32a062bc. --- buildkite/scripts/check-compatibility.sh | 35 ++++++------------- .../src/Jobs/Test/BerkeleyCompatibility.dhall | 3 +- .../src/Jobs/Test/DevelopCompatibility.dhall | 3 +- 3 files changed, 14 insertions(+), 27 deletions(-) diff --git a/buildkite/scripts/check-compatibility.sh b/buildkite/scripts/check-compatibility.sh index 14ddf77fd09..1c9c33d59b2 100755 --- a/buildkite/scripts/check-compatibility.sh +++ b/buildkite/scripts/check-compatibility.sh @@ -82,37 +82,22 @@ function boot_and_sync { # allow time to boot sleep 20 - attempt_num=0 - - # 30 minutes - attempt_max=120 - SYNCED=0 - REST_SERVER="http://127.0.0.1:$REST_PORT/graphql" - while [[ $SYNCED -eq 0 && $attempt_num -lt $attempt_max ]]; do - SYNC_STATUS=$(docker container exec -it $DAEMON_CONTAINER \ - curl -g -X POST -H "Content-Type: application/json" -d '{"query":"query { syncStatus }"}' ${REST_SERVER}) - - # print logs - docker container logs $DAEMON_CONTAINER --tail 10 + while [ $SYNCED -eq 0 ]; do + SYNC_STATUS=$(docker container exec -it $DAEMON_CONTAINER \ + curl -g -X POST -H "Content-Type: application/json" -d '{"query":"query { syncStatus }"}' ${REST_SERVER}) - # "connection refused" until GraphQL server up - GOT_SYNC_STATUS=$(echo ${SYNC_STATUS} | grep "syncStatus") - if [ ! -z $GOT_SYNC_STATUS ]; then - echo $(date +'%Y-%m-%d %H:%M:%S') ". Sync status:" $GOT_SYNC_STATUS - fi + # "connection refused" until GraphQL server up + GOT_SYNC_STATUS=$(echo ${SYNC_STATUS} | grep "syncStatus") + if [ ! -z $GOT_SYNC_STATUS ]; then + echo "Sync status:" $GOT_SYNC_STATUS + fi - SYNCED=$(echo ${SYNC_STATUS} | grep -c "SYNCED") - sleep 5 - attempt_num=$((attempt_num+1)) + SYNCED=$(echo ${SYNC_STATUS} | grep -c "SYNCED") + sleep 5 done - - if [ $SYNCED -eq 0 ]; then - echo "Hit timeout for $IMAGE_ID to sync. exiting..." - exit 1 - fi } function rm_docker_container { diff --git a/buildkite/src/Jobs/Test/BerkeleyCompatibility.dhall b/buildkite/src/Jobs/Test/BerkeleyCompatibility.dhall index e1e165be74d..1f40ef66761 100644 --- a/buildkite/src/Jobs/Test/BerkeleyCompatibility.dhall +++ b/buildkite/src/Jobs/Test/BerkeleyCompatibility.dhall @@ -38,7 +38,8 @@ in Pipeline.build Pipeline.Config::{ key = "berkeley-compatibilty-test", target = Size.XLarge, docker = None Docker.Type, - depends_on = dependsOn + depends_on = dependsOn, + timeout_in_minutes = Some 60 } ] } diff --git a/buildkite/src/Jobs/Test/DevelopCompatibility.dhall b/buildkite/src/Jobs/Test/DevelopCompatibility.dhall index b67d4e1a107..fe4749ae33c 100644 --- a/buildkite/src/Jobs/Test/DevelopCompatibility.dhall +++ b/buildkite/src/Jobs/Test/DevelopCompatibility.dhall @@ -38,7 +38,8 @@ in Pipeline.build Pipeline.Config::{ key = "develop-compatibilty-test", target = Size.XLarge, docker = None Docker.Type, - depends_on = dependsOn + depends_on = dependsOn, + timeout_in_minutes = Some 60 } ] } From 00af549d6ddbbb69e9125fd03443f8d424c4c66d Mon Sep 17 00:00:00 2001 From: dkijania Date: Mon, 16 Oct 2023 20:39:55 +0200 Subject: [PATCH 06/11] print logs from containers --- buildkite/scripts/check-compatibility.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/buildkite/scripts/check-compatibility.sh b/buildkite/scripts/check-compatibility.sh index 1c9c33d59b2..5570ab30050 100755 --- a/buildkite/scripts/check-compatibility.sh +++ b/buildkite/scripts/check-compatibility.sh @@ -89,6 +89,15 @@ function boot_and_sync { SYNC_STATUS=$(docker container exec -it $DAEMON_CONTAINER \ curl -g -X POST -H "Content-Type: application/json" -d '{"query":"query { syncStatus }"}' ${REST_SERVER}) + # print logs + docker container logs $DAEMON_CONTAINER --tail 10 + + # "connection refused" until GraphQL server up + GOT_SYNC_STATUS=$(echo ${SYNC_STATUS} | grep "syncStatus") + if [ ! -z $GOT_SYNC_STATUS ]; then + echo $(date +'%Y-%m-%d %H:%M:%S') ". Sync status:" $GOT_SYNC_STATUS + fi + # "connection refused" until GraphQL server up GOT_SYNC_STATUS=$(echo ${SYNC_STATUS} | grep "syncStatus") if [ ! -z $GOT_SYNC_STATUS ]; then From 5039e62e0f7e367d5686825a4a2b92676fc44ab8 Mon Sep 17 00:00:00 2001 From: dkijania Date: Tue, 17 Oct 2023 19:39:04 +0200 Subject: [PATCH 07/11] add timeout_in_minutes to command --- buildkite/src/Command/Base.dhall | 5 +++-- buildkite/src/Jobs/Test/BerkeleyCompatibility.dhall | 2 +- buildkite/src/Jobs/Test/DevelopCompatibility.dhall | 2 +- buildkite/src/Jobs/Test/Libp2pUnitTest.dhall | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/buildkite/src/Command/Base.dhall b/buildkite/src/Command/Base.dhall index a1993a3161a..5c84d1367e4 100644 --- a/buildkite/src/Command/Base.dhall +++ b/buildkite/src/Command/Base.dhall @@ -105,7 +105,7 @@ let Config = , soft_fail : Optional B/SoftFail , skip: Optional B/Skip , `if` : Optional B/If - , timeout_in_minutes : Optional Natural + , timeout_in_minutes : Optional Integer } , default = { depends_on = [] : List TaggedKey.Type @@ -119,7 +119,7 @@ let Config = , soft_fail = None B/SoftFail , skip = None B/Skip , `if` = None B/If - , timeout_in_minutes = None Natural + , timeout_in_minutes = None Integer } } @@ -156,6 +156,7 @@ let build : Config.Type -> B/Command.Type = \(c : Config.Type) -> else Some (B/ArtifactPaths.String (SelectFiles.compile c.artifact_paths)), key = Some c.key, label = Some c.label, + timeout_in_minutes = c.timeout_in_minutes, retry = Some { -- we only consider automatic retries diff --git a/buildkite/src/Jobs/Test/BerkeleyCompatibility.dhall b/buildkite/src/Jobs/Test/BerkeleyCompatibility.dhall index 1f40ef66761..fbe72a1751c 100644 --- a/buildkite/src/Jobs/Test/BerkeleyCompatibility.dhall +++ b/buildkite/src/Jobs/Test/BerkeleyCompatibility.dhall @@ -39,7 +39,7 @@ in Pipeline.build Pipeline.Config::{ target = Size.XLarge, docker = None Docker.Type, depends_on = dependsOn, - timeout_in_minutes = Some 60 + timeout_in_minutes = Some +60 } ] } diff --git a/buildkite/src/Jobs/Test/DevelopCompatibility.dhall b/buildkite/src/Jobs/Test/DevelopCompatibility.dhall index fe4749ae33c..ba907ed0d5e 100644 --- a/buildkite/src/Jobs/Test/DevelopCompatibility.dhall +++ b/buildkite/src/Jobs/Test/DevelopCompatibility.dhall @@ -39,7 +39,7 @@ in Pipeline.build Pipeline.Config::{ target = Size.XLarge, docker = None Docker.Type, depends_on = dependsOn, - timeout_in_minutes = Some 60 + timeout_in_minutes = Some +60 } ] } diff --git a/buildkite/src/Jobs/Test/Libp2pUnitTest.dhall b/buildkite/src/Jobs/Test/Libp2pUnitTest.dhall index 76098a7f444..ce5a974ee22 100644 --- a/buildkite/src/Jobs/Test/Libp2pUnitTest.dhall +++ b/buildkite/src/Jobs/Test/Libp2pUnitTest.dhall @@ -57,7 +57,7 @@ Pipeline.build key = "libp2p-bs-qc", target = Size.Large, docker = None Docker.Type, - timeout_in_minutes = Some 45 + timeout_in_minutes = Some +45 } ] From d8d347c907fecc8be7f8bb1469a202d7bee2085c Mon Sep 17 00:00:00 2001 From: dkijania Date: Wed, 18 Oct 2023 18:10:28 +0200 Subject: [PATCH 08/11] remove duplicated printout --- buildkite/scripts/check-compatibility.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/buildkite/scripts/check-compatibility.sh b/buildkite/scripts/check-compatibility.sh index 5570ab30050..377cb6d50e4 100755 --- a/buildkite/scripts/check-compatibility.sh +++ b/buildkite/scripts/check-compatibility.sh @@ -98,12 +98,6 @@ function boot_and_sync { echo $(date +'%Y-%m-%d %H:%M:%S') ". Sync status:" $GOT_SYNC_STATUS fi - # "connection refused" until GraphQL server up - GOT_SYNC_STATUS=$(echo ${SYNC_STATUS} | grep "syncStatus") - if [ ! -z $GOT_SYNC_STATUS ]; then - echo "Sync status:" $GOT_SYNC_STATUS - fi - SYNCED=$(echo ${SYNC_STATUS} | grep -c "SYNCED") sleep 5 done From 858450cdb1f054b83496d78ca39e54823541d23e Mon Sep 17 00:00:00 2001 From: dkijania Date: Wed, 18 Oct 2023 20:17:05 +0200 Subject: [PATCH 09/11] fix comma --- buildkite/src/Constants/DebianVersions.dhall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildkite/src/Constants/DebianVersions.dhall b/buildkite/src/Constants/DebianVersions.dhall index f6a3878b950..39895baa5a3 100644 --- a/buildkite/src/Constants/DebianVersions.dhall +++ b/buildkite/src/Constants/DebianVersions.dhall @@ -67,7 +67,7 @@ let minimalDirtyWhen = [ S.exactly "scripts/rebuild-deb" "sh", S.exactly "scripts/release-docker" "sh", S.exactly "buildkite/scripts/build-artifact" "sh", - S.exactly "buildkite/scripts/check-compatibility" "sh" + S.exactly "buildkite/scripts/check-compatibility" "sh", -- Snark profiler dirtyWhen S.exactly "buildkite/src/Jobs/Test/RunSnarkProfiler" "dhall", S.exactly "buildkite/scripts/run-snark-transaction-profiler" "sh", From a2ff9eb31cf3a135c52b563003b29cac15c8af58 Mon Sep 17 00:00:00 2001 From: dkijania Date: Fri, 20 Oct 2023 16:29:45 +0200 Subject: [PATCH 10/11] add indent --- buildkite/scripts/check-compatibility.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/buildkite/scripts/check-compatibility.sh b/buildkite/scripts/check-compatibility.sh index 377cb6d50e4..dcccdd97ba9 100755 --- a/buildkite/scripts/check-compatibility.sh +++ b/buildkite/scripts/check-compatibility.sh @@ -86,20 +86,20 @@ function boot_and_sync { REST_SERVER="http://127.0.0.1:$REST_PORT/graphql" while [ $SYNCED -eq 0 ]; do - SYNC_STATUS=$(docker container exec -it $DAEMON_CONTAINER \ - curl -g -X POST -H "Content-Type: application/json" -d '{"query":"query { syncStatus }"}' ${REST_SERVER}) + SYNC_STATUS=$(docker container exec -it $DAEMON_CONTAINER \ + curl -g -X POST -H "Content-Type: application/json" -d '{"query":"query { syncStatus }"}' ${REST_SERVER}) - # print logs - docker container logs $DAEMON_CONTAINER --tail 10 + # print logs + docker container logs $DAEMON_CONTAINER --tail 10 - # "connection refused" until GraphQL server up - GOT_SYNC_STATUS=$(echo ${SYNC_STATUS} | grep "syncStatus") - if [ ! -z $GOT_SYNC_STATUS ]; then - echo $(date +'%Y-%m-%d %H:%M:%S') ". Sync status:" $GOT_SYNC_STATUS - fi + # "connection refused" until GraphQL server up + GOT_SYNC_STATUS=$(echo ${SYNC_STATUS} | grep "syncStatus") + if [ ! -z $GOT_SYNC_STATUS ]; then + echo $(date +'%Y-%m-%d %H:%M:%S') ". Sync status:" $GOT_SYNC_STATUS + fi - SYNCED=$(echo ${SYNC_STATUS} | grep -c "SYNCED") - sleep 5 + SYNCED=$(echo ${SYNC_STATUS} | grep -c "SYNCED") + sleep 5 done } From 35f90e7642d7cbf8484beb48e069ab45f5433bc3 Mon Sep 17 00:00:00 2001 From: Danny Willems Date: Mon, 23 Oct 2023 11:33:01 +0200 Subject: [PATCH 11/11] Remove return_early_digest_exception param and related exception Fix https://github.com/MinaProtocol/mina/issues/14409 --- src/lib/pickles/compile.ml | 24 +++++------------------- src/lib/pickles/compile.mli | 3 --- src/lib/pickles/pickles.ml | 14 +++++--------- src/lib/pickles/pickles_intf.mli | 3 --- 4 files changed, 10 insertions(+), 34 deletions(-) diff --git a/src/lib/pickles/compile.ml b/src/lib/pickles/compile.ml index b3210ef5974..1fcc8fa85bf 100644 --- a/src/lib/pickles/compile.ml +++ b/src/lib/pickles/compile.ml @@ -15,8 +15,6 @@ open Poly_types open Hlist open Backend -exception Return_digest of Md5.t - let profile_constraints = false let verify_promise = Verify.verify @@ -347,7 +345,6 @@ struct -> ?disk_keys: (Cache.Step.Key.Verification.t, branches) Vector.t * Cache.Wrap.Key.Verification.t - -> ?return_early_digest_exception:bool -> ?override_wrap_domain:Pickles_base.Proofs_verified.t -> ?override_wrap_main: (max_proofs_verified, branches, prev_varss) wrap_main_generic @@ -382,8 +379,7 @@ struct * _ * _ * _ = - fun ~self ~cache ~proof_cache ?disk_keys - ?(return_early_digest_exception = false) ?override_wrap_domain + fun ~self ~cache ~proof_cache ?disk_keys ?override_wrap_domain ?override_wrap_main ?(num_chunks = 1) ~branches:(module Branches) ~max_proofs_verified ~name ~constraint_constants ~public_input ~auxiliary_typ ~choices () -> @@ -555,13 +551,6 @@ struct in let () = if true then log_step main typ name b.index in let open Impls.Step in - (* HACK: TODO docs *) - if return_early_digest_exception then - raise - (Return_digest - ( constraint_system ~input_typ:Typ.unit ~return_typ:typ main - |> R1CS_constraint_system.digest ) ) ; - let k_p = lazy (let cs = @@ -957,7 +946,6 @@ let compile_with_wrap_main_override_promise : -> ?disk_keys: (Cache.Step.Key.Verification.t, branches) Vector.t * Cache.Wrap.Key.Verification.t - -> ?return_early_digest_exception:bool -> ?override_wrap_domain:Pickles_base.Proofs_verified.t -> ?override_wrap_main: (max_proofs_verified, branches, prev_varss) wrap_main_generic @@ -1007,8 +995,7 @@ let compile_with_wrap_main_override_promise : (* This function is an adapter between the user-facing Pickles.compile API and the underlying Make(_).compile function which builds the circuits. *) - fun ?self ?(cache = []) ?proof_cache ?disk_keys - ?(return_early_digest_exception = false) ?override_wrap_domain + fun ?self ?(cache = []) ?proof_cache ?disk_keys ?override_wrap_domain ?override_wrap_main ?num_chunks ~public_input ~auxiliary_typ ~branches ~max_proofs_verified ~name ~constraint_constants ~choices () -> let self = @@ -1076,10 +1063,9 @@ let compile_with_wrap_main_override_promise : r :: conv_irs rs in let provers, wrap_vk, wrap_disk_key, cache_handle = - M.compile ~return_early_digest_exception ~self ~proof_cache ~cache - ?disk_keys ?override_wrap_domain ?override_wrap_main ?num_chunks ~branches - ~max_proofs_verified ~name ~public_input ~auxiliary_typ - ~constraint_constants + M.compile ~self ~proof_cache ~cache ?disk_keys ?override_wrap_domain + ?override_wrap_main ?num_chunks ~branches ~max_proofs_verified ~name + ~public_input ~auxiliary_typ ~constraint_constants ~choices:(fun ~self -> conv_irs (choices ~self)) () in diff --git a/src/lib/pickles/compile.mli b/src/lib/pickles/compile.mli index ea098dd3c00..c110b4f105c 100644 --- a/src/lib/pickles/compile.mli +++ b/src/lib/pickles/compile.mli @@ -5,8 +5,6 @@ open Async_kernel open Pickles_types open Hlist -exception Return_digest of Md5.t - val pad_messages_for_next_wrap_proof : (module Pickles_types.Hlist.Maxes.S with type length = 'max_proofs_verified @@ -278,7 +276,6 @@ val compile_with_wrap_main_override_promise : -> ?disk_keys: (Cache.Step.Key.Verification.t, 'branches) Vector.t * Cache.Wrap.Key.Verification.t - -> ?return_early_digest_exception:bool -> ?override_wrap_domain:Pickles_base.Proofs_verified.t -> ?override_wrap_main: ('max_proofs_verified, 'branches, 'prev_varss) wrap_main_generic diff --git a/src/lib/pickles/pickles.ml b/src/lib/pickles/pickles.ml index eb2f01d2b97..23378f10bc3 100644 --- a/src/lib/pickles/pickles.ml +++ b/src/lib/pickles/pickles.ml @@ -45,8 +45,6 @@ module Make_str (_ : Wire_types.Concrete) = struct module Step_verifier = Step_verifier module Proof_cache = Proof_cache - exception Return_digest = Compile.Return_digest - type chunking_data = Verify.Instance.chunking_data = { num_chunks : int; domain_size : int; zk_rows : int } @@ -311,14 +309,12 @@ module Make_str (_ : Wire_types.Concrete) = struct let compile_with_wrap_main_override_promise = Compile.compile_with_wrap_main_override_promise - let compile_promise ?self ?cache ?proof_cache ?disk_keys - ?return_early_digest_exception ?override_wrap_domain ?num_chunks - ~public_input ~auxiliary_typ ~branches ~max_proofs_verified ~name - ~constraint_constants ~choices () = + let compile_promise ?self ?cache ?proof_cache ?disk_keys ?override_wrap_domain + ?num_chunks ~public_input ~auxiliary_typ ~branches ~max_proofs_verified + ~name ~constraint_constants ~choices () = compile_with_wrap_main_override_promise ?self ?cache ?proof_cache ?disk_keys - ?return_early_digest_exception ?override_wrap_domain ?num_chunks - ~public_input ~auxiliary_typ ~branches ~max_proofs_verified ~name - ~constraint_constants ~choices () + ?override_wrap_domain ?num_chunks ~public_input ~auxiliary_typ ~branches + ~max_proofs_verified ~name ~constraint_constants ~choices () let compile ?self ?cache ?proof_cache ?disk_keys ?override_wrap_domain ?num_chunks ~public_input ~auxiliary_typ ~branches ~max_proofs_verified diff --git a/src/lib/pickles/pickles_intf.mli b/src/lib/pickles/pickles_intf.mli index eaf5f57c7b0..652116ea4ec 100644 --- a/src/lib/pickles/pickles_intf.mli +++ b/src/lib/pickles/pickles_intf.mli @@ -17,8 +17,6 @@ module type S = sig module Common = Common module Proof_cache = Proof_cache - exception Return_digest of Md5.t - module type Statement_intf = sig type field @@ -374,7 +372,6 @@ module type S = sig -> ?disk_keys: (Cache.Step.Key.Verification.t, 'branches) Vector.t * Cache.Wrap.Key.Verification.t - -> ?return_early_digest_exception:bool -> ?override_wrap_domain:Pickles_base.Proofs_verified.t -> ?num_chunks:int -> public_input: