better secmod

src/http_management.ml

@@ -2,7 +2,7 @@ open Syntax
 open Api
 
 module Keys_get = struct
-  let mk_future_denom ~sm_key_priv
+  let mk_future_denom ~sm
       ({
          pub;
          priv= _;
@@ -32,7 +32,8 @@ module Keys_get = struct
       let duration_withdraw =
         Timestamp.diff stamp_start stamp_expire_withdraw
       in
-      sign ~key:sm_key_priv
+      sign_f
+        ~f:(Secmod.sign_with_sm_key sm)
         { h_denom_pub; h_section_name; anchor_time; duration_withdraw }
     in
     FutureDenom.
@@ -51,7 +52,7 @@ module Keys_get = struct
         denom_secmod_sig;
       }
 
-  let mk_future_signkey ~sm_signkey_priv
+  let mk_future_signkey ~sm
       ({ pub; priv= _; stamp_start; stamp_expire; stamp_end; master_sig= _ } :
         Signkey_data.t) =
     let signkey_secmod_sig =
@@ -59,7 +60,9 @@ module Keys_get = struct
       let exchange_pub = pub in
       let anchor_time = stamp_start in
       let duration = Timestamp.diff stamp_start stamp_expire in
-      sign ~key:sm_signkey_priv { exchange_pub; anchor_time; duration }
+      sign_f
+        ~f:(Secmod.sign_with_sm_key sm)
+        { exchange_pub; anchor_time; duration }
     in
     FutureSignKey.
       { key= pub; stamp_start; stamp_expire; stamp_end; signkey_secmod_sig }
@@ -68,16 +71,12 @@ module Keys_get = struct
     let future_signkeys =
       Secmod.get_signkeys sm
       |> List.filter (fun k -> Option.is_none k.Signkey_data.master_sig)
-      |> List.map (fun signkey ->
-          let sm_signkey_priv = Secmod.get_sm_key_priv sm in
-          mk_future_signkey ~sm_signkey_priv signkey)
+      |> List.map (fun signkey -> mk_future_signkey ~sm signkey)
     in
     let future_denoms =
       Secmod.get_denoms sm
       |> List.filter (fun k -> Option.is_none k.Denom_data.master_sig)
-      |> List.map (fun denom ->
-          let sm_key_priv = Secmod.get_sm_key_priv sm in
-          mk_future_denom ~sm_key_priv denom)
+      |> List.map (fun denom -> mk_future_denom ~sm denom)
     in
     let master_pub = Config.Exchange.master_public_key in
     let denom_secmod_public_key = Secmod.get_sm_key_pub sm in
@@ -108,9 +107,7 @@ module Keys_post = struct
   let verify_denom_signature ~sm DenomSignature.{ h_denom_pub; master_sig } =
     let denom_hash = HashCode.to_denomination_hash h_denom_pub in
     let* denom =
-      Secmod.get_denoms sm
-      |> List.find_opt (fun (denom : Denom_data.t) -> denom.h_pub = denom_hash)
-      |> function
+      match Secmod.find_denom_data sm denom_hash with
       | None ->
           Fmt.error
             "404 not found, One of the keys for which a signature was provided \
@@ -132,13 +129,11 @@ module Keys_post = struct
         denom_hash;
       }
     in
-    verify ~key:Config.master_public_key master_sig r
+    verify_f ~f:Secmod.verify_with_master_key master_sig r
 
   let verify_signkey_signature ~sm SignKeySignature.{ key; master_sig } =
     let* signkey =
-      Secmod.get_signkeys sm
-      |> List.find_opt (fun (signkey : Signkey_data.t) -> signkey.pub = key)
-      |> function
+      match Secmod.find_signkey_data sm key with
       | None ->
           Fmt.error
             "404 not found, One of the keys for which a signature was provided \
@@ -154,7 +149,7 @@ module Keys_post = struct
         signkey_pub= signkey.pub;
       }
     in
-    verify ~key:Config.master_public_key master_sig r
+    verify_f ~f:Secmod.verify_with_master_key master_sig r
 
   let verify ~sm MasterSignatures.{ denom_sigs; signkey_sigs } =
     let* () = list_iter (verify_denom_signature ~sm) denom_sigs in
@@ -226,7 +221,7 @@ end
 module Denom_revoke = struct
   let verify h_denom_pub DenomRevocationSignature.{ master_sig } =
     let open Bin_sig.MasterDenominationKeyRevocation in
-    verify ~key:Config.Exchange.master_public_key master_sig { h_denom_pub }
+    verify_f ~f:Secmod.verify_with_master_key master_sig { h_denom_pub }
 
   let do_ ~db_conn ~sm h_denom_pub DenomRevocationSignature.{ master_sig } =
     let* () = Secmod.revoke_denomination sm h_denom_pub master_sig in
