@ocap/tx-pipeline 1.19.15 → 1.19.17

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2018-2019 ArcBlock
+Copyright 2018-2025 ArcBlock
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/lib/pipes/take-state-snapshot.js

@@ -3,15 +3,16 @@ const { groupStatesByAddress } = require('./verify-state-diff');
 
 module.exports = function CreateTakeStateSnapshotPipe({ key = 'stateSnapshot' } = {}) {
   return async function TakeStateSnapshot(context, next) {
-    const { statedb, config } = context;
+    const { statedb } = context;
 
     // feeVaultState and gasVaultState is usually add to context at the end, so we need to query it here
-    if (!context.feeVaultState) {
-      context.feeVaultState = await statedb.account.get(config.vaults.txFee, context);
-    }
-    if (context.gasVault && !context.gasVaultState) {
-      context.gasVaultState = await statedb.account.get(context.gasVault, context);
-    }
+    const [feeVaultState, gasVaultState] = await Promise.all([
+      context.feeVault && !context.feeVaultState ? statedb.account.get(context.feeVault, context) : null,
+      context.gasVault && !context.gasVaultState ? statedb.account.get(context.gasVault, context) : null,
+    ]);
+
+    if (feeVaultState) context.feeVaultState = feeVaultState;
+    if (gasVaultState) context.gasVaultState = gasVaultState;
 
     const statesMap = groupStatesByAddress(context);
 
@@ -21,10 +22,10 @@ module.exports = function CreateTakeStateSnapshotPipe({ key = 'stateSnapshot' }
       const states = await Promise.all(
         (mintHook?.compiled || []).map((x) => {
           const address = x.args.to;
-          return statesMap[address] || statedb.account.get(address, context);
+          return statedb.account.get(address, context);
         })
       );
-      states.forEach((x) => {
+      states.filter(Boolean).forEach((x) => {
         statesMap[x.address] = x;
       });
     }

package/lib/pipes/verify-state-diff.js

@@ -48,8 +48,11 @@ function findStates(address, statesMap) {
   // Try to find state from migrated addresses
   const matchedAddress = Object.keys(statesMap).find((x) => {
     const state = statesMap[x];
-    const relatedAddresses = getRelatedAddresses(state);
-    return !state.migratedTo?.length && relatedAddresses.some((y) => isSameDid(y, address));
+    if (state) {
+      const relatedAddresses = getRelatedAddresses(state);
+      return !state.migratedTo?.length && relatedAddresses.some((y) => isSameDid(y, address));
+    }
+    return false;
   });
   return statesMap[matchedAddress];
 }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.19.15",
+  "version": "1.19.17",
   "description": "Pipeline runner and common pipelines to process transactions",
   "main": "lib/index.js",
   "files": [
@@ -29,16 +29,16 @@
     "elliptic": "6.5.3"
   },
   "dependencies": {
-    "@arcblock/did": "1.19.15",
-    "@arcblock/did-util": "1.19.15",
-    "@ocap/mcrypto": "1.19.15",
-    "@ocap/message": "1.19.15",
-    "@ocap/state": "1.19.15",
-    "@ocap/util": "1.19.15",
-    "@ocap/wallet": "1.19.15",
+    "@arcblock/did": "1.19.17",
+    "@arcblock/did-util": "1.19.17",
+    "@ocap/mcrypto": "1.19.17",
+    "@ocap/message": "1.19.17",
+    "@ocap/state": "1.19.17",
+    "@ocap/util": "1.19.17",
+    "@ocap/wallet": "1.19.17",
     "debug": "^4.3.6",
     "empty-value": "^1.0.1",
     "lodash": "^4.17.21"
   },
-  "gitHead": "ab6cd19ab8633c815ab0235b7ab5d80fc071de15"
+  "gitHead": "d25d8b52053b0e3254a28c3b44ea5e447ce1c08a"
 }