This commit is contained in:
swrup 2026-02-03 13:34:25 +01:00
parent d0be4593c7
commit 98bf2ecfb0

View file

@ -43,9 +43,9 @@ let find_signkey =
let find_signkey =
Caqti_type.(eddsa_pub ->? signkey_data)
"SELECT esk.exchange_pub, esk.valid_from, esk.expire_sign, \
esk.expire_legal, esk.master_sig, sr.master_sig FROM exchange_sign_keys \
AS esk LEFT JOIN signkey_revocations AS sr ON esk.esk_serial = \
sr.esk_serial WHERE esk.exchange_pub=$1"
esk.expire_legal, esk.master_sig, skr.master_sig FROM \
exchange_sign_keys AS esk LEFT JOIN signkey_revocations AS skr ON \
esk.esk_serial = skr.esk_serial WHERE esk.exchange_pub=$1"
in
fun (module Conn : CONN) (exchange_pub : EddsaPublicKey.t) ->
Conn.find_opt find_signkey exchange_pub
@ -53,10 +53,10 @@ let find_signkey =
let get_active_signkeys =
let get_active_signkeys =
Caqti_type.(time ->* signkey_data)
"SELECT exchange_pub, valid_from, expire_sign, expire_legal, master_sig, \
NULL FROM exchange_sign_keys esk WHERE expire_sign > $1 AND NOT EXISTS \
(SELECT esk_serial FROM signkey_revocations skr WHERE esk.esk_serial = \
skr.esk_serial)"
"SELECT esk.exchange_pub, esk.valid_from, esk.expire_sign, \
esk.expire_legal, esk.master_sig, NULL FROM exchange_sign_keys esk \
WHERE expire_sign > $1 AND NOT EXISTS (SELECT esk_serial FROM \
signkey_revocations AS skr WHERE esk.esk_serial = skr.esk_serial)"
in
fun (module Conn : CONN) ->
let now = Ptime_clock.now () |> Option.some in
@ -80,7 +80,8 @@ let find_denom =
(fee_refresh).*, (fee_refund).*, age_mask, denom_pub_hash, master_sig, \
NULL FROM denominations WHERE 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
let get_denominations =
let get_denominations =