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

package/background/KoniTypes.d.ts

@@ -1652,8 +1652,8 @@ export interface KoniRequestSignatures {
     'pri(accounts.inject.add)': [RequestAddInjectedAccounts, boolean];
     'pri(accounts.inject.remove)': [RequestRemoveInjectedAccounts, boolean];
     'pri(derivation.createV2)': [RequestDeriveCreateV2, boolean];
-    'pri(json.restoreV2)': [RequestJsonRestoreV2, void];
-    'pri(json.batchRestoreV2)': [RequestBatchRestoreV2, void];
+    'pri(json.restoreV2)': [RequestJsonRestoreV2, string[]];
+    'pri(json.batchRestoreV2)': [RequestBatchRestoreV2, string[]];
     'pri(accounts.batchExportV2)': [RequestAccountBatchExportV2, ResponseAccountBatchExportV2];
     'pri(accounts.exportPrivateKey)': [RequestAccountExportPrivateKey, ResponseAccountExportPrivateKey];
     'pri(accounts.subscribeWithCurrentAddress)': [RequestAccountSubscribe, AccountsWithCurrentAddress, AccountsWithCurrentAddress];

package/cjs/constants/blocked-actions-list.js

@@ -0,0 +1,15 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.fetchLastestBlockedActionsAndFeatures = void 0;
+var _utils = require("@subwallet/extension-base/utils");
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+const BLOCKED_ACTIONS_AND_FEATURES_PROMISE = (0, _utils.fetchStaticData)('blocked-actions-features');
+const fetchLastestBlockedActionsAndFeatures = async () => {
+  return await BLOCKED_ACTIONS_AND_FEATURES_PROMISE;
+};
+exports.fetchLastestBlockedActionsAndFeatures = fetchLastestBlockedActionsAndFeatures;

package/cjs/constants/index.js

@@ -62,6 +62,18 @@ Object.keys(_storage).forEach(function (key) {
     }
   });
 });
+var _blockedActionsList = require("./blocked-actions-list");
+Object.keys(_blockedActionsList).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _blockedActionsList[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _blockedActionsList[key];
+    }
+  });
+});
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 

package/cjs/core/logic-validation/transfer.js

@@ -8,6 +8,8 @@ exports.additionalValidateTransfer = additionalValidateTransfer;
 exports.additionalValidateXcmTransfer = additionalValidateXcmTransfer;
 exports.checkBalanceWithTransactionFee = checkBalanceWithTransactionFee;
 exports.checkSigningAccountForTransaction = checkSigningAccountForTransaction;
+exports.checkSupportForAction = checkSupportForAction;
+exports.checkSupportForFeature = checkSupportForFeature;
 exports.checkSupportForTransaction = checkSupportForTransaction;
 exports.estimateFeeForTransaction = estimateFeeForTransaction;
 exports.validateTransferRequest = validateTransferRequest;
@@ -152,6 +154,170 @@ function additionalValidateXcmTransfer(originTokenInfo, destinationTokenInfo, se
   }
   return [warning, error];
 }
