From ba4aa7077d6e914507ad158655ce06aec051998c Mon Sep 17 00:00:00 2001
From: nolash <dev@holbrook.no>
Date: Fri, 26 Nov 2021 10:56:36 +0100
Subject: [PATCH] Update scripts to dep changes

---
 requirements.txt     |  8 ++++----
 scripts/parse_csv.py | 10 +++++-----
 scripts/submit.py    |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 2ccad2e..cbdef21 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 jsonschema~=3.2.0
-chainlib~=0.0.3a1
-confini~=0.3.6rc3
-cic-eth-registry~=0.5.5a7
-eth-erc20~=0.0.9a3
+chainlib~=0.0.12
+confini~=0.5.1
+cic-eth-registry~=0.6.2
+eth-erc20~=0.1.2
 pycryptodome==3.10.1
 pyxdg==0.27
diff --git a/scripts/parse_csv.py b/scripts/parse_csv.py
index 0d1be3b..5d0c6b1 100644
--- a/scripts/parse_csv.py
+++ b/scripts/parse_csv.py
@@ -18,8 +18,8 @@ from chainlib.eth.gas import OverrideGasOracle
 from chainlib.eth.tx import TxFormat
 from chainlib.chain import ChainSpec
 from chainlib.eth.connection import EthHTTPConnection
-from crypto_dev_signer.eth.signer import ReferenceSigner as EIP155Signer
-from crypto_dev_signer.keystore.dict import DictKeystore
+from funga.eth.signer import EIP155Signer
+from funga.eth.keystore.dict import DictKeystore
 from eth_erc20 import ERC20
 from cic_eth_registry.erc20 import ERC20Token
 
@@ -32,10 +32,10 @@ required_fields = [
     'value',
         ]
 
-config_dir = os.environ.get('CONFINI_DIR', '.')
+config_dir = os.environ.get('CONFINI_DIR', './config')
 
 argparser = argparse.ArgumentParser('chainqueue transaction submission and trigger server')
-argparser.add_argument('-c', '--config', dest='c', type=str, default=config_dir, help='configuration directory')
+argparser.add_argument('-c', '--config', dest='c', type=str, help='configuration directory')
 argparser.add_argument('-p', type=str, help='rpc endpoint')
 argparser.add_argument('-i', type=str, help='chain spec')
 argparser.add_argument('--session-id', dest='session_id', type=str, default=str(uuid.uuid4()), help='session id to use for session')
@@ -53,7 +53,7 @@ if args.vv:
 elif args.v:
     logg.setLevel(logging.INFO)
 
-config = confini.Config(args.c)
+config = confini.Config(config_dir, override_dirs=args.c)
 config.process()
 args_override = {
             'SESSION_CHAIN_SPEC': getattr(args, 'i'),
diff --git a/scripts/submit.py b/scripts/submit.py
index badb932..88bef1f 100644
--- a/scripts/submit.py
+++ b/scripts/submit.py
@@ -24,7 +24,7 @@ argparser.add_argument('-s', '--socket-path', dest='s', type=str, help='socket p
 argparser.add_argument('--env-prefix', default=os.environ.get('CONFINI_ENV_PREFIX'), dest='env_prefix', type=str, help='environment prefix for variables to overwrite configuration')
 argparser.add_argument('-v', action='store_true', help='be verbose')
 argparser.add_argument('-vv', action='store_true', help='be very verbose')
-argparser.add_argument('input_dir', type=str, help='directory with transaction files')
+argparser.add_argument('input_dir', type=str, default='output', help='directory with transaction files')
 args = argparser.parse_args(sys.argv[1:])
 
 if args.vv:
@@ -34,11 +34,11 @@ elif args.v:
 
 config = confini.Config(args.c)
 socket_path = getattr(args, 's')
+config.process()
 args_override = {
         'QUEUE_SOCKET_PATH': getattr(args, 's'),
         }
 config.dict_override(args_override, 'cli args')
-config.process()
 config.add(getattr(args, 'input_dir'), '_INPUT_DIR', True)
 config.add(getattr(args, 'session_id'), '_SESSION_ID', True)
 if not config.get('QUEUE_SOCKET_PATH'):