Handle single dict input to account tx list, add ext module to tasker

apps/cic-eth/cic_eth/api/api_task.py

@@ -490,7 +490,7 @@ class Api:
             queue=self.queue,
             )
         if self.callback_param != None:
-            s_assemble.link(self.callback_success).on_error(self.callback_error)
+            s_brief.link(self.callback_success).on_error(self.callback_error)
 
         t = None
         if external_task != None:
@@ -515,7 +515,8 @@ class Api:
             c = celery.chain(s_external_get, s_external_process)
             t = celery.chord([s_local, c])(s_brief)
         else:
-            t = s_local.apply_sync()
+            s_local.link(s_brief)
+            t = s_local.apply_async()
 
         return t
 

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

@@ -40,6 +40,8 @@ from cic_eth.callbacks import redis
 from cic_eth.db.models.base import SessionBase
 from cic_eth.db.models.otx import Otx
 from cic_eth.db import dsn_from_config
+from cic_eth.ext import tx
+from cic_eth.ext import address
 
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()

apps/cic-meta/.gitignore

@@ -1,6 +1,5 @@
 node_modules
 dist
 dist-web
-dist-server
 scratch
 tests

apps/cic-meta/CHANGELOG

@@ -1,7 +1,6 @@
 * 0.0.7-pending
 	- Add immutable content
 	- Add db lock on server
-	- Add ArgPair and KeyStore to src exports
 * 0.0.6
 	- Add server build
 * 0.0.5

apps/cic-meta/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cic-client-meta",
-	"version": "0.0.7-alpha.3",
+	"version": "0.0.7-alpha.2",
 	"description": "Signed CRDT metadata graphs for the CIC network",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -32,12 +32,6 @@
 		"webpack-cli": "^4.2.0"
 	},
 	"author": "Louis Holbrook <dev@holbrook.no>",
-	"contributors": [
-		{
-			"name": "Spencer Ofwiti",
-			"email": "maxspencer56@gmail.com"
-		}
-	],
 	"license": "GPL-3.0-or-later",
 	"engines": {
 		"node": "~15.3.0"

apps/cic-meta/scripts/server/server.ts

@@ -101,18 +101,6 @@ function parseDigest(url) {
 
 async function processRequest(req, res) {
 	let digest = undefined;
-	const headers = {
-		"Access-Control-Allow-Origin": "*",
-		"Access-Control-Allow-Methods": "OPTIONS, POST, GET, PUT",
-		"Access-Control-Max-Age": 2592000, // 30 days
-		"Access-Control-Allow-Headers": 'Access-Control-Allow-Origin, Content-Type, x-cic-automerge'
-	};
-
-	if (req.method === "OPTIONS") {
-		res.writeHead(200, headers);
-		res.end();
-		return;
-	}
 
 	if (!['PUT', 'GET', 'POST'].includes(req.method)) {
 		res.writeHead(405, {"Content-Type": "text/plain"});
@@ -213,7 +201,6 @@ async function processRequest(req, res) {
 
 		const responseContentLength = (new TextEncoder().encode(content)).length;
 		res.writeHead(200, {
-			"Access-Control-Allow-Origin": "*",
 			"Content-Type": contentType,
 			"Content-Length": responseContentLength,
 		});

apps/cic-meta/src/index.ts

@@ -1,5 +1,5 @@
-export { PGPSigner, PGPKeyStore, Signer, KeyStore } from './auth';
+export { PGPSigner, PGPKeyStore } from './auth';
-export { ArgPair,  Envelope, Syncable } from './sync';
+export { Envelope, Syncable } from './sync';
 export { User } from './assets/user';
 export { Phone } from './assets/phone';
 export { Config } from './config';

apps/cic-meta/src/sync.ts

@@ -93,7 +93,7 @@ function orderDict(src) {
 	return dst;
 }
 
-class Syncable implements JSONSerializable, Authoritative, Signable {
+class Syncable implements JSONSerializable, Authoritative {
 
 	id:		string
 	timestamp:	number

ci_templates/.cic-template.yml

@@ -40,12 +40,11 @@ before_script:
       - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" $CI_REGISTRY --password-stdin
     variables:
         CI_DEBUG_TRACE: "true"
-        IMAGE_TAG_BASE: $CI_REGISTRY_IMAGE/$APP_NAME:$CI_COMMIT_BRANCH-$CI_COMMIT_SHORT_SHA
+        IMAGE_TAG: $CI_REGISTRY_IMAGE/$APP_NAME:$CI_COMMIT_BRANCH-$CI_COMMIT_SHORT_SHA
         LATEST_TAG: $CI_REGISTRY_IMAGE/$APP_NAME:latest
     script:
-      - export IMAGE_TAG="$IMAGE_TAG_BASE-$(date +%F.%H%M%S)"
       - docker build -t $IMAGE_TAG -f $DOCKERFILE_PATH .
-      - docker push "$IMAGE_TAG
+      - docker push $IMAGE_TAG
       - docker tag $IMAGE_TAG $LATEST_TAG
       - docker push $LATEST_TAG
     rules: