JJ: Description from the destination commit:
add enable-auditor cmd JJ: Description from source commit: .
This commit is contained in:
parent
ac4058df7e
commit
0c2dd270d1
14 changed files with 330 additions and 242 deletions
143
tools/offline.ml
143
tools/offline.ml
|
|
@ -2,24 +2,54 @@ open Cmdliner
|
|||
open Cmdliner.Term.Syntax
|
||||
open Offline_impl
|
||||
|
||||
module Arg = struct
|
||||
include Arg
|
||||
|
||||
let timestamp =
|
||||
Arg.Conv.make ~docv:"timestamp argument" ~parser:Timestamp.of_string
|
||||
~pp:Timestamp.pp ()
|
||||
|
||||
let relative_time =
|
||||
Arg.Conv.make ~docv:"relative time argument"
|
||||
~parser:Timestamp.Span.of_string ~pp:Timestamp.Span.pp ()
|
||||
|
||||
let amount =
|
||||
Arg.Conv.make ~docv:"amount argument" ~parser:Amount.of_string ~pp:Amount.pp
|
||||
()
|
||||
|
||||
let eddsa_pub =
|
||||
let parser s = Crypto.EddsaPublicKey.of_b32 s in
|
||||
let pp fmt key =
|
||||
let s = Crypto.EddsaPublicKey.to_b32 key in
|
||||
Fmt.pf fmt "%s" s
|
||||
in
|
||||
Arg.Conv.make ~docv:"eddsa public key argument" ~parser ~pp ()
|
||||
end
|
||||
|
||||
let default_master_offline_key_file = "data/master_offline_private_key"
|
||||
(*
|
||||
let default_response_file = "response.json"
|
||||
let default_request_file = "request.json"
|
||||
*)
|
||||
|
||||
(*let to_term_ret = function Error e -> `Error (false, e) | Ok () -> `Ok ()*)
|
||||
let to_term_ret = Fun.id
|
||||
let master_key =
|
||||
let doc = "Master offline Eddsa private key file." in
|
||||
Arg.(
|
||||
value
|
||||
& opt file default_master_offline_key_file
|
||||
& info [ "master_key_file" ] ~doc)
|
||||
|
||||
let timestamp =
|
||||
Arg.Conv.make ~docv:"timestamp argument" ~parser:Timestamp.of_string
|
||||
~pp:Timestamp.pp ()
|
||||
let input =
|
||||
let doc = "input file" in
|
||||
Arg.(required & opt (some file) None & info [ "i"; "input" ] ~doc)
|
||||
|
||||
let relative_time =
|
||||
Arg.Conv.make ~docv:"relative time argument" ~parser:Timestamp.Span.of_string
|
||||
~pp:Timestamp.Span.pp ()
|
||||
let output =
|
||||
let doc = "output file" in
|
||||
Arg.(required & opt (some filepath) None & info [ "o"; "output" ] ~doc)
|
||||
|
||||
let amount =
|
||||
Arg.Conv.make ~docv:"amount argument" ~parser:Amount.of_string ~pp:Amount.pp
|
||||
()
|
||||
let url =
|
||||
let doc = "url" in
|
||||
Arg.(required & opt (some string) None & info [ "url" ] ~doc)
|
||||
|
||||
let setup_cmd =
|
||||
let doc = "Generate offline master keys" in
|
||||
|
|
@ -33,56 +63,31 @@ let setup_cmd =
|
|||
Cmd.make (Cmd.info "setup" ~doc)
|
||||
@@
|
||||
let+ output = output in
|
||||
setup ~output |> to_term_ret
|
||||
setup ~output
|
||||
|
||||
let download_cmd =
|
||||
let doc = "GET /management/keys/" in
|
||||
let man =
|
||||
[ `S Manpage.s_description; `P "$(cmd) download /management/keys." ]
|
||||
in
|
||||
let output =
|
||||
let doc = "output file" in
|
||||
Arg.(
|
||||
value & opt filepath default_response_file & info [ "o"; "output" ] ~doc)
|
||||
in
|
||||
Cmd.make (Cmd.info "download" ~doc ~man)
|
||||
@@
|
||||
let+ output = output in
|
||||
download ~output |> to_term_ret
|
||||
download ~output
|
||||
|
||||
let upload_cmd =
|
||||
let doc = "POST input.json data to url (default /management/keys)" in
|
||||
let input =
|
||||
let doc = "input file" in
|
||||
Arg.(value & opt file default_request_file & info [ "i"; "input" ] ~doc)
|
||||
in
|
||||
let url =
|
||||
let doc = "url" in
|
||||
Arg.(value & opt string "/management/keys" & info [ "url" ] ~doc)
|
||||
in
|
||||
Cmd.make (Cmd.info "upload" ~doc)
|
||||
@@
|
||||
let+ input = input and+ url = url in
|
||||
upload ~input ~url |> to_term_ret
|
||||
|
||||
let master_key =
|
||||
let doc = "Master offline Eddsa private key file." in
|
||||
Arg.(value & opt file default_master_offline_key_file & info [ "key" ] ~doc)
|
||||
|
||||
let input =
|
||||
let doc = "input file" in
|
||||
Arg.(value & opt file default_response_file & info [ "i"; "input" ] ~doc)
|
||||
|
||||
let output =
|
||||
let doc = "output file" in
|
||||
Arg.(value & opt filepath default_request_file & info [ "o"; "output" ] ~doc)
|
||||
upload ~input ~url
|
||||
|
||||
let sign_cmd =
|
||||
let doc = "Sign FutureKeysResponse." in
|
||||
Cmd.make (Cmd.info "sign" ~doc)
|
||||
@@
|
||||
let+ input = input and+ output = output and+ master_key = master_key in
|
||||
sign ~input ~output ~master_key |> to_term_ret
|
||||
sign ~input ~output ~master_key
|
||||
|
||||
let revoke_denom_cmd =
|
||||
let doc = "Revoke denomination." in
|
||||
|
|
@ -93,18 +98,59 @@ let revoke_denom_cmd =
|
|||
Cmd.make (Cmd.info "revoke-denom" ~doc)
|
||||
@@
|
||||
let+ output = output and+ master_key = master_key and+ h_denom = h_denom in
|
||||
revoke_denom ~output ~master_key ~h_denom |> to_term_ret
|
||||
revoke_denom ~output ~master_key ~h_denom
|
||||
|
||||
let revoke_signkey_cmd =
|
||||
let doc = "Revoke signkey." in
|
||||
let signkey =
|
||||
let doc = "public signing key" in
|
||||
Arg.(required & pos 0 (some string) None & info [] ~doc)
|
||||
Arg.(required & pos 0 (some eddsa_pub) None & info [] ~doc)
|
||||
in
|
||||
Cmd.make (Cmd.info "revoke-signkey" ~doc)
|
||||
@@
|
||||
let+ output = output and+ master_key = master_key and+ signkey = signkey in
|
||||
revoke_signkey ~output ~master_key ~signkey |> to_term_ret
|
||||
revoke_signkey ~output ~master_key ~signkey
|
||||
|
||||
let enable_auditor_cmd =
|
||||
let doc = "Enable auditor." in
|
||||
let auditor_url =
|
||||
Arg.(required & opt (some string) None & info [ "auditor_url" ])
|
||||
in
|
||||
let auditor_name =
|
||||
Arg.(required & opt (some string) None & info [ "auditor_name" ])
|
||||
in
|
||||
let auditor_pub =
|
||||
Arg.(required & opt (some eddsa_pub) None & info [ "auditor_pub" ])
|
||||
in
|
||||
let validity_start =
|
||||
Arg.(required & opt (some timestamp) None & info [ "validity_start" ])
|
||||
in
|
||||
Cmd.make (Cmd.info "enable-auditor" ~doc)
|
||||
@@
|
||||
let+ output = output
|
||||
and+ master_key = master_key
|
||||
and+ auditor_url = auditor_url
|
||||
and+ auditor_name = auditor_name
|
||||
and+ auditor_pub = auditor_pub
|
||||
and+ validity_start = validity_start in
|
||||
enable_auditor ~output ~master_key ~auditor_url ~auditor_name ~auditor_pub
|
||||
~validity_start
|
||||
|
||||
let disable_auditor_cmd =
|
||||
let doc = "Disable auditor." in
|
||||
let auditor_pub =
|
||||
Arg.(required & opt (some eddsa_pub) None & info [ "auditor_pub" ])
|
||||
in
|
||||
let validity_end =
|
||||
Arg.(required & opt (some timestamp) None & info [ "validity_end" ])
|
||||
in
|
||||
Cmd.make (Cmd.info "disable-auditor" ~doc)
|
||||
@@
|
||||
let+ output = output
|
||||
and+ master_key = master_key
|
||||
and+ auditor_pub = auditor_pub
|
||||
and+ validity_end = validity_end in
|
||||
disable_auditor ~output ~master_key ~auditor_pub ~validity_end
|
||||
|
||||
let global_fees_cmd =
|
||||
let doc = "Provides global fee configuration." in
|
||||
|
|
@ -148,7 +194,6 @@ let global_fees_cmd =
|
|||
global_fees ~output ~master_key ~start_date ~end_date ~history_fee
|
||||
~account_fee ~purse_fee ~history_expiration ~purse_account_limit
|
||||
~purse_timeout
|
||||
|> to_term_ret
|
||||
|
||||
let cli =
|
||||
let info =
|
||||
|
|
@ -163,8 +208,18 @@ let cli =
|
|||
upload_cmd;
|
||||
revoke_denom_cmd;
|
||||
revoke_signkey_cmd;
|
||||
enable_auditor_cmd;
|
||||
disable_auditor_cmd;
|
||||
global_fees_cmd;
|
||||
]
|
||||
|
||||
let main () = Cmd.eval_result cli
|
||||
let () = if !Sys.interactive then () else exit (main ())
|
||||
|
||||
(* TODO all management operations:
|
||||
/management/wire-fee
|
||||
/management/wire
|
||||
/management/wire/disable
|
||||
/management/drain
|
||||
/management/aml-officers
|
||||
/management/partners *)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue