denom caqti, move section_name out of denom_data

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