@ocap/resolver 1.13.60 → 1.13.64

package/lib/index.js

@@ -311,11 +311,6 @@ module.exports = class OCAPResolver {
           const tokens = await this.formatTokenMap({ [state.tokenAddress]: '0' });
           state.tokenInfo = tokens.find((x) => x.address === state.tokenAddress);
           state.foreignToken = state.tokenInfo.foreignToken;
-
-          // TODO: deprecate following 3 fields
-          state.erc20TokenAddress = state.foreignToken.contractAddress;
-          state.foreignChainType = state.foreignToken.chainType;
-          state.foreignChainId = state.foreignToken.chainName;
         }
 
         return state;
@@ -396,11 +391,6 @@ module.exports = class OCAPResolver {
       if (typeof state.decimal === 'undefined') {
         state.decimal = DEFAULT_TOKEN_DECIMAL;
       }
-
-      // TODO: deprecate this
-      if (state.foreignToken) {
-        state.erc20ContractAddress = state.foreignToken.contractAddress;
-      }
     }
 
     return state;
@@ -911,7 +901,14 @@ module.exports = class OCAPResolver {
       return [];
     }
 
-    const rollupTxs = ['DepositTokenV2Tx', 'WithdrawTokenV2Tx', 'JoinRollupTx', 'LeaveRollupTx', 'CreateRollupBlockTx'];
+    const rollupTxs = [
+      'DepositTokenV2Tx',
+      'WithdrawTokenV2Tx',
+      'JoinRollupTx',
+      'LeaveRollupTx',
+      'CreateRollupBlockTx',
+      'ClaimBlockRewardTx',
+    ];
     const typeUrl = formatTxType(tx.tx.itxJson._type);
     const tokens = [];
 
@@ -934,13 +931,21 @@ module.exports = class OCAPResolver {
           'address'
         ).filter((x) => x.address)
       );
-    } else if (['RevokeStakeTx'].includes(typeUrl)) {
+    } else if (typeUrl === 'RevokeStakeTx') {
       tokens.push(
         ...uniqBy(
           tx.tx.itxJson.outputs.reduce((acc, x) => acc.concat(x.tokens), []),
           'address'
         ).filter((x) => x.address)
       );
+    } else if (typeUrl === 'ClaimStakeTx') {
+      const revokeTx = await this.indexdb.tx.get(tx.tx.itxJson.evidence.hash);
+      tokens.push(
+        ...uniqBy(
+          revokeTx.tx.itxJson.outputs.reduce((acc, x) => acc.concat(x.tokens), []),
+          'address'
+        ).filter((x) => x.address)
+      );
     } else if (rollupTxs.includes(typeUrl)) {
       const rollup = await this.indexdb.rollup.get(tx.tx.itxJson.rollup);
       tokens.push({ address: rollup.tokenAddress, value: '0' });

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.13.60",
+  "version": "1.13.64",
   "description": "GraphQL resolver built upon ocap statedb and GQL layer",
   "main": "lib/index.js",
   "files": [
@@ -22,17 +22,17 @@
     "jest": "^27.3.1"
   },
   "dependencies": {
-    "@arcblock/did": "1.13.60",
-    "@arcblock/did-util": "1.13.60",
-    "@ocap/config": "1.13.60",
-    "@ocap/indexdb": "1.13.60",
-    "@ocap/mcrypto": "1.13.60",
-    "@ocap/message": "1.13.60",
-    "@ocap/state": "1.13.60",
-    "@ocap/tx-protocols": "1.13.60",
-    "@ocap/util": "1.13.60",
+    "@arcblock/did": "1.13.64",
+    "@arcblock/did-util": "1.13.64",
+    "@ocap/config": "1.13.64",
+    "@ocap/indexdb": "1.13.64",
+    "@ocap/mcrypto": "1.13.64",
+    "@ocap/message": "1.13.64",
+    "@ocap/state": "1.13.64",
+    "@ocap/tx-protocols": "1.13.64",
+    "@ocap/util": "1.13.64",
     "debug": "^4.3.2",
     "lodash": "^4.17.21"
   },
-  "gitHead": "2afb4dd279effb31bd28a2024789d50631819789"
+  "gitHead": "49c94d9fd5f12ec63c34ad609d041a92f68322a8"
 }