handle global_fees; add do_management.sh

src/amount.ml

@@ -117,3 +117,5 @@ let bin_nbo =
   |+ field beint32 (fun t -> t.fraction)
   |+ field (bytes currency_len) (fun t -> pad_currency t.currency)
   |> sealr
+
+let dummy_value = "DUMMY:0.0" |> of_string |> Result.get_ok

src/amount.mli

@@ -25,3 +25,7 @@ val jsont : t Jsont.t
 (* only for encoding *)
 val bin : t Bin.t
 val bin_nbo : t Bin.t
+
+(* TODO
+   dummy value to use as placeholder for WIP *)
+val dummy_value : t

src/http_keys.ml

@@ -190,8 +190,10 @@ let mk_keys ~db_conn (module Sm : Secmod.S) ~last_issue_date =
     sign_f ~f:(Sm.sign_with_signkey ~pub:exchange_pub) R.{ list_issue_date; hc }
   in
 
-  let recoup = [] in
-  let global_fees = (* TODO *) [] in
+  let recoup = (* TODO /recoup *) [] in
+  let* global_fees =
+    Pg.get_global_fees db_conn ~start_date:Timestamp.epoch |> unwrap_err_caqti
+  in
   let auditors = (* TODO *) [] in
   let extensions = None in
   let extensions_sig = None in

src/http_management.ml

@@ -303,7 +303,7 @@ module Auditors = struct
     let auditor_pub = v.AuditorSetupMessage.auditor_pub in
     let validity_start = v.AuditorSetupMessage.validity_start in
     let* last_date_opt =
-      Pg.lookup_auditor_timestamp db_conn auditor_pub |> unwrap_err_caqti
+      Pg.get_auditor_timestamp db_conn auditor_pub |> unwrap_err_caqti
     in
     match last_date_opt with
     | None ->
@@ -341,7 +341,7 @@ module Auditors_disable = struct
   let do_ ~db_conn auditor_pub
       AuditorTeardownMessage.{ master_sig= _; validity_end } =
     let* last_date_opt =
-      Pg.lookup_auditor_timestamp db_conn auditor_pub |> unwrap_err_caqti
+      Pg.get_auditor_timestamp db_conn auditor_pub |> unwrap_err_caqti
     in
     match last_date_opt with
     | None -> Error "auditor not found"
@@ -433,13 +433,10 @@ module Global_fees = struct
           purse_timeout;
           master_sig;
         } =
-    (* TODO what is kyc_timeout, kyc_fee ? *)
-    let dummy_amount =
-      Amount.make ~sign:None ~currency:"EUR" ~value:0_L ~fraction:0_l
-      |> Result.get_ok
-    in
+    (* TODO KYC
+       what is kyc_timeout, kyc_fee ? *)
     let kyc_timeout = None in
-    let kyc_fee = dummy_amount in
+    let kyc_fee = Amount.dummy_value in
     (* * *)
     let open Bin_sig.GlobalFees in
     verify_f ~f:Sm.verify_with_master_key master_sig
@@ -460,17 +457,33 @@ module Global_fees = struct
     let* global_fees =
       let start_date = v.GlobalFees.start_date in
       let end_date = v.GlobalFees.end_date in
-      Pg.lookup_global_fees_by_time db_conn ~start_date ~end_date
+      Pg.get_global_fees_by_time db_conn ~start_date ~end_date
       |> unwrap_err_caqti
     in
     match global_fees with
     | [] ->
-        let+ () = Pg.insert_global_fee db_conn v |> unwrap_err_caqti in
+        let+ () = Pg.insert_global_fees db_conn v |> unwrap_err_caqti in
+        Logs.info (fun m -> m "added global fees");
         ()
-    | _l -> Error "global-fees already setup"
+    | [ vv ] -> (
+        match v.master_sig = vv.master_sig with
+        | false ->
+            Error
+              "a different global-fees was already setup for this time frame"
+        | true ->
+            Logs.info (fun m -> m "an identical global-fees was already setup");
+            Ok ())
+    | _ ->
+        Error
+          "invalid database state, multiple global-fees found in database for \
+           this time frame"
 
   let jsont = GlobalFees.jsont
 
+  (* TODO global_fees
+     ensure it is defined for the current time.
+     there should be only one global_fees for each moment in time
+     and once set for a timeframe, it should not change. *)
   let f req server _env =
     Logs.info (fun m -> m "POST /management/global-fees/");
     let sm = Vif.Server.device Devices.secmod server in
