@ocap/tx-protocols 1.20.2 → 1.20.4

package/README.md

@@ -5,7 +5,7 @@ Defines the interface of OCAP query resolver.
 ## Usage
 
 ```shell
-yarn add @ocap/tx-pipeline
+pnpm install @ocap/tx-pipeline
 ```
 
 Then:

package/lib/execute.js

@@ -1,6 +1,7 @@
 /* eslint-disable consistent-return */
 const get = require('lodash/get');
 const pick = require('lodash/pick');
+const merge = require('lodash/merge');
 const camelCase = require('lodash/camelCase');
 const { CustomError: Error } = require('@ocap/util/lib/error');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
@@ -159,54 +160,60 @@ module.exports = ({ filter, runAsLambda }) => {
       const startTime = Date.now();
 
       try {
-        await runAsLambda(async (txn) => {
-          // create a new context each time in case we are retrying
-          ctx = pick(context, ['txBase64', 'statedb', 'indexdb', 'config', 'states', 'filter', 'extra', 'logger']);
-          ctx.txn = txn;
+        const txState = await runAsLambda(
+          async (txn) => {
+            // create a new context each time in case we are retrying
+            ctx = pick(context, ['txBase64', 'statedb', 'indexdb', 'config', 'states', 'filter', 'extra', 'logger']);
+            ctx.txn = txn;
 
-          await execute(ctx, protocols, true);
+            await execute(ctx, protocols, true);
 
-          const txState = context.states.tx.create(ctx, 'OK');
-          await context.statedb.tx.create(txState.hash, txState, ctx);
+            const state = context.states.tx.create(ctx, 'OK');
+            await context.statedb.tx.create(state.hash, state, ctx);
 
-          // update indexdb
-          flushEvents(ctx, { txState });
+            return state;
+          },
+          { cleanWorkingSet: true, verifyHash: true }
+        );
 
-          ctx.logger?.info('Tx finalized', {
-            txHash: ctx.txHash,
-            txState,
-            txStatus: 'OK',
-            duration: Date.now() - startTime,
-          });
+        // update indexdb after statedb commit
+        flushEvents(ctx, { txState });
+
+        ctx.logger?.info('Tx finalized', {
+          txHash: ctx.txHash,
+          txState,
+          txStatus: 'OK',
+          duration: Date.now() - startTime,
         });
       } catch (error) {
         const txStatus = error.code || 'INTERNAL';
-        let txState = context.states.tx.create(ctx, txStatus, false);
+        let txState = ctx.tx ? context.states.tx.create(ctx, txStatus, false) : null;
 
         ctx.logger?.error('Failed to execute transaction', { error, txHash: ctx.txHash, txState });
 
-        if (shouldPersistTx(error)) {
+        if (txState && shouldPersistTx(error)) {
           try {
-            await runAsLambda(async (txn) => {
+            txState = await runAsLambda(async (txn) => {
               ctx = Object.assign({}, ctx, { txn, cacheStates: null });
 
               await ensureGasFeePaid(ctx);
 
               // Recreate tx to pick up gas related fields
-              txState = context.states.tx.create(ctx, txStatus);
+              const state = context.states.tx.create(ctx, txStatus);
+              await ctx.statedb.tx.create(state.hash, state, ctx);
 
-              await ctx.statedb.tx.create(txState.hash, txState, ctx);
+              return state;
+            });
 
-              // update indexdb
-              flushEvents(ctx, { txState });
+            // update indexdb after statedb commit
+            flushEvents(ctx, { txState });
 
-              ctx.logger?.info('Tx finalized', {
-                txHash: ctx.txHash,
-                txState,
-                txStatus,
-                error,
-                duration: Date.now() - startTime,
-              });
+            ctx.logger?.info('Tx finalized', {
+              txHash: ctx.txHash,
+              txState,
+              txStatus,
+              error,
+              duration: Date.now() - startTime,
             });
           } catch (err) {
             ctx.logger?.error('Failed to save invalid transaction to statedb', {
@@ -221,6 +228,9 @@ module.exports = ({ filter, runAsLambda }) => {
         }
 
         throw error;
+      } finally {
+        // Merge new ctx to original context
+        merge(context, ctx);
       }
 
       return ctx;

package/package.json

@@ -3,41 +3,35 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.20.2",
+  "version": "1.20.4",
   "description": "Predefined tx pipeline sets to execute certain type of transactions",
   "main": "lib/index.js",
   "files": [
     "lib"
   ],
-  "scripts": {
-    "lint": "eslint tests lib",
-    "lint:fix": "eslint --fix tests lib",
-    "start": "node tools/start-chain.js",
-    "test": "jest --forceExit --detectOpenHandles",
-    "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.20.2",
-    "@arcblock/did-util": "1.20.2",
-    "@arcblock/jwt": "1.20.2",
-    "@arcblock/validator": "1.20.2",
-    "@ocap/asset": "1.20.2",
-    "@ocap/mcrypto": "1.20.2",
-    "@ocap/merkle-tree": "1.20.2",
-    "@ocap/message": "1.20.2",
-    "@ocap/state": "1.20.2",
-    "@ocap/tx-pipeline": "1.20.2",
-    "@ocap/util": "1.20.2",
-    "@ocap/wallet": "1.20.2",
     "debug": "^4.3.6",
     "deep-diff": "^1.0.2",
     "empty-value": "^1.0.1",
     "lodash": "^4.17.21",
-    "url-join": "^4.0.1"
+    "url-join": "^4.0.1",
+    "@arcblock/did": "1.20.4",
+    "@arcblock/did-util": "1.20.4",
+    "@arcblock/jwt": "1.20.4",
+    "@arcblock/validator": "1.20.4",
+    "@ocap/asset": "1.20.4",
+    "@ocap/mcrypto": "1.20.4",
+    "@ocap/merkle-tree": "1.20.4",
+    "@ocap/state": "1.20.4",
+    "@ocap/util": "1.20.4",
+    "@ocap/message": "1.20.4",
+    "@ocap/tx-pipeline": "1.20.4",
+    "@ocap/wallet": "1.20.4",
+    "@ocap/client": "1.20.4",
+    "@ocap/statedb-memory": "1.20.4"
   },
   "resolutions": {
     "bn.js": "5.2.1",
@@ -45,7 +39,15 @@
   },
   "devDependencies": {
     "jest": "^29.7.0",
-    "start-server-and-test": "^1.14.0"
+    "start-server-and-test": "^1.14.0",
+    "@ocap/e2e-test": "1.20.4"
   },
-  "gitHead": "70ddd9b43070605879fed7dff50a9f19f5325ea8"
-}
+  "scripts": {
+    "lint": "eslint tests lib",
+    "lint:fix": "eslint --fix tests lib",
+    "start": "node tools/start-chain.js",
+    "test": "jest --forceExit --detectOpenHandles",
+    "test:ci": "jest --forceExit --detectOpenHandles --coverage",
+    "coverage": "start-server-and-test start http://127.0.0.1:4001 test:ci"
+  }
+}