From 0e4dff6594e307b8dd1f7444d9300dba1f95baee Mon Sep 17 00:00:00 2001 From: swrup Date: Tue, 3 Feb 2026 14:11:10 +0100 Subject: [PATCH] + global_fees --- src/http_keys.ml | 5 ++++- src/pg.ml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/http_keys.ml b/src/http_keys.ml index f7382e89..8cc472ec 100644 --- a/src/http_keys.ml +++ b/src/http_keys.ml @@ -191,7 +191,10 @@ let mk_keys ~db_conn (module Sm : Secmod.S) ~last_issue_date = in let recoup = (* todo /recoup *) [] in - let global_fees = (* TODO *) [] in + let* global_fees = + (* todo take start_date = now? *) + Pg.get_global_fees db_conn ~start_date:None |> unwrap_err_caqti + in let auditors = (* TODO *) [] in let extensions = None in let extensions_sig = None in diff --git a/src/pg.ml b/src/pg.ml index 18136cb7..e53ec092 100644 --- a/src/pg.ml +++ b/src/pg.ml @@ -298,7 +298,7 @@ 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 get_global_fees_by_time (start_date, end_date)