@ocap/resolver 1.18.149 → 1.18.151

package/lib/index.js

@@ -331,12 +331,13 @@ module.exports = class OCAPResolver {
     return JSON.stringify(this.config);
   }
 
-  getAccountState({ address, traceMigration = true }, ctx) {
+  getAccountState({ address, traceMigration = true, expandContext = true }, ctx) {
     return this._getState({
       table: 'account',
       id: address,
       dataKey: 'data',
       extraParams: { traceMigration },
+      expandContext,
       onRead: async (state) => {
         if (state) {
           if (state.tokens) {
@@ -965,7 +966,9 @@ module.exports = class OCAPResolver {
       tx.receipts = getTxReceipts(tx, { config: this.config });
     }
 
-    if (get(tx, 'tx.itxJson.type_url') === 'fg:t:revoke_withdraw') {
+    const typeUrl = get(tx, 'tx.itxJson.type_url');
+
+    if (typeUrl === 'fg:t:revoke_withdraw' || typeUrl === 'fg:t:approve_withdraw') {
       const withdrawHash = get(tx, 'tx.itxJson.withdraw_tx_hash');
       // Avoid infinite loop by invalid data
       if (withdrawHash && withdrawHash !== tx.hash) {
@@ -975,10 +978,25 @@ module.exports = class OCAPResolver {
     }
 
     // https://github.com/blocklet/abt-wallet/issues/681
-    if (get(tx, 'tx.itxJson.type_url') === 'fg:t:deposit_token') {
+    if (typeUrl === 'fg:t:deposit_token') {
       tx.receipts = getTxReceipts(tx, { config: this.config });
     }
 
+    if (typeUrl === 'fg:t:account_migrate') {
+      const fromState = await this.getAccountState({
+        address: tx.tx.from,
+        traceMigration: false,
+        expandContext: false,
+      });
+      if (fromState) {
+        tx.receipts = getTxReceipts(tx, { config: this.config, fromState });
+      }
+    }
+
+    if (typeUrl === 'fg:t:declare') {
+      tx.receipts = getTxReceipts(tx, { config: this.config, time: tx.time });
+    }
+
     tx.receipts = mergeTxReceipts(tx.receipts);
     tx.tokenSymbols = await this.getTxTokenSymbols(tx);
 
@@ -1153,6 +1171,41 @@ module.exports = class OCAPResolver {
     migrationChain.buildChains(migrationTxs);
     this.migrationChain = migrationChain;
   }
+
+  /** fix accounts field of legacy approve_withdraw transactions in indexdb */
+  async fixApproveWithdrawAccounts() {
+    const approveWithdrawTxs = await this._getAllResults('transactions', (paging) =>
+      this.listTransactions({
+        paging,
+        typeFilter: { types: ['approve_withdraw'] },
+        validityFilter: { validity: ['VALID'] },
+      })
+    );
+
+    const updatedTxs = await Promise.all(
+      approveWithdrawTxs.map(async (tx) => {
+        const withdrawHash = tx.tx?.itxJson?.withdraw_tx_hash;
+
+        if (!withdrawHash) return;
+
+        const indexdbTx = await this.indexdb.tx.get(tx.hash);
+        const withdrawTx = await this.getTx({ hash: withdrawHash });
+        const from = withdrawTx?.tx?.from;
+
+        if (!from || !indexdbTx) return;
+
+        const accounts = uniq((indexdbTx.accounts || []).concat([from]).filter(Boolean));
+        debug('fixApproveWithdrawAccounts', { tx, from, accounts });
+
+        // update indexdb
+        const updatedTx = await this.indexdb.tx.update(tx.hash, { accounts });
+        // eslint-disable-next-line consistent-return
+        return updatedTx;
+      })
+    );
+
+    return updatedTxs.filter(Boolean);
+  }
 };
 
 module.exports.formatData = formatData;

package/lib/token-flow.js

@@ -4,6 +4,7 @@ const { BN, fromTokenToUnit } = require('@ocap/util');
 const { schemas, Joi } = require('@arcblock/validator');
 const { CustomError } = require('@ocap/util/lib/error');
 const uniq = require('lodash/uniq');
+const { FORGE_TOKEN_HOLDER } = require('@ocap/state/lib/states/tx');
 const debug = require('debug')(require('../package.json').name);
 
 const ZERO = new BN(0);
@@ -122,7 +123,7 @@ const getTransferFlow = (tx, tokenAddress) => {
 };
 
 const getVaultAccounts = (config) => {
-  return Object.values(config.vaults).flat();
+  return Object.values(config.vaults).flat().concat(FORGE_TOKEN_HOLDER);
 };
 
 const fixMigrateReceipts = async ({ accountAddress, tx }, resolver) => {
@@ -170,8 +171,8 @@ const verifyAccountRisk = async ({ accountAddress, tokenAddress }, resolver, ctx
     // Avoid circular query
     if (checkedAccounts.has(address)) continue;
     // skip trusted accounts
-    if (await resolver.filter.isTrusted(accountAddress)) {
-      checkedAccounts.set(accountAddress, {});
+    if (await resolver.filter.isTrusted(address)) {
+      checkedAccounts.set(address, {});
       continue;
     }
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.18.149",
+  "version": "1.18.151",
   "description": "GraphQL resolver built upon ocap statedb and GQL layer",
   "main": "lib/index.js",
   "files": [
@@ -22,18 +22,18 @@
     "jest": "^29.7.0"
   },
   "dependencies": {
-    "@arcblock/did": "1.18.149",
-    "@arcblock/did-util": "1.18.149",
-    "@arcblock/validator": "1.18.149",
-    "@ocap/config": "1.18.149",
-    "@ocap/indexdb": "1.18.149",
-    "@ocap/mcrypto": "1.18.149",
-    "@ocap/message": "1.18.149",
-    "@ocap/state": "1.18.149",
-    "@ocap/tx-protocols": "1.18.149",
-    "@ocap/util": "1.18.149",
+    "@arcblock/did": "1.18.151",
+    "@arcblock/did-util": "1.18.151",
+    "@arcblock/validator": "1.18.151",
+    "@ocap/config": "1.18.151",
+    "@ocap/indexdb": "1.18.151",
+    "@ocap/mcrypto": "1.18.151",
+    "@ocap/message": "1.18.151",
+    "@ocap/state": "1.18.151",
+    "@ocap/tx-protocols": "1.18.151",
+    "@ocap/util": "1.18.151",
     "debug": "^4.3.6",
     "lodash": "^4.17.21"
   },
-  "gitHead": "8979a303ba489127e429df9ce09738995f716d71"
+  "gitHead": "ad9f0a1c3913c304a716247de283be2146b7105e"
 }