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

denom query quickfix: set revoke sig to none

Browse source
This commit is contained in:
swrup 2026-01-24 01:20:38 +01:00
parent 8a05d74172
commit 4738d70566
2 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/http_keys.ml
View file

@ -95,7 +95,11 @@ let mk_keys ~db_conn (module Sm : Secmod.S) ~last_issue_date =
let wallet_balance_limit_without_kyc = None in let wallet_balance_limit_without_kyc = None in
let hard_limits = [] in let hard_limits = [] in
let zero_limits = [] in let zero_limits = [] in
let* denom_data_l = Pg.get_denominations db_conn |> unwrap_err_caqti in let denom_data_l =
(* TODO sm-db *)
(*Pg.get_denominations db_conn |> unwrap_err_caqti *)
Sm.get_denoms_data ()
in
(* TODO check order!! *) (* TODO check order!! *)
let denom_data_l = let denom_data_l =
List.sort List.sort
@ -118,7 +122,7 @@ let mk_keys ~db_conn (module Sm : Secmod.S) ~last_issue_date =
in in
let signkeys = let signkeys =
(* TODO (* TODO sm-db
use database signkey data / verify secmod and database are in sync *) use database signkey data / verify secmod and database are in sync *)
(*let+ signkey_data_l = Pg.get_active_signkeys db_conn |> unwrap_err_caqti in*) (*let+ signkey_data_l = Pg.get_active_signkeys db_conn |> unwrap_err_caqti in*)
let signkey_data_l = Sm.get_signkeys_data () in let signkey_data_l = Sm.get_signkeys_data () in

13
src/pg.ml
View file

@ -73,15 +73,14 @@ let insert_signkey =
in in
fun (module Conn : CONN) v -> Conn.exec insert_signkey v fun (module Conn : CONN) v -> Conn.exec insert_signkey v
(* TODO revokation master_sig *)
let find_denom = let find_denom =
let find_denom = let find_denom =
Caqti_type.(denomination_hash ->? denom_data) Caqti_type.(denomination_hash ->? denom_data)
"SELECT denom_pub, (coin).*, valid_from, expire_withdraw, \ "SELECT denom_pub, (coin).*, valid_from, expire_withdraw, \
expire_deposit, expire_legal, (fee_withdraw).*, (fee_deposit).*, \ expire_deposit, expire_legal, (fee_withdraw).*, (fee_deposit).*, \
(fee_refresh).*, (fee_refund).*, age_mask, denom_pub_hash, \ (fee_refresh).*, (fee_refund).*, age_mask, denom_pub_hash, master_sig, \
denominations.master_sig, denomination_revocations.master_sig FROM \ NULL FROM denominations WHERE denom_pub_hash=$1"
denominations WHERE denom_pub_hash=$1 LEFT JOIN \
denomination_revocations USING (denominations_serial)"
in 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
@ -90,10 +89,8 @@ let get_denominations =
Caqti_type.(unit ->* denom_data) Caqti_type.(unit ->* denom_data)
"SELECT denom_pub, (coin).*, valid_from, expire_withdraw, \ "SELECT denom_pub, (coin).*, valid_from, expire_withdraw, \
expire_deposit, expire_legal, (fee_withdraw).*, (fee_deposit).*, \ expire_deposit, expire_legal, (fee_withdraw).*, (fee_deposit).*, \
(fee_refresh).*, (fee_refund).*, age_mask, denom_pub_hash, \ (fee_refresh).*, (fee_refund).*, age_mask, denom_pub_hash, master_sig, \
denominations.master_sig, denomination_revocations.master_sig FROM \ NULL FROM denominations"
denominations LEFT JOIN denomination_revocations USING \
(denominations_serial)"
in in
fun (module Conn : CONN) -> Conn.collect_list get_denominations () fun (module Conn : CONN) -> Conn.collect_list get_denominations ()