usawa

commit 816414ef26259d09c04254235bb6199c6ecdac36
parent 7a99940a41eb892ad44abaea9b59b7c37443a42c
Author: lash <dev@holbrook.no>
Date:   Mon, 23 Mar 2026 19:43:57 -0600

Enable config and wallet passphrase on legacy cli

Diffstat:
M
dummy/usawa/runnable/add.py
 | 
5
+++--
M
dummy/usawa/runnable/create.py
 | 
3
++-
M
dummy/usawa/runnable/export.py
 | 
5
+++--
M
dummy/usawa/runnable/view.py
 | 
5
+++--

4 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/dummy/usawa/runnable/add.py b/dummy/usawa/runnable/add.py
@@ -133,6 +133,7 @@ argp.add_argument('--dst-type', dest='dst_type', type=str, choices=CATEGORIES, d
 argp.add_argument('-d', '--description', dest='description', type=str, help='interactive edit')
 # TODO: read default from xml if not defined
 argp.add_argument('-u', '--unit', type=str, default=UnitIndex.default_unit, help='Unit to use for transaction')
+argp.add_argument('-c', type=str, help='override config dir')
 argp.add_argument('--unit-precision', dest='unit_precision', type=int, default=UnitIndex.default_precision, help='Unit precision')
 argp.add_argument('--unit-rate', dest='unit_precision', type=float, default=1.0, help='Unit exchange rate')
 argp.add_argument('--valkey-host', dest='valkey_host', type=str, default='localhost', help='Valkey host')
@@ -149,12 +150,12 @@ ledger_tree = load(arg.ledger_xml_file)
 uidx = UnitIndex.from_tree(ledger_tree)
 ledger = Ledger.from_tree(ledger_tree)
 
-cfg = usawa.config.load()
+cfg = usawa.config.load_config(config_dir=arg.c)
 db = ValkeyStore('', host=ctx.valkey_host, port=ctx.valkey_port)
 store = LedgerStore(db, ledger)
 #pk = store.get_key()
 #wallet = DemoWallet(privatekey=pk)
-wallet = store.get_key(DemoWallet, passphrase=cfg.get('SIGS_KEY_PASSPHRASE'))
+wallet = store.get_key(DemoWallet, passphrase=cfg.get('WALLET_KEY_PASSPHRASE'))
 ledger.set_wallet(wallet)
 dt = datetime.datetime.now()
 
diff --git a/dummy/usawa/runnable/create.py b/dummy/usawa/runnable/create.py
@@ -113,6 +113,7 @@ argp.add_argument('-t', dest='topic', type=str, help='ledger topic')
 argp.add_argument('-u', '--unit', type=str, default=UnitIndex.default_unit, help='Unit to use for transaction')
 argp.add_argument('-o', type=str, dest='output', help='output file for updated XML document')
 argp.add_argument('-l', type=str, dest='src_uri', help='URI for data source')
+argp.add_argument('-c', type=str, help='override config dir')
 argp.add_argument('--unit-precision', type=int, default=UnitIndex.default_precision, help='Unit precision')
 arg = argp.parse_args()
 ctx = Context.from_args(arg)
@@ -142,7 +143,7 @@ pk = None
 wallet = None
 dt = datetime.datetime.now()
 
-cfg = usawa.config.load_config()
+cfg = usawa.config.load_config(config_dir=arg.c)
 
 try:
     #pk = store.get_key()
diff --git a/dummy/usawa/runnable/export.py b/dummy/usawa/runnable/export.py
@@ -56,6 +56,7 @@ class Context:
 
 argp = argparse.ArgumentParser()
 argp.add_argument('-o', type=str, dest='output', help='output dir for resulting XML entry documents')
+argp.add_argument('-c', type=str, help='override config dir')
 argp.add_argument('--valkey-host', dest='valkey_host', type=str, default='localhost', help='Valkey host')
 argp.add_argument('--valkey-port', dest='valkey_port', type=int, default=6379, help='Valkey port')
 argp.add_argument('ledger_xml_file', type=str, help='load ledger metadata from XML file')
@@ -68,12 +69,12 @@ ctx = Context.from_args(arg)
 #ledger = Ledger.from_tree(ledger_tree)
 ledger = Ledger.from_file(arg.ledger_xml_file)
 
-cfg = usawa.config.load()
+cfg = usawa.config.load_config(config_dir=arg.c)
 storedb = ValkeyStore('', host=ctx.valkey_host, port=ctx.valkey_port)
 store = LedgerStore(storedb, ledger)
 #pk = store.get_key()
 #wallet = DemoWallet(privatekey=pk)
-wallet = store.get_key(DemoWallet, passphrase=cfg.get('SIGS_KEY_PASSPHRASE'))
+wallet = store.get_key(DemoWallet, passphrase=cfg.get('WALLET_KEY_PASSPHRASE'))
 acl = ACL.from_wallet(wallet)
 store.load(acl=acl)
 resolve = FSResolver(ctx.output)
diff --git a/dummy/usawa/runnable/view.py b/dummy/usawa/runnable/view.py
@@ -56,6 +56,7 @@ class Context:
 
 argp = argparse.ArgumentParser()
 argp.add_argument('-o', type=str, dest='output', help='output file for resulting XML document')
+argp.add_argument('-c', type=str, help='override config dir')
 argp.add_argument('--valkey-host', dest='valkey_host', type=str, default='localhost', help='Valkey host')
 argp.add_argument('--valkey-port', dest='valkey_port', type=int, default=6379, help='Valkey port')
 argp.add_argument('ledger_xml_file', type=str, help='load ledger metadata from XML file')
@@ -68,12 +69,12 @@ ctx = Context.from_args(arg)
 #ledger = Ledger.from_tree(ledger_tree)
 ledger = Ledger.from_file(arg.ledger_xml_file)
 
-cfg = usawa.config.load()
+cfg = usawa.config.load_config(config_dir=arg.c)
 storedb = ValkeyStore('', host=ctx.valkey_host, port=ctx.valkey_port)
 store = LedgerStore(storedb, ledger)
 #pk = store.get_key()
 #wallet = DemoWallet(privatekey=pk)
-wallet = store.get_key(DemoWallet, passphrase=cfg.get('SIGS_KEY_PASSPHRASE'))
+wallet = store.get_key(DemoWallet, passphrase=cfg.get('WALLET_KEY_PASSPHRASE'))
 acl = ACL.from_wallet(wallet)
 store.load(acl=acl)
 sys.stdout.write(ledger.to_string())