@ocap/tx-protocols 1.20.4 → 1.20.6

package/lib/execute.js

@@ -173,7 +173,7 @@ module.exports = ({ filter, runAsLambda }) => {
 
             return state;
           },
-          { cleanWorkingSet: true, verifyHash: true }
+          { cleanWorkingSet: true, verifyHash: true, context: ctx }
         );
 
         // update indexdb after statedb commit
@@ -192,18 +192,24 @@ module.exports = ({ filter, runAsLambda }) => {
         ctx.logger?.error('Failed to execute transaction', { error, txHash: ctx.txHash, txState });
 
         if (txState && shouldPersistTx(error)) {
+          // Avoid sync data in failed transactions to indexdb
+          ctx.events = [];
+
           try {
-            txState = await runAsLambda(async (txn) => {
-              ctx = Object.assign({}, ctx, { txn, cacheStates: null });
+            txState = await runAsLambda(
+              async (txn) => {
+                ctx = Object.assign({}, ctx, { txn, cacheStates: null });
 
-              await ensureGasFeePaid(ctx);
+                await ensureGasFeePaid(ctx);
 
-              // Recreate tx to pick up gas related fields
-              const state = context.states.tx.create(ctx, txStatus);
-              await ctx.statedb.tx.create(state.hash, state, ctx);
+                // Recreate tx to pick up gas related fields
+                const state = context.states.tx.create(ctx, txStatus);
+                await ctx.statedb.tx.create(state.hash, state, ctx);
 
-              return state;
-            });
+                return state;
+              },
+              { cleanWorkingSet: true, verifyHash: true, context: ctx }
+            );
 
             // update indexdb after statedb commit
             flushEvents(ctx, { txState });

package/lib/protocols/asset/acquire-v3.js

@@ -260,7 +260,7 @@ runner.use(
         ),
 
         // create receiver if not exist: asset owner
-        ownerState
+        ownerState || owner === tx.from
           ? Promise.resolve(ownerState)
           : statedb.account.create(owner, account.create({ address: owner }, context), context),
 
@@ -294,7 +294,7 @@ runner.use(
     await updateVaults();
 
     context.senderState = newSenderState;
-    context.receiverState = newReceiverState;
+    context.receiverState = owner === tx.from ? newSenderState : newReceiverState;
     context.signerStates = isAlsoSigner ? newSignerStates.concat(newSenderState) : newSignerStates;
     context.assetState = assetState;
     context.factoryState = newFactoryState;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.20.4",
+  "version": "1.20.6",
   "description": "Predefined tx pipeline sets to execute certain type of transactions",
   "main": "lib/index.js",
   "files": [
@@ -18,20 +18,20 @@
     "empty-value": "^1.0.1",
     "lodash": "^4.17.21",
     "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"
+    "@arcblock/did": "1.20.6",
+    "@arcblock/did-util": "1.20.6",
+    "@arcblock/jwt": "1.20.6",
+    "@arcblock/validator": "1.20.6",
+    "@ocap/asset": "1.20.6",
+    "@ocap/mcrypto": "1.20.6",
+    "@ocap/merkle-tree": "1.20.6",
+    "@ocap/message": "1.20.6",
+    "@ocap/state": "1.20.6",
+    "@ocap/tx-pipeline": "1.20.6",
+    "@ocap/util": "1.20.6",
+    "@ocap/wallet": "1.20.6",
+    "@ocap/client": "1.20.6",
+    "@ocap/statedb-memory": "1.20.6"
   },
   "resolutions": {
     "bn.js": "5.2.1",
@@ -40,7 +40,7 @@
   "devDependencies": {
     "jest": "^29.7.0",
     "start-server-and-test": "^1.14.0",
-    "@ocap/e2e-test": "1.20.4"
+    "@ocap/e2e-test": "1.20.6"
   },
   "scripts": {
     "lint": "eslint tests lib",