diff --git a/data/assets/default.config b/data/assets/default.config index 0c401640..ea32f28a 100644 --- a/data/assets/default.config +++ b/data/assets/default.config @@ -14,7 +14,7 @@ db = postgres attribute_encryption_key = "deadbeef" port = 3434 bind_to = localhost -master_public_key = "8MQF2XPWCKCW4199JFPE08X7Y9XAX21SF2HD8NZKXM3PY3CMCJ90====" +master_public_key = "SJ0NYND22VQP3MP7FM754RDX8HCKVWAXTHY9SQNBTPRJZ2SPM2S0====" stefan_abs = EUR:0.00 stefan_log = EUR:0.00 stefan_lin = 0.00 diff --git a/data/eddsa_master_offline b/data/eddsa_master_offline index 3e6eca77..739df007 100644 Binary files a/data/eddsa_master_offline and b/data/eddsa_master_offline differ diff --git a/future_keys.json b/future_keys.json new file mode 100644 index 00000000..52b02e5e --- /dev/null +++ b/future_keys.json @@ -0,0 +1 @@ +{"future_denoms":[{"section_name":"kudo_1","value":"EUR:0.01","stamp_start":{"t_s":1764349887.8252935},"stamp_expire_withdraw":{"t_s":1795885887.8252935},"stamp_expire_deposit":{"t_s":1795885887.8252935},"stamp_expire_legal":{"t_s":1795885887.8252935},"denom_pub":{"cipher":"RSA","age_mask":0,"rsa_pub":"00G000FKQE5FWXJ7A7K4M5WYTJR9S1CWGYTQ6FFRFP6VDJNJ3X7Z3VVS8C0G===="},"fee_withdraw":"EUR:0.00","fee_deposit":"EUR:0.00","fee_refresh":"EUR:0.00","fee_refund":"EUR:0.00","denom_secmod_sig":"3XG7Y6CMWVCEWBTYS4SRD7T4R6E8YC7YPN24VG28NVAFHD3KDFFRRCNF3243BWT9TY9BG0S0NKP1JBM2A1NEXY53PGP4ZFAQYJ1W238="},{"section_name":"kudo_2","value":"EUR:0.02","stamp_start":{"t_s":1764349887.8441067},"stamp_expire_withdraw":{"t_s":1795885887.8441067},"stamp_expire_deposit":{"t_s":1795885887.8441067},"stamp_expire_legal":{"t_s":1795885887.8441067},"denom_pub":{"cipher":"RSA","age_mask":0,"rsa_pub":"00G000ASM2D1WCF8DY8P153XPZW6WK37ZRDTA5GZC3P4W6V4DXYF3ZZ2SM0G===="},"fee_withdraw":"EUR:0.00","fee_deposit":"EUR:0.00","fee_refresh":"EUR:0.00","fee_refund":"EUR:0.00","denom_secmod_sig":"PJJSFSC7BC12EX5HWVFRP5NQFNM7GV4KJHGKPV6NV4D26BVWRTT0JJMENP73MG39AG3VFCMBF6YCZ58YJKMFWQK5FXWHHJZ5J35QY0G="}],"future_signkeys":[{"key":"46TPZRP7T0Y1D9PBA230QQCEWT9SJF3EQR94R5A8RPY0M8KEJPCG====","stamp_start":{"t_s":1764349887.8252115},"stamp_expire":{"t_s":1795885887.8252115},"stamp_end":{"t_s":1795885887.8252115},"signkey_secmod_sig":"NCEETQJRMFHPDKCSDFHMZ807B6S3J396TJ07XWVPB8E1YQ8PB57W9VQZ0N20HVG57KQFTQR2S51FCJQANJKA6CEDDBAQNSRNNX7N60R="}],"master_pub":"SJ0NYND22VQP3MP7FM754RDX8HCKVWAXTHY9SQNBTPRJZ2SPM2S0====","denom_secmod_public_key":"1CMGZSN5M0FZ15S1PHE1NWPMGDWZGZAEYYX7QJ7EXQFA5A9ABJ10====","signkey_secmod_public_key":"1QPRGS6XX1XMJXF3KKC32SW1KQ4PYHB2CRHDNRWXHQX5TQXCNH10===="} \ No newline at end of file diff --git a/tools/offline.ml b/tools/offline.ml index 347c5f09..e8bdf5e9 100644 --- a/tools/offline.ml +++ b/tools/offline.ml @@ -3,6 +3,7 @@ - setup - sign *) (* doc: https://docs.taler.net/manpages/taler-exchange-offline.1.html *) +let version = "%%VERSION%%" let download ~base_url ~output = let open Bos in @@ -53,7 +54,7 @@ let setup_cmd = & opt filepath "data/eddsa_master_offline" & info [ "o"; "output" ] ~doc) in - Cmd.make (Cmd.info "setup" ~version:"%%VERSION%%" ~doc) + Cmd.make (Cmd.info "setup" ~version ~doc) @@ let+ output = output in match setup ~output with @@ -75,7 +76,7 @@ let download_cmd = let doc = "Base url of the exchange." in Arg.(value & opt string "http://localhost:3434/" & info [ "base-url" ] ~doc) in - Cmd.make (Cmd.info "download" ~version:"%%VERSION%%" ~doc ~man) + Cmd.make (Cmd.info "download" ~version ~doc ~man) @@ let+ output = output and+ base_url = base_url in match download ~base_url ~output with @@ -104,7 +105,7 @@ let sign_cmd = & opt filepath "data/eddsa_master_offline" & info [ "master-key" ] ~doc) in - Cmd.make (Cmd.info "sign" ~version:"%%VERSION%%" ~doc) + Cmd.make (Cmd.info "sign" ~version ~doc) @@ let+ input = input and+ output = output and+ master_key = master_key in match sign ~input ~output ~master_key with @@ -113,7 +114,12 @@ let sign_cmd = exit 1 | Ok () -> () -let main () = Cmd.eval setup_cmd -let _main () = Cmd.eval download_cmd -let __main () = Cmd.eval sign_cmd -let () = if !Sys.interactive then () else exit (main ()) +let cli = + let info = + let doc = "MTE Offline CLI tool" in + Cmd.info "mte-offline" ~version ~doc + in + Cmd.group info [ setup_cmd; download_cmd; sign_cmd ] + +let main () = Cmd.eval cli +let () = exit (main ())