@subwallet/extension-base 1.2.30-0 → 1.2.32-0

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);
       }
@@ -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.30-0",
+  "version": "1.2.32-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.5.2",
+    "@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.87",
-    "@subwallet/extension-base": "^1.2.30-0",
-    "@subwallet/extension-chains": "^1.2.30-0",
-    "@subwallet/extension-dapp": "^1.2.30-0",
-    "@subwallet/extension-inject": "^1.2.30-0",
-    "@subwallet/keyring": "^0.1.6",
-    "@subwallet/ui-keyring": "^0.1.6",
+    "@subwallet/chain-list": "0.2.88",
+    "@subwallet/extension-base": "^1.2.32-0",
+    "@subwallet/extension-chains": "^1.2.32-0",
+    "@subwallet/extension-dapp": "^1.2.32-0",
+    "@subwallet/extension-inject": "^1.2.32-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.30-0'
+  version: '1.2.32-0'
 };

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

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

package/services/chain-service/handler/SubstrateApi.js

@@ -208,6 +208,7 @@ export class SubstrateApi {
     console.log(`Connected to ${this.chainSlug || ''} at ${this.apiUrl}`);
     if (this.isApiReadyOnce) {
       this.handleApiReady.resolve(this);
+      this.isApiReady = true;
     }
   }
   onDisconnect() {

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/mkt-campaign-service/types.d.ts

@@ -92,12 +92,16 @@ export interface AppPopupData extends AppCommonData {
     media: string;
     buttons: AppContentButton[];
     repeat_every_x_days: number | null;
+    ios_version_range: string;
+    app_version_range: string;
 }
 export interface AppBannerData extends AppCommonData {
     priority: number;
     media: string;
     action: AppContentButtonAction;
     instruction: AppContentButtonInstruction | null;
+    ios_version_range: string;
+    app_version_range: string;
 }
 export interface AppConfirmationData extends AppCommonData {
     name: string;

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';
@@ -18,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-Cb-5VdIi").a>;
-    get chainMapping(): Record<string, import("@chainflip/sdk/dist/contracts-Cb-5VdIi").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;

package/services/swap-service/handler/chainflip-handler.js

@@ -9,7 +9,7 @@ import { BasicTxErrorType, ChainType, ExtrinsicType } from '@subwallet/extension
 import { _getChainflipEarlyValidationError } from '@subwallet/extension-base/core/logic-validation/swap';
 import { getERC20TransactionObject, getEVMTransactionObject } from '@subwallet/extension-base/services/balance-service/transfer/smart-contract';
 import { createTransferExtrinsic } from '@subwallet/extension-base/services/balance-service/transfer/token';
-import { _getAssetDecimals, _getChainNativeTokenSlug, _getContractAddressOfToken, _isNativeToken, _isSubstrateChain } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getAssetDecimals, _getAssetSymbol, _getChainNativeTokenSlug, _getContractAddressOfToken, _isNativeToken, _isSmartContractToken, _isSubstrateChain } from '@subwallet/extension-base/services/chain-service/utils';
 import { SwapBaseHandler } from '@subwallet/extension-base/services/swap-service/handler/base-handler';
 import { calculateSwapRate, CHAIN_FLIP_SUPPORTED_MAINNET_ASSET_MAPPING, CHAIN_FLIP_SUPPORTED_MAINNET_MAPPING, CHAIN_FLIP_SUPPORTED_TESTNET_ASSET_MAPPING, CHAIN_FLIP_SUPPORTED_TESTNET_MAPPING, getChainflipOptions, SWAP_QUOTE_TIMEOUT_MAP } from '@subwallet/extension-base/services/swap-service/utils';
 import { CommonStepType } from '@subwallet/extension-base/types/service-base';
@@ -90,11 +90,12 @@ export 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 = _getAssetSymbol(fromAsset);
+      const toAssetId = _getAssetSymbol(toAsset);
       if (!srcChainId || !destChainId || !fromAssetId || !toAssetId) {
         return {
           error: SwapErrorType.ASSET_NOT_SUPPORTED
@@ -102,9 +103,21 @@ export 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 (_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()) === _getContractAddressOfToken(fromAsset).toLowerCase() && a.asset === fromAssetId;
+        }
+        return a.asset === fromAssetId;
+      });
+      const destAssetData = destAssets.find(a => {
+        if (_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()) === _getContractAddressOfToken(toAsset).toLowerCase() && a.asset === toAssetId;
+        }
+        return a.asset === toAssetId;
+      });
+      if (!destAssetData || !srcAssetData || isSwapCrossChain && !supportedDestChainId) {
         return {
           error: SwapErrorType.UNKNOWN
         };
@@ -200,8 +213,8 @@ export 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 = _getAssetSymbol(fromAsset);
+    const toAssetId = _getAssetSymbol(toAsset);
     try {
       var _metadata$maxSwap;
       const quoteResponse = await this.swapSdk.getQuote({
@@ -215,13 +228,22 @@ export 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: 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: SwapFeeType.NETWORK_FEE
               });
@@ -235,9 +257,9 @@ export class ChainflipSwapHandler {
           // 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: SwapFeeType.PLATFORM_FEE
               });
@@ -322,8 +344,8 @@ export 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 = _getAssetSymbol(fromAsset);
+    const toAssetId = _getAssetSymbol(toAsset);
     const depositAddressResponse = await this.swapSdk.requestDepositAddress({
       srcChain: srcChainId,
       destChain: destChainId,

package/services/swap-service/utils.js

@@ -11,7 +11,8 @@ export const CHAIN_FLIP_TESTNET_EXPLORER = 'https://blocks-perseverance.chainfli
 export const CHAIN_FLIP_MAINNET_EXPLORER = 'https://scan.chainflip.io';
 export const CHAIN_FLIP_SUPPORTED_MAINNET_MAPPING = {
   [COMMON_CHAIN_SLUGS.POLKADOT]: Chains.Polkadot,
-  [COMMON_CHAIN_SLUGS.ETHEREUM]: Chains.Ethereum
+  [COMMON_CHAIN_SLUGS.ETHEREUM]: Chains.Ethereum,
+  [COMMON_CHAIN_SLUGS.ARBITRUM]: Chains.Arbitrum
 };
 export const CHAIN_FLIP_SUPPORTED_TESTNET_MAPPING = {
   [COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA]: Chains.Ethereum,
@@ -20,7 +21,8 @@ export const CHAIN_FLIP_SUPPORTED_TESTNET_MAPPING = {
 export const CHAIN_FLIP_SUPPORTED_MAINNET_ASSET_MAPPING = {
   [COMMON_ASSETS.DOT]: Assets.DOT,
   [COMMON_ASSETS.ETH]: Assets.ETH,
-  [COMMON_ASSETS.USDC_ETHEREUM]: Assets.USDC
+  [COMMON_ASSETS.USDC_ETHEREUM]: Assets.USDC,
+  [COMMON_ASSETS.USDT_ETHEREUM]: Assets.USDT
 };
 export const CHAIN_FLIP_SUPPORTED_TESTNET_ASSET_MAPPING = {
   [COMMON_ASSETS.PDOT]: Assets.DOT,
@@ -36,7 +38,7 @@ export const SWAP_QUOTE_TIMEOUT_MAP = {
 export const _PROVIDER_TO_SUPPORTED_PAIR_MAP = {
   [SwapProviderId.HYDRADX_MAINNET]: [COMMON_CHAIN_SLUGS.HYDRADX],
   [SwapProviderId.HYDRADX_TESTNET]: [COMMON_CHAIN_SLUGS.HYDRADX_TESTNET],
-  [SwapProviderId.CHAIN_FLIP_MAINNET]: [COMMON_CHAIN_SLUGS.POLKADOT, COMMON_CHAIN_SLUGS.ETHEREUM],
+  [SwapProviderId.CHAIN_FLIP_MAINNET]: [COMMON_CHAIN_SLUGS.POLKADOT, COMMON_CHAIN_SLUGS.ETHEREUM, COMMON_CHAIN_SLUGS.ARBITRUM],
   [SwapProviderId.CHAIN_FLIP_TESTNET]: [COMMON_CHAIN_SLUGS.CHAINFLIP_POLKADOT, COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA],
   [SwapProviderId.POLKADOT_ASSET_HUB]: [COMMON_CHAIN_SLUGS.POLKADOT_ASSET_HUB],
   [SwapProviderId.KUSAMA_ASSET_HUB]: [COMMON_CHAIN_SLUGS.KUSAMA_ASSET_HUB],

package/services/transaction-service/index.js

@@ -4,8 +4,8 @@
 import { EvmProviderError } from '@subwallet/extension-base/background/errors/EvmProviderError';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { BasicTxErrorType, ChainType, EvmProviderErrorType, ExtrinsicStatus, ExtrinsicType, NotificationType, TransactionDirection } from '@subwallet/extension-base/background/KoniTypes';
-import { ALL_ACCOUNT_KEY } from '@subwallet/extension-base/constants';
-import { checkBalanceWithTransactionFee, checkSigningAccountForTransaction, checkSupportForTransaction, estimateFeeForTransaction } from '@subwallet/extension-base/core/logic-validation/transfer';
+import { ALL_ACCOUNT_KEY, fetchLastestBlockedActionsAndFeatures } from '@subwallet/extension-base/constants';
+import { checkBalanceWithTransactionFee, checkSigningAccountForTransaction, checkSupportForAction, checkSupportForFeature, checkSupportForTransaction, estimateFeeForTransaction } from '@subwallet/extension-base/core/logic-validation/transfer';
 import { _getAssetDecimals, _getAssetSymbol, _getChainNativeTokenBasicInfo, _getEvmChainId, _isChainEvmCompatible } from '@subwallet/extension-base/services/chain-service/utils';
 import { EXTENSION_REQUEST_URL } from '@subwallet/extension-base/services/request-service/constants';
 import { TRANSACTION_TIMEOUT } from '@subwallet/extension-base/services/transaction-service/constants';
@@ -68,6 +68,13 @@ export default class TransactionService {
       chain,
       extrinsicType
     } = validationResponse;
+    const chainInfo = this.state.chainService.getChainInfoByKey(chain);
+    const {
+      blockedActionsMap,
+      blockedFeaturesList
+    } = await fetchLastestBlockedActionsAndFeatures();
+    checkSupportForFeature(validationResponse, blockedFeaturesList, chainInfo);
+    checkSupportForAction(validationResponse, blockedActionsMap);
     const transaction = transactionInput.transaction;
 
     // Check duplicated transaction
@@ -75,7 +82,6 @@ export default class TransactionService {
 
     // Check support for transaction
     checkSupportForTransaction(validationResponse, transaction);
-    const chainInfo = this.state.chainService.getChainInfoByKey(chain);
     if (!chainInfo) {
       validationResponse.errors.push(new TransactionError(BasicTxErrorType.INTERNAL_ERROR, t('Cannot find network')));
     }

package/utils/staticData/blockedActionsFeatures.json

@@ -0,0 +1,39 @@
+{
+  "blockedFeaturesList": [],
+  "blockedActionsMap": {
+    "transfer.balance": [],
+    "transfer.token": [],
+    "transfer.xcm": [],
+    "send_nft": [],
+    "swap": [],
+    "staking.join_pool": [],
+    "staking.leave_pool": [],
+    "staking.bond": [],
+    "staking.unbond": [],
+    "staking.claim_reward": [],
+    "staking.withdraw": [],
+    "staking.compounding": [],
+    "staking.cancel_compounding": [],
+    "staking.cancel_unstake": [],
+    "earn.join_pool": [],
+    "earn.mint_vdot": [],
+    "earn.mint_ldot": [],
+    "earn.mint_sdot": [],
+    "earn.mint_qdot": [],
+    "earn.mint_stdot": [],
+    "earn.mint_vmanta": [],
+    "earn.redeem_qdot": [],
+    "earn.redeem_vdot": [],
+    "earn.redeem_ldot": [],
+    "earn.redeem_sdot": [],
+    "earn.redeem_stdot": [],
+    "earn.redeem_vmanta": [],
+    "earn.unstake_qdot": [],
+    "earn.unstake_vdot": [],
+    "earn.unstake_ldot": [],
+    "earn.unstake_sdot": [],
+    "earn.unstake_stdot": [],
+    "earn.unstake_vmanta": [],
+    "token.spending_approval": []
+  }
+}

package/utils/staticData/index.d.ts

@@ -4,6 +4,7 @@ export declare const crowdloanFunds: Record<string, unknown>[];
 export declare const marketingCampaigns: Record<string, unknown>;
 export declare const termAndCondition: Record<string, unknown>;
 export declare const currencySymbol: Record<string, unknown>;
+export declare const blockedActionsFeatures: Record<string, unknown>;
 export declare enum StaticKey {
     BUY_SERVICE_INFOS = "buy-service-infos",
     CHAINS = "chains",
@@ -11,7 +12,8 @@ export declare enum StaticKey {
     MARKETING_CAMPAINGS = "marketing-campaigns",
     CROWDLOAN_FUNDS = "crowdloan-funds",
     TERM_AND_CONDITION = "term-and-condition",
-    BUY_TOKEN_CONFIGS = "buy-token-configs"
+    BUY_TOKEN_CONFIGS = "buy-token-configs",
+    BLOCKED_ACTIONS_FEATURES = "blocked-actions-features"
 }
 export declare const staticData: {
     chains: import("@subwallet/chain-list/types")._ChainInfo[];
@@ -21,4 +23,5 @@ export declare const staticData: {
     "marketing-campaigns": Record<string, unknown>;
     "term-and-condition": unknown;
     "buy-token-configs": Record<string, unknown>[];
+    "blocked-actions-features": Record<string, unknown>;
 };