WIP Fix more typos in daemons

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

@@ -40,7 +40,7 @@ class GasFilter(SyncFilter):
                 return
 
             chain_spec = ChainSpec.from_chain_str(chain_str)
-            txs = get_paused_txs(StatusEnum.WAITFORGAS, r[0], chain_spec.chain_id(), session=session)
+            txs = get_paused_txs(StatusBits.GAS_ISSUES, r[0], chain_spec.chain_id(), session=session)
 
             SessionBase.release_session(session)
 

apps/cic-meta/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cic-client-meta",
-	"version": "0.0.7-alpha.1",
+	"version": "0.0.7-alpha.2",
 	"description": "Signed CRDT metadata graphs for the CIC network",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -9,7 +9,8 @@
 		"build": "node_modules/typescript/bin/tsc -d --outDir dist && npm run build-server",
 		"build-server": "tsc -d --outDir dist-server scripts/server/*.ts",
 		"pack": "node_modules/typescript/bin/tsc -d --outDir dist && webpack",
-		"clean": "rm -rf dist"
+		"clean": "rm -rf dist",
+		"prepare": "npm run build && npm run build-server"
 	},
 	"dependencies": {
 		"@ethereumjs/tx": "^3.0.0-beta.1",

apps/contract-migration/scripts/README

@@ -40,7 +40,7 @@ Monitors a folder for output from the `import_users.py` script, adding the metad
 
 (Only if you used the `--gift-threshold` option above)
 
-`python -c config -i <newchain:id> -r <cic_registry_address> -p <eth_provider> --head <datadir>` 
+`python -c config -i <newchain:id> -r <cic_registry_address> -p <eth_provider> --head -y ../keystore/UTC--2021-01-08T17-18-44.521011372Z--eb3907ecad74a0013c259d5874ae7f22dcbcc95c <datadir>` 
 
 This will monitor new mined blocks and send balances to the newly created accounts.
 

apps/contract-migration/scripts/create_import_users.py

@@ -33,7 +33,9 @@ logg = logging.getLogger()
 
 fake = Faker(['sl', 'en_US', 'no', 'de', 'ro'])
 
-config_dir = os.environ.get('CONFINI_DIR', '/usr/local/etc/cic')
+script_dir = os.path.realpath(os.path.dirname(__file__))
+#config_dir = os.environ.get('CONFINI_DIR', '/usr/local/etc/cic')
+config_dir = os.environ.get('CONFINI_DIR', os.path.join(script_dir, 'config'))
 
 argparser = argparse.ArgumentParser()
 argparser.add_argument('-c', type=str, default=config_dir, help='Config dir')

apps/contract-migration/scripts/import_users.py

@@ -100,7 +100,14 @@ def register_eth(i, u):
 
     ps.get_message()
     m = ps.get_message(timeout=args.timeout)
-    address = json.loads(m['data'])
+    try:
+        address = json.loads(m['data'])
+    except TypeError as e:
+        if m == None:
+            logg.critical('empty response from redis callback (did the service crash?)')
+        else:
+            logg.critical('unexpected response from redis callback: {}'.format(m))
+        sys.exit(1)
     logg.debug('[{}] register eth {} {}'.format(i, u, address))
 
     return address

apps/contract-migration/scripts/node_modules/cic-client-meta

@@ -1 +0,0 @@
-../../../cic-meta