Merge remote-tracking branch 'origin/master' into lash/external-chain-queue

apps/cic-eth/cic_eth/runnable/daemons/filters/tx.py

@@ -52,7 +52,6 @@ class TxFilter(SyncFilter):
                     ],
                 queue=self.queue,
                 )
-        #s_final_state.link(s_obsolete_state)
         t = celery.group(s_obsolete_state, s_final_state)()
 
         return t

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

@@ -80,7 +80,7 @@ straggler_delay = int(config.get('CIC_TX_RETRY_DELAY'))
 #    logg.debug('submitting tx {} for retry'.format(tx_hash))
 #    s_check = celery.signature(
 #            'cic_eth.admin.ctrl.check_lock',
-#            [
+            [
 #                tx_hash,
 #                chain_str,
 #                LockEnum.QUEUE,
@@ -115,7 +115,6 @@ straggler_delay = int(config.get('CIC_TX_RETRY_DELAY'))
 #    s_check.apply_async()
 
 
-
 def main(): 
     conn = RPCConnection.connect(chain_spec, 'default')
     syncer = RetrySyncer(conn, chain_spec, straggler_delay, batch_size=config.get('_BATCH_SIZE'))

apps/contract-migration/scripts/requirements.txt

@@ -1,4 +1,4 @@
-cic-base[full_graph]==0.1.2a58
+cic-base[full_graph]==0.1.2a60
 sarafu-faucet==0.0.2a16
 cic-eth==0.11.0a4
 cic-types==0.1.0a10