@subwallet/extension-base 1.3.53-0 → 1.3.54-1

package/background/KoniTypes.d.ts

@@ -16,7 +16,7 @@ import { AuthUrls } from '@subwallet/extension-base/services/request-service/typ
 import { CrowdloanContributionsResponse } from '@subwallet/extension-base/services/subscan-service/types';
 import { BitcoinTransactionData, SWTransactionResponse, SWTransactionResult } from '@subwallet/extension-base/services/transaction-service/types';
 import { WalletConnectNotSupportRequest, WalletConnectSessionRequest } from '@subwallet/extension-base/services/wallet-connect-service/types';
-import { AccountChainType, AccountJson, AccountsWithCurrentAddress, AddressJson, BalanceJson, BaseRequestSign, BuyServiceInfo, BuyTokenInfo, CommonOptimalTransferPath, CurrentAccountInfo, EarningRewardHistoryItem, EarningRewardJson, EarningStatus, HandleYieldStepParams, InternalRequestSign, LeavePoolAdditionalData, NominationPoolInfo, OptimalYieldPath, OptimalYieldPathParams, RequestAccountBatchExportV2, RequestAccountCreateSuriV2, RequestAccountNameValidate, RequestAccountProxyEdit, RequestAccountProxyForget, RequestBatchJsonGetAccountInfo, RequestBatchRestoreV2, RequestBounceableValidate, RequestChangeAllowOneSign, RequestChangeTonWalletContractVersion, RequestCheckCrossChainTransfer, RequestCheckPublicAndSecretKey, RequestCheckTransfer, RequestCrossChainTransfer, RequestDeriveCreateMultiple, RequestDeriveCreateV3, RequestDeriveValidateV2, RequestEarlyValidateYield, RequestEarningSlippage, RequestExportAccountProxyMnemonic, RequestGetAllTonWalletContractVersion, RequestGetAmountForPair, RequestGetDeriveAccounts, RequestGetDeriveSuggestion, RequestGetTokensCanPayFee, RequestGetYieldPoolTargets, RequestInputAccountSubscribe, RequestJsonGetAccountInfo, RequestJsonRestoreV2, RequestMetadataHash, RequestMnemonicCreateV2, RequestMnemonicValidateV2, RequestPrivateKeyValidateV2, RequestShortenMetadata, RequestStakeCancelWithdrawal, RequestStakeClaimReward, RequestSubmitProcessTransaction, RequestSubscribeProcessById, RequestTransfer, RequestUnlockDotCheckCanMint, RequestUnlockDotSubscribeMintedData, RequestYieldLeave, RequestYieldStepSubmit, RequestYieldWithdrawal, ResponseAccountBatchExportV2, ResponseAccountCreateSuriV2, ResponseAccountNameValidate, ResponseBatchJsonGetAccountInfo, ResponseCheckPublicAndSecretKey, ResponseDeriveValidateV2, ResponseEarlyValidateYield, ResponseExportAccountProxyMnemonic, ResponseGetAllTonWalletContractVersion, ResponseGetDeriveAccounts, ResponseGetDeriveSuggestion, ResponseGetYieldPoolTargets, ResponseInputAccountSubscribe, ResponseJsonGetAccountInfo, ResponseMetadataHash, ResponseMnemonicCreateV2, ResponseMnemonicValidateV2, ResponsePrivateKeyValidateV2, ResponseShortenMetadata, ResponseSubscribeProcessAlive, ResponseSubscribeProcessById, StorageDataInterface, SubmitChangeValidatorStaking, SubmitYieldJoinData, SubmitYieldStepData, SubnetYieldPositionInfo, SwapPair, SwapQuoteResponse, SwapRequest, SwapRequestResult, SwapRequestV2, SwapSubmitParams, SwapTxData, TokenSpendingApprovalParams, UnlockDotTransactionNft, UnstakingStatus, ValidateSwapProcessParams, ValidateYieldProcessParams, YieldPoolInfo, YieldPoolType, YieldPositionInfo } from '@subwallet/extension-base/types';
+import { AccountChainType, AccountJson, AccountsWithCurrentAddress, AddressJson, BalanceJson, BaseRequestSign, BuyServiceInfo, BuyTokenInfo, CommonOptimalTransferPath, CurrentAccountInfo, EarningRewardHistoryItem, EarningRewardJson, EarningStatus, HandleYieldStepParams, InternalRequestSign, LeavePoolAdditionalData, NominationPoolInfo, OptimalYieldPath, OptimalYieldPathParams, RequestAccountBatchExportV2, RequestAccountCreateSuriV2, RequestAccountNameValidate, RequestAccountProxyEdit, RequestAccountProxyForget, RequestBatchJsonGetAccountInfo, RequestBatchRestoreV2, RequestBounceableValidate, RequestChangeAllowOneSign, RequestChangeTonWalletContractVersion, RequestCheckCrossChainTransfer, RequestCheckPublicAndSecretKey, RequestCheckTransfer, RequestCrossChainTransfer, RequestDeriveCreateMultiple, RequestDeriveCreateV3, RequestDeriveValidateV2, RequestEarlyValidateYield, RequestEarningImpact, RequestExportAccountProxyMnemonic, RequestGetAllTonWalletContractVersion, RequestGetAmountForPair, RequestGetDeriveAccounts, RequestGetDeriveSuggestion, RequestGetTokensCanPayFee, RequestGetYieldPoolTargets, RequestInputAccountSubscribe, RequestJsonGetAccountInfo, RequestJsonRestoreV2, RequestMetadataHash, RequestMnemonicCreateV2, RequestMnemonicValidateV2, RequestPrivateKeyValidateV2, RequestShortenMetadata, RequestStakeCancelWithdrawal, RequestStakeClaimReward, RequestSubmitProcessTransaction, RequestSubscribeProcessById, RequestTransfer, RequestUnlockDotCheckCanMint, RequestUnlockDotSubscribeMintedData, RequestYieldLeave, RequestYieldStepSubmit, RequestYieldWithdrawal, ResponseAccountBatchExportV2, ResponseAccountCreateSuriV2, ResponseAccountNameValidate, ResponseBatchJsonGetAccountInfo, ResponseCheckPublicAndSecretKey, ResponseDeriveValidateV2, ResponseEarlyValidateYield, ResponseExportAccountProxyMnemonic, ResponseGetAllTonWalletContractVersion, ResponseGetDeriveAccounts, ResponseGetDeriveSuggestion, ResponseGetYieldPoolTargets, ResponseInputAccountSubscribe, ResponseJsonGetAccountInfo, ResponseMetadataHash, ResponseMnemonicCreateV2, ResponseMnemonicValidateV2, ResponsePrivateKeyValidateV2, ResponseShortenMetadata, ResponseSubscribeProcessAlive, ResponseSubscribeProcessById, StorageDataInterface, SubmitChangeValidatorStaking, SubmitYieldJoinData, SubmitYieldStepData, SubnetYieldPositionInfo, SwapPair, SwapQuoteResponse, SwapRequest, SwapRequestResult, SwapRequestV2, SwapSubmitParams, SwapTxData, TokenSpendingApprovalParams, UnlockDotTransactionNft, UnstakingStatus, ValidateSwapProcessParams, ValidateYieldProcessParams, YieldPoolInfo, YieldPoolType, YieldPositionInfo } from '@subwallet/extension-base/types';
 import { RequestSubmitSignPsbtTransfer, RequestSubmitTransfer, RequestSubmitTransferWithId, RequestSubscribeTransfer, ResponseSubscribeTransfer, ResponseSubscribeTransferConfirmation } from '@subwallet/extension-base/types/balance/transfer';
 import { RequestClaimBridge } from '@subwallet/extension-base/types/bridge';
 import { GetNotificationParams, RequestIsClaimedPolygonBridge, RequestSwitchStatusParams } from '@subwallet/extension-base/types/notification';
