@ocap/tx-protocols 1.14.1 → 1.14.5

package/lib/execute.js

@@ -62,7 +62,7 @@ module.exports = ({ filter, runAsLambda }) => {
           // we should only flush events when retry is not supported
           // otherwise the outer caller should handle these 2
           if (shouldPersistTx(err) && isRetrySupported === false) {
-            const txState = context.states.tx.create(context, err ? err.code : 'OK');
+            const txState = context.states.tx.create(context, err ? err.code || 'INTERNAL' : 'OK');
             try {
               await context.statedb.tx.create(txState.hash, txState, context);
             } catch (e) {
@@ -100,7 +100,7 @@ module.exports = ({ filter, runAsLambda }) => {
       } finally {
         if (shouldPersistTx(error)) {
           try {
-            const txState = context.states.tx.create(ctx, error ? error.code : 'OK');
+            const txState = context.states.tx.create(ctx, error ? error.code || 'INTERNAL' : 'OK');
             flushEvents(ctx, { txState });
             await runAsLambda(async (txn) => {
               const newCtx = { ...omit(ctx, ['txn']), txn };

package/lib/protocols/account/declare.js

@@ -38,11 +38,15 @@ runner.use(
     const { tx, itx, statedb } = context;
     const tokens = { [context.config.token.address]: '0' };
 
-    context.senderState = await statedb.account.create(
-      tx.from,
-      account.create({ address: tx.from, pk: toBase58(tx.pk), nonce: tx.nonce, tokens, ...itx }, context),
-      context
-    );
+    const [senderState] = await Promise.all([
+      statedb.account.create(
+        tx.from,
+        account.create({ address: tx.from, pk: toBase58(tx.pk), nonce: tx.nonce, tokens, ...itx }, context),
+        context
+      ),
+    ]);
+
+    context.senderState = senderState;
 
     next();
   },

package/lib/protocols/asset/create.js

@@ -2,7 +2,6 @@
 const Error = require('@ocap/util/lib/error');
 const isEmpty = require('lodash/isEmpty');
 const cloneDeep = require('lodash/cloneDeep');
-const Joi = require('@ocap/validator');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { account, asset } = require('@ocap/state');
 const { toAssetAddress } = require('@arcblock/did-util');
@@ -18,18 +17,8 @@ const runner = new Runner();
 runner.use(pipes.VerifyMultiSig(0));
 
 // Verify itx
-const schema = Joi.object({
-  moniker: Joi.string().min(2).max(255).required(),
-  data: Joi.any().required(),
-  readonly: Joi.boolean().default(false),
-  transferrable: Joi.boolean().default(false),
-  ttl: Joi.number().min(0).default(0),
-  parent: Joi.DID().optional().allow(''),
-  address: Joi.DID().role('ROLE_ASSET').required(),
-  issuer: Joi.DID().optional().allow(''),
-}).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
-  const { error } = schema.validate(itx);
+  const { error } = asset.schema.validate(itx);
   if (error) {
     return next(new Error('INVALID_TX', `Invalid itx: ${error.message}`));
   }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.14.1",
+  "version": "1.14.5",
   "description": "Predefined tx pipeline sets to execute certain type of transactions",
   "main": "lib/index.js",
   "files": [
@@ -12,24 +12,26 @@
   "scripts": {
     "lint": "eslint tests lib",
     "lint:fix": "eslint --fix tests lib",
+    "start": "node tools/start-chain.js",
     "test": "jest --forceExit --detectOpenHandles",
-    "coverage": "npm run test -- --coverage"
+    "test:ci": "jest --forceExit --detectOpenHandles --coverage",
+    "coverage": "start-server-and-test start http://127.0.0.1:4001 test:ci"
   },
   "keywords": [],
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@arcblock/did": "1.14.1",
-    "@arcblock/did-util": "1.14.1",
-    "@ocap/asset": "1.14.1",
-    "@ocap/mcrypto": "1.14.1",
-    "@ocap/merkle-tree": "1.14.1",
-    "@ocap/message": "1.14.1",
-    "@ocap/state": "1.14.1",
-    "@ocap/tx-pipeline": "1.14.1",
-    "@ocap/util": "1.14.1",
-    "@ocap/validator": "1.14.1",
-    "@ocap/wallet": "1.14.1",
+    "@arcblock/did": "1.14.5",
+    "@arcblock/did-util": "1.14.5",
+    "@ocap/asset": "1.14.5",
+    "@ocap/mcrypto": "1.14.5",
+    "@ocap/merkle-tree": "1.14.5",
+    "@ocap/message": "1.14.5",
+    "@ocap/state": "1.14.5",
+    "@ocap/tx-pipeline": "1.14.5",
+    "@ocap/util": "1.14.5",
+    "@ocap/validator": "1.14.5",
+    "@ocap/wallet": "1.14.5",
     "debug": "^4.3.2",
     "empty-value": "^1.0.1",
     "lodash": "^4.17.21",
@@ -40,7 +42,8 @@
     "elliptic": "6.5.3"
   },
   "devDependencies": {
-    "jest": "^27.3.1"
+    "jest": "^27.3.1",
+    "start-server-and-test": "^1.14.0"
   },
-  "gitHead": "ad0f82d07b1656581665f09953c738b24be07298"
+  "gitHead": "9a685c7182412efc208a5193c17b92ec299dccb2"
 }