From 4fc9a96fdec5f8f6255af6be30c27f13698a39b7 Mon Sep 17 00:00:00 2001 From: swrup Date: Sun, 7 Dec 2025 05:37:19 +0100 Subject: [PATCH] rename --- src/api.ml | 2 +- src/{api_sig.ml => bin_sig.ml} | 0 src/denomination.ml | 2 +- src/management.ml | 8 ++++---- src/pg.ml | 4 ++-- src/secmod_denom.mli | 2 +- src/secmod_signkey.mli | 2 +- src/signkey.ml | 2 +- tools/offline_sig.ml | 8 ++++---- 9 files changed, 15 insertions(+), 15 deletions(-) rename src/{api_sig.ml => bin_sig.ml} (100%) diff --git a/src/api.ml b/src/api.ml index 0e77a541..3b50101b 100644 --- a/src/api.ml +++ b/src/api.ml @@ -22,7 +22,7 @@ - number is "float", but we probably want int everywhere instead - numeric values capped at 2^53 -1 inclusive because json *) open Crypto -open Api_sig +open Bin_sig open Jsont.Object let encode_exn jsont v = Jsont_bytesrw.encode_string jsont v |> Result.get_ok diff --git a/src/api_sig.ml b/src/bin_sig.ml similarity index 100% rename from src/api_sig.ml rename to src/bin_sig.ml diff --git a/src/denomination.ml b/src/denomination.ml index 5a7c6202..076dcd3f 100644 --- a/src/denomination.ml +++ b/src/denomination.ml @@ -15,7 +15,7 @@ type t = { fee_refund: Amount.t; age_mask: int; h_pub: Bin_type.DenominationHash.t; - master_sig: Api_sig.DenominationKeyValidityPS.t option; + master_sig: Bin_sig.DenominationKeyValidityPS.t option; } let make diff --git a/src/management.ml b/src/management.ml index f4436548..c23c1e3f 100644 --- a/src/management.ml +++ b/src/management.ml @@ -23,7 +23,7 @@ let mk_future_denom ~sm_denom_priv DenominationKey.of_rsa RsaDenominationKey.{ age_mask; rsa_pub= pub } in let denom_secmod_sig = - let open Api_sig.DenominationKeyAnnouncementPS in + let open Bin_sig.DenominationKeyAnnouncementPS in let h_denom_pub = h_pub in let h_section_name = Bin_type.Hash_64_cstr.hash section_name in let anchor_time = stamp_start in @@ -53,7 +53,7 @@ let mk_future_signkey ~sm_signkey_priv ({ pub; priv= _; stamp_start; stamp_expire; stamp_end; master_sig= _ } : Signkey.t) = let signkey_secmod_sig = - let open Api_sig.SigningKeyAnnouncementPS in + let open Bin_sig.SigningKeyAnnouncementPS in let exchange_pub = pub in let anchor_time = stamp_start in let duration = @@ -112,7 +112,7 @@ let verify_denom_signature ~sm_denom DenomSignature.{ h_denom_pub; master_sig } is unknown to the exchange." | Some denom -> Ok denom in - let open Api_sig.DenominationKeyValidityPS in + let open Bin_sig.DenominationKeyValidityPS in let r : r = { master= Config.master_public_key; @@ -141,7 +141,7 @@ let verify_signkey_signature ~sm_signkey SignKeySignature.{ key; master_sig } = is unknown to the exchange." | Some signkey -> Ok signkey in - let open Api_sig.ExchangeSigningKeyValidityPS in + let open Bin_sig.ExchangeSigningKeyValidityPS in let r : r = { start= signkey.stamp_start; diff --git a/src/pg.ml b/src/pg.ml index 1295ad25..a7ba125a 100644 --- a/src/pg.ml +++ b/src/pg.ml @@ -99,7 +99,7 @@ let lookup_signing_key = let activate_signing_key = let insert_signkey = - let master_sig = Api_sig.ExchangeSigningKeyValidityPS.caqti in + let master_sig = Bin_sig.ExchangeSigningKeyValidityPS.caqti in Caqti_type.(t5 eddsa_public time time time master_sig ->. unit) "INSERT INTO exchange_sign_keys (exchange_pub, valid_from, expire_sign, \ expire_legal, master_sig) VALUES ($1, $2, $3, $4, $5)" @@ -136,7 +136,7 @@ let lookup_denomination_key = let add_denomination_key = let denomination_insert = - let master_sig = Api_sig.DenominationKeyValidityPS.caqti in + let master_sig = Bin_sig.DenominationKeyValidityPS.caqti in Caqti_type.( t12 denomination_hash rsa_public master_sig time time time time amount amount amount amount (t2 amount age_mask) diff --git a/src/secmod_denom.mli b/src/secmod_denom.mli index 0c373086..c0b4ca47 100644 --- a/src/secmod_denom.mli +++ b/src/secmod_denom.mli @@ -6,7 +6,7 @@ val get_denoms : t -> Denomination.t list val add_master_signatures : (module Pg.CONN) -> t -> - (Bin_type.DenominationHash.t * Api_sig.DenominationKeyValidityPS.t) list -> + (Bin_type.DenominationHash.t * Bin_sig.DenominationKeyValidityPS.t) list -> (unit, string) result val init : (module Pg.CONN) -> t diff --git a/src/secmod_signkey.mli b/src/secmod_signkey.mli index 40c19702..63791310 100644 --- a/src/secmod_signkey.mli +++ b/src/secmod_signkey.mli @@ -6,7 +6,7 @@ val get_signkeys : t -> Signkey.t list val add_master_signatures : (module Pg.CONN) -> t -> - (Crypto.EddsaPublicKey.t * Api_sig.ExchangeSigningKeyValidityPS.t) list -> + (Crypto.EddsaPublicKey.t * Bin_sig.ExchangeSigningKeyValidityPS.t) list -> (unit, string) result val init : (module Pg.CONN) -> t diff --git a/src/signkey.ml b/src/signkey.ml index fbb29d72..03d9b947 100644 --- a/src/signkey.ml +++ b/src/signkey.ml @@ -8,7 +8,7 @@ type t = { stamp_start: Timestamp.t; stamp_expire: Timestamp.t; stamp_end: Timestamp.t; - master_sig: Api_sig.ExchangeSigningKeyValidityPS.t option; + master_sig: Bin_sig.ExchangeSigningKeyValidityPS.t option; } let make () = diff --git a/tools/offline_sig.ml b/tools/offline_sig.ml index e39c7411..88eb4e47 100644 --- a/tools/offline_sig.ml +++ b/tools/offline_sig.ml @@ -21,7 +21,7 @@ let denom_signature ~master_key let octets = DenominationKey.to_octets denom_pub in let h_denom_pub = HashCode.hash octets in let master_sig = - let open Api_sig.DenominationKeyValidityPS in + let open Bin_sig.DenominationKeyValidityPS in let master = EddsaPrivateKey.(pub_of_priv master_key) in let denom_hash = DenominationHash.hash octets in sign ~key:master_key @@ -44,7 +44,7 @@ let signkey_signature ~master_key FutureSignKey. { key; stamp_start; stamp_expire; stamp_end; signkey_secmod_sig= _ } = let master_sig = - let open Api_sig.ExchangeSigningKeyValidityPS in + let open Bin_sig.ExchangeSigningKeyValidityPS in sign ~key:master_key { start= stamp_start; @@ -78,7 +78,7 @@ let verify_future_signkey ~sm_signkey_pub let duration = Timestamp.diff stamp_start stamp_expire |> Timestamp.of_span_exn in - let open Api_sig.SigningKeyAnnouncementPS in + let open Bin_sig.SigningKeyAnnouncementPS in verify ~key:sm_signkey_pub signkey_secmod_sig { exchange_pub; anchor_time; duration } @@ -106,7 +106,7 @@ let verify_future_denom ~sm_denom_pub let duration_withdraw = Timestamp.diff stamp_start stamp_expire_withdraw |> Timestamp.of_span_exn in - let open Api_sig.DenominationKeyAnnouncementPS in + let open Bin_sig.DenominationKeyAnnouncementPS in verify ~key:sm_denom_pub denom_secmod_sig { h_denom_pub; h_section_name; anchor_time; duration_withdraw }