Move registry initialization before aux

apps/cic-eth/cic_eth/aux/erc20_demurrage_token/__init__.py

@@ -1,18 +1,41 @@
 # standard imports
-import celery
+import logging
 
 # external imports
+import celery
 from erc20_demurrage_token.demurrage import DemurrageCalculator
+from chainlib.connection import RPCConnection
+from chainlib.chain import ChainSpec
+from chainlib.eth.constant import ZERO_ADDRESS
+from cic_eth_registry import CICRegistry
+
+logg = logging.getLogger(__name__)
 
 celery_app = celery.current_app
 
 
 class DemurrageCalculationTask(celery.Task):
 
-    demurrage_token_rates = {}
+    demurrage_token_calcs = {}
+
+    @classmethod
+    def register_token(cls, rpc, chain_spec, token_symbol, sender_address=ZERO_ADDRESS):
+        registry = CICRegistry(chain_spec, rpc)
+        token_address = registry.by_name(token_symbol, sender_address=sender_address)
+        c = DemurrageCalculator.from_contract(rpc, chain_spec, token_address, sender_address=sender_address)
+        logg.info('registered demurrage calculator for ERC20 {} @ {}'.format(token_symbol, token_address))
+        cls.demurrage_token_calcs[token_symbol] = c
 
 
 @celery_app.task(bind=True, base=DemurrageCalculationTask)
 def get_adjusted_balance(self, token_symbol, amount, timestamp):
-    c = self.demurrage_token_rates[token_symbol]
+    c = self.demurrage_token_calcs[token_symbol]
     return c.amount_since(amount, timestamp)
+
+
+def setup(rpc, config, sender_address=ZERO_ADDRESS):
+    chain_spec_str = config.get('CIC_CHAIN_SPEC')
+    chain_spec = ChainSpec.from_chain_str(chain_spec_str)
+    token_symbol = config.get('CIC_DEFAULT_TOKEN_SYMBOL')
+    
+    DemurrageCalculationTask.register_token(rpc, chain_spec, token_symbol, sender_address=sender_address)

apps/cic-eth/cic_eth/runnable/daemons/tasker.py

@@ -116,43 +116,6 @@ if len(health_modules) != 0:
 logg.debug('health mods {}'.format(health_modules))
 
 
-# detect aux 
-aux_dir = os.path.join(script_dir, '..', '..', 'aux')
-aux = []
-if args.aux_all:
-    if len(args.aux) > 0:
-        logg.warning('--aux-all is set so --aux will have no effect')
-    for v in os.listdir(aux_dir):
-        if v[:1] == '.':
-            logg.debug('dotfile, skip {}'.format(v))
-            continue
-        aux_mod_path = os.path.join(aux_dir, v)
-        st = os.stat(aux_mod_path)
-        if not stat.S_ISDIR(st.st_mode):
-            logg.debug('not a dir, skip {}'.format(v))
-            continue
-        aux_mod_file = os.path.join(aux_dir, v,'__init__.py')
-        try:
-            st = os.stat(aux_mod_file)
-        except FileNotFoundError:
-            logg.debug('__init__.py not found, skip {}'.format(v))
-            continue 
-        aux.append(v)
-
-elif len(args.aux) > 0:
-    for v in args.aux:
-        aux_mod_file = os.path.join(aux_dir, v,'__init__.py')
-        try:
-            st = os.stat(aux_mod_file)
-        except FileNotFoundError:
-            logg.critical('cannot find explicity requested aux module {}'.format(v))
-            sys.exit(1)
-        logg.info('aux module {} found in path'.format(v))
-        aux.append(v)
-
-for v in aux:
-    importlib.import_module('cic_eth.aux.' + v)
-
 
 # connect to database
 dsn = dsn_from_config(config)
@@ -212,6 +175,65 @@ Otx.tracing = config.true('TASKS_TRACE_QUEUE_STATUS')
 #    raise RuntimeError()
 liveness.linux.load(health_modules, rundir=config.get('CIC_RUN_DIR'), config=config, unit='cic-eth-tasker')
 
