@ocap/resolver 1.18.145 → 1.18.146

package/lib/index.js

@@ -959,7 +959,16 @@ module.exports = class OCAPResolver {
     }
 
     if (!tx.receipts) {
-      tx.receipts = getTxReceipts(tx, { config: this.config });
+      if (get(tx, 'tx.itxJson.type_url') === 'fg:t:revoke_withdraw') {
+        const withdrawHash = get(tx, 'tx.itxJson.withdraw_tx_hash');
+        // Avoid infinite loop by invalid data
+        if (withdrawHash && withdrawHash !== tx.hash) {
+          const withdrawTx = await this.getTx({ hash: withdrawHash }, ctx);
+          tx.receipts = getTxReceipts(tx, { config: this.config, withdrawTx });
+        }
+      } else {
+        tx.receipts = getTxReceipts(tx, { config: this.config });
+      }
     }
 
     // https://github.com/blocklet/abt-wallet/issues/681

package/lib/token-flow.js

@@ -158,7 +158,7 @@ const verifyAccountRisk = async ({ accountAddress, tokenAddress }, resolver, ctx
     const transactions = await resolver._getAllResults('transactions', (paging) =>
       resolver.listTransactions({ paging, accountFilter: { accounts: [address] } }, ctx)
     );
-    const accountState = await resolver.getAccountState({ address }, ctx);
+    const accountState = await resolver.getAccountState({ address, traceMigration: false }, ctx);
     if (!accountState) {
       throw new CustomError('INVALID_REQUEST', `Invalid address ${address}`);
     }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.18.145",
+  "version": "1.18.146",
   "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.145",
-    "@arcblock/did-util": "1.18.145",
-    "@arcblock/validator": "1.18.145",
-    "@ocap/config": "1.18.145",
-    "@ocap/indexdb": "1.18.145",
-    "@ocap/mcrypto": "1.18.145",
-    "@ocap/message": "1.18.145",
-    "@ocap/state": "1.18.145",
-    "@ocap/tx-protocols": "1.18.145",
-    "@ocap/util": "1.18.145",
+    "@arcblock/did": "1.18.146",
+    "@arcblock/did-util": "1.18.146",
+    "@arcblock/validator": "1.18.146",
+    "@ocap/config": "1.18.146",
+    "@ocap/indexdb": "1.18.146",
+    "@ocap/mcrypto": "1.18.146",
+    "@ocap/message": "1.18.146",
+    "@ocap/state": "1.18.146",
+    "@ocap/tx-protocols": "1.18.146",
+    "@ocap/util": "1.18.146",
     "debug": "^4.3.6",
     "lodash": "^4.17.21"
   },
-  "gitHead": "52b533ef56196496dc068fbf86ea07afbb87366e"
+  "gitHead": "ea7f3d1ad606f277b89c390364f20bf295d9e4f9"
 }