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

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

@@ -9,9 +9,9 @@ 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, SWAP_QUOTE_TIMEOUT_MAP } from '@subwallet/extension-base/services/swap-service/utils';
+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';
 import { SwapErrorType, SwapFeeType, SwapProviderId, SwapStepType } from '@subwallet/extension-base/types/swap';
 import BigNumber from 'bignumber.js';
@@ -20,10 +20,12 @@ 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 = COMMON_ASSETS.USDC_ETHEREUM;
 const INTERMEDIARY_TESTNET_ASSET_SLUG = COMMON_ASSETS.USDC_SEPOLIA;
+export const CHAINFLIP_BROKER_API = process.env.CHAINFLIP_BROKER_API || '';
 var CHAINFLIP_QUOTE_ERROR;
 (function (CHAINFLIP_QUOTE_ERROR) {
   CHAINFLIP_QUOTE_ERROR["InsufficientLiquidity"] = "InsufficientLiquidity";
@@ -40,9 +42,9 @@ export class ChainflipSwapHandler {
     });
     this.isTestnet = isTestnet;
     this.providerSlug = isTestnet ? SwapProviderId.CHAIN_FLIP_TESTNET : SwapProviderId.CHAIN_FLIP_MAINNET;
-    this.swapSdk = new SwapSDK({
-      network: isTestnet ? 'perseverance' : 'mainnet'
-    });
+
+    // @ts-ignore
+    this.swapSdk = new SwapSDK(getChainflipOptions(isTestnet));
   }
   get chainService() {
     return this.swapBaseHandler.chainService;
@@ -88,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
@@ -100,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
         };
@@ -198,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({
@@ -213,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
               });
@@ -228,11 +252,14 @@ export 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: SwapFeeType.PLATFORM_FEE
               });
@@ -317,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.d.ts

@@ -13,3 +13,15 @@ export declare function getSwapAlternativeAsset(swapPair: SwapPair): string | un
 export declare function getSwapAltToken(chainAsset: _ChainAsset): string | undefined;
 export declare function calculateSwapRate(fromAmount: string, toAmount: string, fromAsset: _ChainAsset, toAsset: _ChainAsset): number;
 export declare function convertSwapRate(rate: string, fromAsset: _ChainAsset, toAsset: _ChainAsset): number;
+export declare function getChainflipOptions(isTestnet: boolean): {
+    network: string;
+    broker?: undefined;
+} | {
+    network: string;
+    broker: {
+        url: string;
+    };
+};
+export declare function getChainflipBroker(isTestnet: boolean): {
+    url: string;
+};

package/services/swap-service/utils.js

@@ -4,13 +4,15 @@
 import { Assets, Chains } from '@chainflip/sdk/swap';
 import { COMMON_ASSETS, COMMON_CHAIN_SLUGS } from '@subwallet/chain-list';
 import { _getAssetDecimals } from '@subwallet/extension-base/services/chain-service/utils';
+import { CHAINFLIP_BROKER_API } from '@subwallet/extension-base/services/swap-service/handler/chainflip-handler';
 import { SwapProviderId } from '@subwallet/extension-base/types/swap';
 import BigN from 'bignumber.js';
 export const CHAIN_FLIP_TESTNET_EXPLORER = 'https://blocks-perseverance.chainflip.io';
 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,
@@ -19,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,
@@ -35,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],
@@ -60,4 +63,30 @@ export function convertSwapRate(rate, fromAsset, toAsset) {
   const decimalDiff = _getAssetDecimals(toAsset) - _getAssetDecimals(fromAsset);
   const bnRate = new BigN(rate);
   return bnRate.times(10 ** decimalDiff).pow(-1).toNumber();
+}
+export function getChainflipOptions(isTestnet) {
+  if (isTestnet) {
+    return {
+      network: getChainflipNetwork(isTestnet)
+    };
+  }
+  return {
+    network: getChainflipNetwork(isTestnet),
+    broker: getChainflipBroker(isTestnet)
+  };
+}
+function getChainflipNetwork(isTestnet) {
+  return isTestnet ? 'perseverance' : 'mainnet';
+}
+export function getChainflipBroker(isTestnet) {
+  // noted: currently not use testnet broker
+  if (isTestnet) {
+    return {
+      url: `https://perseverance.chainflip-broker.io/rpc/${CHAINFLIP_BROKER_API}`
+    };
+  } else {
+    return {
+      url: `https://chainflip-broker.io/rpc/${CHAINFLIP_BROKER_API}`
+    };
+  }
 }

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>;
 };

package/utils/staticData/index.js

@@ -16,6 +16,8 @@ export const marketingCampaigns = require("./marketingCampaigns.json");
 export const termAndCondition = require("./termAndCondition.json");
 // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
 export const currencySymbol = require("./currencySymbol.json");
+// eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
+export const blockedActionsFeatures = require("./blockedActionsFeatures.json");
 export let StaticKey;
 (function (StaticKey) {
   StaticKey["BUY_SERVICE_INFOS"] = "buy-service-infos";
@@ -25,6 +27,7 @@ export let 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 || (StaticKey = {}));
 export const staticData = {
   [StaticKey.CHAINS]: Object.values(ChainInfoMap),
@@ -33,5 +36,6 @@ export 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
 };