This commit is contained in:
swrup 2026-01-24 00:57:18 +01:00
parent 40cb778726
commit c11fde85cc
2 changed files with 64 additions and 51 deletions

View file

@ -41,7 +41,7 @@ let denomgroup_of_denomdata
RsaDenomGroup.
{ denoms; value; fee_withdraw; fee_deposit; fee_refresh; fee_refund }
let mk_keys ~db_conn ~sm ~last_issue_date =
let mk_keys ~db_conn (module Sm : Secmod.S) ~last_issue_date =
let version = "0" in
let base_url = Config.base_url in
let currency = Config.currency in
@ -121,7 +121,7 @@ let mk_keys ~db_conn ~sm ~last_issue_date =
(* TODO
use database signkey data / verify secmod and database are in sync *)
(*let+ signkey_data_l = Pg.get_active_signkeys db_conn |> unwrap_err_caqti in*)
let signkey_data_l = Secmod.get_signkeys_data sm in
let signkey_data_l = Sm.get_signkeys_data () in
let signkey_data_l =
List.sort
(fun a b ->
@ -166,9 +166,7 @@ let mk_keys ~db_conn ~sm ~last_issue_date =
|> Bin_type.Hash_64.hash
in
let open Bin_sig.ExchangeKeySet in
sign_f
~f:(Secmod.sign_with_signkey sm ~pub:exchange_pub)
R.{ list_issue_date; hc }
sign_f ~f:(Sm.sign_with_signkey ~pub:exchange_pub) R.{ list_issue_date; hc }
in
let recoup = [] in
@ -223,7 +221,7 @@ let f req server _env =
let sm = Vif.Server.device Devices.secmod server in
let res =
let last_issue_date = Ptime_clock.now () |> Option.some in
let* v = mk_keys ~db_conn ~sm ~last_issue_date in
let* v = mk_keys ~db_conn sm ~last_issue_date in
let s = Api.encode_exn jsont v in
Ok s
in