@@ -256,7 +251,7 @@ end
 module Signkey_revoke = struct
   let verify exchange_pub SignkeyRevocationSignature.{ master_sig } =
     let open Bin_sig.MasterSigningKeyRevocation in
-    verify ~key:Config.Exchange.master_public_key master_sig { exchange_pub }
+    verify_f ~f:Secmod.verify_with_master_key master_sig { exchange_pub }
 
   let do_ ~db_conn ~sm exchange_pub SignkeyRevocationSignature.{ master_sig } =
     let* () = Secmod.revoke_signkey sm exchange_pub master_sig in
@@ -293,7 +288,7 @@ module Auditors = struct
           validity_start;
         } =
     let open Bin_sig.MasterAddAuditor in
-    verify ~key:Config.Exchange.master_public_key master_sig
+    verify_f ~f:Secmod.verify_with_master_key master_sig
       {
         start_date= validity_start;
         auditor_pub;
@@ -337,7 +332,7 @@ end
 module Auditors_disable = struct
   let verify auditor_pub AuditorTeardownMessage.{ master_sig; validity_end } =
     let open Bin_sig.MasterDelAuditor in
-    verify ~key:Config.Exchange.master_public_key master_sig
+    verify_f ~f:Secmod.verify_with_master_key master_sig
       { end_date= validity_end; auditor_pub }
 
   let do_ ~db_conn auditor_pub
@@ -384,7 +379,7 @@ module Wire_fee = struct
           wire_fee;
         } =
     let open Bin_sig.MasterWireFee in
-    verify ~key:Config.Exchange.master_public_key master_sig_wire
+    verify_f ~f:Secmod.verify_with_master_key master_sig_wire
       {
         h_wire_method= Bin_type.Hash_64_cstr.hash wire_method;
         start_date= fee_start;
@@ -455,7 +450,7 @@ module Global_fees = struct
     let kyc_fee = dummy_amount in
     (* * *)
     let open Bin_sig.GlobalFees in
-    verify ~key:Config.Exchange.master_public_key master_sig
+    verify_f ~f:Secmod.verify_with_master_key master_sig
       {
         start_date;
         end_date;
@@ -514,7 +509,7 @@ module Wire = struct
     let open Bin_type in
     let* () =
       let open Bin_sig.MasterWireDetails in
-      verify ~key:Config.Exchange.master_public_key master_sig_wire
+      verify_f ~f:Secmod.verify_with_master_key master_sig_wire
         {
           h_wire_details= FullPaytoHash.hash payto_uri;
           h_conversion_url= Hash_64_cstr.hash conversion_url;
@@ -524,7 +519,7 @@ module Wire = struct
     in
     let* () =
       let open Bin_sig.MasterAddWire in
-      verify ~key:Config.Exchange.master_public_key master_sig_add
+      verify_f ~f:Secmod.verify_with_master_key master_sig_add
         {
           start_date= validity_start;
           h_wire= FullPaytoHash.hash payto_uri;
@@ -577,7 +572,7 @@ end
 module Wire_disable = struct
   let verify WireTeardownMessage.{ payto_uri; master_sig_del; validity_end } =
     let open Bin_sig.MasterDelWire in
-    verify ~key:Config.Exchange.master_public_key master_sig_del
+    verify_f ~f:Secmod.verify_with_master_key master_sig_del
       { end_date= validity_end; h_wire= Bin_type.FullPaytoHash.hash payto_uri }
 
   let do_ ~db_conn
@@ -620,7 +615,7 @@ module Drain = struct
         } =
     let open Bin_sig.MasterDrainProfit in
     let open Bin_type in
-    verify ~key:Config.Exchange.master_public_key master_sig
+    verify_f ~f:Secmod.verify_with_master_key master_sig
       {
         wtid;
         date;
@@ -660,7 +655,7 @@ module AmlOfficer = struct
         } =
     let open Bin_sig.MasterAmlOfficerStatus in
     let is_active = match is_active with true -> 1_l | false -> 0_l in
-    verify ~key:Config.Exchange.master_public_key master_sig
+    verify_f ~f:Secmod.verify_with_master_key master_sig
       {
         change_date;
         officer_pub;
@@ -699,7 +694,7 @@ module Partners = struct
           wad_fee;
         } =
     let open Bin_sig.PartnerConfiguration in
-    verify ~key:Config.Exchange.master_public_key master_sig
+    verify_f ~f:Secmod.verify_with_master_key master_sig
       {
         partner_pub;
         start_date;