+ wip /keys

src/bin_sig.ml

@@ -92,6 +92,10 @@ end) : sig
 
   val jsont : t Jsont.t
   val caqti : t Caqti_type.t
+
+  (* TODO rm *)
+  (* escape hatch, only needed for /keys `exchange_sig` (signature over contatentation of all of the master_sigs) *)
+  val to_octets : t -> string
 end = struct
   open Crypto
 
@@ -102,6 +106,7 @@ end = struct
   let verify_f ~f t r = f t ~msg:(Bin.to_string R.bin r)
   let jsont = EddsaSignature.jsont
   let caqti : EddsaSignature.t Caqti_type.t = EddsaSignature.caqti
+  let to_octets t = EddsaSignature.to_octets t
 end
 
 module DenominationKeyAnnouncement = struct

src/config.ml

@@ -20,9 +20,13 @@ module Exchange = struct
   let port = get "port" |> int
   let bind_to = get "bind_to"
   let master_public_key = get "master_public_key" |> ed25519
+
+  (* TODO Defaults to 0.0 if not specified. *)
   let stefan_abs = get "stefan_abs" |> amount
   let stefan_log = get "stefan_log" |> amount
-  let stefan_lin = get_opt "stefan_lin" |> Option.map float
+
+  let stefan_lin =
+    get_opt "stefan_lin" |> Option.map float |> Option.value ~default:0.0
 
   let aggregator_idle_sleep_interval =
     get "aggregator_idle_sleep_interval" |> duration

src/http_keys.ml

@@ -88,16 +88,97 @@ let mk_keys ~db_conn ~sm ~last_issue_date =
   let kyc_enabled = false in
   let disable_direct_deposit = (* todo *) false in
   let master_public_key = Config.master_public_key in
-  let reserve_closing_delay = Config.Exchangedb.idle_reserve_expiration_time in
+  let reserve_closing_delay =
+    Some Config.Exchangedb.idle_reserve_expiration_time
+  in
   (* todo *)
   let wallet_balance_limit_without_kyc = None in
   let hard_limits = [] in
   let zero_limits = [] in
-  let* denominations =
-    let+ denom_data_l = Pg.get_denominations db_conn |> unwrap_err_caqti in
+  let* denom_data_l = Pg.get_denominations db_conn |> unwrap_err_caqti in
+  (* TODO check order!! *)
+  let denom_data_l =
+    List.sort
+      (fun a b ->
+        let open Denom_data in
+        Stdlib.compare a.stamp_start b.stamp_start)
+      denom_data_l
+  in
+  let list_issue_date =
+    (* TODO is this the last [stamp_start] value? *)
+    (* date when the denomination keys were last updated *)
+    match denom_data_l with
+    | [] -> None
+    | v :: _ -> v.stamp_start
+  in
+  let denominations =
+    (* TODO really need to understand and correctly group denoms
+       'exchange_sig' depends on correct denom group/order *)
     List.map denomgroup_of_denomdata denom_data_l
   in
-  (*
+
+  let* signkeys =
+    let+ signkey_data_l = Pg.get_active_signkeys db_conn |> unwrap_err_caqti in
+    let signkey_data_l =
+      List.sort
+        (fun a b ->
+          let open Signkey_data in
+          Stdlib.compare a.stamp_start b.stamp_start)
+        signkey_data_l
+    in
+    List.map
+      (fun Signkey_data.
+             {
+               pub;
+               stamp_start;
+               stamp_expire;
+               stamp_end;
+               master_sig;
+               revoked_sig= _;
+             } ->
+        let master_sig =
+          match master_sig with
+          | None -> Fmt.failwith "signkey_data without master_sig"
+          | Some v -> v
+        in
+        SignKey.{ key= pub; stamp_start; stamp_expire; stamp_end; master_sig })
+      signkey_data_l
+  in
+
+  let exchange_pub =
+    (* the eddsa pub key used to sign exchange_sig *)
+    match signkeys with
+    | [] -> Fmt.failwith "exchange has no active signkey"
+    | v :: _ -> v.SignKey.key
+  in
+  let exchange_sig =
+    (* Compact EdDSA signature (binary-only) over the
+       contatentation of all of the master_sigs (in reverse
+       chronological order by group) in the arrays under "denominations". *)
+    let l =
+      List.map
+        (fun v ->
+          match v.Denom_data.master_sig with
+          | None -> Fmt.failwith "denom_data without master_sig"
+          | Some v -> v)
+        denom_data_l
+    in
+    let l = List.map (fun v -> Bin_sig.DenominationKeyValidity.to_octets v) l in
+    let data = String.concat "" l in
+    let hc = Bin_type.Hash_64.hash data in
+    let open Bin_sig.ExchangeKeySet in
+    sign_f
+      ~f:(Secmod.sign_with_signkey sm ~pub:exchange_pub)
+      R.{ list_issue_date; hc }
+  in
+
+  let recoup = [] in
+  let global_fees = (* TODO *) [] in
+  let auditors = (* TODO *) [] in
+  let extensions = None in
+  let extensions_sig = None in
+  Ok
+    ExchangeKeysResponse.
       {
         version;
         base_url;
@@ -133,8 +214,6 @@ let mk_keys ~db_conn ~sm ~last_issue_date =
         extensions;
         extensions_sig;
       }
-      *)
-  assert false
 
 let jsont = ExchangeKeysResponse.jsont
 

src/pg.ml

@@ -61,7 +61,7 @@ let get_active_signkeys =
        esk_serial FROM signkey_revocations skr WHERE esk.esk_serial = \
        skr.esk_serial)"
   in
-  fun (module Conn : CONN) () ->
+  fun (module Conn : CONN) ->
     let now = Ptime_clock.now () |> Option.some in
     Conn.collect_list get_active_signkeys now
 

src/secmod.mli

@@ -1,3 +1,4 @@
+(* TODO functorize *)
 open Crypto
 
 type t