@subwallet/extension-base 1.2.29-0 → 1.2.31-0

package/cjs/utils/staticData/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.termAndCondition = exports.staticData = exports.marketingCampaigns = exports.currencySymbol = exports.crowdloanFunds = exports.buyTokenConfigs = exports.buyServiceInfos = exports.StaticKey = void 0;
+exports.termAndCondition = exports.staticData = exports.marketingCampaigns = exports.currencySymbol = exports.crowdloanFunds = exports.buyTokenConfigs = exports.buyServiceInfos = exports.blockedActionsFeatures = exports.StaticKey = void 0;
 var _chainList = require("@subwallet/chain-list");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -27,7 +27,10 @@ const termAndCondition = require('./termAndCondition.json');
 // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
 exports.termAndCondition = termAndCondition;
 const currencySymbol = require('./currencySymbol.json');
+// eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
 exports.currencySymbol = currencySymbol;
+const blockedActionsFeatures = require('./blockedActionsFeatures.json');
+exports.blockedActionsFeatures = blockedActionsFeatures;
 let StaticKey;
 exports.StaticKey = StaticKey;
 (function (StaticKey) {
@@ -38,6 +41,7 @@ exports.StaticKey = StaticKey;
   StaticKey["CROWDLOAN_FUNDS"] = "crowdloan-funds";
   StaticKey["TERM_AND_CONDITION"] = "term-and-condition";
   StaticKey["BUY_TOKEN_CONFIGS"] = "buy-token-configs";
+  StaticKey["BLOCKED_ACTIONS_FEATURES"] = "blocked-actions-features";
 })(StaticKey || (exports.StaticKey = StaticKey = {}));
 const staticData = {
   [StaticKey.CHAINS]: Object.values(_chainList.ChainInfoMap),
@@ -46,6 +50,7 @@ const staticData = {
   [StaticKey.CROWDLOAN_FUNDS]: crowdloanFunds,
   [StaticKey.MARKETING_CAMPAINGS]: marketingCampaigns,
   [StaticKey.TERM_AND_CONDITION]: termAndCondition.default,
-  [StaticKey.BUY_TOKEN_CONFIGS]: buyTokenConfigs
+  [StaticKey.BUY_TOKEN_CONFIGS]: buyTokenConfigs,
+  [StaticKey.BLOCKED_ACTIONS_FEATURES]: blockedActionsFeatures
 };
 exports.staticData = staticData;

package/constants/blocked-actions-list.d.ts

@@ -0,0 +1,7 @@
+import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
+interface BlockedActionsFeaturesMap {
+    blockedActionsMap: Record<ExtrinsicType, string[]>;
+    blockedFeaturesList: string[];
+}
+export declare const fetchLastestBlockedActionsAndFeatures: () => Promise<BlockedActionsFeaturesMap>;
+export {};

package/constants/blocked-actions-list.js

@@ -0,0 +1,8 @@
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { fetchStaticData } from '@subwallet/extension-base/utils';
+const BLOCKED_ACTIONS_AND_FEATURES_PROMISE = fetchStaticData('blocked-actions-features');
+export const fetchLastestBlockedActionsAndFeatures = async () => {
+  return await BLOCKED_ACTIONS_AND_FEATURES_PROMISE;
+};

package/constants/index.d.ts

@@ -32,3 +32,4 @@ export declare const ORDINAL_METHODS: string[];
 export declare const PERMISSIONS_TO_REVOKE: string[];
 export * from './staking';
 export * from './storage';
+export * from './blocked-actions-list';

package/constants/index.js

@@ -34,4 +34,5 @@ export const ORDINAL_COLLECTION = '__Ordinal__';
 export const ORDINAL_METHODS = ['drc-20', 'pol-20'];
 export const PERMISSIONS_TO_REVOKE = ['eth_accounts'];
 export * from "./staking.js";
-export * from "./storage.js";
+export * from "./storage.js";
+export * from "./blocked-actions-list.js";

package/core/logic-validation/transfer.d.ts

@@ -10,6 +10,8 @@ export declare function validateTransferRequest(tokenInfo: _ChainAsset, from: _A
 export declare function additionalValidateTransfer(tokenInfo: _ChainAsset, nativeTokenInfo: _ChainAsset, extrinsicType: ExtrinsicType, receiverTransferTokenFreeBalance: string, transferAmount: string, senderTransferTokenTransferable?: string, receiverNativeTransferable?: string): [TransactionWarning[], TransactionError[]];
 export declare function validateXcmTransferRequest(destTokenInfo: _ChainAsset | undefined, sender: _Address, sendingValue: string): [TransactionError[], KeyringPair | undefined, BigN | undefined];
 export declare function additionalValidateXcmTransfer(originTokenInfo: _ChainAsset, destinationTokenInfo: _ChainAsset, sendingAmount: string, senderTransferable: string, receiverNativeBalance: string, destChainInfo: _ChainInfo, isSnowBridge?: boolean): [TransactionWarning | undefined, TransactionError | undefined];
+export declare function checkSupportForFeature(validationResponse: SWTransactionResponse, blockedFeaturesList: string[], chainInfo: _ChainInfo): void;
+export declare function checkSupportForAction(validationResponse: SWTransactionResponse, blockedActionsMap: Record<ExtrinsicType, string[]>): void;
 export declare function checkSupportForTransaction(validationResponse: SWTransactionResponse, transaction: OptionalSWTransaction): void;
 export declare function estimateFeeForTransaction(validationResponse: SWTransactionResponse, transaction: OptionalSWTransaction, chainInfo: _ChainInfo, evmApi: _EvmApi): Promise<FeeData>;
 export declare function checkSigningAccountForTransaction(validationResponse: SWTransactionResponse): void;

package/core/logic-validation/transfer.js

@@ -138,6 +138,170 @@ export function additionalValidateXcmTransfer(originTokenInfo, destinationTokenI
   }
   return [warning, error];
 }
+export function checkSupportForFeature(validationResponse, blockedFeaturesList, chainInfo) {
+  const extrinsicType = validationResponse.extrinsicType;
+  const chain = validationResponse.chain;
+  const currentFeature = `${extrinsicType}___${chain}`;
+  if (blockedFeaturesList.includes(currentFeature)) {
+    validationResponse.errors.push(new TransactionError(BasicTxErrorType.UNSUPPORTED, t(`Feature under maintenance on ${chainInfo.name} network. Try again later`)));
+  }
+}
+export function checkSupportForAction(validationResponse, blockedActionsMap) {
+  const extrinsicType = validationResponse.extrinsicType;
+  let currentAction = '';
+  switch (extrinsicType) {
+    case ExtrinsicType.TRANSFER_BALANCE:
+
+    // eslint-disable-next-line no-fallthrough
+    case ExtrinsicType.TRANSFER_TOKEN:
+      {
+        const data = validationResponse.data;
+        const tokenSlug = data.tokenSlug;
+        currentAction = `${extrinsicType}___${tokenSlug}`;
+        break;
+      }
+    case ExtrinsicType.TRANSFER_XCM:
+      {
+        const data = validationResponse.data;
+        const tokenSlug = data.tokenSlug;
+        const destinationNetworkKey = data.destinationNetworkKey;
+        currentAction = `${extrinsicType}___${tokenSlug}___${destinationNetworkKey}`;
+        break;
+      }
+    case ExtrinsicType.SEND_NFT:
+      {
+        const data = validationResponse.data;
+        const networkKey = data.networkKey;
+        const collectionId = data.nftItem.collectionId;
+        currentAction = `${extrinsicType}___${networkKey}___${collectionId}`;
+        break;
+      }
+    case ExtrinsicType.SWAP:
+      {
+        const data = validationResponse.data;
+        const pairSlug = data.quote.pair.slug;
+        const providerId = data.provider.id;
+        currentAction = `${extrinsicType}___${pairSlug}___${providerId}`;
+        break;
+      }
+    case ExtrinsicType.STAKING_BOND:
+      {
+        const data = validationResponse.data;
+        const chain = data.chain;
+        currentAction = `${extrinsicType}___${chain}`;
+        break;
+      }
+    case ExtrinsicType.STAKING_LEAVE_POOL:
+      {
+        const data = validationResponse.data;
+        const slug = data.slug;
+        currentAction = `${extrinsicType}___${slug}`;
+        break;
+      }
+    case ExtrinsicType.STAKING_UNBOND:
+      {
+        const data = validationResponse.data;
+        const chain = data.chain;
+        currentAction = `${extrinsicType}___${chain}`;
+        break;
+      }
+    case ExtrinsicType.STAKING_CLAIM_REWARD:
+      {
+        const data = validationResponse.data;
+        const slug = data.slug;
+        currentAction = `${extrinsicType}___${slug}`;
+        break;
+      }
+    case ExtrinsicType.STAKING_WITHDRAW:
+      {
+        const data = validationResponse.data;
+        const slug = data.slug;
+        currentAction = `${extrinsicType}___${slug}`;
+        break;
+      }
+    case ExtrinsicType.STAKING_COMPOUNDING:
+      {
+        const data = validationResponse.data;
+        const networkKey = data.networkKey;
+        currentAction = `${extrinsicType}___${networkKey}`;
+        break;
+      }
+    case ExtrinsicType.STAKING_CANCEL_COMPOUNDING:
+      {
+        const data = validationResponse.data;
+        const networkKey = data.networkKey;
+        currentAction = `${extrinsicType}___${networkKey}`;
+        break;
+      }
+    case ExtrinsicType.STAKING_CANCEL_UNSTAKE:
+      {
+        const data = validationResponse.data;
+        const slug = data.slug;
+        currentAction = `${extrinsicType}___${slug}`;
+        break;
+      }
+    case ExtrinsicType.JOIN_YIELD_POOL:
+      {
+        const data = validationResponse.data;
+        const slug = data.data.slug;
+        currentAction = `${extrinsicType}___${slug}`;
+        break;
+      }
+    case ExtrinsicType.MINT_VDOT:
+    case ExtrinsicType.MINT_LDOT:
+    case ExtrinsicType.MINT_SDOT:
+    case ExtrinsicType.MINT_QDOT:
+    case ExtrinsicType.MINT_STDOT:
+
+    // eslint-disable-next-line no-fallthrough
+    case ExtrinsicType.MINT_VMANTA:
+      {
+        const data = validationResponse.data;
+        const slug = data.slug;
+        currentAction = `${extrinsicType}___${slug}`;
+        break;
+      }
+    case ExtrinsicType.REDEEM_VDOT:
+    case ExtrinsicType.REDEEM_LDOT:
+    case ExtrinsicType.REDEEM_SDOT:
+    case ExtrinsicType.REDEEM_QDOT:
+    case ExtrinsicType.REDEEM_STDOT:
+
+    // eslint-disable-next-line no-fallthrough
+    case ExtrinsicType.REDEEM_VMANTA:
+      {
+        const data = validationResponse.data;
+        const slug = data.slug;
+        currentAction = `${extrinsicType}___${slug}`;
+        break;
+      }
+    case ExtrinsicType.UNSTAKE_VDOT:
+    case ExtrinsicType.UNSTAKE_LDOT:
+    case ExtrinsicType.UNSTAKE_SDOT:
+    case ExtrinsicType.UNSTAKE_QDOT:
+    case ExtrinsicType.UNSTAKE_STDOT:
+
+    // eslint-disable-next-line no-fallthrough
+    case ExtrinsicType.UNSTAKE_VMANTA:
+      {
+        const data = validationResponse.data;
+        const slug = data.slug;
+        currentAction = `${extrinsicType}___${slug}`;
+        break;
+      }
+    case ExtrinsicType.TOKEN_SPENDING_APPROVAL:
+      {
+        const data = validationResponse.data;
+        const chain = data.chain;
+        currentAction = `${extrinsicType}___${chain}`;
+        break;
+      }
+  }
+  const blockedActionsList = Object.values(blockedActionsMap).flat();
+  if (blockedActionsList.includes(currentAction)) {
+    validationResponse.errors.push(new TransactionError(BasicTxErrorType.UNSUPPORTED, t('Feature under maintenance. Try again later')));
+  }
+}
 
 // general validations
 export function checkSupportForTransaction(validationResponse, transaction) {

package/koni/background/handlers/Extension.js

@@ -34,7 +34,7 @@ import { isProposalExpired, isSupportWalletConnectChain, isSupportWalletConnectN
 import { SWStorage } from '@subwallet/extension-base/storage';
 import { AccountsStore } from '@subwallet/extension-base/stores';
 import { YieldPoolType } from '@subwallet/extension-base/types';
-import { BN_ZERO, convertSubjectInfoToAddresses, createTransactionFromRLP, isSameAddress, MODULE_SUPPORT, reformatAddress, signatureToHex, uniqueStringArray } from '@subwallet/extension-base/utils';
+import { BN_ZERO, convertSubjectInfoToAddresses, createPromiseHandler, createTransactionFromRLP, isSameAddress, MODULE_SUPPORT, reformatAddress, signatureToHex, uniqueStringArray } from '@subwallet/extension-base/utils';
 import { parseContractInput, parseEvmRlp } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { metadataExpand } from '@subwallet/extension-chains';
 import { createPair } from '@subwallet/keyring';
@@ -1375,6 +1375,10 @@ export default class KoniExtension {
     withMasterPassword
   }) {
     const isPasswordValidated = this.validatePassword(file, password);
+    const {
+      promise,
+      resolve
+    } = createPromiseHandler();
     if (isPasswordValidated) {
       try {
         this._saveCurrentAccountAddress(address, () => {
@@ -1389,10 +1393,12 @@ export default class KoniExtension {
             });
           }
           this._addAddressToAuthList(address, isAllowed);
+          resolve([address]);
         });
         if (this.#alwaysLock) {
           this.keyringLock();
         }
+        return promise;
       } catch (error) {
         throw new Error(error.message);
       }
@@ -1408,17 +1414,35 @@ export default class KoniExtension {
   }) {
     const addressList = accountsInfo.map(acc => acc.address);
     const isPasswordValidated = this.validatedAccountsPassword(file, password);
+    const {
+      promise,
+      resolve
+    } = createPromiseHandler();
     if (isPasswordValidated) {
       try {
         this._saveCurrentAccountAddress(ALL_ACCOUNT_KEY, () => {
           keyring.restoreAccounts(file, password);
           this.#koniState.keyringService.removeNoneHardwareGenesisHash();
-          this._addAddressesToAuthList(addressList, isAllowed);
+          const successAddressList = addressList.reduce((addressList, address) => {
+            try {
+              const account = keyring.getPair(address);
+              if (account) {
+                addressList.push(address);
+              }
+            } catch (error) {
+              console.log(error);
+            }
+            return addressList;
+          }, []);
+          this._addAddressesToAuthList(successAddressList, isAllowed);
+          resolve(successAddressList);
         });
 
         // if (this.#alwaysLock) {
         //   this.keyringLock();
         // }
+
+        return promise;
       } catch (error) {
         throw new Error(error.message);
       }
@@ -1940,8 +1964,9 @@ export default class KoniExtension {
     const substrateApi = this.#koniState.chainService.getSubstrateApi(originTokenInfo.originChain);
     const chainInfoMap = this.#koniState.chainService.getChainInfoMap();
     const destinationTokenInfo = this.#koniState.getXcmEqualAssetByChain(destChain, originTokenInfo.slug);
+    const existentialDeposit = originTokenInfo.minAmount || '0';
     if (destinationTokenInfo) {
-      const [bnMockFee, {
+      const [bnMockExecutionFee, {
         value
       }] = await Promise.all([getXcmMockTxFee(substrateApi, chainInfoMap, originTokenInfo, destinationTokenInfo), this.getAddressTransferableBalance({
         extrinsicType: ExtrinsicType.TRANSFER_XCM,
@@ -1950,8 +1975,7 @@ export default class KoniExtension {
         token: originTokenInfo.slug
       })]);
       const bnMaxTransferable = new BigN(value);
-      const estimatedFee = bnMockFee.multipliedBy(XCM_FEE_RATIO); // multiply by weight to account for destination chain fee
-
+      const estimatedFee = bnMockExecutionFee.multipliedBy(XCM_FEE_RATIO).plus(new BigN(existentialDeposit));
       return bnMaxTransferable.minus(estimatedFee);
     }
     return new BigN(0);
@@ -2968,14 +2992,14 @@ export default class KoniExtension {
       } else {
         metadata = await this.#koniState.chainService.getMetadataByHash(payload.genesisHash);
         if (metadata) {
-          var _chainInfo$substrateI, _chainInfo$substrateI2, _chainInfo$substrateI3;
+          var _chainInfo$substrateI, _chainInfo$substrateI2, _chainInfo$substrateI3, _chainInfo$substrateI4;
           registry = new TypeRegistry();
           const _metadata = new Metadata(registry, metadata.hexValue);
           registry.register(metadata.types);
           registry.setChainProperties(registry.createType('ChainProperties', {
-            ss58Format: (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI = chainInfo.substrateInfo) === null || _chainInfo$substrateI === void 0 ? void 0 : _chainInfo$substrateI.addressPrefix) || 42,
-            tokenDecimals: chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI2 = chainInfo.substrateInfo) === null || _chainInfo$substrateI2 === void 0 ? void 0 : _chainInfo$substrateI2.decimals,
-            tokenSymbol: chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI3 = chainInfo.substrateInfo) === null || _chainInfo$substrateI3 === void 0 ? void 0 : _chainInfo$substrateI3.symbol
+            ss58Format: (_chainInfo$substrateI = chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI2 = chainInfo.substrateInfo) === null || _chainInfo$substrateI2 === void 0 ? void 0 : _chainInfo$substrateI2.addressPrefix) !== null && _chainInfo$substrateI !== void 0 ? _chainInfo$substrateI : 42,
+            tokenDecimals: chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI3 = chainInfo.substrateInfo) === null || _chainInfo$substrateI3 === void 0 ? void 0 : _chainInfo$substrateI3.decimals,
+            tokenSymbol: chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI4 = chainInfo.substrateInfo) === null || _chainInfo$substrateI4 === void 0 ? void 0 : _chainInfo$substrateI4.symbol
           }));
           registry.setMetadata(_metadata, payload.signedExtensions, metadata.userExtensions);
         } else {
@@ -4301,9 +4325,9 @@ export default class KoniExtension {
       case 'pri(accounts.batchExportV2)':
         return this.batchExportV2(request);
       case 'pri(json.restoreV2)':
-        return this.jsonRestoreV2(request);
+        return await this.jsonRestoreV2(request);
       case 'pri(json.batchRestoreV2)':
-        return this.batchRestoreV2(request);
+        return await this.batchRestoreV2(request);
       case 'pri(nft.getNft)':
         return await this.getNft();
       case 'pri(nft.getSubscription)':

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.2.29-0",
+  "version": "1.2.31-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -114,6 +114,11 @@
       "require": "./cjs/constants/index.js",
       "default": "./constants/index.js"
     },
+    "./constants/blocked-actions-list": {
+      "types": "./constants/blocked-actions-list.d.ts",
+      "require": "./cjs/constants/blocked-actions-list.js",
+      "default": "./constants/blocked-actions-list.js"
+    },
     "./constants/i18n": {
       "types": "./constants/i18n.d.ts",
       "require": "./cjs/constants/i18n.js",
@@ -2016,6 +2021,7 @@
       "require": "./cjs/utils/staticData/index.js",
       "default": "./utils/staticData/index.js"
     },
+    "./utils/staticData/blockedActionsFeatures.json": "./utils/staticData/blockedActionsFeatures.json",
     "./utils/staticData/buyServiceInfos.json": "./utils/staticData/buyServiceInfos.json",
     "./utils/staticData/buyTokenConfigs.json": "./utils/staticData/buyTokenConfigs.json",
     "./utils/staticData/chains.json": "./utils/staticData/chains.json",
@@ -2038,12 +2044,12 @@
     "@acala-network/api": "^5.0.2",
     "@apollo/client": "^3.7.14",
     "@azns/resolver-core": "^1.4.0",
-    "@chainflip/sdk": "^1.3.0",
+    "@chainflip/sdk": "^1.6.0",
     "@equilab/api": "~1.14.25",
     "@ethereumjs/common": "^4.1.0",
     "@ethereumjs/tx": "^5.1.0",
     "@ethersproject/abi": "^5.7.0",
-    "@galacticcouncil/sdk": "^4.2.0",
+    "@galacticcouncil/sdk": "^4.2.1",
     "@gear-js/api": "^0.38.1",
     "@json-rpc-tools/utils": "^1.7.6",
     "@metamask/eth-sig-util": "^7.0.3",
@@ -2070,13 +2076,13 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.86",
-    "@subwallet/extension-base": "^1.2.29-0",
-    "@subwallet/extension-chains": "^1.2.29-0",
-    "@subwallet/extension-dapp": "^1.2.29-0",
-    "@subwallet/extension-inject": "^1.2.29-0",
-    "@subwallet/keyring": "^0.1.6",
-    "@subwallet/ui-keyring": "^0.1.6",
+    "@subwallet/chain-list": "0.2.88",
+    "@subwallet/extension-base": "^1.2.31-0",
+    "@subwallet/extension-chains": "^1.2.31-0",
+    "@subwallet/extension-dapp": "^1.2.31-0",
+    "@subwallet/extension-inject": "^1.2.31-0",
+    "@subwallet/keyring": "^0.1.7",
+    "@subwallet/ui-keyring": "^0.1.7",
     "@walletconnect/keyvaluestorage": "^1.1.1",
     "@walletconnect/sign-client": "^2.14.0",
     "@walletconnect/types": "^2.14.0",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.2.29-0'
+  version: '1.2.31-0'
 };

package/services/balance-service/helpers/subscribe/index.js

@@ -109,10 +109,10 @@ export function subscribeBalance(addresses, chains, tokens, _chainAssetMap, _cha
         evmApi
       });
     }
