From 2a35a9c176bd8e395257d329b1ce15bf04510caa Mon Sep 17 00:00:00 2001 From: swrup Date: Tue, 3 Feb 2026 13:40:17 +0100 Subject: [PATCH] --- src/pg.ml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/pg.ml b/src/pg.ml index c8742c67..779fca8e 100644 --- a/src/pg.ml +++ b/src/pg.ml @@ -71,18 +71,19 @@ let insert_signkey = in fun (module Conn : CONN) v -> Conn.exec insert_signkey v -(* TODO revocation master_sig *) let find_denom = let find_denom = Caqti_type.(denomination_hash ->? denom_data) - "SELECT denom_pub, (coin).*, valid_from, expire_withdraw, \ - expire_deposit, expire_legal, (fee_withdraw).*, (fee_deposit).*, \ - (fee_refresh).*, (fee_refund).*, age_mask, denom_pub_hash, master_sig, \ - NULL FROM denominations WHERE denom_pub_hash=$1" + "SELECT dn.denom_pub, (dn.coin).*, dn.valid_from, dn.expire_withdraw, \ + dn.expire_deposit, dn.expire_legal, (dn.fee_withdraw).*, \ + (dn.fee_deposit).*, (dn.fee_refresh).*, (dn.fee_refund).*, dn.age_mask, \ + dn.denom_pub_hash, dn.master_sig, dnr.master_sig FROM denominations AS \ + dn LEFT JOIN denomination_revocations AS dnr ON dn.denominations_serial \ + = dnr.denominations_serial WHERE dn.denom_pub_hash=$1" in - fun (module Conn : CONN) h_denom_pub -> - Conn.find_opt find_denom h_denom_pub + fun (module Conn : CONN) h_denom_pub -> Conn.find_opt find_denom h_denom_pub +(* TODO revocation master_sig *) let get_denominations = let get_denominations = Caqti_type.(unit ->* denom_data)