+ secmod; + .master_sig

This commit is contained in:
swrup 2025-10-19 01:10:52 +02:00
parent bc6ea09a59
commit 7c230bdb8e
6 changed files with 65 additions and 39 deletions

View file

@ -1,8 +1,10 @@
(*open Types*)
open Api_types
open Devices
let mk_future_denom denom_key_signf
({
pub;
section_name;
value;
stamp_start;
@ -13,8 +15,9 @@ let mk_future_denom denom_key_signf
fee_deposit;
fee_refresh;
fee_refund;
pub;
h_pub;
sign= _;
master_sig= _;
} :
Denomination.t) =
let denom_pub =
@ -22,7 +25,7 @@ let mk_future_denom denom_key_signf
in
let denom_secmod_sig =
let open Binary_formats in
let h_denom_pub = DenominationHash.hash pub in
let h_denom_pub = h_pub in
let h_section_name = Cstring_hash_64.hash section_name in
let anchor_time =
TimeAbsoluteNBO.{ v= Util.ptime_to_int64_us stamp_start }
@ -58,7 +61,8 @@ let mk_future_denom denom_key_signf
}
let mk_future_signkey signkey_signf
({ pub; sign= _; stamp_start; stamp_expire; stamp_end } : Signkey.t) =
({ pub; stamp_start; stamp_expire; stamp_end; sign= _; master_sig= _ } :
Signkey.t) =
let signkey_secmod_sig =
let open Binary_formats in
let exchange_pub = pub in
@ -85,18 +89,21 @@ let mk_future_signkey signkey_signf
signkey_secmod_sig;
}
let mk_future_keys_response ~signkey ~online_key ~denom_key ~denominations =
let mk_future_keys_response (secmod_signkey : Secmod_signkey.t)
(secmod_denom : Secmod_denom.t) =
let future_denoms =
(* todo: "only those lacking a master signature" *)
List.map (mk_future_denom denom_key.Signkey.sign) denominations
secmod_denom.keys
|> List.filter (fun k -> Option.is_none k.Denomination.master_sig)
|> List.map (mk_future_denom secmod_denom.secmod_key.Signkey.sign)
in
let future_signkeys =
(* todo: "only those lacking a master signature" *)
List.map (mk_future_signkey signkey.Signkey.sign) [ online_key ]
secmod_signkey.keys
|> List.filter (fun k -> Option.is_none k.Signkey.master_sig)
|> List.map (mk_future_signkey secmod_signkey.secmod_key.sign)
in
let master_pub = Config.Exchange.master_public_key in
let denom_secmod_public_key = denom_key.pub in
let signkey_secmod_public_key = signkey.pub in
let denom_secmod_public_key = secmod_denom.secmod_key.pub in
let signkey_secmod_public_key = secmod_signkey.secmod_key.pub in
FutureKeysResponse.
{
future_denoms;
@ -109,13 +116,9 @@ let mk_future_keys_response ~signkey ~online_key ~denom_key ~denominations =
let keys req server _env =
let open Vif.Response in
let open Syntax in
let signkey = Vif.Server.device Devices.signkey server in
let online_key = Vif.Server.device Devices.online_key server in
let denom_key = Vif.Server.device Devices.denom_key server in
let denominations = Vif.Server.device Devices.denominations server in
let v =
mk_future_keys_response ~signkey ~online_key ~denom_key ~denominations
in
let secmod_signkey = Vif.Server.device Devices.secmod_signkey server in
let secmod_denom = Vif.Server.device Devices.secmod_denom server in
let v = mk_future_keys_response secmod_signkey secmod_denom in
let s = Json.encode_exn Json.FutureKeysResponse.jsont v in
let* () = with_string req s in
let* () = add ~field:"content-type" "application/json" in