@@ -526,7 +539,7 @@ module Wire = struct
   let do_ ~db_conn v =
     let* last_change_opt =
       let payto_uri = v.WireSetupMessage.payto_uri in
-      Pg.lookup_wire_timestamp db_conn ~payto_uri |> unwrap_err_caqti
+      Pg.get_wire_timestamp db_conn ~payto_uri |> unwrap_err_caqti
     in
     match last_change_opt with
     | Some _ -> Error "wire already setup"
@@ -573,7 +586,7 @@ module Wire_disable = struct
   let do_ ~db_conn
       WireTeardownMessage.{ payto_uri; master_sig_del= _; validity_end } =
     let* last_change_opt =
-      Pg.lookup_wire_timestamp db_conn ~payto_uri |> unwrap_err_caqti
+      Pg.get_wire_timestamp db_conn ~payto_uri |> unwrap_err_caqti
     in
     match last_change_opt with
     | None -> Error "wire not found"

src/pg.ml

@@ -12,6 +12,8 @@
    transaction
 
    should check validity of signatures got from db, for /management at least *)
+(* TODO time
+   fix comparison with timestamp footgun *)
 
 module type CONN = Caqti_miou.CONNECTION
 
@@ -128,13 +130,13 @@ let insert_signkey_revocation =
   fun (module Conn : CONN) exchange_pub master_sig ->
     Conn.exec signkey_revocation_insert (exchange_pub, master_sig)
 
-let lookup_auditor_timestamp =
-  let lookup_auditor_timestamp =
+let get_auditor_timestamp =
+  let get_auditor_timestamp =
     Caqti_type.(eddsa_pub ->? time)
       "SELECT last_change FROM auditors WHERE auditor_pub=$1"
   in
   fun (module Conn : CONN) auditor_pub ->
-    Conn.find_opt lookup_auditor_timestamp auditor_pub
+    Conn.find_opt get_auditor_timestamp auditor_pub
 
 let insert_auditor =
   let insert_auditor =
@@ -265,14 +267,14 @@ let insert_wire_fee =
       (wire_method, fee_start, fee_end, wire_fee, closing_fee, master_sig_wire)
 
 let get_wire_fees_by_time =
-  let lookup_wire_fee_by_time =
+  let get_wire_fee_by_time =
     Caqti_type.(t3 wire_method time time ->* aggregate_transfer_fee)
       "SELECT (wire_fee).*, (closing_fee).*, start_date, end_date, master_sig \
        FROM wire_fee WHERE wire_method=$1 AND end_date > $2 AND start_date < \
        $3"
   in
   fun (module Conn : CONN) ~wire_method ~start_date ~end_date ->
-    Conn.collect_list lookup_wire_fee_by_time (wire_method, start_date, end_date)
+    Conn.collect_list get_wire_fee_by_time (wire_method, start_date, end_date)
 
 let get_wire_fees =
   let get_wire_fees =
@@ -293,33 +295,33 @@ let get_global_fees =
   fun (module Conn : CONN) ~start_date ->
     Conn.collect_list get_global_fees start_date
 
-let lookup_global_fees_by_time =
-  let lookup_global_fees_by_time =
+let get_global_fees_by_time =
+  let get_global_fees_by_time =
     Caqti_type.(t2 time time ->* global_fee)
       "SELECT start_date, end_date, (history_fee).*, (account_fee).*, \
        (purse_fee).*, history_expiration, purse_account_limit, purse_timeout, \
-       master_sig FROM global_fee WHERE end_date > $1 AND start_date < $2"
+       master_sig FROM global_fee WHERE start_date >= $1 AND end_date <= $2"
   in
   fun (module Conn : CONN) ~start_date ~end_date ->
-    Conn.collect_list lookup_global_fees_by_time (start_date, end_date)
+    Conn.collect_list get_global_fees_by_time (start_date, end_date)
 
-let insert_global_fee =
-  let insert_global_fee =
+let insert_global_fees =
+  let insert_global_fees =
     Caqti_type.(global_fee ->. unit)
       "INSERT INTO global_fee (start_date, end_date, history_fee, account_fee, \
        purse_fee, history_expiration, purse_account_limit, purse_timeout, \
        master_sig) VALUES ($1, $2, ($3,$4), ($5,$6), ($7,$8), $9, $10, $11, \
        $12)"
   in
-  fun (module Conn : CONN) v -> Conn.exec insert_global_fee v
+  fun (module Conn : CONN) v -> Conn.exec insert_global_fees v
 
