From 9e78e57791fa24d01e839d54517dce868a932b38 Mon Sep 17 00:00:00 2001 From: swrup Date: Tue, 16 Dec 2025 17:21:50 +0100 Subject: [PATCH] JJ: Description from the destination commit: wip denom caqti; section_name issue JJ: Description from source commit: . --- src/denom_data.ml | 1 - src/http_management.ml | 35 ++++---- src/pg.ml | 176 ++++++++++++++++++++++++----------------- src/secmod.ml | 68 +++++++--------- src/secmod.mli | 1 + 5 files changed, 145 insertions(+), 136 deletions(-) diff --git a/src/denom_data.ml b/src/denom_data.ml index cde45055..e83a80a3 100644 --- a/src/denom_data.ml +++ b/src/denom_data.ml @@ -2,7 +2,6 @@ open Crypto type t = { pub: rsa_pub; - section_name: string; value: Amount.t; stamp_start: Timestamp.t; stamp_expire_withdraw: Timestamp.t; diff --git a/src/http_management.ml b/src/http_management.ml index 65842da2..27f99433 100644 --- a/src/http_management.ml +++ b/src/http_management.ml @@ -2,10 +2,9 @@ open Syntax open Api module Keys_get = struct - let mk_future_denom ~sm + let mk_future_denom ~sm ~section_name ({ pub; - section_name; value; stamp_start; stamp_expire_withdraw; @@ -75,7 +74,13 @@ module Keys_get = struct let future_denoms = Secmod.get_denoms_data sm |> List.filter (fun k -> Option.is_none k.Denom_data.master_sig) - |> List.map (fun denom -> mk_future_denom ~sm denom) + |> List.map (fun dn_data -> + let opt = + Secmod.find_denom_section_name sm dn_data.Denom_data.h_pub + in + match opt with + | None -> Fmt.failwith "section_name not found." + | Some section_name -> mk_future_denom ~sm ~section_name dn_data) in let master_pub = Config.Exchange.master_public_key in let denom_secmod_public_key = Secmod.get_sm_key_pub sm in @@ -161,28 +166,16 @@ module Keys_post = struct |> list_iter (fun denom -> let error = Error "update_master_signatures sanity check failure" in let* opt = - Pg.lookup_denomination_key db_conn denom.Denom_data.h_pub - |> unwrap_err_caqti - in - let* ( valid_from, - _expire_withdraw, - _expire_deposit, - _expire_legal, - coin, - _fee_withdraw, - _fee_deposit, - _fee_refresh, - fee_refund, - age_mask ) = - match opt with None -> error | Some v -> Ok v + Pg.find_denom db_conn denom.Denom_data.h_pub |> unwrap_err_caqti in + let* v = match opt with None -> error | Some v -> Ok v in let check = function false -> error | true -> Ok () in let* () = - check (Timestamp.compare valid_from denom.stamp_start = Some 0) + check (Timestamp.compare v.stamp_start denom.stamp_start = Some 0) in - let* () = check (coin = denom.value) in - let* () = check (fee_refund = denom.fee_refund) in - let* () = check (age_mask = denom.age_mask) in + let* () = check (v.value = denom.value) in + let* () = check (v.fee_refund = denom.fee_refund) in + let* () = check (v.age_mask = denom.age_mask) in Ok ()) let do_ ~db_conn ~sm MasterSignatures.{ denom_sigs; signkey_sigs } = diff --git a/src/pg.ml b/src/pg.ml index 4954e0d3..e105f946 100644 --- a/src/pg.ml +++ b/src/pg.ml @@ -42,6 +42,22 @@ module Caqti_type = struct let wire_method = Caqti_type.string let payto_uri = Caqti_type.string + include struct + (* alias for hash *) + + let fullpayto_hash = FullPaytoHash.caqti + let nomalizaedpayto_hash = NormalizedPaytoHash.caqti + let denomination_hash = DenominationHash.caqti + let privatecontract_hash = PrivateContractHash.caqti + let extensionspolicy_hash = ExtensionsPolicyHash.caqti + let merchantwire_hash = MerchantWireHash.caqti + let agecommitment_hash = AgeCommitmentHash.caqti + let blindedcoin_hash = BlindedCoinHash.caqti + let coinpub_hash = CoinPubHash.caqti + let outputcommitment_hash = OutputCommitmentHash.caqti + let planchets_hash = HashPlanchetsP.caqti + end + let signkey_data = let master_sig = Bin_sig.ExchangeSigningKeyValidity.caqti in custom @@ -63,6 +79,76 @@ module Caqti_type = struct }) (t5 eddsa_pub time time time master_sig) + let denom_data = + let master_sig = Bin_sig.DenominationKeyValidity.caqti in + custom + ~encode:(fun + Denom_data. + { + pub; + value; + stamp_start; + stamp_expire_withdraw; + stamp_expire_deposit; + stamp_expire_legal; + fee_withdraw; + fee_deposit; + fee_refresh; + fee_refund; + age_mask; + h_pub; + master_sig; + } + -> + match master_sig with + | None -> Error "denom_data master_sig is none" + | Some master_sig -> + Ok + ( pub, + value, + stamp_start, + stamp_expire_withdraw, + stamp_expire_deposit, + stamp_expire_legal, + fee_withdraw, + fee_deposit, + fee_refresh, + fee_refund, + age_mask, + (h_pub, master_sig) )) + ~decode:(fun + ( pub, + value, + stamp_start, + stamp_expire_withdraw, + stamp_expire_deposit, + stamp_expire_legal, + fee_withdraw, + fee_deposit, + fee_refresh, + fee_refund, + age_mask, + (h_pub, master_sig) ) + -> + Ok + { + pub; + value; + stamp_start; + stamp_expire_withdraw; + stamp_expire_deposit; + stamp_expire_legal; + fee_withdraw; + fee_deposit; + fee_refresh; + fee_refund; + age_mask; + h_pub; + master_sig= Some master_sig; + }) + (t12 rsa_pub amount time time time time amount amount amount amount int + (t2 denomination_hash master_sig)) + let account_restrictions = custom ~encode:(fun l -> Api.encode (Jsont.list AccountRestriction.jsont) l) @@ -122,22 +208,6 @@ module Caqti_type = struct Caqti_type.( t9 time time amount amount amount time_span int32 time_span master_sig) - include struct - (* alias for hash *) - - let fullpayto_hash = FullPaytoHash.caqti - let nomalizaedpayto_hash = NormalizedPaytoHash.caqti - let denomination_hash = DenominationHash.caqti - let privatecontract_hash = PrivateContractHash.caqti - let extensionspolicy_hash = ExtensionsPolicyHash.caqti - let merchantwire_hash = MerchantWireHash.caqti - let agecommitment_hash = AgeCommitmentHash.caqti - let blindedcoin_hash = BlindedCoinHash.caqti - let coinpub_hash = CoinPubHash.caqti - let outputcommitment_hash = OutputCommitmentHash.caqti - let planchets_hash = HashPlanchetsP.caqti - end - include Caqti_request.Infix end @@ -173,66 +243,26 @@ let insert_signkey = in fun (module Conn : CONN) v -> Conn.exec insert_signkey v -(* TODO return type *) -let lookup_denomination_key = - let lookup_denomination_key = - Caqti_type.( - denomination_hash - ->? t10 time time time time amount amount amount amount amount age_mask) - "SELECT valid_from, expire_withdraw, expire_deposit, expire_legal, \ - (coin).*, (fee_withdraw).*, (fee_deposit).*, (fee_refresh).*, \ - (fee_refund).*, age_mask FROM denominations WHERE denom_pub_hash=$1" +let find_denom = + let find_denom = + Caqti_type.(denomination_hash ->? denom_data) + "SELECT denom_pub, (coin).*, valid_from, expire_withdraw, \ + expire_deposit, expire_legal, (fee_withdraw).*, (fee_deposit).*, \ + (fee_refresh).*, (fee_refund).*, age_mask, denom_pub_hash, master_sig \ + FROM denominations WHERE denom_pub_hash=$1" in - fun (module Conn : CONN) (h_denom_pub : DenominationHash.t) -> - Conn.find_opt lookup_denomination_key h_denom_pub + fun (module Conn : CONN) h_denom_pub -> Conn.find_opt find_denom h_denom_pub -let add_denomination_key = - let denomination_insert = - let master_sig = Bin_sig.DenominationKeyValidity.caqti in - Caqti_type.( - t12 denomination_hash rsa_pub master_sig time time time time amount amount - amount amount (t2 amount age_mask) - ->. unit) - "INSERT INTO denominations (denom_pub_hash, denom_pub, master_sig, \ - valid_from, expire_withdraw, expire_deposit, expire_legal, coin, \ - fee_withdraw, fee_deposit, fee_refresh, fee_refund, age_mask) VALUES \ - ($1, $2, $3, $4, $5, $6, $7, ($8,$9), ($10,$11),($12,$13), ($14,$15), \ - ($16,$17), $18)" +let insert_denom = + let insert_denom = + Caqti_type.(denom_data ->. unit) + "INSERT INTO denominations (denom_pub, (coin).*, valid_from, \ + expire_withdraw, expire_deposit, expire_legal, (fee_withdraw).*, \ + (fee_deposit).*, (fee_refresh).*, (fee_refund).*, age_mask, \ + denom_pub_hash, master_sig) VALUES ($1, ($2, $3), $4, $5, $6, $7, \ + ($8,$9), ($10,$11), ($12,$13), ($14,$15), $18, $19, $18)" in - fun (module Conn : CONN) - ~master_sig - Denom_data. - { - pub; - section_name= _; - value; - stamp_start; - stamp_expire_withdraw; - stamp_expire_deposit; - stamp_expire_legal; - fee_withdraw; - fee_deposit; - fee_refresh; - fee_refund; - age_mask; - h_pub; - master_sig= master_sig_opt; - } - -> - assert (master_sig_opt = Some master_sig); - Conn.exec denomination_insert - ( h_pub, - pub, - master_sig, - stamp_start, - stamp_expire_withdraw, - stamp_expire_deposit, - stamp_expire_legal, - value, - fee_withdraw, - fee_deposit, - fee_refresh, - (fee_refund, age_mask) ) + fun (module Conn : CONN) v -> Conn.exec insert_denom v let insert_denomination_revocation = let denomination_revocation_insert = diff --git a/src/secmod.ml b/src/secmod.ml index e3f959ac..9ca3727c 100644 --- a/src/secmod.ml +++ b/src/secmod.ml @@ -27,6 +27,7 @@ type t = { sk_revoked_ht: (eddsa_pub, signkey * Bin_sig.MasterSigningKeyRevocation.t) Hashtbl.t; dn_ht: (denomination_hash, denom) Hashtbl.t; + dn_section_name_ht: (denomination_hash, string) Hashtbl.t; dn_revoked_ht: ( denomination_hash, denom * Bin_sig.MasterDenominationKeyRevocation.t ) @@ -83,6 +84,10 @@ let find_signkey_data t pub = let find_denom_data t h_denom = find_denom t h_denom |> Option.map (fun v -> v.dn_data) +let find_denom_section_name t h_denom = + Miou.Mutex.protect t.lock @@ fun () -> + Hashtbl.find_opt t.dn_section_name_ht h_denom + let add_signkey_master_signatures conn t l = Miou.Mutex.protect t.lock @@ fun () -> list_iter @@ -106,9 +111,7 @@ let add_denom_master_signatures conn t l = | Some denom -> let dn_data = { denom.dn_data with master_sig= Some master_sig } in let denom = { denom with dn_data } in - let* () = - Pg.add_denomination_key conn ~master_sig dn_data |> unwrap_err_caqti - in + let* () = Pg.insert_denom conn dn_data |> unwrap_err_caqti in Hashtbl.replace t.dn_ht h_denom_pub denom; Ok ()) l @@ -147,45 +150,14 @@ let db_lookup_signkey_data conn fname priv = let db_lookup_denom_data conn ~section_name priv = let pub = RsaPrivateKey.pub_of_priv priv in let h_pub = Bin_type.DenominationHash.hash (RsaPublicKey.to_octets pub) in - let* opt = Pg.lookup_denomination_key conn h_pub in + let* opt = Pg.find_denom conn h_pub in match opt with | None -> Fmt.error_msg "load_denom error no associated metadata found in database for \ denomination `%s`." section_name - | Some - ( stamp_start, - stamp_expire_withdraw, - stamp_expire_deposit, - stamp_expire_legal, - value, - fee_withdraw, - fee_deposit, - fee_refresh, - fee_refund, - age_mask ) -> - let master_sig = None in - let v = - Denom_data. - { - pub; - section_name; - value; - stamp_start; - stamp_expire_withdraw; - stamp_expire_deposit; - stamp_expire_legal; - fee_withdraw; - fee_deposit; - fee_refresh; - fee_refund; - age_mask; - h_pub; - master_sig; - } - in - Ok v + | Some dn_data -> Ok dn_data let load_signkey conn fname = let* opt = Data_file.read_eddsa fname in @@ -224,6 +196,7 @@ let load conn = let* l = list_map (fun fname -> load_signkey conn fname) l in match opt_list l with Error () -> error_invalid_state | Ok opt -> Ok opt in + let dn_section_name_ht = Hashtbl.create 0xff in let* denoms = let* l = let open Config.Coin in @@ -237,6 +210,7 @@ let load conn = | Some priv -> (* todo: could check that coin config match db values *) let* dn_data = db_lookup_denom_data conn ~section_name priv in + Hashtbl.replace dn_section_name_ht dn_data.h_pub section_name; let denom = { priv; dn_data } in Ok (Some denom)) all_coins @@ -273,6 +247,7 @@ let load conn = sk_ht; sk_revoked_ht; dn_ht; + dn_section_name_ht; dn_revoked_ht; }) | _, _, _ -> error_invalid_state @@ -294,7 +269,7 @@ let make_new_signkey () = let make_new_denom Config.Coin. { - section_name; + section_name= _; value; duration_withdraw; duration_spend; @@ -325,7 +300,6 @@ let make_new_denom Denom_data. { pub; - section_name; value; stamp_start; stamp_expire_withdraw; @@ -351,16 +325,28 @@ let make_new () = |> List.to_seq |> Hashtbl.of_seq in + let dn_section_name_ht = Hashtbl.create 0xff in let dn_ht = Config.Coin.all_coins - |> List.map make_new_denom - |> List.map (fun v -> (v.dn_data.h_pub, v)) + |> List.map (fun coin -> + let denom = make_new_denom coin in + Hashtbl.replace dn_section_name_ht denom.dn_data.h_pub coin.section_name; + (denom.dn_data.h_pub, denom)) |> List.to_seq |> Hashtbl.of_seq in let sk_revoked_ht = Hashtbl.create 0xff in let dn_revoked_ht = Hashtbl.create 0xff in - { lock; sm_key_priv; sm_key_pub; sk_ht; sk_revoked_ht; dn_ht; dn_revoked_ht } + { + lock; + sm_key_priv; + sm_key_pub; + sk_ht; + sk_revoked_ht; + dn_ht; + dn_section_name_ht; + dn_revoked_ht; + } let init conn = match load conn with diff --git a/src/secmod.mli b/src/secmod.mli index 176a1313..f7f6a3d0 100644 --- a/src/secmod.mli +++ b/src/secmod.mli @@ -15,6 +15,7 @@ val get_signkeys_data : t -> Signkey_data.t list val get_denoms_data : t -> Denom_data.t list val find_signkey_data : t -> eddsa_pub -> Signkey_data.t option val find_denom_data : t -> denomination_hash -> Denom_data.t option +val find_denom_section_name : t -> denomination_hash -> string option (* - management operations - *) val init : (module Pg.CONN) -> t