-    if (!substrateApiMap[chainSlug].isApiReady) {
+    const substrateApi = await substrateApiMap[chainSlug].isReady;
+    if (!substrateApi.isApiReady) {
       handleUnsupportedOrPendingAddresses(useAddresses, chainSlug, chainAssetMap, APIItemState.PENDING, callback);
     }
-    const substrateApi = await substrateApiMap[chainSlug].isReady;
     return subscribeSubstrateBalance(useAddresses, chainInfo, chainAssetMap, substrateApi, evmApi, callback, extrinsicType);
   });
   return () => {

package/services/balance-service/helpers/subscribe/substrate/gear.js

@@ -16,7 +16,8 @@ export const subscribeGRC20Balance = ({
   chainInfo,
   substrateApi
 }) => {
-  if (!(substrateApi instanceof GearApi)) {
+  const apiPromise = substrateApi.api;
+  if (!(apiPromise instanceof GearApi)) {
     console.warn('Cannot subscribe GRC20 balance without GearApi instance');
     return noop;
   }
@@ -24,7 +25,7 @@ export const subscribeGRC20Balance = ({
   const grc20ContractMap = {};
   const tokenList = filterAssetsByChainAndType(assetMap, chain, [_AssetType.GRC20]);
   Object.entries(tokenList).forEach(([slug, tokenInfo]) => {
-    grc20ContractMap[slug] = getGRC20ContractPromise(substrateApi, _getContractAddressOfToken(tokenInfo));
+    grc20ContractMap[slug] = getGRC20ContractPromise(apiPromise, _getContractAddressOfToken(tokenInfo));
   });
   const getTokenBalances = () => {
     Object.values(tokenList).map(async tokenInfo => {
@@ -72,7 +73,8 @@ export const subscribeVftBalance = ({
   chainInfo,
   substrateApi
 }) => {
-  if (!(substrateApi instanceof GearApi)) {
+  const apiPromise = substrateApi.api;
+  if (!(apiPromise instanceof GearApi)) {
     console.warn('Cannot subscribe VFT balance without GearApi instance');
     return noop;
   }
@@ -80,7 +82,7 @@ export const subscribeVftBalance = ({
   const vftContractMap = {};
   const tokenList = filterAssetsByChainAndType(assetMap, chain, [_AssetType.VFT]);
   Object.entries(tokenList).forEach(([slug, tokenInfo]) => {
-    vftContractMap[slug] = getVFTContractPromise(substrateApi, _getContractAddressOfToken(tokenInfo));
+    vftContractMap[slug] = getVFTContractPromise(apiPromise, _getContractAddressOfToken(tokenInfo));
   });
   const getTokenBalances = () => {
     Object.values(tokenList).map(async tokenInfo => {

package/services/earning-service/handlers/liquid-staking/stella-swap.js

@@ -64,16 +64,16 @@ export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakin
     const tvlCall = stakingContract.methods.fundRaisedBalance();
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
     const exchangeRateCall = stakingContract.methods.getPooledTokenByShares(sampleTokenShare);
-
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    const [aprObject, tvl, equivalentTokenShare] = await Promise.all([aprPromise,
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
-    tvlCall.call(),
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
-    exchangeRateCall.call()]);
+    const equivalentTokenShare = await exchangeRateCall.call();
     const rate = equivalentTokenShare;
     const exchangeRate = rate / 10 ** _getAssetDecimals(derivativeTokenInfo);
     this.updateExchangeRate(rate);
+
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const [aprObject, tvl] = await Promise.all([aprPromise,
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
+    tvlCall.call()]);
     return {
       ...this.baseInfo,
       type: this.type,

package/services/swap-service/handler/chainflip-handler.d.ts

@@ -1,3 +1,4 @@
+import { Asset } from '@chainflip/sdk/swap';
 import { COMMON_ASSETS } from '@subwallet/chain-list';
 import { SwapError } from '@subwallet/extension-base/background/errors/SwapError';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
@@ -6,6 +7,7 @@ import { ChainService } from '@subwallet/extension-base/services/chain-service';
 import { SwapBaseInterface } from '@subwallet/extension-base/services/swap-service/handler/base-handler';
 import { BaseStepDetail, CommonOptimalPath, CommonStepFeeInfo } from '@subwallet/extension-base/types/service-base';
 import { OptimalSwapPathParams, SwapEarlyValidation, SwapProviderId, SwapQuote, SwapRequest, SwapSubmitParams, SwapSubmitStepData, ValidateSwapProcessParams } from '@subwallet/extension-base/types/swap';
+export declare const CHAINFLIP_BROKER_API: string;
 export declare class ChainflipSwapHandler implements SwapBaseInterface {
     private swapSdk;
     private readonly isTestnet;
@@ -17,8 +19,8 @@ export declare class ChainflipSwapHandler implements SwapBaseInterface {
     get providerInfo(): import("@subwallet/extension-base/types/swap").SwapProvider;
     get name(): string;
     get slug(): string;
-    get assetMapping(): Record<string, import("@chainflip/sdk/dist/contracts-b0BB7B5m").A>;
-    get chainMapping(): Record<string, import("@chainflip/sdk/dist/contracts-b0BB7B5m").C>;
+    get assetMapping(): Record<string, Asset>;
+    get chainMapping(): Record<string, import("@chainflip/sdk/dist/contracts-DmShvHR7").C>;
     get intermediaryAssetSlug(): COMMON_ASSETS.USDC_ETHEREUM | COMMON_ASSETS.USDC_SEPOLIA;
     validateSwapRequest(request: SwapRequest): Promise<SwapEarlyValidation>;
     private parseSwapPath;