~
This commit is contained in:
parent
3b24e17c60
commit
ec47e4d661
1 changed files with 56 additions and 64 deletions
120
src/pg.ml
120
src/pg.ml
|
|
@ -36,7 +36,7 @@ let preflight =
|
|||
fun (module Conn : CONN) -> Syntax.list_iter (fun p -> Conn.exec p ()) l
|
||||
|
||||
let find_signkey =
|
||||
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 \
|
||||
|
|
@ -44,29 +44,29 @@ let find_signkey =
|
|||
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
|
||||
Conn.find_opt req exchange_pub
|
||||
|
||||
let get_active_signkeys =
|
||||
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 \
|
||||
signkey_revocations AS skr WHERE esk.esk_serial = skr.esk_serial)"
|
||||
in
|
||||
fun (module Conn : CONN) ~now -> Conn.collect_list get_active_signkeys now
|
||||
fun (module Conn : CONN) ~now -> Conn.collect_list req now
|
||||
|
||||
(* note: does not update revocation *)
|
||||
let insert_signkey =
|
||||
let insert_signkey =
|
||||
let req =
|
||||
Caqti_type.(signkey_data ->. unit)
|
||||
"INSERT INTO exchange_sign_keys (exchange_pub, valid_from, expire_sign, \
|
||||
expire_legal, master_sig) VALUES ($1, $2, $3, $4, $5)"
|
||||
in
|
||||
fun (module Conn : CONN) v -> Conn.exec insert_signkey v
|
||||
fun (module Conn : CONN) v -> Conn.exec req v
|
||||
|
||||
let find_denom =
|
||||
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).*, \
|
||||
|
|
@ -75,10 +75,10 @@ let find_denom =
|
|||
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 req h_denom_pub
|
||||
|
||||
let get_denominations =
|
||||
let get_denominations =
|
||||
let req =
|
||||
Caqti_type.(unit ->* denom_data)
|
||||
"SELECT dn.denom_pub, (dn.coin).*, dn.valid_from, dn.expire_withdraw, \
|
||||
dn.expire_deposit, dn.expire_legal, (dn.fee_withdraw).*, \
|
||||
|
|
@ -87,11 +87,11 @@ let get_denominations =
|
|||
dn LEFT JOIN denomination_revocations AS dnr ON dn.denominations_serial \
|
||||
= dnr.denominations_serial"
|
||||
in
|
||||
fun (module Conn : CONN) -> Conn.collect_list get_denominations ()
|
||||
fun (module Conn : CONN) -> Conn.collect_list req ()
|
||||
|
||||
(* note: does not update revocation *)
|
||||
let insert_denom =
|
||||
let insert_denom =
|
||||
let req =
|
||||
Caqti_type.(denom_data ->. unit)
|
||||
"INSERT INTO denominations (denom_pub, coin, valid_from, \
|
||||
expire_withdraw, expire_deposit, expire_legal, fee_withdraw, \
|
||||
|
|
@ -99,10 +99,10 @@ let insert_denom =
|
|||
master_sig) VALUES ($1, ($2, $3), $4, $5, $6, $7, ($8,$9), ($10,$11), \
|
||||
($12,$13), ($14,$15), $16, $17, $18)"
|
||||
in
|
||||
fun (module Conn : CONN) v -> Conn.exec insert_denom v
|
||||
fun (module Conn : CONN) v -> Conn.exec req v
|
||||
|
||||
let insert_denomination_revocation =
|
||||
let denomination_revocation_insert =
|
||||
let req =
|
||||
let master_sig = Signatures.MasterDenominationKeyRevocation.caqti in
|
||||
Caqti_type.(t2 denom_hash master_sig ->. unit)
|
||||
"INSERT INTO denomination_revocations (denominations_serial, master_sig) \
|
||||
|
|
@ -110,28 +110,27 @@ let insert_denomination_revocation =
|
|||
denom_pub_hash=$1"
|
||||
in
|
||||
fun (module Conn : CONN) h_denom_pub master_sig ->
|
||||
Conn.exec denomination_revocation_insert (h_denom_pub, master_sig)
|
||||
Conn.exec req (h_denom_pub, master_sig)
|
||||
|
||||
let insert_signkey_revocation =
|
||||
let signkey_revocation_insert =
|
||||
let req =
|
||||
let master_sig = Signatures.MasterSigningKeyRevocation.caqti in
|
||||
Caqti_type.(t2 eddsa_pub master_sig ->. unit)
|
||||
"INSERT INTO signkey_revocations (esk_serial, master_sig) SELECT \
|
||||
esk_serial, $2 FROM exchange_sign_keys WHERE exchange_pub=$1"
|
||||
in
|
||||
fun (module Conn : CONN) exchange_pub master_sig ->
|
||||
Conn.exec signkey_revocation_insert (exchange_pub, master_sig)
|
||||
Conn.exec req (exchange_pub, master_sig)
|
||||
|
||||
let get_auditor_timestamp =
|
||||
let get_auditor_timestamp =
|
||||
let req =
|
||||
Caqti_type.(eddsa_pub ->? time)
|
||||
"SELECT last_change FROM auditors WHERE auditor_pub=$1"
|
||||
in
|
||||
fun (module Conn : CONN) auditor_pub ->
|
||||
Conn.find_opt get_auditor_timestamp auditor_pub
|
||||
fun (module Conn : CONN) auditor_pub -> Conn.find_opt req auditor_pub
|
||||
|
||||
let insert_auditor =
|
||||
let insert_auditor =
|
||||
let req =
|
||||
Caqti_type.(t4 eddsa_pub string string time ->. unit)
|
||||
"INSERT INTO auditors (auditor_pub, auditor_name, auditor_url, \
|
||||
is_active, last_change) VALUES ($1, $2, $3, true, $4)"
|
||||
|
|
@ -139,12 +138,10 @@ let insert_auditor =
|
|||
fun (module Conn : CONN)
|
||||
AuditorSetupMessage.
|
||||
{ auditor_url; auditor_name; auditor_pub; master_sig= _; validity_start }
|
||||
->
|
||||
Conn.exec insert_auditor
|
||||
(auditor_pub, auditor_name, auditor_url, validity_start)
|
||||
-> Conn.exec req (auditor_pub, auditor_name, auditor_url, validity_start)
|
||||
|
||||
let update_auditor =
|
||||
let update_auditor =
|
||||
let req =
|
||||
Caqti_type.(t5 eddsa_pub string string bool time ->. unit)
|
||||
"UPDATE auditors SET auditor_url=$2, auditor_name=$3, is_active=$4, \
|
||||
last_change=$5 WHERE auditor_pub=$1"
|
||||
|
|
@ -152,21 +149,19 @@ let update_auditor =
|
|||
fun (module Conn : CONN)
|
||||
AuditorSetupMessage.
|
||||
{ auditor_url; auditor_name; auditor_pub; master_sig= _; validity_start }
|
||||
->
|
||||
Conn.exec update_auditor
|
||||
(auditor_pub, auditor_url, auditor_name, true, validity_start)
|
||||
-> Conn.exec req (auditor_pub, auditor_url, auditor_name, true, validity_start)
|
||||
|
||||
let disable_auditor =
|
||||
let update_auditor =
|
||||
let req =
|
||||
Caqti_type.(t5 eddsa_pub string string bool time ->. unit)
|
||||
"UPDATE auditors SET auditor_url=$2, auditor_name=$3, is_active=$4, \
|
||||
last_change=$5 WHERE auditor_pub=$1"
|
||||
in
|
||||
fun (module Conn : CONN) ~auditor_pub ~change_date ->
|
||||
Conn.exec update_auditor (auditor_pub, "", "", false, change_date)
|
||||
Conn.exec req (auditor_pub, "", "", false, change_date)
|
||||
|
||||
let insert_auditor_denom_sig =
|
||||
let insert_auditor_denom_sig =
|
||||
let req =
|
||||
let auditor_sig = Signatures.ExchangeKeyValidity.caqti in
|
||||
Caqti_type.(t3 eddsa_pub denom_hash auditor_sig ->. unit)
|
||||
"WITH ax AS (SELECT auditor_uuid FROM auditors WHERE auditor_pub=$1) \
|
||||
|
|
@ -176,14 +171,14 @@ let insert_auditor_denom_sig =
|
|||
NOTHING"
|
||||
in
|
||||
fun (module Conn : CONN) ~auditor_pub ~h_denom_pub ~auditor_sig ->
|
||||
Conn.exec insert_auditor_denom_sig (auditor_pub, h_denom_pub, auditor_sig)
|
||||
Conn.exec req (auditor_pub, h_denom_pub, auditor_sig)
|
||||
|
||||
(* todo auditors
|
||||
maybe check that url and name are unique/same for each auditor_pub
|
||||
and do the ht logic out of pg.ml? *)
|
||||
(* this does not return auditors that are not auditing any denom *)
|
||||
let get_auditor_keys =
|
||||
let get_auditor_keys =
|
||||
let req =
|
||||
let auditor_sig = Signatures.ExchangeKeyValidity.caqti in
|
||||
Caqti_type.(unit ->* t5 eddsa_pub string string denom_hash auditor_sig)
|
||||
"SELECT a.auditor_pub, a.auditor_url, a.auditor_name, dn.denom_pub_hash, \
|
||||
|
|
@ -193,7 +188,7 @@ let get_auditor_keys =
|
|||
in
|
||||
fun (module Conn : CONN) ->
|
||||
let open Syntax in
|
||||
let* l = Conn.collect_list get_auditor_keys () |> unwrap_err_caqti in
|
||||
let* l = Conn.collect_list req () |> unwrap_err_caqti in
|
||||
let ht = Hashtbl.create 0xff in
|
||||
List.iter
|
||||
(fun (pub, url, name, denom_pub_h, auditor_sig) ->
|
||||
|
|
@ -219,7 +214,7 @@ let get_auditor_keys =
|
|||
Ok l
|
||||
|
||||
let insert_wire_fee =
|
||||
let insert_wire_fee =
|
||||
let req =
|
||||
let master_sig = Signatures.MasterWireFee.caqti in
|
||||
Caqti_type.(t6 wire_method time time amount amount master_sig ->. unit)
|
||||
"INSERT INTO wire_fee (wire_method, start_date, end_date, wire_fee, \
|
||||
|
|
@ -236,68 +231,65 @@ let insert_wire_fee =
|
|||
wire_fee;
|
||||
}
|
||||
->
|
||||
Conn.exec insert_wire_fee
|
||||
Conn.exec req
|
||||
(wire_method, fee_start, fee_end, wire_fee, closing_fee, master_sig_wire)
|
||||
|
||||
let get_wire_fees_by_time =
|
||||
let get_wire_fee_by_time =
|
||||
let req =
|
||||
Caqti_type.(t3 wire_method time time ->* aggregate_transfer_fee)
|
||||
"SELECT (wire_fee).*, (closing_fee).*, start_date, end_date, master_sig \
|
||||
FROM wire_fee WHERE wire_method=$1 AND end_date > $2 AND start_date < \
|
||||
$3"
|
||||
in
|
||||
fun (module Conn : CONN) ~wire_method ~start_date ~end_date ->
|
||||
Conn.collect_list get_wire_fee_by_time (wire_method, start_date, end_date)
|
||||
Conn.collect_list req (wire_method, start_date, end_date)
|
||||
|
||||
let get_wire_fees =
|
||||
let get_wire_fees =
|
||||
let req =
|
||||
Caqti_type.(string ->* aggregate_transfer_fee)
|
||||
"SELECT (wire_fee).*, (closing_fee).*, start_date, end_date, master_sig \
|
||||
FROM wire_fee WHERE wire_method=$1"
|
||||
in
|
||||
fun (module Conn : CONN) ~wire_method ->
|
||||
Conn.collect_list get_wire_fees wire_method
|
||||
fun (module Conn : CONN) ~wire_method -> Conn.collect_list req wire_method
|
||||
|
||||
let get_global_fees =
|
||||
let get_global_fees =
|
||||
let req =
|
||||
Caqti_type.(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 start_date >= $1"
|
||||
in
|
||||
fun (module Conn : CONN) ~start_date ->
|
||||
Conn.collect_list get_global_fees start_date
|
||||
fun (module Conn : CONN) ~start_date -> Conn.collect_list req start_date
|
||||
|
||||
let get_global_fees_by_time =
|
||||
let get_global_fees_by_time =
|
||||
let req =
|
||||
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 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)
|
||||
Conn.collect_list req (start_date, end_date)
|
||||
|
||||
let insert_global_fees =
|
||||
let insert_global_fees =
|
||||
let req =
|
||||
Caqti_type.(global_fee ->. unit)
|
||||
"INSERT INTO global_fee (start_date, end_date, history_fee, account_fee, \
|
||||
purse_fee, history_expiration, purse_account_limit, purse_timeout, \
|
||||
master_sig) VALUES ($1, $2, ($3,$4), ($5,$6), ($7,$8), $9, $10, $11, \
|
||||
$12)"
|
||||
in
|
||||
fun (module Conn : CONN) v -> Conn.exec insert_global_fees v
|
||||
fun (module Conn : CONN) v -> Conn.exec req v
|
||||
|
||||
let get_wire_timestamp =
|
||||
let get_wire_timestamp =
|
||||
let req =
|
||||
Caqti_type.(payto_uri ->? time)
|
||||
"SELECT last_change FROM wire_accounts WHERE payto_uri=$1"
|
||||
in
|
||||
fun (module Conn : CONN) ~payto_uri ->
|
||||
Conn.find_opt get_wire_timestamp payto_uri
|
||||
fun (module Conn : CONN) ~payto_uri -> Conn.find_opt req payto_uri
|
||||
|
||||
let insert_wire =
|
||||
let insert_wire =
|
||||
let req =
|
||||
Caqti_type.(t3 exchange_wire_account bool time ->. unit)
|
||||
"INSERT INTO wire_accounts (payto_uri, conversion_url, \
|
||||
credit_restrictions, debit_restrictions, master_sig, bank_label, \
|
||||
|
|
@ -306,10 +298,10 @@ let insert_wire =
|
|||
in
|
||||
fun (module Conn : CONN) ~last_change v ->
|
||||
let is_active = true in
|
||||
Conn.exec insert_wire (v, is_active, last_change)
|
||||
Conn.exec req (v, is_active, last_change)
|
||||
|
||||
let update_wire =
|
||||
let update_wire =
|
||||
let req =
|
||||
Caqti_type.(t3 exchange_wire_account bool time ->. unit)
|
||||
"UPDATE wire_accounts SET conversion_url=$2, \
|
||||
debit_restrictions=$3::TEXT::JSONB, \
|
||||
|
|
@ -317,48 +309,48 @@ let update_wire =
|
|||
priority=$7, is_active=$8, last_change=$9 WHERE payto_uri=$1"
|
||||
in
|
||||
fun (module Conn : CONN) ~is_active ~last_change v ->
|
||||
Conn.exec update_wire (v, is_active, last_change)
|
||||
Conn.exec req (v, is_active, last_change)
|
||||
|
||||
let disable_wire =
|
||||
let disable_wire =
|
||||
let req =
|
||||
Caqti_type.(t2 payto_uri time ->. unit)
|
||||
"UPDATE wire_accounts SET conversion_url=NULL, debit_restrictions=NULL, \
|
||||
credit_restrictions=NULL, master_sig=NULL, bank_label=NULL, \
|
||||
priority=NULL, is_active=FALSE, last_change=$2 WHERE payto_uri=$1"
|
||||
in
|
||||
fun (module Conn : CONN) ~payto_uri ~validity_end ->
|
||||
Conn.exec disable_wire (payto_uri, validity_end)
|
||||
Conn.exec req (payto_uri, validity_end)
|
||||
|
||||
let get_wire_accounts =
|
||||
let get_wire_accounts =
|
||||
let req =
|
||||
Caqti_type.(unit ->* exchange_wire_account)
|
||||
"SELECT payto_uri, conversion_url, debit_restrictions::TEXT, \
|
||||
credit_restrictions::TEXT, master_sig, bank_label, priority FROM \
|
||||
wire_accounts WHERE is_active"
|
||||
in
|
||||
fun (module Conn : CONN) -> Conn.collect_list get_wire_accounts ()
|
||||
fun (module Conn : CONN) -> Conn.collect_list req ()
|
||||
|
||||
let insert_drain_profit =
|
||||
let insert_drain_profit =
|
||||
let req =
|
||||
Caqti_type.(drain_profit_message ->. unit)
|
||||
"INSERT INTO profit_drains (wtid, account_section, payto_uri, \
|
||||
trigger_date, amount, master_sig) VALUES ($1, $2, $3, $4, ($5,$6), $7)"
|
||||
in
|
||||
fun (module Conn : CONN) v -> Conn.exec insert_drain_profit v
|
||||
fun (module Conn : CONN) v -> Conn.exec req v
|
||||
|
||||
let insert_aml_officer =
|
||||
let exchange_do_insert_aml_officer =
|
||||
let req =
|
||||
Caqti_type.(aml_officer_setup ->! time)
|
||||
"SELECT out_last_change FROM exchange_do_insert_aml_officer ($1, $2, $3, \
|
||||
$4, $5, $6)"
|
||||
in
|
||||
fun (module Conn : CONN) v -> Conn.find exchange_do_insert_aml_officer v
|
||||
fun (module Conn : CONN) v -> Conn.find req v
|
||||
|
||||
let insert_partner =
|
||||
let insert_partner =
|
||||
let req =
|
||||
Caqti_type.(exchange_partner_setup ->. unit)
|
||||
"INSERT INTO partners (partner_master_pub, start_date, end_date, \
|
||||
wad_frequency, wad_fee, master_sig, partner_base_url) VALUES ($1, $2, \
|
||||
$3, $4, ($5,$6), $7, $8) ON CONFLICT DO NOTHING"
|
||||
in
|
||||
fun (module Conn : CONN) v -> Conn.exec insert_partner v
|
||||
fun (module Conn : CONN) v -> Conn.exec req v
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue