Merge remote-tracking branch 'origin/master' into lash/split-migration

2021-10-15 22:19:01 +02:00
parent 97f4fe8ca7 8f1afa094d
commit 4634ac41df
34 changed files with 614 additions and 263 deletions
--- a/apps/cic-eth/cic_eth/runnable/daemons/tasker.py
+++ b/apps/cic-eth/cic_eth/runnable/daemons/tasker.py
@@ -214,6 +214,7 @@ def main():
    default_token.load(conn)
    BaseTask.default_token_decimals = default_token.decimals
    BaseTask.default_token_name = default_token.name
+    BaseTask.trusted_addresses = trusted_addresses

    BaseTask.run_dir = config.get('CIC_RUN_DIR')
    logg.info('default token set to {} {}'.format(BaseTask.default_token_symbol, BaseTask.default_token_address))