@ocap/tx-protocols 1.18.153 → 1.18.154

package/lib/execute.js

@@ -24,7 +24,6 @@ const flushEvents = (context, extra = {}) => {
 };
 
 const shouldPersistTx = (err) => !err || get(err, 'props.persist');
-const logError = (...args) => process.env.NODE_ENV !== 'test' && console.error(...args);
 
 module.exports = ({ filter, runAsLambda }) => {
   // pipeline before executing the transaction
@@ -69,7 +68,7 @@ module.exports = ({ filter, runAsLambda }) => {
         updateVaults(),
       ]);
     } catch (err) {
-      logError('Failed to charge gas fee for errored tx', err);
+      context.logger?.error('Failed to charge gas fee for errored tx', err);
     }
   };
 
@@ -77,7 +76,7 @@ module.exports = ({ filter, runAsLambda }) => {
     new Promise((resolve, reject) => {
       pre.run(context, (err) => {
         if (err) {
-          logError('Failed to prepare transaction', err);
+          context.logger?.error('Failed to prepare transaction', err);
           return reject(err);
         }
 
@@ -101,7 +100,7 @@ module.exports = ({ filter, runAsLambda }) => {
               txState = context.states.tx.create(context, err ? err.code || 'INTERNAL' : 'OK');
               await context.statedb.tx.create(txState.hash, txState, context);
             } catch (e) {
-              logError('Failed to save transaction to statedb', e);
+              context.logger?.error('Failed to save transaction to statedb', e, txState);
               return reject(e);
             }
 
@@ -110,7 +109,7 @@ module.exports = ({ filter, runAsLambda }) => {
 
           // after executing the transaction
           if (err) {
-            logError('Failed to execute transaction', err);
+            context.logger?.error('Failed to execute transaction', err);
             return reject(err);
           }
 
@@ -148,11 +147,13 @@ 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);
           } catch (err) {
             const txState = context.states.tx.create(ctx, error ? error.code || 'INTERNAL' : 'OK', false);
-            logError('failed to save invalid transaction to statedb', JSON.stringify(txState, null));
-            logError('failed to save invalid transaction to statedb', err);
+            ctx.logger?.error('Failed to save invalid transaction to statedb', err, txState);
           }
+        } else {
+          ctx.logger?.error('Failed to execute transaction', error);
         }
       }
 

package/lib/protocols/trade/transfer-v3.js

@@ -231,6 +231,12 @@ runner.use(
     const isAlsoSigner = !!signerUpdates[sender];
     const isAlsoReceiver = !!receiverUpdates[sender];
 
+    // When the sender is not in the inputs and outputs, we need to handle the gas fee update separately
+    const senderUpdates = {};
+    if (!isAlsoSigner && !isAlsoReceiver && senderState && senderChange) {
+      senderUpdates[sender] = applyTokenChange(senderState, senderChange);
+    }
+
     debug('transfer-v3', { signerUpdates, receiverUpdates, assetUpdates, isAlsoSigner, isAlsoReceiver });
 
     const [newSenderState, newSignerStates, newReceiverStates, newAssetStates] = await Promise.all([
@@ -242,7 +248,8 @@ runner.use(
           Object.assign(
             { address: sender, nonce: tx.nonce, pk: tx.pk },
             signerUpdates[sender] || {},
-            receiverUpdates[sender] || {}
+            receiverUpdates[sender] || {},
+            senderUpdates[sender] || {}
           ),
           context
         ),

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.18.153",
+  "version": "1.18.154",
   "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.153",
-    "@arcblock/did-util": "1.18.153",
-    "@arcblock/jwt": "1.18.153",
-    "@arcblock/validator": "1.18.153",
-    "@ocap/asset": "1.18.153",
-    "@ocap/mcrypto": "1.18.153",
-    "@ocap/merkle-tree": "1.18.153",
-    "@ocap/message": "1.18.153",
-    "@ocap/state": "1.18.153",
-    "@ocap/tx-pipeline": "1.18.153",
-    "@ocap/util": "1.18.153",
-    "@ocap/wallet": "1.18.153",
+    "@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",
     "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": "ad18c565becef73d6ee782502c3f4858de43b68b"
+  "gitHead": "414d4207886905fca9529912a12a3b6b8c811886"
 }