From bdd5f6fcec6393c8b7d7b4ce08905e55184a162b Mon Sep 17 00:00:00 2001
From: nolash <dev@holbrook.no>
Date: Sun, 17 Oct 2021 19:37:29 +0200
Subject: [PATCH] Update readme in data seeding

---
 apps/data-seeding/README.md                   |  4 +--
 apps/data-seeding/cic_eth/import_balance.py   | 27 ++++++++++---------
 apps/data-seeding/config/{eth.ini => rpc.ini} |  2 +-
 3 files changed, 17 insertions(+), 16 deletions(-)
 rename apps/data-seeding/config/{eth.ini => rpc.ini} (85%)

diff --git a/apps/data-seeding/README.md b/apps/data-seeding/README.md
index 682af50c..959bd4fe 100644
--- a/apps/data-seeding/README.md
+++ b/apps/data-seeding/README.md
@@ -150,11 +150,11 @@ Then run:
 
 Run in sequence, in first terminal:
 
-`python cic_eth/import_balance.py -v -c config -p <eth_provider> -r <cic_registry_address> --token-symbol <token_symbol> -y ../contract-migration/keystore/UTC--2021-01-08T17-18-44.521011372Z--eb3907ecad74a0013c259d5874ae7f22dcbcc95c --head out`
+`python cic_eth/import_balance.py -v -p <eth_provider> -r <cic_registry_address> --token-symbol <token_symbol> -y ../contract-migration/keystore/UTC--2021-01-08T17-18-44.521011372Z--eb3907ecad74a0013c259d5874ae7f22dcbcc95c --head out`
 
 In another terminal:
 
-`python cic_eth/import_users.py -v -c config --redis-host-callback <redis_hostname_in_docker> out`
+`python cic_eth/import_users.py -v --redis-host-callback <redis_hostname_in_docker> out`
 
 The `redis_hostname_in_docker` value is the hostname required to reach the redis server from within the docker cluster, and should be `redis` if you left the docker-compose unchanged. The `import_users` script will receive the address of each newly created custodial account on a redis subscription fed by a callback task in the `cic_eth` account creation task chain.
 
diff --git a/apps/data-seeding/cic_eth/import_balance.py b/apps/data-seeding/cic_eth/import_balance.py
index 0a25380e..28104341 100644
--- a/apps/data-seeding/cic_eth/import_balance.py
+++ b/apps/data-seeding/cic_eth/import_balance.py
@@ -47,12 +47,14 @@ from eth_token_index import TokenUniqueSymbolIndex
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()
 
-config_dir = './config'
+script_dir = os.path.dirname(os.path.realpath(__file__))
+root_dir = os.path.dirname(script_dir)
+base_config_dir = os.path.join(root_dir, 'config')
 
 argparser = argparse.ArgumentParser(description='daemon that monitors transactions in new blocks')
+argparser.add_argument('-c', type=str, help='config override directory')
 argparser.add_argument('-p', '--provider', dest='p', type=str, help='chain rpc provider address')
 argparser.add_argument('-y', '--key-file', dest='y', type=str, help='Ethereum keystore file to use for signing')
-argparser.add_argument('-c', type=str, default=config_dir, help='config root to use')
 argparser.add_argument('--old-chain-spec', type=str, dest='old_chain_spec', default='evm:oldchain:1', help='chain spec')
 argparser.add_argument('-i', '--chain-spec', type=str, dest='i', help='chain spec')
 argparser.add_argument('-r', '--registry-address', type=str, dest='r', help='CIC Registry address')
@@ -71,22 +73,21 @@ if args.v == True:
 elif args.vv == True:
     logging.getLogger().setLevel(logging.DEBUG)
 
-config_dir = os.path.join(args.c)
-os.makedirs(config_dir, 0o777, True)
-config = confini.Config(config_dir, args.env_prefix)
-# override args
+config = None
+if args.c != None:
+    config = confini.Config(base_config_dir, os.environ.get('CONFINI_ENV_PREFIX'), override_config_dir=args.c)
+else:
+    config = confini.Config(base_config_dir, os.environ.get('CONFINI_ENV_PREFIX'))
 config.process()
-logg.debug('config loaded from {}:\n{}'.format(config_dir, config))
 args_override = {
-        'CIC_CHAIN_SPEC': getattr(args, 'i'),
-        'ETH_PROVIDER': getattr(args, 'p'),
+        'CHAIN_SPEC': getattr(args, 'i'),
+        'RPC_PROVIDER': getattr(args, 'p'),
         'CIC_REGISTRY_ADDRESS': getattr(args, 'r'),
-        'KEYSTORE_FILE_PATH': getattr(args, 'y'),
+        'WALLET_KEY_FILE': getattr(args, 'y'),
         }
 config.dict_override(args_override, 'cli flag')
 config.censor('PASSWORD', 'DATABASE')
 config.censor('PASSWORD', 'SSL')
-logg.debug('config loaded from {}:\n{}'.format(config_dir, config))
 
 #app = celery.Celery(backend=config.get('CELERY_RESULT_URL'),  broker=config.get('CELERY_BROKER_URL'))
 
@@ -99,7 +100,7 @@ if args.y != None:
 signer = EIP155Signer(keystore)
 
 queue = args.q
-chain_str = config.get('CIC_CHAIN_SPEC')
+chain_str = config.get('CHAIN_SPEC')
 block_offset = 0
 if args.head:
     block_offset = -1
@@ -192,7 +193,7 @@ def progress_callback(block_number, tx_index):
 def main():
     global chain_str, block_offset, user_dir
     
-    conn = EthHTTPConnection(config.get('ETH_PROVIDER'))
+    conn = EthHTTPConnection(config.get('RPC_PROVIDER'))
     gas_oracle = OverrideGasOracle(conn=conn, limit=8000000)
     nonce_oracle = RPCNonceOracle(signer_address, conn)
 
diff --git a/apps/data-seeding/config/eth.ini b/apps/data-seeding/config/rpc.ini
similarity index 85%
rename from apps/data-seeding/config/eth.ini
rename to apps/data-seeding/config/rpc.ini
index 321384f8..3db40b22 100644
--- a/apps/data-seeding/config/eth.ini
+++ b/apps/data-seeding/config/rpc.ini
@@ -1,2 +1,2 @@
-[eth]
+[rpc]
 provider = http://localhost:63545