@ocap/tx-pipeline 1.18.164 → 1.18.165

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

@@ -5,24 +5,27 @@ module.exports = function CreateTakeStateSnapshotPipe({ key = 'stateSnapshot' }
   return async function TakeStateSnapshot(context, next) {
     const { statedb, config } = context;
 
-    const statesMap = groupStatesByAddress(context);
-
-    // feeVaultState is usually add to context at the end, so we need to query it here
-    if (!statesMap[config.vaults.txFee]) {
-      statesMap[config.vaults.txFee] = [await statedb.account.get(config.vaults.txFee, 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 statesMap = groupStatesByAddress(context);
+
     // for acquire transactions, we should pre-fetch the account state in the mint hooks to verify their balance changes later
     if (context.factoryState && ['fg:t:acquire_asset_v3', 'fg:t:acquire_asset_v2'].includes(context.txType)) {
       const mintHook = context.factoryState.hooks?.find((x) => x.name === 'mint');
       const states = await Promise.all(
         (mintHook?.compiled || []).map((x) => {
           const address = x.args.to;
-          return statesMap[address]?.[0] || statedb.account.get(address, context);
+          return statesMap[address] || statedb.account.get(address, context);
         })
       );
       states.forEach((x) => {
-        statesMap[x.address] = [x];
+        statesMap[x.address] = x;
       });
     }
 

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

@@ -15,24 +15,25 @@ const { pickBy } = require('lodash');
 
 function groupStatesByAddress(context) {
   /**
-   * a map of address -> state list
-   * @type {Record<string, []>}
+   * a map of address -> state
+   * @type {Record<string, any>}
    */
   const statesMap = {};
 
-  for (const [stateKey, stateOrStates] of Object.entries(context)) {
+  for (const stateOrStates of Object.values(context)) {
     const states = [].concat(stateOrStates).filter((x) => x && x.address && x.tokens && x.context);
 
     for (const state of states) {
-      // mintHookStates has the highest priority
-      if (stateKey === 'mintHookStates') {
-        statesMap[state.address] = [state];
+      const curStates = statesMap[state.address];
+
+      if (!curStates) {
+        statesMap[state.address] = state;
         continue;
       }
-      // skip state with the same tokens as existing states
-      const curStates = statesMap[state.address] || [];
-      if (curStates.every((x) => !isEqual(x.tokens, state.tokens))) {
-        statesMap[state.address] = curStates.concat(state);
+      // Use the state that recently retrieved from database
+      if ((state._retrievedAt || 0) > (curStates._retrievedAt || 0)) {
+        statesMap[state.address] = state;
+        continue;
       }
     }
   }
@@ -46,11 +47,11 @@ function findStates(address, statesMap) {
   }
   // Try to find state from migrated addresses
   const matchedAddress = Object.keys(statesMap).find((x) => {
-    const state = statesMap[x][0];
+    const state = statesMap[x];
     const relatedAddresses = getRelatedAddresses(state);
     return !state.migratedTo?.length && relatedAddresses.some((y) => isSameDid(y, address));
   });
-  return statesMap[matchedAddress] || [];
+  return statesMap[matchedAddress];
 }
 
 function getStateTokens(state, txType) {
@@ -74,7 +75,7 @@ function mergeTokenChange(token1, token2, operator = 'add') {
  * Update migrated addresses in receipts to their latest addresses
  */
 function fixMigratedReceipts(receipts, statesMap) {
-  const states = Object.values(statesMap).flat();
+  const states = Object.values(statesMap);
   const fixedReceipts = receipts.map((receipt) => {
     const state = states.find((x) => {
       const relatedAddresses = getRelatedAddresses(x);
@@ -109,10 +110,10 @@ module.exports = function CreateVerifyStateDiffPipe({ snapshotKey = 'stateSnapsh
     // verify: receipts -> state diff
     // before tokens + receipt changes = after tokens
     for (const [address, tokenChanges] of Object.entries(receiptChanges)) {
-      const beforeState = findStates(address, snapshotStates)[0];
-      const afterStates = findStates(address, contextStates);
+      const beforeState = findStates(address, snapshotStates);
+      const afterState = findStates(address, contextStates);
 
-      if (!afterStates.length) {
+      if (!afterState) {
         logger?.error('INVALID_RECEIPT', 'Changed state not found for receipt', {
           address,
           context,
@@ -126,14 +127,14 @@ module.exports = function CreateVerifyStateDiffPipe({ snapshotKey = 'stateSnapsh
       const expectedTokens = beforeState
         ? mergeTokenChange(getStateTokens(beforeState, txState.type), tokenChanges)
         : tokenChanges;
-      const matchAfterState = afterStates.find((x) => isEqual(expectedTokens, getStateTokens(x, txState.type)));
+      const isMatchExpected = isEqual(expectedTokens, getStateTokens(afterState, txState.type));
 
-      if (!matchAfterState) {
+      if (!isMatchExpected) {
         logger?.error('INVALID_RECEIPT', 'Tx receipts does not match with state diff', {
           txState,
           expectedTokens,
           beforeState,
-          afterStates,
+          afterState,
           tokenChanges,
         });
         return next(new Error('INVALID_RECEIPT', 'Tx receipts does not match with state diff'));
@@ -142,45 +143,37 @@ module.exports = function CreateVerifyStateDiffPipe({ snapshotKey = 'stateSnapsh
 
     // verify: state diff -> receipts
     // after tokens - before tokens = receipt changes
-    for (const [address, afterStates] of Object.entries(contextStates)) {
-      const beforeState = findStates(address, snapshotStates)[0];
-      const beforeTokens = beforeState ? getStateTokens(beforeState, txState.type) : {};
+    for (const [address, afterState] of Object.entries(contextStates)) {
       const roleType = toTypeInfo(address).role;
-
-      // there might be multiple afterStates found, e.g. when signerState and senderState have the same address,
-      // and it's possible that senderState has updated tokens but signerState hasn't.
-      // so we need to verify each afterState. there are two cases:
-      // 1. state with updated tokens: their tokens differ from beforeState.tokens, so they will enter verification logic
-      // 2. state with no updated tokens: their tokens match beforeState.tokens, so they will skip verification logic
-      for (const afterState of afterStates) {
-        const afterTokens = getStateTokens(afterState, txState.type);
-        if (!beforeState || !isEqual(afterTokens, beforeTokens)) {
-          const tokenChange = pickBy(
-            beforeState ? mergeTokenChange(afterTokens, beforeTokens, 'sub') : afterTokens,
+      const beforeState = findStates(address, snapshotStates);
+      const beforeTokens = beforeState ? getStateTokens(beforeState, txState.type) : {};
+      const afterTokens = getStateTokens(afterState, txState.type);
+
+      if (!beforeState || !isEqual(afterTokens, beforeTokens)) {
+        const tokenChange = pickBy(
+          beforeState ? mergeTokenChange(afterTokens, beforeTokens, 'sub') : afterTokens,
+          (value) => value !== '0'
+        );
+        let expectedChange = pickBy(receiptChanges[address] || {}, (value) => value !== '0');
+
+        // revoke_stake only moves tokens from staked to revoked tokens and without generating any receipts
+        // after tokens - before tokens = before revoke tokens - after revoke tokens
+        if (txState.type === 'revoke_stake' && roleType === RoleType.ROLE_STAKE) {
+          expectedChange = pickBy(
+            mergeTokenChange(beforeState.revokedTokens, afterState.revokedTokens, 'sub'),
             (value) => value !== '0'
           );
-          let expectedChange = receiptChanges[address] || {};
-
-          // revoke_stake only moves tokens from staked to revoked tokens and without generating any receipts
-          // after tokens - before tokens = before revoke tokens - after revoke tokens
-          if (txState.type === 'revoke_stake' && roleType === RoleType.ROLE_STAKE) {
-            expectedChange = pickBy(
-              mergeTokenChange(beforeState.revokedTokens, afterState.revokedTokens, 'sub'),
-              (value) => value !== '0'
-            );
-          }
-
-          if (!isEqual(tokenChange, expectedChange)) {
-            logger?.error('INVALID_RECEIPT', 'State diff does not match with tx receipts', {
-              txState,
-              beforeState,
-              afterState,
-              afterStates,
-              tokenChange,
-              expectedChange,
-            });
-            return next(new Error('INVALID_RECEIPT', 'State diff does not match with tx receipts'));
-          }
+        }
+
+        if (!isEqual(tokenChange, expectedChange)) {
+          logger?.error('INVALID_RECEIPT', 'State diff does not match with tx receipts', {
+            txState,
+            beforeState,
+            afterState,
+            tokenChange,
+            expectedChange,
+          });
+          return next(new Error('INVALID_RECEIPT', 'State diff does not match with tx receipts'));
         }
       }
     }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.18.164",
+  "version": "1.18.165",
   "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.18.164",
-    "@arcblock/did-util": "1.18.164",
-    "@ocap/mcrypto": "1.18.164",
-    "@ocap/message": "1.18.164",
-    "@ocap/state": "1.18.164",
-    "@ocap/util": "1.18.164",
-    "@ocap/wallet": "1.18.164",
+    "@arcblock/did": "1.18.165",
+    "@arcblock/did-util": "1.18.165",
+    "@ocap/mcrypto": "1.18.165",
+    "@ocap/message": "1.18.165",
+    "@ocap/state": "1.18.165",
+    "@ocap/util": "1.18.165",
+    "@ocap/wallet": "1.18.165",
     "debug": "^4.3.6",
     "empty-value": "^1.0.1",
     "lodash": "^4.17.21"
   },
-  "gitHead": "f517d0620f7fb4acd26716ab76f68829587b6483"
+  "gitHead": "e1a9e9e807ca049f67ffbb5ac556b014461cb7a1"
 }