+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.TransactionError(_KoniTypes.BasicTxErrorType.UNSUPPORTED, (0, _i18next.t)(`Feature under maintenance on ${chainInfo.name} network. Try again later`)));
+  }
+}
+function checkSupportForAction(validationResponse, blockedActionsMap) {
+  const extrinsicType = validationResponse.extrinsicType;
+  let currentAction = '';
+  switch (extrinsicType) {
+    case _KoniTypes.ExtrinsicType.TRANSFER_BALANCE:
+
+    // eslint-disable-next-line no-fallthrough
+    case _KoniTypes.ExtrinsicType.TRANSFER_TOKEN:
+      {
+        const data = validationResponse.data;
+        const tokenSlug = data.tokenSlug;
+        currentAction = `${extrinsicType}___${tokenSlug}`;
+        break;
+      }
+    case _KoniTypes.ExtrinsicType.TRANSFER_XCM:
+      {
+        const data = validationResponse.data;
+        const tokenSlug = data.tokenSlug;
+        const destinationNetworkKey = data.destinationNetworkKey;
+        currentAction = `${extrinsicType}___${tokenSlug}___${destinationNetworkKey}`;
+        break;
+      }
+    case _KoniTypes.ExtrinsicType.SEND_NFT:
+      {
+        const data = validationResponse.data;
+        const networkKey = data.networkKey;
+        const collectionId = data.nftItem.collectionId;
+        currentAction = `${extrinsicType}___${networkKey}___${collectionId}`;
+        break;
+      }
+    case _KoniTypes.ExtrinsicType.SWAP:
+      {
+        const data = validationResponse.data;
+        const pairSlug = data.quote.pair.slug;
+        const providerId = data.provider.id;
+        currentAction = `${extrinsicType}___${pairSlug}___${providerId}`;
+        break;
+      }
+    case _KoniTypes.ExtrinsicType.STAKING_BOND:
+      {
+        const data = validationResponse.data;
+        const chain = data.chain;
+        currentAction = `${extrinsicType}___${chain}`;
+        break;
+      }
+    case _KoniTypes.ExtrinsicType.STAKING_LEAVE_POOL:
+      {
+        const data = validationResponse.data;
+        const slug = data.slug;
+        currentAction = `${extrinsicType}___${slug}`;
+        break;
+      }
+    case _KoniTypes.ExtrinsicType.STAKING_UNBOND:
+      {
+        const data = validationResponse.data;
+        const chain = data.chain;
+        currentAction = `${extrinsicType}___${chain}`;
+        break;
+      }
+    case _KoniTypes.ExtrinsicType.STAKING_CLAIM_REWARD:
+      {
+        const data = validationResponse.data;
+        const slug = data.slug;
+        currentAction = `${extrinsicType}___${slug}`;
+        break;
+      }
+    case _KoniTypes.ExtrinsicType.STAKING_WITHDRAW:
+      {
+        const data = validationResponse.data;
+        const slug = data.slug;
+        currentAction = `${extrinsicType}___${slug}`;
+        break;
+      }
+    case _KoniTypes.ExtrinsicType.STAKING_COMPOUNDING:
+      {
+        const data = validationResponse.data;
+        const networkKey = data.networkKey;
+        currentAction = `${extrinsicType}___${networkKey}`;
+        break;
+      }
+    case _KoniTypes.ExtrinsicType.STAKING_CANCEL_COMPOUNDING:
+      {
+        const data = validationResponse.data;
+        const networkKey = data.networkKey;
+        currentAction = `${extrinsicType}___${networkKey}`;
+        break;
+      }
+    case _KoniTypes.ExtrinsicType.STAKING_CANCEL_UNSTAKE:
+      {
+        const data = validationResponse.data;
+        const slug = data.slug;
+        currentAction = `${extrinsicType}___${slug}`;
+        break;
+      }
+    case _KoniTypes.ExtrinsicType.JOIN_YIELD_POOL:
+      {
+        const data = validationResponse.data;
+        const slug = data.data.slug;
+        currentAction = `${extrinsicType}___${slug}`;
+        break;
+      }
+    case _KoniTypes.ExtrinsicType.MINT_VDOT:
+    case _KoniTypes.ExtrinsicType.MINT_LDOT:
+    case _KoniTypes.ExtrinsicType.MINT_SDOT:
+    case _KoniTypes.ExtrinsicType.MINT_QDOT:
+    case _KoniTypes.ExtrinsicType.MINT_STDOT:
+
+    // eslint-disable-next-line no-fallthrough
+    case _KoniTypes.ExtrinsicType.MINT_VMANTA:
+      {
+        const data = validationResponse.data;
+        const slug = data.slug;
+        currentAction = `${extrinsicType}___${slug}`;
+        break;
+      }
+    case _KoniTypes.ExtrinsicType.REDEEM_VDOT:
+    case _KoniTypes.ExtrinsicType.REDEEM_LDOT:
+    case _KoniTypes.ExtrinsicType.REDEEM_SDOT:
+    case _KoniTypes.ExtrinsicType.REDEEM_QDOT:
+    case _KoniTypes.ExtrinsicType.REDEEM_STDOT:
+
+    // eslint-disable-next-line no-fallthrough
+    case _KoniTypes.ExtrinsicType.REDEEM_VMANTA:
+      {
+        const data = validationResponse.data;
+        const slug = data.slug;
+        currentAction = `${extrinsicType}___${slug}`;
+        break;
+      }
+    case _KoniTypes.ExtrinsicType.UNSTAKE_VDOT:
+    case _KoniTypes.ExtrinsicType.UNSTAKE_LDOT:
+    case _KoniTypes.ExtrinsicType.UNSTAKE_SDOT:
+    case _KoniTypes.ExtrinsicType.UNSTAKE_QDOT:
+    case _KoniTypes.ExtrinsicType.UNSTAKE_STDOT:
+
+    // eslint-disable-next-line no-fallthrough
+    case _KoniTypes.ExtrinsicType.UNSTAKE_VMANTA:
+      {
+        const data = validationResponse.data;
+        const slug = data.slug;
+        currentAction = `${extrinsicType}___${slug}`;
+        break;
+      }
+    case _KoniTypes.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.TransactionError(_KoniTypes.BasicTxErrorType.UNSUPPORTED, (0, _i18next.t)('Feature under maintenance. Try again later')));
+  }
+}
 
 // general validations
 function checkSupportForTransaction(validationResponse, transaction) {

package/cjs/koni/background/handlers/Extension.js

@@ -1431,6 +1431,10 @@ class KoniExtension {
       withMasterPassword
     } = _ref43;
     const isPasswordValidated = this.validatePassword(file, password);
+    const {
+      promise,
+      resolve
+    } = (0, _utils4.createPromiseHandler)();
     if (isPasswordValidated) {
       try {
         this._saveCurrentAccountAddress(address, () => {
@@ -1445,10 +1449,12 @@ class KoniExtension {
             });
           }
           this._addAddressToAuthList(address, isAllowed);
+          resolve([address]);
         });
         if (this.#alwaysLock) {
           this.keyringLock();
         }
+        return promise;
       } catch (error) {
         throw new Error(error.message);
       }