-let lookup_wire_timestamp =
-  let lookup_wire_timestamp =
+let get_wire_timestamp =
+  let get_wire_timestamp =
     Caqti_type.(payto_uri ->? time)
       "SELECT last_change FROM wire_accounts WHERE payto_uri=$1"
   in
   fun (module Conn : CONN) ~payto_uri ->
-    Conn.find_opt lookup_wire_timestamp payto_uri
+    Conn.find_opt get_wire_timestamp payto_uri
 
 let insert_wire =
   let insert_wire =
@@ -388,7 +390,3 @@ let insert_partner =
        $3, $4, ($5,$6), $7, $8) ON CONFLICT DO NOTHING"
   in
   fun (module Conn : CONN) v -> Conn.exec insert_partner v
-
-(* TODO
-get_recoup_denoms
-*)

src/timestamp.ml

@@ -1,6 +1,8 @@
 type t = Ptime.t option
 type span = Ptime.Span.t option
 
+let epoch = Some Ptime.epoch
+
 let diff a b =
   match (a, b) with
   | None, _ | _, None -> None
@@ -23,6 +25,23 @@ let of_span_exn = function
 
 (* -- *)
 
+(* TODO
+   this doesn't handle "never" value, and truncate time *)
+let of_string s =
+  match Float.of_string_opt s with
+  | None -> Error "Timestamp.of_string failure: not a float"
+  | Some v -> (
+      match Ptime.of_float_s v with
+      | None -> Error "Timestamp.of_string failure"
+      | Some v -> Ok (Some v))
+
+let pp fmt t =
+  match t with
+  | None -> Fmt.pf fmt {|"never"|}
+  | Some v ->
+      let v = Ptime.to_float_s v in
+      Fmt.pf fmt {|%f|} v
+
 (* microseconds since the UNIX Epoch, or "never" if None *)
 let jsont =
   let number_or_never_jsont =
@@ -62,7 +81,7 @@ let decode_int64 i = if i = Int64.max_int then None else Some (ptime_of_int64 i)
 let bin = Bin.map Bin.neint64 decode_int64 encode_int64
 let bin_nbo = Bin.map Bin.beint64 decode_int64 encode_int64
 
-let caqti : Ptime.t option Caqti_type.t =
+let caqti : t Caqti_type.t =
   let encode v = Ok (encode_int64 v) in
   let decode v = Ok (decode_int64 v) in
   Caqti_type.custom ~encode ~decode Caqti_type.int64
@@ -80,6 +99,23 @@ let compare a b =
 module Span = struct
   type t = span
 
+  (* TODO
+   this doesn't handle "never" value, and truncate time *)
+  let of_string s =
+    match Float.of_string_opt s with
+    | None -> Error "Timestamp.Span.of_string failure: not a float"
+    | Some v -> (
+        match Ptime.Span.of_float_s v with
+        | None -> Error "Timestamp.Span.of_string failure"
+        | Some v -> Ok (Some v))
+
+  let pp fmt t =
+    match t with
+    | None -> Fmt.pf fmt {|"forever"|}
+    | Some v ->
+        let v = Ptime.Span.to_float_s v in
+        Fmt.pf fmt {|%f|} v
+
   let to_int64 ptime = ptime |> Ptime.Span.to_float_s |> Int64.of_float
 
   let of_int64 i =

src/timestamp.mli

@@ -1,8 +1,8 @@
 (* TODO time
    uhuh!
    need to be int64 for binary/pg round trip
-
-   really need to fix this module *)
+   really need to fix this module
+   don't use option for never/forever *)
 
 type t = Ptime.t option
 type span = Ptime.Span.t option
@@ -10,17 +10,27 @@ type span = Ptime.Span.t option
 module Span : sig
   type t = span
 
+  val of_string : string -> (t, string) result
+  val pp : Stdlib.Format.formatter -> t -> unit
+
+  (* - *)
+
   val jsont : t Jsont.t
   val bin : t Bin.t
   val bin_nbo : t Bin.t
   val caqti : t Caqti_type.t
 end
 
+val epoch : t
 val diff : t -> t -> span
 val add_span_exn : t -> span -> t
 val of_span_exn : span -> t
 val compare : t -> t -> int option
 
+(* used for offline tool argument conversion *)
+val of_string : string -> (t, string) result
+val pp : Stdlib.Format.formatter -> t -> unit
+
 (* - *)
 val jsont : t Jsont.t
 val bin : t Bin.t