@@ -33,7 +33,7 @@ import { JsonRpcPayload, JsonRpcResponse } from 'web3-core-helpers';
 import { ExtDef } from '@polkadot/types/extrinsic/signedExtensions/types';
 import { SignerResult } from '@polkadot/types/types/extrinsic';
 import { HexString } from '@polkadot/util/types';
-import { EarningSlippageResult } from '../services/earning-service/handlers/native-staking/dtao';
+import { EarningImpactResult } from '../services/earning-service/handlers/native-staking/dtao';
 import { TransactionWarning } from './warnings/TransactionWarning';
 export declare enum RuntimeEnvironment {
     Web = "Web",
@@ -1388,9 +1388,15 @@ export interface BondingSubmitParams extends BaseRequestSign {
         metadata: SubnetYieldPositionInfo;
         type: YieldPoolType;
         chain: string;
+        slug: string;
     };
     poolPosition?: {
         chain: string;
+        slug: string;
+    };
+    subnetData?: {
+        netuid: number;
+        stakingFee?: string;
     };
 }
 export declare type RequestBondingSubmit = InternalRequestSign<BondingSubmitParams>;
@@ -1407,6 +1413,7 @@ export interface UnbondingSubmitParams extends BaseRequestSign {
     poolInfo?: {
         metadata: SubnetYieldPositionInfo;
     };
+    stakingFee?: string;
 }
 export declare type RequestUnbondingSubmit = InternalRequestSign<UnbondingSubmitParams>;
 export interface StakePoolingBondingParams extends BaseRequestSign {
@@ -1935,7 +1942,7 @@ export interface KoniRequestSignatures {
     'pri(yield.withdraw.submit)': [RequestYieldWithdrawal, SWTransactionResponse];
     'pri(yield.cancelWithdrawal.submit)': [RequestStakeCancelWithdrawal, SWTransactionResponse];
     'pri(yield.claimReward.submit)': [RequestStakeClaimReward, SWTransactionResponse];
-    'pri(yield.getEarningSlippage)': [RequestEarningSlippage, EarningSlippageResult];
+    'pri(yield.getEarningImpact)': [RequestEarningImpact, EarningImpactResult];
     'pri(yield.changeValidator.submit)': [SubmitYieldJoinData, SWTransactionResponse];
     'pri(transaction.history.getSubscription)': [null, TransactionHistoryItem[], TransactionHistoryItem[]];
     'pri(transaction.history.subscribe)': [RequestSubscribeHistory, ResponseSubscribeHistory, TransactionHistoryItem[]];

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

@@ -4051,7 +4051,7 @@ class KoniExtension {
       chainType: (poolHandler === null || poolHandler === void 0 ? void 0 : poolHandler.transactionChainType) || _KoniTypes.ChainType.SUBSTRATE
     });
   }
