This commit is contained in:
parent
c42636b998
commit
696ac151d1
5 changed files with 38 additions and 50 deletions
|
|
@ -31,9 +31,7 @@ module Future_keys = struct
|
|||
Timestamp.diff stamp_start stamp_expire_withdraw
|
||||
in
|
||||
let open Signatures.DenominationKeyAnnouncement in
|
||||
verify_f
|
||||
~f:(EddsaSignature.verify ~key:sm_denom_pub)
|
||||
denom_secmod_sig
|
||||
verify sm_denom_pub denom_secmod_sig
|
||||
{ h_denom_pub; h_section_name; anchor_time; duration_withdraw }
|
||||
in
|
||||
let verify_future_signkey ~sm_signkey_pub
|
||||
|
|
@ -43,9 +41,7 @@ module Future_keys = struct
|
|||
let anchor_time = stamp_start in
|
||||
let duration = Timestamp.diff stamp_start stamp_expire in
|
||||
let open Signatures.SigningKeyAnnouncement in
|
||||
verify_f
|
||||
~f:(EddsaSignature.verify ~key:sm_signkey_pub)
|
||||
signkey_secmod_sig
|
||||
verify sm_signkey_pub signkey_secmod_sig
|
||||
{ exchange_pub; anchor_time; duration }
|
||||
in
|
||||
fun our_master_public_key
|
||||
|
|
@ -99,8 +95,8 @@ module Future_keys = struct
|
|||
let master_sig =
|
||||
let open Signatures.DenominationKeyValidity in
|
||||
let master = EddsaPrivateKey.(pub_of_priv master_key) in
|
||||
sign_f
|
||||
~f:(EddsaSignature.sign ~key:master_key)
|
||||
signf
|
||||
(EddsaSignature.sign ~key:master_key)
|
||||
{
|
||||
master;
|
||||
start= stamp_start;
|
||||
|
|
@ -122,8 +118,8 @@ module Future_keys = struct
|
|||
{ key; stamp_start; stamp_expire; stamp_end; signkey_secmod_sig= _ } =
|
||||
let master_sig =
|
||||
let open Signatures.ExchangeSigningKeyValidity in
|
||||
sign_f
|
||||
~f:(EddsaSignature.sign ~key:master_key)
|
||||
signf
|
||||
(EddsaSignature.sign ~key:master_key)
|
||||
{
|
||||
start= stamp_start;
|
||||
expire= stamp_expire;
|
||||
|
|
@ -218,7 +214,7 @@ let revoke_denom ~output ~master_key ~h_denom =
|
|||
let denom_revoke =
|
||||
let master_sig =
|
||||
let open Signatures.MasterDenominationKeyRevocation in
|
||||
sign_f ~f:(Crypto.EddsaSignature.sign ~key) { h_denom_pub }
|
||||
signf (Crypto.EddsaSignature.sign ~key) { h_denom_pub }
|
||||
in
|
||||
Api.DenomRevocationSignature.{ master_sig }
|
||||
in
|
||||
|
|
@ -231,7 +227,7 @@ let revoke_signkey ~output ~master_key ~signkey =
|
|||
let signkey_revoke =
|
||||
let master_sig =
|
||||
let open Signatures.MasterSigningKeyRevocation in
|
||||
sign_f ~f:(Crypto.EddsaSignature.sign ~key) { exchange_pub= signkey }
|
||||
signf (Crypto.EddsaSignature.sign ~key) { exchange_pub= signkey }
|
||||
in
|
||||
Api.SignkeyRevocationSignature.{ master_sig }
|
||||
in
|
||||
|
|
@ -254,7 +250,7 @@ let global_fees ~output ~master_key ~start_date ~end_date ~history_fee
|
|||
in
|
||||
let master_sig =
|
||||
let open Signatures.GlobalFees in
|
||||
sign_f ~f:(EddsaSignature.sign ~key)
|
||||
signf (EddsaSignature.sign ~key)
|
||||
{
|
||||
start_date;
|
||||
end_date;
|
||||
|
|
@ -290,7 +286,7 @@ let enable_auditor ~output ~master_key ~auditor_url ~auditor_name ~auditor_pub
|
|||
let* key = read_master_key_file master_key in
|
||||
let master_sig =
|
||||
let open Signatures.MasterAddAuditor in
|
||||
sign_f ~f:(EddsaSignature.sign ~key)
|
||||
signf (EddsaSignature.sign ~key)
|
||||
{
|
||||
start_date= validity_start;
|
||||
auditor_pub;
|
||||
|
|
@ -310,7 +306,7 @@ let disable_auditor ~output ~master_key ~auditor_pub ~validity_end =
|
|||
let* key = read_master_key_file master_key in
|
||||
let master_sig =
|
||||
let open Signatures.MasterDelAuditor in
|
||||
sign_f ~f:(EddsaSignature.sign ~key) { end_date= validity_end; auditor_pub }
|
||||
signf (EddsaSignature.sign ~key) { end_date= validity_end; auditor_pub }
|
||||
in
|
||||
let v = Api.AuditorTeardownMessage.{ master_sig; validity_end } in
|
||||
let* s = Api.encode Api.AuditorTeardownMessage.jsont v in
|
||||
|
|
@ -323,7 +319,7 @@ let wire_fee ~output ~master_key ~wire_method ~fee_start ~fee_end ~closing_fee
|
|||
let* key = read_master_key_file master_key in
|
||||
let master_sig_wire =
|
||||
let open Signatures.MasterWireFee in
|
||||
sign_f ~f:(EddsaSignature.sign ~key)
|
||||
signf (EddsaSignature.sign ~key)
|
||||
{
|
||||
h_wire_method= Hash.Cstring.H64.hash wire_method;
|
||||
start_date= fee_start;
|
||||
|
|
@ -353,7 +349,7 @@ let drain ~output ~master_key ~debit_account_section ~credit_payto_uri ~wtid
|
|||
let* key = read_master_key_file master_key in
|
||||
let master_sig =
|
||||
let open Signatures.MasterDrainProfit in
|
||||
sign_f ~f:(EddsaSignature.sign ~key)
|
||||
signf (EddsaSignature.sign ~key)
|
||||
{
|
||||
wtid;
|
||||
date;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue