swrup/mte
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

simplify: rm revoke from sk/dn data type

Browse source
This commit is contained in:
swrup 2026-02-23 06:55:13 +01:00
parent d7ccd69350
commit af355249fc
7 changed files with 21 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/pg.ml
View file

@ -38,10 +38,8 @@ let preflight =
let find_signkey =
let req =
Caqti_type.(eddsa_pub ->? signkey_data)
"SELECT esk.exchange_pub, esk.valid_from, esk.expire_sign, \
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"
"SELECT exchange_pub, valid_from, expire_sign, expire_legal, master_sig \
FROM exchange_sign_keys WHERE exchange_pub=$1"
in
fun (module Conn : CONN) (exchange_pub : EddsaPublicKey.t) ->
Conn.find_opt req exchange_pub
@ -50,13 +48,12 @@ let get_active_signkeys =
let req =
Caqti_type.(time ->* signkey_data)
"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 \
esk.expire_legal, esk.master_sig 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) ~now -> Conn.collect_list req now
(* note: does not update revocation *)
let insert_signkey =
let req =
Caqti_type.(signkey_data ->. unit)
@ -68,12 +65,10 @@ let insert_signkey =
let find_denom =
let req =
Caqti_type.(denom_hash ->? denom_data)
"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"
"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 \
FROM denominations WHERE denom_pub_hash=$1"
in
fun (module Conn : CONN) h_denom_pub -> Conn.find_opt req h_denom_pub
@ -83,9 +78,9 @@ let get_denominations =
"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"
dn.denom_pub_hash, dn.master_sig FROM denominations AS dn WHERE NOT \
EXISTS (SELECT dn.denominations_serial FROM denomination_revocations AS \
dnr WHERE dn.denominations_serial = dnr.denominations_serial)"
in
fun (module Conn : CONN) () -> Conn.collect_list req ()