-  async yieldGetEarningSlippage(params) {
+  async yieldGetEarningImpact(params) {
     const {
       slug
     } = params;
@@ -4059,7 +4059,7 @@ class KoniExtension {
     if (!poolHandler) {
       return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_types4.BasicTxErrorType.INVALID_PARAMS)]);
     }
-    const slippage = await this.#koniState.earningService.yieldGetEarningSlippage(params);
+    const slippage = await this.#koniState.earningService.yieldGetEarningImpact(params);
     return slippage;
   }
   async handleYieldChangeValidator(params) {
@@ -4953,8 +4953,8 @@ class KoniExtension {
         return await this.yieldSubmitCancelWithdrawal(request);
       case 'pri(yield.claimReward.submit)':
         return await this.yieldSubmitClaimReward(request);
-      case 'pri(yield.getEarningSlippage)':
-        return await this.yieldGetEarningSlippage(request);
+      case 'pri(yield.getEarningImpact)':
+        return await this.yieldGetEarningImpact(request);
       case 'pri(yield.changeValidator.submit)':
         return await this.handleYieldChangeValidator(request);
       /* Others */

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

@@ -1836,6 +1836,7 @@ class KoniState {
     this.chainService.resetWallet(resetAll);
     await this.walletConnectService.resetWallet(resetAll);
     await this.chainService.init();
+    this.chainOnlineService.resetFirstApplied();
     this.chainOnlineService.checkLatestData();
     this.chainService.checkLatestData();
     this.chainService.subscribeChainInfoMap().subscribe(() => {

package/cjs/packageInfo.js

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

package/cjs/services/balance-service/transfer/xcm/snowBridge.js

@@ -4,6 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getSnowBridgeEvmTransfer = getSnowBridgeEvmTransfer;
+var _api = require("@snowbridge/api");
+var _registry = require("@snowbridge/registry");
 var _web = require("@subwallet/extension-base/koni/api/contract-handler/evm/web3");
 var _utils = require("@subwallet/extension-base/koni/api/contract-handler/utils");
 var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
@@ -13,13 +15,6 @@ var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-async function getSendFeeToken(contract, tokenContract, destChainParaId, destinationFee) {
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
-  const quoteSendTokenFee = contract.methods.quoteSendTokenFee(tokenContract, destChainParaId, destinationFee);
-
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
-  return await quoteSendTokenFee.call();
-}
 async function getSnowBridgeEvmTransfer(tokenInfo, originChainInfo, destinationChainInfo, sender, recipientAddress, value, evmApi, _feeInfo, feeCustom, feeOption) {
   const snowBridgeContractAddress = (0, _utils.getSnowBridgeGatewayContract)(originChainInfo.slug);
   const snowBridgeContract = (0, _web.getWeb3Contract)(snowBridgeContractAddress, evmApi, _utils._SNOWBRIDGE_GATEWAY_ABI);
@@ -29,7 +24,24 @@ async function getSnowBridgeEvmTransfer(tokenInfo, originChainInfo, destinationC
     kind: 1,
     data: (0, _utils2._isChainEvmCompatible)(destinationChainInfo) ? recipientAddress : (0, _util.u8aToHex)((0, _utilCrypto.decodeAddress)(recipientAddress))
   };
-  const destinationFee = '0';
+  let destinationFee;
+  let totalFee;
+  try {
+    const environment = 'polkadot_mainnet';
+    const context = new _api.Context((0, _api.contextConfigFor)(environment));
+    const registry = (0, _registry.assetRegistryFor)(environment);
+    const deliveryFee = await _api.toPolkadotV2.getDeliveryFee(context, registry, tokenContract, destinationChainParaId);
+    console.log('deliveryFee', deliveryFee);
+    totalFee = deliveryFee.totalFeeInWei.toString();
+    destinationFee = (deliveryFee.destinationDeliveryFeeDOT + deliveryFee.destinationExecutionFeeDOT).toString();
+
+    // Clean up all open connections
+    await context.destroyContext();
+  } catch (error) {
+    console.error('Cannot get snow-bridge delivery fees with error:', error);
+    totalFee = '0';
+    destinationFee = '0';
+  }
 
   // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
   const transferCall = snowBridgeContract.methods.sendToken(tokenContract, destinationChainParaId, recipient, destinationFee, value);
@@ -38,11 +50,10 @@ async function getSnowBridgeEvmTransfer(tokenInfo, originChainInfo, destinationC
   const feeInfo = _feeInfo;
   const _feeCustom = feeCustom;
   const feeCombine = (0, _utils3.combineEthFee)(feeInfo, feeOption, _feeCustom);
-  const sendTokenFee = await getSendFeeToken(snowBridgeContract, tokenContract, destinationChainParaId, destinationFee);
   const transactionConfig = {
     from: sender,
     to: snowBridgeContractAddress,
-    value: sendTokenFee,
+    value: totalFee,
     data: transferEncodedCall,
     ...feeCombine
   };

package/cjs/services/chain-online-service/index.js

@@ -5,9 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ChainOnlineService = void 0;
 var _chainList = require("@subwallet/chain-list");
+var _types = require("@subwallet/chain-list/types");
 var _constants = require("@subwallet/extension-base/services/chain-online-service/constants");
 var _chainService = require("@subwallet/extension-base/services/chain-service");
-var _types = require("@subwallet/extension-base/services/chain-service/types");
+var _types2 = require("@subwallet/extension-base/services/chain-service/types");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -20,6 +21,9 @@ class ChainOnlineService {
     this.dbService = dbService;
     this.firstApplied = false;
   }
+  resetFirstApplied() {
+    this.firstApplied = false;
+  }
   validatePatchWithHash(latestPatch) {
     const {
       ChainAsset,
@@ -67,7 +71,7 @@ class ChainOnlineService {
         providers: _providers,
         ...info
       } = _info;
-      const providers = Object.assign(((_rs$slug = rs[slug]) === null || _rs$slug === void 0 ? void 0 : _rs$slug.providers) || {}, _providers);
+      const providers = rs[slug] ? (_rs$slug = rs[slug]) === null || _rs$slug === void 0 ? void 0 : _rs$slug.providers : _providers;
       rs[slug] = {
         ...info,
         providers
@@ -75,6 +79,26 @@ class ChainOnlineService {
     }
     return rs;
   }
+  checkExistedPredefinedChain(latestChainInfoMap, genesisHash, evmChainId) {
+    let duplicatedSlug = '';
+    if (genesisHash) {
+      for (const chainInfo of Object.values(latestChainInfoMap)) {
+        if (chainInfo.substrateInfo && chainInfo.substrateInfo.genesisHash === genesisHash) {
+          duplicatedSlug = chainInfo.slug;
+        }
+      }
+    } else if (evmChainId) {
+      for (const chainInfo of Object.values(latestChainInfoMap)) {
+        if (chainInfo.evmInfo && chainInfo.evmInfo.evmChainId === evmChainId) {
+          duplicatedSlug = chainInfo.slug;
+        }
+      }
+    }
+    return duplicatedSlug;
+  }
+  generateSlugForSmartContractAsset(originChain, assetType, symbol, contractAddress) {
+    return `${originChain}-${assetType}-${symbol}-${contractAddress}`;
+  }
   async handleLatestPatch(latestPatch) {
     try {
       var _await$this$settingSe;
@@ -94,31 +118,151 @@ class ChainOnlineService {
       let assetRegistry = structuredClone(this.chainService.getAssetRegistry());
       const currentChainStateMap = structuredClone(this.chainService.getChainStateMap());
       const currentChainStatusMap = structuredClone(this.chainService.getChainStatusMap());
+      const assetSetting = structuredClone(await this.chainService.getAssetSettings());
+      const migratedAssetSetting = {};
       let addedChain = [];
+      const customChains = [];
+      const deprecatedChains = [];
+      const deprecatedChainMap = {};
+      const deprecatedAssets = [];
       if (isSafePatch && (!this.firstApplied || currentPatchVersion !== latestPatchVersion)) {
         this.firstApplied = true;
 
         // 2. merge data map
         if (latestChainInfo && Object.keys(latestChainInfo).length > 0) {
+          const storedChainSettings = await this.dbService.getAllChainStore();
+          const storedChainSettingMap = {};
+          storedChainSettings.forEach(chainStoredSetting => {
+            storedChainSettingMap[chainStoredSetting.slug] = chainStoredSetting;
+          });
+          if (storedChainSettings.length > 0) {
+            for (const [storedSlug, storedChainInfo] of Object.entries(storedChainSettingMap)) {
+              if ((0, _utils._isCustomChain)(storedSlug)) {
+                var _storedChainInfo$subs, _storedChainInfo$evmI;
+                // Check if this custom chain duplicates any of the latest chainInfo from patch based on genesisHash (for Substrate) or EVM chain ID.
+                const duplicatedDefaultSlug = this.checkExistedPredefinedChain(latestChainInfo, (_storedChainInfo$subs = storedChainInfo.substrateInfo) === null || _storedChainInfo$subs === void 0 ? void 0 : _storedChainInfo$subs.genesisHash, (_storedChainInfo$evmI = storedChainInfo.evmInfo) === null || _storedChainInfo$evmI === void 0 ? void 0 : _storedChainInfo$evmI.evmChainId);
+                if (duplicatedDefaultSlug.length > 0) {
+                  // Add the old custom chain slug to the list of deprecated chains.
+                  deprecatedChainMap[storedSlug] = duplicatedDefaultSlug;
+                  deprecatedChains.push(storedSlug);
+                  const storedChainState = currentChainStateMap[storedSlug];
+                  const storedChainStatus = currentChainStatusMap[storedSlug];
+
+                  // Update the current chain state to use the new chain slug, inheriting the active/inactive status from custom chain and randomly assigning a provider
+                  currentChainStateMap[duplicatedDefaultSlug] = {
+                    slug: duplicatedDefaultSlug,
+                    active: storedChainState.active,
+                    currentProvider: (0, _utils.randomizeProvider)(latestChainInfo[duplicatedDefaultSlug].providers).providerKey,
+                    manualTurnOff: storedChainState.manualTurnOff
+                  };
+
+                  // Update the current chain status to use the new chain slug, inheriting the connection status from custom chain and updating the last updated timestamp
+                  currentChainStatusMap[duplicatedDefaultSlug] = {
+                    slug: duplicatedDefaultSlug,
+                    connectionStatus: storedChainStatus.connectionStatus,
+                    lastUpdated: Date.now()
+                  };
+                  customChains.push(duplicatedDefaultSlug);
+
+                  // Remove the deprecated custom chain's info from the old chain info map and the current state/status maps.
+                  delete oldChainInfoMap[storedSlug];
+                  delete currentChainStateMap[storedSlug];
+                  delete currentChainStatusMap[storedSlug];
+                }
+              }
+            }
+          }
           chainInfoMap = this.mergeChainList(oldChainInfoMap, latestChainInfo);
           const [currentChainStateKey, newChainKey] = [Object.keys(currentChainStateMap), Object.keys(chainInfoMap)];
-          addedChain = newChainKey.filter(chain => !currentChainStateKey.includes(chain));
+          addedChain = newChainKey.filter(chain => !currentChainStateKey.includes(chain) || customChains.includes(chain));
           addedChain.forEach(key => {
-            currentChainStateMap[key] = {
-              active: false,
-              currentProvider: (0, _utils.randomizeProvider)(chainInfoMap[key].providers).providerKey,
-              manualTurnOff: false,
-              slug: key
-            };
-            currentChainStatusMap[key] = {
-              slug: key,
-              connectionStatus: _types._ChainConnectionStatus.DISCONNECTED,
-              lastUpdated: Date.now()
-            };
+            if (!currentChainStateMap[key] && !currentChainStatusMap[key]) {
+              currentChainStateMap[key] = {
+                active: false,
+                currentProvider: (0, _utils.randomizeProvider)(chainInfoMap[key].providers).providerKey,
+                manualTurnOff: false,
+                slug: key
+              };
+              currentChainStatusMap[key] = {
+                slug: key,
+                connectionStatus: _types2._ChainConnectionStatus.DISCONNECTED,
+                lastUpdated: Date.now()
+              };
+            }
           });
         }
         if (latestAssetInfo && Object.keys(latestAssetInfo).length > 0) {
-          assetRegistry = (0, _chainService.filterAssetInfoMap)(oldChainInfoMap, Object.assign({}, oldAssetRegistry, latestAssetInfo), addedChain);
+          // Get all previously stored asset registry entries from the database.
+          const storedAssetRegistry = await this.dbService.getAllAssetStore();
+          const availableChains = Object.values(chainInfoMap).filter(info => info.chainStatus === _types._ChainStatus.ACTIVE).map(chainInfo => chainInfo.slug);
+          let finalAssetRegistry;
+          if (storedAssetRegistry.length === 0) {
+            finalAssetRegistry = oldAssetRegistry;
+          } else {
+            const mergedAssetRegistry = oldAssetRegistry;
+            const parsedStoredAssetRegistry = {};
+
+            // Update custom assets of merged custom chains
+            for (const storedAsset of Object.values(storedAssetRegistry)) {
+              var _storedAsset$metadata;
+              // If the stored asset is a custom asset and its origin chain is marked as deprecated, and its assetType is ERC20
+              if ((0, _utils._isCustomAsset)(storedAsset.slug) && Object.keys(deprecatedChainMap).includes(storedAsset.originChain) && (_storedAsset$metadata = storedAsset.metadata) !== null && _storedAsset$metadata !== void 0 && _storedAsset$metadata.contractAddress) {
+                const newOriginChain = deprecatedChainMap[storedAsset.originChain];
+                // const newSlug = this.generateSlugForSmartContractAsset(newOriginChain, storedAsset.assetType, storedAsset.symbol, storedAsset.metadata?.contractAddress);
+
+                // Mark the old custom asset slug as deprecated.
+                deprecatedAssets.push(storedAsset.slug);
+                parsedStoredAssetRegistry[storedAsset.slug] = {
+                  ...storedAsset,
+                  originChain: newOriginChain
+                };
+              } else {
+                parsedStoredAssetRegistry[storedAsset.slug] = storedAsset;
+              }
+            }
+            for (const storedAssetInfo of Object.values(parsedStoredAssetRegistry)) {
+              let duplicated = false;
+              let deprecated = false;
+              let defaultSlugForMigration;
+              for (const defaultChainAsset of Object.values(latestAssetInfo)) {
+                // case: the stored asset is the same to a smart contract asset from patch
+                if ((0, _utils._isEqualSmartContractAsset)(storedAssetInfo, defaultChainAsset)) {
+                  duplicated = true;
+                  defaultSlugForMigration = defaultChainAsset.slug;
+                  break;
+                }
+
+                // case: the origin chain of the stored asset is no longer active (Exp: custom chain is deprecated)
+                if (availableChains.indexOf(storedAssetInfo.originChain) === -1) {
+                  deprecated = true;
+                  defaultSlugForMigration = defaultChainAsset.slug;
+                  break;
+                }
+              }
+
+              // If the stored asset is a duplicate of a default asset or its origin chain is deprecated.
+              if (duplicated || deprecated) {
+                if (Object.keys(assetSetting).includes(storedAssetInfo.slug)) {
+                  const isVisible = assetSetting[storedAssetInfo.slug].visible;
+
+                  // Migrate assetSetting from custom token to token from patch
+                  if (defaultSlugForMigration) {
+                    migratedAssetSetting[defaultSlugForMigration] = {
+                      visible: isVisible
+                    };
+                    delete assetSetting[storedAssetInfo.slug];
+                  }
+                }
+                delete mergedAssetRegistry[storedAssetInfo.slug];
+                deprecatedAssets.push(storedAssetInfo.slug);
+              } else {
+                // If the stored asset is not a duplicate and its origin chain is active, keep it in the merged registry.
+                mergedAssetRegistry[storedAssetInfo.slug] = storedAssetInfo;
+              }
+            }
+            finalAssetRegistry = mergedAssetRegistry;
+          }
+          assetRegistry = (0, _chainService.filterAssetInfoMap)(oldChainInfoMap, Object.assign({}, finalAssetRegistry, latestAssetInfo), addedChain);
         }
 
         // 3. validate data before write
@@ -136,6 +280,15 @@ class ChainOnlineService {
           this.chainService.setChainStateMap(currentChainStateMap);
           this.chainService.subscribeChainStateMap().next(currentChainStateMap);
           this.chainService.subscribeChainStatusMap().next(currentChainStatusMap);
+          // Migrate assetSetting
+          this.chainService.setAssetSettings({
+            ...assetSetting,
+            ...migratedAssetSetting
+          });
+
+          // Remove all custom chains and custom tokens that is duplicated from chains or tokens in patch
+          await this.dbService.removeFromChainStore(deprecatedChains);
+          await this.dbService.removeFromAssetStore(deprecatedAssets);
           const storedChainInfoList = Object.keys(chainInfoMap).map(chainSlug => {
             return {
               ...chainInfoMap[chainSlug],

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

@@ -1256,8 +1256,11 @@ class ChainService {
   async initAssetRegistry(deprecatedCustomChainMap) {
     const storedAssetRegistry = await this.dbService.getAllAssetStore();
     const latestAssetRegistry = filterAssetInfoMap(this.getChainInfoMap(), _chainList.ChainAssetMap);
+    const assetSetting = await this.getAssetSettings();
     const availableChains = Object.values(this.dataMap.chainInfoMap).filter(info => info.chainStatus === _types._ChainStatus.ACTIVE).map(chainInfo => chainInfo.slug);
+    const customChains = Object.keys(deprecatedCustomChainMap).filter(chain => (0, _utils._isCustomChain)(chain));
     let finalAssetRegistry = {};
+    const migratedAssetSetting = {};
     if (storedAssetRegistry.length === 0) {
       finalAssetRegistry = latestAssetRegistry;
     } else {
@@ -1267,15 +1270,18 @@ class ChainService {
 
       // Update custom assets of merged custom chains
       Object.values(storedAssetRegistry).forEach(storedAsset => {
-        if ((0, _utils._isCustomAsset)(storedAsset.slug) && Object.keys(deprecatedCustomChainMap).includes(storedAsset.originChain)) {
-          var _storedAsset$metadata;
+        var _storedAsset$metadata;
+        const isFromCustomChain = customChains ? customChains.includes(storedAsset.originChain) : false;
+
+        // If the stored asset is a custom asset, from a deprecated custom chain, and has a contract address.
+        if ((0, _utils._isCustomAsset)(storedAsset.slug) && isFromCustomChain && (_storedAsset$metadata = storedAsset.metadata) !== null && _storedAsset$metadata !== void 0 && _storedAsset$metadata.contractAddress) {
           const newOriginChain = deprecatedCustomChainMap[storedAsset.originChain];
-          const newSlug = this.generateSlugForSmartContractAsset(newOriginChain, storedAsset.assetType, storedAsset.symbol, (_storedAsset$metadata = storedAsset.metadata) === null || _storedAsset$metadata === void 0 ? void 0 : _storedAsset$metadata.contractAddress);
+          // const newSlug = this.generateSlugForSmartContractAsset(newOriginChain, storedAsset.assetType, storedAsset.symbol, storedAsset.metadata?.contractAddress);
+
           deprecatedAssets.push(storedAsset.slug);
-          parsedStoredAssetRegistry[newSlug] = {
+          parsedStoredAssetRegistry[storedAsset.slug] = {
             ...storedAsset,
-            originChain: newOriginChain,
-            slug: newSlug
+            originChain: newOriginChain
           };
         } else {
           parsedStoredAssetRegistry[storedAsset.slug] = storedAsset;
@@ -1284,25 +1290,48 @@ class ChainService {
       for (const storedAssetInfo of Object.values(parsedStoredAssetRegistry)) {
         let duplicated = false;
         let deprecated = false;
+        let defaultSlugForMigration;
         for (const defaultChainAsset of Object.values(latestAssetRegistry)) {
-          // case merge custom asset with default asset
+          // Case: The stored asset is the same to a smart contract asset from new stable chainlist
           if ((0, _utils._isEqualSmartContractAsset)(storedAssetInfo, defaultChainAsset)) {
             duplicated = true;
+            defaultSlugForMigration = defaultChainAsset.slug;
             break;
           }
+
+          // Case: If the origin chain of the stored asset is no longer active. (custom chain is deprecated)
           if (availableChains.indexOf(storedAssetInfo.originChain) === -1) {
             deprecated = true;
+            defaultSlugForMigration = defaultChainAsset.slug;
             break;
           }
+
+          // Case: If a default asset already exists with the same slug as the stored asset (from patch)
           if (defaultChainAsset.slug === storedAssetInfo.slug) {
             duplicated = true;
+            defaultSlugForMigration = defaultChainAsset.slug;
             break;
           }
         }
-        if (!duplicated && !deprecated) {
-          mergedAssetRegistry[storedAssetInfo.slug] = storedAssetInfo;
-        } else {
+
+        // If the stored asset is a duplicate of a default asset or its origin chain is deprecated.
+        if (duplicated || deprecated) {
+          if (Object.keys(assetSetting).includes(storedAssetInfo.slug)) {
+            const isVisible = assetSetting[storedAssetInfo.slug].visible;
+
+            // Migrate assetSetting from custom token to new default token
+            if (defaultSlugForMigration) {
+              migratedAssetSetting[defaultSlugForMigration] = {
+                visible: isVisible
+              };
+              delete assetSetting[storedAssetInfo.slug];
+            }
+          }
+          delete mergedAssetRegistry[storedAssetInfo.slug];
           deprecatedAssets.push(storedAssetInfo.slug);
+        } else {
+          // If the stored asset is not a duplicate and its origin chain is active, keep it in the merged registry.
+          mergedAssetRegistry[storedAssetInfo.slug] = storedAssetInfo;
         }
       }
       finalAssetRegistry = mergedAssetRegistry;

package/cjs/services/chain-service/utils/patch.js

@@ -10,9 +10,9 @@ exports.fetchPatchData = fetchPatchData;
 
 const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
 const branchName = process.env.BRANCH_NAME || 'subwallet-dev';
-const fetchDomain = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'https://chain-list-assets.subwallet.app' : 'https://dev.sw-chain-list-assets.pages.dev';
+const fetchDomain = process.env.PATCH_CHAIN_LIST_URL || (PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'https://chain-list-assets.subwallet.app' : 'https://dev.sw-chain-list-assets.pages.dev');
 const fetchFile = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'list.json' : 'preview.json';
-const ChainListVersion = '0.2.111'; // update this when build chain-list
+const ChainListVersion = '0.2.112'; // update this when build chain-list
 
 // todo: move this interface to chainlist
 exports.ChainListVersion = ChainListVersion;

package/cjs/services/earning-service/constants/chains.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._SUPPORT_CHANGE_VALIDATOR_CHAIN = exports._STAKING_CHAIN_GROUP = exports.TON_CHAINS = exports.ST_LIQUID_TOKEN_ABI = exports.STAKING_IDENTITY_API_SLUG = exports.MaxEraRewardPointsEras = exports.MANTA_VALIDATOR_POINTS_PER_BLOCK = exports.MANTA_MIN_DELEGATION = exports.CHANNEL_ID = void 0;
+exports._STAKING_CHAIN_GROUP = exports.TON_CHAINS = exports.ST_LIQUID_TOKEN_ABI = exports.STAKING_IDENTITY_API_SLUG = exports.MaxEraRewardPointsEras = exports.MANTA_VALIDATOR_POINTS_PER_BLOCK = exports.MANTA_MIN_DELEGATION = exports.CHANNEL_ID = void 0;
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -46,6 +46,4 @@ const STAKING_IDENTITY_API_SLUG = {
   polkadot: 'polkadot_people',
   kusama: 'peopleKusama'
 };
-exports.STAKING_IDENTITY_API_SLUG = STAKING_IDENTITY_API_SLUG;
-const _SUPPORT_CHANGE_VALIDATOR_CHAIN = ['polkadot', 'kusama'];
-exports._SUPPORT_CHANGE_VALIDATOR_CHAIN = _SUPPORT_CHANGE_VALIDATOR_CHAIN;
+exports.STAKING_IDENTITY_API_SLUG = STAKING_IDENTITY_API_SLUG;

package/cjs/services/earning-service/handlers/base.js

@@ -288,7 +288,7 @@ class BasePoolHandler {
   canHandleSlug(slug) {
     return this.slug === slug;
   }
-  getEarningSlippage(params) {
+  getEarningImpact(params) {
     return Promise.resolve({
       slippage: 0,
       rate: 1

package/cjs/services/earning-service/handlers/native-staking/base.js

@@ -139,7 +139,8 @@ class BaseNativeStakingPoolHandler extends _base.default {
       address,
       amount,
       selectedValidators,
-      slug
+      slug,
+      subnetData
     } = data;
     const positionInfo = await this.getPoolPosition(address, slug);
     const [extrinsic] = await this.createJoinExtrinsic(data, positionInfo);
@@ -148,7 +149,8 @@ class BaseNativeStakingPoolHandler extends _base.default {
       slug: this.slug,
       amount,
       address,
-      selectedValidators
+      selectedValidators,
+      subnetData
     };
     return {
       txChain: this.chain,

package/cjs/services/earning-service/handlers/native-staking/dtao.js

@@ -50,7 +50,7 @@ class SubnetTaoStakingPoolHandler extends _tao.default {
   canHandleSlug(slug) {
     return slug.startsWith(`${this.slug}__`);
   }
-  async getEarningSlippage(params) {
+  async getEarningImpact(params) {
     const substrateApi = await this.substrateApi.isReady;
     const subnetInfo = (await substrateApi.api.call.subnetInfoRuntimeApi.getDynamicInfo(params.netuid)).toJSON();
     const alphaIn = new _bignumber.default((subnetInfo === null || subnetInfo === void 0 ? void 0 : subnetInfo.alphaIn) || 0);
@@ -58,15 +58,18 @@ class SubnetTaoStakingPoolHandler extends _tao.default {
     const k = alphaIn.multipliedBy(taoIn);
     const value = new _bignumber.default(params.value);
     const rate = taoIn.dividedBy(alphaIn);
+    const feeRate = await this.bittensorCache.fetchSubnetFeeRate(params.netuid);
     if (params.type === _KoniTypes.ExtrinsicType.STAKING_BOND) {
       const newTaoIn = taoIn.plus(value);
       const newAlphaIn = k.dividedBy(newTaoIn);
       const alphaReturned = alphaIn.minus(newAlphaIn);
       const alphaIdeal = value.multipliedBy(alphaIn).dividedBy(taoIn);
       const slippage = alphaIdeal.minus(alphaReturned).dividedBy(alphaIdeal);
+      const bnStakingTaoFee = value.multipliedBy(feeRate);
       return {
         slippage: slippage.plus(0.0001).toNumber(),
-        rate: rate.toNumber()
+        rate: rate.toNumber(),
+        stakingTaoFee: bnStakingTaoFee.toString()
       };
     } else if (params.type === _KoniTypes.ExtrinsicType.STAKING_UNBOND) {
       const newAlphaIn = alphaIn.plus(value);
@@ -74,9 +77,12 @@ class SubnetTaoStakingPoolHandler extends _tao.default {
       const taoReturned = taoIn.minus(newTaoReserve);
       const taoIdeal = value.multipliedBy(taoIn).dividedBy(alphaIn);
       const slippage = taoIdeal.minus(taoReturned).dividedBy(taoIdeal);
+      const taoAmount = value.multipliedBy(rate);
+      const bnStakingTaoFee = taoAmount.multipliedBy(feeRate);
       return {
         slippage: slippage.plus(0.0001).toNumber(),
-        rate: rate.toNumber()
+        rate: rate.toNumber(),
+        stakingTaoFee: bnStakingTaoFee.toString()
       };
     }
     return {

package/cjs/services/earning-service/handlers/native-staking/relay-chain.js

@@ -29,17 +29,8 @@ class RelayNativeStakingPoolHandler extends _base.default {
     cancelUnstake: true,
     withdraw: true,
     claimReward: false,
-    changeValidator: false
+    changeValidator: true
   };
-  constructor(state, chain) {
-    super(state, chain);
-    if (_constants2._SUPPORT_CHANGE_VALIDATOR_CHAIN.includes(chain)) {
-      this.availableMethod = {
-        ...this.availableMethod,
-        changeValidator: true
-      };
-    }
-  }
   /* Subscribe pool info */
 
   async subscribePoolInfo(callback) {