wip fix mess

src/secmod_denom.ml

@@ -1,3 +1,6 @@
+(* TODO
+   have something better to represent initialization state
+   (missing master_sig for fresh denom) *)
 open Syntax
 
 type h_denom_pub = Bin_type.DenominationHash.t
@@ -53,6 +56,52 @@ let _store_secmod_data t =
       (fname, key.Denomination.priv))
   |> list_iter (fun (fname, key) -> Data_file.write_rsa fname key)
 
+let db_lookup_denom_data conn ~section_name priv =
+  let pub = Crypto.RsaPrivateKey.pub_of_priv priv in
+  let h_pub =
+    Bin_type.DenominationHash.hash (Crypto.RsaPublicKey.to_octets pub)
+  in
+  let* opt = Pg.lookup_denomination_key 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 =
+        Denomination.
+          {
+            pub;
+            priv;
+            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
+
 let load conn =
   let error_invalid_state =
     Fmt.error_msg "secmod_denom load error: invalid store state."
@@ -61,12 +110,17 @@ let load conn =
   let* denoms =
     let* l =
       let open Config.Coin in
-      Syntax.list_map
+      list_map
         (fun coin ->
           let section_name = coin.section_name in
           let fname = Fpath.(dir / section_name) in
-          (* todo: could check that coin config match db values *)
-          Data_file.load_denom conn ~section_name fname)
+          let* opt = Data_file.read_rsa fname in
+          match opt with
+          | None -> Ok None
+          | Some priv ->
+              (* todo: could check that coin config match db values *)
+              let* denom_data = db_lookup_denom_data conn ~section_name priv in
+              Ok (Some denom_data))
         all_coins
     in
     match Syntax.opt_list l with