@ocap/tx-protocols 1.18.154 → 1.18.156

package/lib/execute.js

@@ -68,7 +68,7 @@ module.exports = ({ filter, runAsLambda }) => {
         updateVaults(),
       ]);
     } catch (err) {
-      context.logger?.error('Failed to charge gas fee for errored tx', err);
+      context.logger?.error('Failed to charge gas fee for errored tx', { error: err, txHash: context.txHash });
     }
   };
 
@@ -76,7 +76,7 @@ module.exports = ({ filter, runAsLambda }) => {
     new Promise((resolve, reject) => {
       pre.run(context, (err) => {
         if (err) {
-          context.logger?.error('Failed to prepare transaction', err);
+          context.logger?.error('Failed to prepare transaction', { error: err, txHash: context.txHash });
           return reject(err);
         }
 
@@ -99,8 +99,18 @@ module.exports = ({ filter, runAsLambda }) => {
             try {
               txState = context.states.tx.create(context, err ? err.code || 'INTERNAL' : 'OK');
               await context.statedb.tx.create(txState.hash, txState, context);
+              context.logger?.info('Tx finalized', {
+                txHash: context.txHash,
+                txStatus: err ? err.code || 'INTERNAL' : 'OK',
+                txState,
+                error: err,
+              });
             } catch (e) {
-              context.logger?.error('Failed to save transaction to statedb', e, txState);
+              context.logger?.error('Failed to save invalid transaction to statedb', {
+                error: e,
+                txHash: context.txHash,
+                txState,
+              });
               return reject(e);
             }
 
@@ -109,7 +119,7 @@ module.exports = ({ filter, runAsLambda }) => {
 
           // after executing the transaction
           if (err) {
-            context.logger?.error('Failed to execute transaction', err);
+            context.logger?.error('Failed to execute transaction', { error: err, txHash: context.txHash });
             return reject(err);
           }
 
@@ -126,7 +136,7 @@ module.exports = ({ filter, runAsLambda }) => {
       try {
         await runAsLambda((txn) => {
           // create a new context each time in case we are retrying
-          ctx = pick(context, ['txBase64', 'statedb', 'indexdb', 'config', 'states', 'filter', 'extra']);
+          ctx = pick(context, ['txBase64', 'statedb', 'indexdb', 'config', 'states', 'filter', 'extra', 'logger']);
           Object.defineProperty(ctx, 'txn', { value: txn });
           return execute(ctx, protocols, true);
         });
@@ -147,13 +157,22 @@ module.exports = ({ filter, runAsLambda }) => {
               await context.statedb.tx.create(txState.hash, txState, newCtx);
               flushEvents(newCtx, { txState });
             });
-            ctx.logger?.info('Transaction has been saved to statedb', error, txState);
+            ctx?.logger?.info('Tx finalized', {
+              txHash: ctx.txHash,
+              txStatus: error ? error.code || 'INTERNAL' : 'OK',
+              txState,
+              error,
+            });
           } catch (err) {
             const txState = context.states.tx.create(ctx, error ? error.code || 'INTERNAL' : 'OK', false);
-            ctx.logger?.error('Failed to save invalid transaction to statedb', err, txState);
+            ctx?.logger?.error('Failed to save invalid transaction to statedb', {
+              error: err,
+              txHash: ctx.txHash,
+              txState,
+            });
           }
         } else {
-          ctx.logger?.error('Failed to execute transaction', error);
+          ctx?.logger?.error('Failed to execute transaction', { error, txHash: ctx.txHash });
         }
       }
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.18.154",
+  "version": "1.18.156",
   "description": "Predefined tx pipeline sets to execute certain type of transactions",
   "main": "lib/index.js",
   "files": [
@@ -21,18 +21,18 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@arcblock/did": "1.18.154",
-    "@arcblock/did-util": "1.18.154",
-    "@arcblock/jwt": "1.18.154",
-    "@arcblock/validator": "1.18.154",
-    "@ocap/asset": "1.18.154",
-    "@ocap/mcrypto": "1.18.154",
-    "@ocap/merkle-tree": "1.18.154",
-    "@ocap/message": "1.18.154",
-    "@ocap/state": "1.18.154",
-    "@ocap/tx-pipeline": "1.18.154",
-    "@ocap/util": "1.18.154",
-    "@ocap/wallet": "1.18.154",
+    "@arcblock/did": "1.18.156",
+    "@arcblock/did-util": "1.18.156",
+    "@arcblock/jwt": "1.18.156",
+    "@arcblock/validator": "1.18.156",
+    "@ocap/asset": "1.18.156",
+    "@ocap/mcrypto": "1.18.156",
+    "@ocap/merkle-tree": "1.18.156",
+    "@ocap/message": "1.18.156",
+    "@ocap/state": "1.18.156",
+    "@ocap/tx-pipeline": "1.18.156",
+    "@ocap/util": "1.18.156",
+    "@ocap/wallet": "1.18.156",
     "debug": "^4.3.6",
     "deep-diff": "^1.0.2",
     "empty-value": "^1.0.1",
@@ -47,5 +47,5 @@
     "jest": "^29.7.0",
     "start-server-and-test": "^1.14.0"
   },
-  "gitHead": "414d4207886905fca9529912a12a3b6b8c811886"
+  "gitHead": "955c3e7ae8e06fc037e6591267babaae1623ef23"
 }