update offline tool; fix dune-workspace
This commit is contained in:
parent
df02bf0f48
commit
9c9414e96b
11 changed files with 78 additions and 126 deletions
|
|
@ -1,7 +1,11 @@
|
|||
open Syntax
|
||||
open Crypto
|
||||
open Time
|
||||
open Hash
|
||||
|
||||
let now_s () =
|
||||
let ns = Mtime_clock.now_ns () in
|
||||
Int64.unsigned_div ns 1_000_000_000L
|
||||
|
||||
module Future_keys = struct
|
||||
open Api
|
||||
|
||||
|
|
@ -34,7 +38,7 @@ module Future_keys = struct
|
|||
match denom_pub with DenominationKey.Rsa denom -> denom.rsa_pub
|
||||
in
|
||||
let h_denom_pub = DenominationHash.hash_of_rsa rsa_pub in
|
||||
let h_section_name = Hash.Cstring.H64.hash section_name in
|
||||
let h_section_name = H64_cstring.hash section_name in
|
||||
let anchor_time = stamp_start in
|
||||
let duration_withdraw =
|
||||
Timestamp.diff stamp_start stamp_expire_withdraw
|
||||
|
|
@ -103,9 +107,9 @@ module Future_keys = struct
|
|||
let h_denom_pub = DenominationHash.hash_of_rsa rsa_pub in
|
||||
let master_sig =
|
||||
let open Signatures.DenominationKeyValidity in
|
||||
let master = EddsaPrivateKey.(pub_of_priv master_key) in
|
||||
let master = Eddsa.pub_of_priv master_key in
|
||||
signf
|
||||
(EddsaSignature.sign ~key:master_key)
|
||||
(Eddsa.sign ~key:master_key)
|
||||
{
|
||||
master;
|
||||
start= stamp_start;
|
||||
|
|
@ -128,7 +132,7 @@ module Future_keys = struct
|
|||
let master_sig =
|
||||
let open Signatures.ExchangeSigningKeyValidity in
|
||||
signf
|
||||
(EddsaSignature.sign ~key:master_key)
|
||||
(Eddsa.sign ~key:master_key)
|
||||
{
|
||||
start= stamp_start;
|
||||
expire= stamp_expire;
|
||||
|
|
@ -152,7 +156,7 @@ let write_file fname content =
|
|||
|
||||
let read_master_key_file filename =
|
||||
let* master_key = read_file filename in
|
||||
EddsaPrivateKey.of_octets master_key
|
||||
Eddsa.priv_of_octets master_key
|
||||
|
||||
let download ~output ~url =
|
||||
let open Bos in
|
||||
|
|
@ -199,7 +203,7 @@ let setup ~output ~output_pubkey =
|
|||
let sign ~master_key ~input ~output =
|
||||
let* master_key = read_master_key_file master_key in
|
||||
let* input = read_file input in
|
||||
let master_pub = EddsaPrivateKey.pub_of_priv master_key in
|
||||
let master_pub = Eddsa.pub_of_priv master_key in
|
||||
let* future_keys_response = Api.decode Api.FutureKeysResponse.jsont input in
|
||||
let* () = Future_keys.verify master_pub future_keys_response in
|
||||
let master_signatures = Future_keys.make ~master_key future_keys_response in
|
||||
|
|
@ -213,7 +217,7 @@ let revoke_denom ~output ~master_key ~h_denom =
|
|||
let denom_revoke =
|
||||
let master_sig =
|
||||
let open Signatures.MasterDenominationKeyRevocation in
|
||||
signf (EddsaSignature.sign ~key) { h_denom_pub }
|
||||
signf (Eddsa.sign ~key) { h_denom_pub }
|
||||
in
|
||||
Api.DenomRevocationSignature.{ master_sig }
|
||||
in
|
||||
|
|
@ -226,7 +230,7 @@ let revoke_signkey ~output ~master_key ~signkey =
|
|||
let signkey_revoke =
|
||||
let master_sig =
|
||||
let open Signatures.MasterSigningKeyRevocation in
|
||||
signf (EddsaSignature.sign ~key) { exchange_pub= signkey }
|
||||
signf (Eddsa.sign ~key) { exchange_pub= signkey }
|
||||
in
|
||||
Api.SignkeyRevocationSignature.{ master_sig }
|
||||
in
|
||||
|
|
@ -248,7 +252,7 @@ let global_fees ~output ~master_key ~start_date ~end_date ~history_fee
|
|||
in
|
||||
let master_sig =
|
||||
let open Signatures.GlobalFees in
|
||||
signf (EddsaSignature.sign ~key)
|
||||
signf (Eddsa.sign ~key)
|
||||
{
|
||||
start_date;
|
||||
end_date;
|
||||
|
|
@ -280,15 +284,14 @@ let global_fees ~output ~master_key ~start_date ~end_date ~history_fee
|
|||
|
||||
let enable_auditor ~output ~master_key ~auditor_url ~auditor_name ~auditor_pub =
|
||||
let* key = read_master_key_file master_key in
|
||||
let ns = Mtime_clock.now_ns () in
|
||||
let validity_start = Timestamp.of_s @@ Int64.unsigned_div ns 1_000_000_000L in
|
||||
let validity_start = Timestamp.of_s (now_s ()) in
|
||||
let master_sig =
|
||||
let open Signatures.MasterAddAuditor in
|
||||
signf (EddsaSignature.sign ~key)
|
||||
signf (Eddsa.sign ~key)
|
||||
{
|
||||
start_date= validity_start;
|
||||
auditor_pub;
|
||||
h_auditor_url= Hash.Cstring.H64.hash auditor_url;
|
||||
h_auditor_url= H64_cstring.hash auditor_url;
|
||||
}
|
||||
in
|
||||
let v =
|
||||
|
|
@ -301,18 +304,14 @@ let enable_auditor ~output ~master_key ~auditor_url ~auditor_name ~auditor_pub =
|
|||
|
||||
let disable_auditor ~output ~master_key ~auditor_pub =
|
||||
let* key = read_master_key_file master_key in
|
||||
let ns = Mtime_clock.now_ns () in
|
||||
let open Time in
|
||||
let validity_end =
|
||||
TimeAbsolute.of_s @@ Int64.unsigned_div ns 1_000_000_000L
|
||||
in
|
||||
let validity_end = TimeAbsolute.of_s (now_s ()) in
|
||||
(* hack for tests: +1sec to be sure it overwrite previous timestamp *)
|
||||
let validity_end =
|
||||
Timestamp.of_absolute (TimeAbsolute.add validity_end TimeRelative.(of_s 1L))
|
||||
in
|
||||
let master_sig =
|
||||
let open Signatures.MasterDelAuditor in
|
||||
signf (EddsaSignature.sign ~key) { end_date= validity_end; auditor_pub }
|
||||
signf (Eddsa.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
|
||||
|
|
@ -324,9 +323,9 @@ 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
|
||||
signf (EddsaSignature.sign ~key)
|
||||
signf (Eddsa.sign ~key)
|
||||
{
|
||||
h_wire_method= Hash.Cstring.H64.hash wire_method;
|
||||
h_wire_method= H64_cstring.hash wire_method;
|
||||
start_date= fee_start;
|
||||
end_date= fee_end;
|
||||
closing_fee;
|
||||
|
|
@ -354,18 +353,17 @@ let enable_wire ~output ~master_key ~payto_uri ~bank_label ~priority =
|
|||
let credit_restrictions = [] in
|
||||
let debit_restrictions = [] in
|
||||
let h_conversion_url =
|
||||
Hash.Cstring.H64.hash ((* ?? *) Option.value ~default:"" conversion_url)
|
||||
H64_cstring.hash ((* ?? *) Option.value ~default:"" conversion_url)
|
||||
in
|
||||
let h_credit_restrictions = Hash.Cstring.H64.hash "" in
|
||||
let h_debit_restrictions = Hash.Cstring.H64.hash "" in
|
||||
let h_credit_restrictions = H64_cstring.hash "" in
|
||||
let h_debit_restrictions = H64_cstring.hash "" in
|
||||
(* - *)
|
||||
let* key = read_master_key_file master_key in
|
||||
let ns = Mtime_clock.now_ns () in
|
||||
let validity_start = Timestamp.of_s @@ Int64.unsigned_div ns 1_000_000_000L in
|
||||
let h_wire_details = Hash.FullPaytoHash.hash payto_uri in
|
||||
let validity_start = Timestamp.of_s (now_s ()) in
|
||||
let h_wire_details = FullPaytoHash.hash payto_uri in
|
||||
let master_sig_wire =
|
||||
let open Signatures.MasterWireDetails in
|
||||
signf (EddsaSignature.sign ~key)
|
||||
signf (Eddsa.sign ~key)
|
||||
{
|
||||
h_wire_details;
|
||||
h_conversion_url;
|
||||
|
|
@ -375,7 +373,7 @@ let enable_wire ~output ~master_key ~payto_uri ~bank_label ~priority =
|
|||
in
|
||||
let master_sig_add =
|
||||
let open Signatures.MasterAddWire in
|
||||
signf (EddsaSignature.sign ~key)
|
||||
signf (Eddsa.sign ~key)
|
||||
{
|
||||
start_date= validity_start;
|
||||
h_wire= h_wire_details;
|
||||
|
|
@ -404,19 +402,15 @@ let enable_wire ~output ~master_key ~payto_uri ~bank_label ~priority =
|
|||
|
||||
let disable_wire ~output ~master_key ~payto_uri =
|
||||
let* key = read_master_key_file master_key in
|
||||
let ns = Mtime_clock.now_ns () in
|
||||
let open Time in
|
||||
let validity_end =
|
||||
TimeAbsolute.of_s @@ Int64.unsigned_div ns 1_000_000_000L
|
||||
in
|
||||
let validity_end = TimeAbsolute.of_s (now_s ()) in
|
||||
(* hack for tests: +1sec to be sure it overwrite previous timestamp *)
|
||||
let validity_end =
|
||||
Timestamp.of_absolute (TimeAbsolute.add validity_end TimeRelative.(of_s 1L))
|
||||
in
|
||||
let h_wire = Hash.FullPaytoHash.hash payto_uri in
|
||||
let h_wire = FullPaytoHash.hash payto_uri in
|
||||
let master_sig_del =
|
||||
let open Signatures.MasterDelWire in
|
||||
signf (EddsaSignature.sign ~key) { end_date= validity_end; h_wire }
|
||||
signf (Eddsa.sign ~key) { end_date= validity_end; h_wire }
|
||||
in
|
||||
let v = Api.WireTeardownMessage.{ payto_uri; master_sig_del; validity_end } in
|
||||
let* s = Api.encode Api.WireTeardownMessage.jsont v in
|
||||
|
|
@ -429,12 +423,12 @@ let drain ~output ~master_key ~debit_account_section ~credit_payto_uri ~wtid
|
|||
let* wtid = Api.Bytes32.of_octets wtid in
|
||||
let master_sig =
|
||||
let open Signatures.MasterDrainProfit in
|
||||
signf (EddsaSignature.sign ~key)
|
||||
signf (Eddsa.sign ~key)
|
||||
{
|
||||
wtid;
|
||||
date;
|
||||
amount;
|
||||
h_section= Hash.Cstring.H64.hash debit_account_section;
|
||||
h_section= H64_cstring.hash debit_account_section;
|
||||
h_payto= FullPaytoHash.hash credit_payto_uri;
|
||||
}
|
||||
in
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue