Skip to content

Commit 7315523

Browse files
authored
Merge pull request #17424 from MinaProtocol/lyh/push-sig-kind-delgation-verify
Remove deprecated sig kind out of delegation verifier
2 parents 29b9cff + 38e6c88 commit 7315523

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

src/app/delegation_verify/delegation_verify.ml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,12 @@ let timestamp =
4545
anon ("timestamp" %: string)
4646

4747
let instantiate_verify_functions ~logger ~genesis_constants
48-
~constraint_constants ~proof_level ~cli_proof_level = function
48+
~constraint_constants ~proof_level ~cli_proof_level ~signature_kind =
49+
function
4950
| None ->
5051
Deferred.return
51-
(Verifier.verify_functions ~constraint_constants ~proof_level ())
52+
(Verifier.verify_functions ~constraint_constants ~proof_level
53+
~signature_kind () )
5254
| Some config_file ->
5355
let%bind.Deferred precomputed_values =
5456
let%bind.Deferred.Or_error config_json =
@@ -73,7 +75,8 @@ let instantiate_verify_functions ~logger ~genesis_constants
7375
let constraint_constants =
7476
Precomputed_values.constraint_constants precomputed_values
7577
in
76-
Verifier.verify_functions ~constraint_constants ~proof_level:Full ()
78+
Verifier.verify_functions ~constraint_constants ~proof_level:Full
79+
~signature_kind ()
7780

7881
module Make_verifier (Source : Submission.Data_source) = struct
7982
let verify_transaction_snarks = Source.verify_transaction_snarks
@@ -158,9 +161,11 @@ let filesystem_command =
158161
Genesis_constants.Compiled.constraint_constants
159162
in
160163
let proof_level = Genesis_constants.Compiled.proof_level in
164+
let signature_kind = Mina_signature_kind.t_DEPRECATED in
161165
let%bind.Deferred verify_blockchain_snarks, verify_transaction_snarks =
162166
instantiate_verify_functions ~logger config_file ~genesis_constants
163167
~constraint_constants ~proof_level ~cli_proof_level:None
168+
~signature_kind
164169
in
165170
let submission_paths = get_filenames inputs in
166171
let module V = Make_verifier (struct
@@ -197,9 +202,12 @@ let cassandra_command =
197202
Genesis_constants.Compiled.constraint_constants
198203
in
199204
let proof_level = Genesis_constants.Compiled.proof_level in
205+
206+
let signature_kind = Mina_signature_kind.t_DEPRECATED in
200207
let%bind.Deferred verify_blockchain_snarks, verify_transaction_snarks =
201208
instantiate_verify_functions ~logger config_file ~genesis_constants
202209
~constraint_constants ~proof_level ~cli_proof_level:None
210+
~signature_kind
203211
in
204212
let module V = Make_verifier (struct
205213
include Submission.Cassandra
@@ -235,9 +243,11 @@ let stdin_command =
235243
Genesis_constants.Compiled.constraint_constants
236244
in
237245
let proof_level = Genesis_constants.Compiled.proof_level in
246+
let signature_kind = Mina_signature_kind.t_DEPRECATED in
238247
let%bind.Deferred verify_blockchain_snarks, verify_transaction_snarks =
239248
instantiate_verify_functions ~logger config_file ~genesis_constants
240249
~constraint_constants ~proof_level ~cli_proof_level:None
250+
~signature_kind
241251
in
242252
let module V = Make_verifier (struct
243253
include Submission.Stdin

src/app/delegation_verify/verifier.ml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
let verify_functions ~constraint_constants ~proof_level () =
1+
let verify_functions ~constraint_constants ~proof_level ~signature_kind () =
22
let module T = Transaction_snark.Make (struct
3-
let signature_kind = Mina_signature_kind.t_DEPRECATED
3+
let signature_kind = signature_kind
44

55
let constraint_constants = constraint_constants
66

0 commit comments

Comments
 (0)