@@ -1465,17 +1471,35 @@ class KoniExtension {
     } = _ref44;
     const addressList = accountsInfo.map(acc => acc.address);
     const isPasswordValidated = this.validatedAccountsPassword(file, password);
+    const {
+      promise,
+      resolve
+    } = (0, _utils4.createPromiseHandler)();
     if (isPasswordValidated) {
       try {
         this._saveCurrentAccountAddress(_constants.ALL_ACCOUNT_KEY, () => {
           _uiKeyring.keyring.restoreAccounts(file, password);
           this.#koniState.keyringService.removeNoneHardwareGenesisHash();
-          this._addAddressesToAuthList(addressList, isAllowed);
+          const successAddressList = addressList.reduce((addressList, address) => {
+            try {
+              const account = _uiKeyring.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);
       }
@@ -2003,8 +2027,9 @@ 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([(0, _xcm.getXcmMockTxFee)(substrateApi, chainInfoMap, originTokenInfo, destinationTokenInfo), this.getAddressTransferableBalance({
         extrinsicType: _KoniTypes.ExtrinsicType.TRANSFER_XCM,
@@ -2013,8 +2038,7 @@ class KoniExtension {
         token: originTokenInfo.slug
       })]);
       const bnMaxTransferable = new _bignumber.default(value);
-      const estimatedFee = bnMockFee.multipliedBy(_constants.XCM_FEE_RATIO); // multiply by weight to account for destination chain fee
-
+      const estimatedFee = bnMockExecutionFee.multipliedBy(_constants.XCM_FEE_RATIO).plus(new _bignumber.default(existentialDeposit));
       return bnMaxTransferable.minus(estimatedFee);
     }
     return new _bignumber.default(0);
@@ -3051,14 +3075,14 @@ 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 _types3.TypeRegistry();
           const _metadata = new _types3.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 {
@@ -4409,9 +4433,9 @@ 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/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.2.29-0'
+  version: '1.2.31-0'
 };
 exports.packageInfo = packageInfo;

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

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

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

@@ -23,7 +23,8 @@ const subscribeGRC20Balance = _ref => {
     chainInfo,
     substrateApi
   } = _ref;
-  if (!(substrateApi instanceof _api.GearApi)) {
+  const apiPromise = substrateApi.api;
+  if (!(apiPromise instanceof _api.GearApi)) {
     console.warn('Cannot subscribe GRC20 balance without GearApi instance');
     return _util.noop;
   }
@@ -32,7 +33,7 @@ const subscribeGRC20Balance = _ref => {
   const tokenList = (0, _utils2.filterAssetsByChainAndType)(assetMap, chain, [_types._AssetType.GRC20]);
   Object.entries(tokenList).forEach(_ref2 => {
     let [slug, tokenInfo] = _ref2;
-    grc20ContractMap[slug] = (0, _utils2.getGRC20ContractPromise)(substrateApi, (0, _utils._getContractAddressOfToken)(tokenInfo));
+    grc20ContractMap[slug] = (0, _utils2.getGRC20ContractPromise)(apiPromise, (0, _utils._getContractAddressOfToken)(tokenInfo));
   });
   const getTokenBalances = () => {
     Object.values(tokenList).map(async tokenInfo => {
@@ -82,7 +83,8 @@ const subscribeVftBalance = _ref3 => {
     chainInfo,
     substrateApi
   } = _ref3;
-  if (!(substrateApi instanceof _api.GearApi)) {
+  const apiPromise = substrateApi.api;
+  if (!(apiPromise instanceof _api.GearApi)) {
     console.warn('Cannot subscribe VFT balance without GearApi instance');
     return _util.noop;
   }
@@ -91,7 +93,7 @@ const subscribeVftBalance = _ref3 => {
   const tokenList = (0, _utils2.filterAssetsByChainAndType)(assetMap, chain, [_types._AssetType.VFT]);
   Object.entries(tokenList).forEach(_ref4 => {
     let [slug, tokenInfo] = _ref4;
-    vftContractMap[slug] = (0, _utils2.getVFTContractPromise)(substrateApi, (0, _utils._getContractAddressOfToken)(tokenInfo));
+    vftContractMap[slug] = (0, _utils2.getVFTContractPromise)(apiPromise, (0, _utils._getContractAddressOfToken)(tokenInfo));
   });
   const getTokenBalances = () => {
     Object.values(tokenList).map(async tokenInfo => {

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

@@ -73,16 +73,16 @@ class StellaSwapLiquidStakingPoolHandler extends _base.default {
     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 ** (0, _utils._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/cjs/services/swap-service/handler/chainflip-handler.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ChainflipSwapHandler = void 0;
+exports.ChainflipSwapHandler = exports.CHAINFLIP_BROKER_API = void 0;
 var _swap = require("@chainflip/sdk/swap");
 var _chainList = require("@subwallet/chain-list");
 var _SwapError = require("@subwallet/extension-base/background/errors/SwapError");
@@ -26,10 +26,13 @@ var ChainflipFeeType;
   ChainflipFeeType["INGRESS"] = "INGRESS";
   ChainflipFeeType["NETWORK"] = "NETWORK";
   ChainflipFeeType["EGRESS"] = "EGRESS";
-  ChainflipFeeType["LIQUIDITY"] = "LIQUIDITY";
+  ChainflipFeeType["BOOST"] = "BOOST";
+  ChainflipFeeType["BROKER"] = "BROKER";
 })(ChainflipFeeType || (ChainflipFeeType = {}));
 const INTERMEDIARY_MAINNET_ASSET_SLUG = _chainList.COMMON_ASSETS.USDC_ETHEREUM;
 const INTERMEDIARY_TESTNET_ASSET_SLUG = _chainList.COMMON_ASSETS.USDC_SEPOLIA;
+const CHAINFLIP_BROKER_API = process.env.CHAINFLIP_BROKER_API || '';
+exports.CHAINFLIP_BROKER_API = CHAINFLIP_BROKER_API;
 var CHAINFLIP_QUOTE_ERROR;
 (function (CHAINFLIP_QUOTE_ERROR) {
   CHAINFLIP_QUOTE_ERROR["InsufficientLiquidity"] = "InsufficientLiquidity";
@@ -47,9 +50,9 @@ class ChainflipSwapHandler {
     });
     this.isTestnet = isTestnet;
     this.providerSlug = isTestnet ? _swap3.SwapProviderId.CHAIN_FLIP_TESTNET : _swap3.SwapProviderId.CHAIN_FLIP_MAINNET;
-    this.swapSdk = new _swap.SwapSDK({
-      network: isTestnet ? 'perseverance' : 'mainnet'
-    });
+
+    // @ts-ignore
+    this.swapSdk = new _swap.SwapSDK((0, _utils2.getChainflipOptions)(isTestnet));
   }
   get chainService() {
     return this.swapBaseHandler.chainService;
@@ -95,11 +98,12 @@ class ChainflipSwapHandler {
       const toAsset = this.chainService.getAssetBySlug(request.pair.to);
       const srcChain = fromAsset.originChain;
       const destChain = toAsset.originChain;
+      const isSwapCrossChain = srcChain !== destChain;
       const srcChainInfo = this.chainService.getChainInfoByKey(srcChain);
       const srcChainId = this.chainMapping[srcChain];
       const destChainId = this.chainMapping[destChain];
-      const fromAssetId = this.assetMapping[fromAsset.slug];
-      const toAssetId = this.assetMapping[toAsset.slug];
+      const fromAssetId = (0, _utils._getAssetSymbol)(fromAsset);
+      const toAssetId = (0, _utils._getAssetSymbol)(toAsset);
       if (!srcChainId || !destChainId || !fromAssetId || !toAssetId) {
         return {
           error: _swap3.SwapErrorType.ASSET_NOT_SUPPORTED
@@ -107,9 +111,21 @@ class ChainflipSwapHandler {
       }
       const [supportedDestChains, srcAssets, destAssets] = await Promise.all([this.swapSdk.getChains(srcChainId), this.swapSdk.getAssets(srcChainId), this.swapSdk.getAssets(destChainId)]);
       const supportedDestChainId = supportedDestChains.find(c => c.chain === destChainId);
-      const srcAssetData = srcAssets.find(a => a.asset === fromAssetId);
-      const destAssetData = destAssets.find(a => a.asset === toAssetId);
-      if (!destAssetData || !srcAssetData || !supportedDestChainId) {
+      const srcAssetData = srcAssets.find(a => {
+        if ((0, _utils._isSmartContractToken)(fromAsset)) {
+          var _a$contractAddress;
+          return (a === null || a === void 0 ? void 0 : (_a$contractAddress = a.contractAddress) === null || _a$contractAddress === void 0 ? void 0 : _a$contractAddress.toLowerCase()) === (0, _utils._getContractAddressOfToken)(fromAsset).toLowerCase() && a.asset === fromAssetId;
+        }
+        return a.asset === fromAssetId;
+      });
+      const destAssetData = destAssets.find(a => {
+        if ((0, _utils._isSmartContractToken)(toAsset)) {
+          var _a$contractAddress2;
+          return (a === null || a === void 0 ? void 0 : (_a$contractAddress2 = a.contractAddress) === null || _a$contractAddress2 === void 0 ? void 0 : _a$contractAddress2.toLowerCase()) === (0, _utils._getContractAddressOfToken)(toAsset).toLowerCase() && a.asset === toAssetId;
+        }
+        return a.asset === toAssetId;
+      });
+      if (!destAssetData || !srcAssetData || isSwapCrossChain && !supportedDestChainId) {
         return {
           error: _swap3.SwapErrorType.UNKNOWN
         };
@@ -205,8 +221,8 @@ class ChainflipSwapHandler {
     }
     const srcChainId = this.chainMapping[fromAsset.originChain];
     const destChainId = this.chainMapping[toAsset.originChain];
-    const fromAssetId = this.assetMapping[fromAsset.slug];
-    const toAssetId = this.assetMapping[toAsset.slug];
+    const fromAssetId = (0, _utils._getAssetSymbol)(fromAsset);
+    const toAssetId = (0, _utils._getAssetSymbol)(toAsset);
     try {
       var _metadata$maxSwap;
       const quoteResponse = await this.swapSdk.getQuote({
@@ -220,13 +236,22 @@ class ChainflipSwapHandler {
       quoteResponse.quote.includedFees.forEach(fee => {
         switch (fee.type) {
           case ChainflipFeeType.INGRESS:
+            {
+              console.log('ingress', fee);
+              feeComponent.push({
+                tokenSlug: fromAsset.slug,
+                amount: fee.amount,
+                feeType: _swap3.SwapFeeType.NETWORK_FEE
+              });
+              break;
+            }
 
           // eslint-disable-next-line no-fallthrough
           case ChainflipFeeType.EGRESS:
             {
-              const tokenSlug = Object.keys(this.assetMapping).find(assetSlug => this.assetMapping[assetSlug] === fee.asset);
+              console.log('egress', fee);
               feeComponent.push({
-                tokenSlug,
+                tokenSlug: toAsset.slug,
                 amount: fee.amount,
                 feeType: _swap3.SwapFeeType.NETWORK_FEE
               });
@@ -235,11 +260,14 @@ class ChainflipSwapHandler {
           case ChainflipFeeType.NETWORK:
 
           // eslint-disable-next-line no-fallthrough
-          case ChainflipFeeType.LIQUIDITY:
+          case ChainflipFeeType.BOOST:
+
+          // eslint-disable-next-line no-fallthrough
+          case ChainflipFeeType.BROKER:
             {
-              const tokenSlug = Object.keys(this.assetMapping).find(assetSlug => this.assetMapping[assetSlug] === fee.asset);
+              console.log('broker fee', fee);
               feeComponent.push({
-                tokenSlug,
+                tokenSlug: this.intermediaryAssetSlug,
                 amount: fee.amount,
                 feeType: _swap3.SwapFeeType.PLATFORM_FEE
               });
@@ -324,8 +352,8 @@ class ChainflipSwapHandler {
     const receiver = recipient !== null && recipient !== void 0 ? recipient : address;
     const srcChainId = this.chainMapping[fromAsset.originChain];
     const destChainId = this.chainMapping[toAsset.originChain];
-    const fromAssetId = this.assetMapping[fromAsset.slug];
-    const toAssetId = this.assetMapping[toAsset.slug];
+    const fromAssetId = (0, _utils._getAssetSymbol)(fromAsset);
+    const toAssetId = (0, _utils._getAssetSymbol)(toAsset);
     const depositAddressResponse = await this.swapSdk.requestDepositAddress({
       srcChain: srcChainId,
       destChain: destChainId,

package/cjs/services/swap-service/utils.js

@@ -7,11 +7,14 @@ Object.defineProperty(exports, "__esModule", {
 exports._PROVIDER_TO_SUPPORTED_PAIR_MAP = exports.SWAP_QUOTE_TIMEOUT_MAP = exports.CHAIN_FLIP_TESTNET_EXPLORER = exports.CHAIN_FLIP_SUPPORTED_TESTNET_MAPPING = exports.CHAIN_FLIP_SUPPORTED_TESTNET_ASSET_MAPPING = exports.CHAIN_FLIP_SUPPORTED_MAINNET_MAPPING = exports.CHAIN_FLIP_SUPPORTED_MAINNET_ASSET_MAPPING = exports.CHAIN_FLIP_MAINNET_EXPLORER = void 0;
 exports.calculateSwapRate = calculateSwapRate;
 exports.convertSwapRate = convertSwapRate;
+exports.getChainflipBroker = getChainflipBroker;
+exports.getChainflipOptions = getChainflipOptions;
 exports.getSwapAltToken = getSwapAltToken;
 exports.getSwapAlternativeAsset = getSwapAlternativeAsset;
 var _swap = require("@chainflip/sdk/swap");
 var _chainList = require("@subwallet/chain-list");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
+var _chainflipHandler = require("@subwallet/extension-base/services/swap-service/handler/chainflip-handler");
 var _swap2 = require("@subwallet/extension-base/types/swap");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 // Copyright 2019-2022 @subwallet/extension-base
@@ -23,7 +26,8 @@ const CHAIN_FLIP_MAINNET_EXPLORER = 'https://scan.chainflip.io';
 exports.CHAIN_FLIP_MAINNET_EXPLORER = CHAIN_FLIP_MAINNET_EXPLORER;
 const CHAIN_FLIP_SUPPORTED_MAINNET_MAPPING = {
   [_chainList.COMMON_CHAIN_SLUGS.POLKADOT]: _swap.Chains.Polkadot,
-  [_chainList.COMMON_CHAIN_SLUGS.ETHEREUM]: _swap.Chains.Ethereum
+  [_chainList.COMMON_CHAIN_SLUGS.ETHEREUM]: _swap.Chains.Ethereum,
+  [_chainList.COMMON_CHAIN_SLUGS.ARBITRUM]: _swap.Chains.Arbitrum
 };
 exports.CHAIN_FLIP_SUPPORTED_MAINNET_MAPPING = CHAIN_FLIP_SUPPORTED_MAINNET_MAPPING;
 const CHAIN_FLIP_SUPPORTED_TESTNET_MAPPING = {
@@ -34,7 +38,8 @@ exports.CHAIN_FLIP_SUPPORTED_TESTNET_MAPPING = CHAIN_FLIP_SUPPORTED_TESTNET_MAPP
 const CHAIN_FLIP_SUPPORTED_MAINNET_ASSET_MAPPING = {
   [_chainList.COMMON_ASSETS.DOT]: _swap.Assets.DOT,
   [_chainList.COMMON_ASSETS.ETH]: _swap.Assets.ETH,
-  [_chainList.COMMON_ASSETS.USDC_ETHEREUM]: _swap.Assets.USDC
+  [_chainList.COMMON_ASSETS.USDC_ETHEREUM]: _swap.Assets.USDC,
+  [_chainList.COMMON_ASSETS.USDT_ETHEREUM]: _swap.Assets.USDT
 };
 exports.CHAIN_FLIP_SUPPORTED_MAINNET_ASSET_MAPPING = CHAIN_FLIP_SUPPORTED_MAINNET_ASSET_MAPPING;
 const CHAIN_FLIP_SUPPORTED_TESTNET_ASSET_MAPPING = {
@@ -53,7 +58,7 @@ exports.SWAP_QUOTE_TIMEOUT_MAP = SWAP_QUOTE_TIMEOUT_MAP;
 const _PROVIDER_TO_SUPPORTED_PAIR_MAP = {
   [_swap2.SwapProviderId.HYDRADX_MAINNET]: [_chainList.COMMON_CHAIN_SLUGS.HYDRADX],
   [_swap2.SwapProviderId.HYDRADX_TESTNET]: [_chainList.COMMON_CHAIN_SLUGS.HYDRADX_TESTNET],
-  [_swap2.SwapProviderId.CHAIN_FLIP_MAINNET]: [_chainList.COMMON_CHAIN_SLUGS.POLKADOT, _chainList.COMMON_CHAIN_SLUGS.ETHEREUM],
+  [_swap2.SwapProviderId.CHAIN_FLIP_MAINNET]: [_chainList.COMMON_CHAIN_SLUGS.POLKADOT, _chainList.COMMON_CHAIN_SLUGS.ETHEREUM, _chainList.COMMON_CHAIN_SLUGS.ARBITRUM],
   [_swap2.SwapProviderId.CHAIN_FLIP_TESTNET]: [_chainList.COMMON_CHAIN_SLUGS.CHAINFLIP_POLKADOT, _chainList.COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA],
   [_swap2.SwapProviderId.POLKADOT_ASSET_HUB]: [_chainList.COMMON_CHAIN_SLUGS.POLKADOT_ASSET_HUB],
   [_swap2.SwapProviderId.KUSAMA_ASSET_HUB]: [_chainList.COMMON_CHAIN_SLUGS.KUSAMA_ASSET_HUB],
@@ -79,4 +84,30 @@ function convertSwapRate(rate, fromAsset, toAsset) {
   const decimalDiff = (0, _utils._getAssetDecimals)(toAsset) - (0, _utils._getAssetDecimals)(fromAsset);
   const bnRate = new _bignumber.default(rate);
   return bnRate.times(10 ** decimalDiff).pow(-1).toNumber();
+}
+function getChainflipOptions(isTestnet) {
+  if (isTestnet) {
+    return {
+      network: getChainflipNetwork(isTestnet)
+    };
+  }
+  return {
+    network: getChainflipNetwork(isTestnet),
+    broker: getChainflipBroker(isTestnet)
+  };
+}
+function getChainflipNetwork(isTestnet) {
+  return isTestnet ? 'perseverance' : 'mainnet';
+}
+function getChainflipBroker(isTestnet) {
+  // noted: currently not use testnet broker
+  if (isTestnet) {
+    return {
+      url: `https://perseverance.chainflip-broker.io/rpc/${_chainflipHandler.CHAINFLIP_BROKER_API}`
+    };
+  } else {
+    return {
+      url: `https://chainflip-broker.io/rpc/${_chainflipHandler.CHAINFLIP_BROKER_API}`
+    };
+  }
 }

package/cjs/services/transaction-service/index.js

@@ -75,6 +75,13 @@ class TransactionService {
       chain,
       extrinsicType
     } = validationResponse;
+    const chainInfo = this.state.chainService.getChainInfoByKey(chain);
+    const {
+      blockedActionsMap,
+      blockedFeaturesList
+    } = await (0, _constants.fetchLastestBlockedActionsAndFeatures)();
+    (0, _transfer.checkSupportForFeature)(validationResponse, blockedFeaturesList, chainInfo);
+    (0, _transfer.checkSupportForAction)(validationResponse, blockedActionsMap);
     const transaction = transactionInput.transaction;
 
     // Check duplicated transaction
@@ -82,7 +89,6 @@ class TransactionService {
 
     // Check support for transaction
     (0, _transfer.checkSupportForTransaction)(validationResponse, transaction);
-    const chainInfo = this.state.chainService.getChainInfoByKey(chain);
     if (!chainInfo) {
       validationResponse.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR, (0, _i18next.t)('Cannot find network')));
     }