+rpc = RPCConnection.connect(chain_spec, 'default')
+try:
+    registry = connect_registry(rpc, chain_spec, config.get('CIC_REGISTRY_ADDRESS'))
+except UnknownContractError as e:
+    logg.exception('Registry contract connection failed for {}: {}'.format(config.get('CIC_REGISTRY_ADDRESS'), e))
+    sys.exit(1)
+logg.info('connected contract registry {}'.format(config.get('CIC_REGISTRY_ADDRESS')))
+
+trusted_addresses_src = config.get('CIC_TRUST_ADDRESS')
+if trusted_addresses_src == None:
+    logg.critical('At least one trusted address must be declared in CIC_TRUST_ADDRESS')
+    sys.exit(1)
+trusted_addresses = trusted_addresses_src.split(',')
+for address in trusted_addresses:
+    logg.info('using trusted address {}'.format(address))
+
+connect_declarator(rpc, chain_spec, trusted_addresses)
+connect_token_registry(rpc, chain_spec)
+
+# detect aux 
+# TODO: move to separate file
+aux_dir = os.path.join(script_dir, '..', '..', 'aux')
+aux = []
+if args.aux_all:
+    if len(args.aux) > 0:
+        logg.warning('--aux-all is set so --aux will have no effect')
+    for v in os.listdir(aux_dir):
+        if v[:1] == '.':
+            logg.debug('dotfile, skip {}'.format(v))
+            continue
+        aux_mod_path = os.path.join(aux_dir, v)
+        st = os.stat(aux_mod_path)
+        if not stat.S_ISDIR(st.st_mode):
+            logg.debug('not a dir, skip {}'.format(v))
+            continue
+        aux_mod_file = os.path.join(aux_dir, v,'__init__.py')
+        try:
+            st = os.stat(aux_mod_file)
+        except FileNotFoundError:
+            logg.debug('__init__.py not found, skip {}'.format(v))
+            continue 
+        aux.append(v)
+
+elif len(args.aux) > 0:
+    for v in args.aux:
+        aux_mod_file = os.path.join(aux_dir, v,'__init__.py')
+        try:
+            st = os.stat(aux_mod_file)
+        except FileNotFoundError:
+            logg.critical('cannot find explicity requested aux module {}'.format(v))
+            sys.exit(1)
+        logg.info('aux module {} found in path'.format(v))
+        aux.append(v)
+
+for v in aux:
+    mod = importlib.import_module('cic_eth.aux.' + v)
+    mod.setup(rpc, config)
+
+
 def main():
     argv = ['worker']
     if args.vv:
@@ -234,24 +256,6 @@ def main():
 
     rpc = RPCConnection.connect(chain_spec, 'default')
 
-    try:
-        registry = connect_registry(rpc, chain_spec, config.get('CIC_REGISTRY_ADDRESS'))
-    except UnknownContractError as e:
-        logg.exception('Registry contract connection failed for {}: {}'.format(config.get('CIC_REGISTRY_ADDRESS'), e))
-        sys.exit(1)
-    logg.info('connected contract registry {}'.format(config.get('CIC_REGISTRY_ADDRESS')))
-
-    trusted_addresses_src = config.get('CIC_TRUST_ADDRESS')
-    if trusted_addresses_src == None:
-        logg.critical('At least one trusted address must be declared in CIC_TRUST_ADDRESS')
-        sys.exit(1)
-    trusted_addresses = trusted_addresses_src.split(',')
-    for address in trusted_addresses:
-        logg.info('using trusted address {}'.format(address))
-
-    connect_declarator(rpc, chain_spec, trusted_addresses)
-    connect_token_registry(rpc, chain_spec)
-
     BaseTask.default_token_symbol = config.get('CIC_DEFAULT_TOKEN_SYMBOL')
     BaseTask.default_token_address = registry.by_name(BaseTask.default_token_symbol)
     default_token = ERC20Token(chain_spec, rpc, BaseTask.default_token_address)

apps/contract-migration/requirements.txt

@@ -1,4 +1,4 @@
-	cic-base[full_graph]==0.1.2b15
-	sarafu-faucet==0.0.3a3
-	sarafu-token==0.0.1a8
-	cic-eth==0.11.0b16 
+cic-base[full]==0.1.3a1
+sarafu-faucet==0.0.4a1
+erc20-demurrage-token==0.0.2a2
+cic-eth==0.12.0a1