diff --git a/apps/cic-cache/cic_cache/cli/arg.py b/apps/cic-cache/cic_cache/cli/arg.py index 43126eb2..e005893d 100644 --- a/apps/cic-cache/cic_cache/cli/arg.py +++ b/apps/cic-cache/cic_cache/cli/arg.py @@ -17,4 +17,5 @@ class ArgumentParser(BaseArgumentParser): self.add_argument('--offset', type=int, help='Start block height for initial history sync') self.add_argument('--no-history', action='store_true', dest='no_history', help='Skip initial history sync') if local_arg_flags & CICFlag.CHAIN: - self.add_argument('-r', '--registry-address', type=str, dest='registry_address', help='CIC registry contract address') + self.add_argument('--registry-address', type=str, dest='registry_address', help='CIC registry contract address') + self.add_argument('--trust-address', type=str, dest='trust_address', action='append', help='Add trust address') diff --git a/apps/cic-cache/cic_cache/cli/config.py b/apps/cic-cache/cic_cache/cli/config.py index c21d46dc..3c61c0d3 100644 --- a/apps/cic-cache/cic_cache/cli/config.py +++ b/apps/cic-cache/cic_cache/cli/config.py @@ -39,6 +39,9 @@ class Config(BaseConfig): if local_arg_flags & CICFlag.CHAIN: local_args_override['CIC_REGISTRY_ADDRESS'] = getattr(args, 'registry_address') + trust_addresses = getattr(args, 'trust_address', None) + if trust_addresses != None: + local_args_override['CIC_TRUST_ADDRESS'] = ','.join(trust_addresses) if local_arg_flags & CICFlag.CELERY: local_args_override['CELERY_QUEUE'] = getattr(args, 'celery_queue') diff --git a/apps/cic-cache/cic_cache/runnable/daemons/tracker.py b/apps/cic-cache/cic_cache/runnable/daemons/tracker.py index d5646ea9..6094d701 100644 --- a/apps/cic-cache/cic_cache/runnable/daemons/tracker.py +++ b/apps/cic-cache/cic_cache/runnable/daemons/tracker.py @@ -40,7 +40,7 @@ logging.basicConfig(level=logging.WARNING) logg = logging.getLogger() # process args -arg_flags = cic_cache.cli.argflag_std_base +arg_flags = cic_cache.cli.argflag_std_read local_arg_flags = cic_cache.cli.argflag_local_sync argparser = cic_cache.cli.ArgumentParser(arg_flags) argparser.process_local_flags(local_arg_flags) diff --git a/apps/cic-cache/requirements.txt b/apps/cic-cache/requirements.txt index 8f47f9b5..9b65a9cd 100644 --- a/apps/cic-cache/requirements.txt +++ b/apps/cic-cache/requirements.txt @@ -1,5 +1,5 @@ alembic==1.4.2 -confini>=0.3.6rc4,<0.5.0 +confini~=0.4.2 uwsgi==2.0.19.1 moolb~=0.1.1b2 cic-eth-registry~=0.6.1a1 @@ -8,7 +8,7 @@ semver==2.13.0 psycopg2==2.8.6 celery==4.4.7 redis==3.5.3 -chainsyncer[sql]>=0.0.6a3,<0.1.0 +chainsyncer[sql]>=0.0.7a3,<0.1.0 erc20-faucet>=0.3.2a2, <0.4.0 -chainlib-eth>=0.0.9a14,<0.1.0 +chainlib-eth>=0.0.10a20,<0.1.0 eth-address-index>=0.2.3a4,<0.3.0 diff --git a/apps/cic-cache/scripts/migrate.py b/apps/cic-cache/scripts/migrate.py index 458b1ff2..6745806e 100644 --- a/apps/cic-cache/scripts/migrate.py +++ b/apps/cic-cache/scripts/migrate.py @@ -36,7 +36,7 @@ if args.vv: elif args.v: logging.getLogger().setLevel(logging.INFO) -config = confini.Config(configdir, args.env_prefix) +config = confini.Config(configdir, args.env_prefix, override_dirs=args.c) config.process() config.censor('PASSWORD', 'DATABASE') config.censor('PASSWORD', 'SSL')