@subwallet/extension-base 1.3.52-0 → 1.3.54-0

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.52-0",
+  "version": "1.3.54-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -2838,7 +2838,7 @@
   "dependencies": {
     "@acala-network/api": "^5.0.2",
     "@apollo/client": "^3.7.14",
-    "@azns/resolver-core": "^1.4.0",
+    "@azns/resolver-core": "2.1.0",
     "@emurgo/cardano-serialization-lib-nodejs": "^13.2.0",
     "@equilab/api": "~1.14.25",
     "@ethereumjs/common": "^4.1.0",
@@ -2851,41 +2851,42 @@
     "@metaverse-network-sdk/type-definitions": "^0.0.1-13",
     "@oak-foundation/types": "^0.0.23",
     "@polkadot-api/merkleize-metadata": "^1.1.0",
-    "@polkadot/api": "^15.7.2",
-    "@polkadot/api-base": "^15.7.2",
-    "@polkadot/api-contract": "^15.7.2",
-    "@polkadot/api-derive": "^15.7.2",
-    "@polkadot/apps-config": "^0.150.2",
-    "@polkadot/hw-ledger": "^13.4.3",
-    "@polkadot/networks": "^13.4.3",
-    "@polkadot/phishing": "^0.25.4",
-    "@polkadot/rpc-provider": "^15.7.2",
-    "@polkadot/types": "^15.7.2",
-    "@polkadot/types-augment": "^15.7.2",
-    "@polkadot/types-known": "^15.7.2",
-    "@polkadot/ui-settings": "^3.12.2",
-    "@polkadot/util": "^13.4.3",
-    "@polkadot/util-crypto": "^13.4.3",
-    "@polkadot/x-global": "^13.4.3",
+    "@polkadot/api": "^16.4.2",
+    "@polkadot/api-base": "^16.4.2",
+    "@polkadot/api-contract": "^16.4.2",
+    "@polkadot/api-derive": "^16.4.2",
+    "@polkadot/apps-config": "^0.161.1",
+    "@polkadot/hw-ledger": "^13.5.3",
+    "@polkadot/networks": "^13.5.3",
+    "@polkadot/phishing": "^0.25.15",
+    "@polkadot/rpc-provider": "^16.4.2",
+    "@polkadot/types": "^16.4.2",
+    "@polkadot/types-augment": "^16.4.2",
+    "@polkadot/types-known": "^16.4.2",
+    "@polkadot/ui-settings": "^3.15.2",
+    "@polkadot/util": "^13.5.3",
+    "@polkadot/util-crypto": "^13.5.3",
+    "@polkadot/x-global": "^13.5.3",
     "@reduxjs/toolkit": "^1.9.1",
+    "@snowbridge/api": "^0.2.0",
+    "@snowbridge/registry": "^0.2.0",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
     "@subwallet-monorepos/subwallet-services-sdk": "^0.1.8",
-    "@subwallet/chain-list": "0.2.111",
-    "@subwallet/extension-base": "^1.3.52-0",
-    "@subwallet/extension-chains": "^1.3.52-0",
-    "@subwallet/extension-dapp": "^1.3.52-0",
-    "@subwallet/extension-inject": "^1.3.52-0",
-    "@subwallet/keyring": "^0.1.12",
-    "@subwallet/subwallet-api-sdk": "^1.3.51-0",
-    "@subwallet/ui-keyring": "^0.1.12",
+    "@subwallet/chain-list": "0.2.112-beta.9",
+    "@subwallet/extension-base": "^1.3.54-0",
+    "@subwallet/extension-chains": "^1.3.54-0",
+    "@subwallet/extension-dapp": "^1.3.54-0",
+    "@subwallet/extension-inject": "^1.3.54-0",
+    "@subwallet/keyring": "^0.1.13",
+    "@subwallet/ui-keyring": "^0.1.13",
     "@ton/core": "^0.56.3",
     "@ton/crypto": "^3.2.0",
     "@ton/ton": "^15.0.0",
     "@walletconnect/keyvaluestorage": "^1.1.1",
-    "@walletconnect/sign-client": "^2.20.2",
-    "@walletconnect/types": "^2.20.2",
-    "@walletconnect/utils": "^2.20.2",
+    "@walletconnect/sign-client": "2.21.5",
+    "@walletconnect/types": "2.21.5",
+    "@walletconnect/utils": "2.21.5",
     "avail-js-sdk": "^0.2.12",
     "axios": "^1.6.2",
     "bignumber.js": "^9.1.1",

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.3.52-0'
+  version: '1.3.54-0'
 };

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

@@ -1,19 +1,14 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
+import { Context, contextConfigFor, toPolkadotV2 } from '@snowbridge/api';
+import { assetRegistryFor } from '@snowbridge/registry';
 import { getWeb3Contract } from '@subwallet/extension-base/koni/api/contract-handler/evm/web3';
 import { _SNOWBRIDGE_GATEWAY_ABI, getSnowBridgeGatewayContract } from '@subwallet/extension-base/koni/api/contract-handler/utils';
 import { _getContractAddressOfToken, _getSubstrateParaId, _isChainEvmCompatible } from '@subwallet/extension-base/services/chain-service/utils';
 import { combineEthFee } from '@subwallet/extension-base/utils';
 import { u8aToHex } from '@polkadot/util';
 import { decodeAddress } from '@polkadot/util-crypto';
-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();
-}
 export async function getSnowBridgeEvmTransfer(tokenInfo, originChainInfo, destinationChainInfo, sender, recipientAddress, value, evmApi, _feeInfo, feeCustom, feeOption) {
   const snowBridgeContractAddress = getSnowBridgeGatewayContract(originChainInfo.slug);
   const snowBridgeContract = getWeb3Contract(snowBridgeContractAddress, evmApi, _SNOWBRIDGE_GATEWAY_ABI);
@@ -23,7 +18,24 @@ export async function getSnowBridgeEvmTransfer(tokenInfo, originChainInfo, desti
     kind: 1,
     data: _isChainEvmCompatible(destinationChainInfo) ? recipientAddress : u8aToHex(decodeAddress(recipientAddress))
   };
-  const destinationFee = '0';
+  let destinationFee;
+  let totalFee;
+  try {
+    const environment = 'polkadot_mainnet';
+    const context = new Context(contextConfigFor(environment));
+    const registry = assetRegistryFor(environment);
+    const deliveryFee = await 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);
@@ -32,11 +44,10 @@ export async function getSnowBridgeEvmTransfer(tokenInfo, originChainInfo, desti
   const feeInfo = _feeInfo;
   const _feeCustom = feeCustom;
   const feeCombine = 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/services/chain-online-service/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
+import { _AssetType, _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
 import { ChainService } from '@subwallet/extension-base/services/chain-service';
 import { PatchInfo } from '@subwallet/extension-base/services/chain-service/utils';
 import { EventService } from '@subwallet/extension-base/services/event-service';
@@ -13,9 +13,12 @@ export declare class ChainOnlineService {
     private firstApplied;
     refreshLatestChainDataTimeOut: NodeJS.Timer | undefined;
     constructor(chainService: ChainService, settingService: SettingService, eventService: EventService, dbService: DatabaseService);
+    resetFirstApplied(): void;
     validatePatchWithHash(latestPatch: PatchInfo): boolean;
     validatePatchBeforeStore(candidateChainInfoMap: Record<string, _ChainInfo>, candidateAssetRegistry: Record<string, _ChainAsset>, latestPatch: PatchInfo): boolean;
     mergeChainList(oldChainInfoMap: Record<string, _ChainInfo>, latestChainInfo: Record<string, _ChainInfo>): Record<string, _ChainInfo>;
+    checkExistedPredefinedChain(latestChainInfoMap: Record<string, _ChainInfo>, genesisHash?: string, evmChainId?: number): string;
+    generateSlugForSmartContractAsset(originChain: string, assetType: _AssetType, symbol: string, contractAddress: string): string;
     handleLatestPatch(latestPatch: PatchInfo): Promise<void>;
     private fetchLatestPatchData;
     handleLatestPatchData(): void;

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

@@ -2,10 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { AssetLogoMap, ChainLogoMap } from '@subwallet/chain-list';
+import { _ChainStatus } from '@subwallet/chain-list/types';
 import { LATEST_CHAIN_PATCH_FETCHING_INTERVAL, md5HashChainAsset, md5HashChainInfo } from '@subwallet/extension-base/services/chain-online-service/constants';
 import { filterAssetInfoMap } from '@subwallet/extension-base/services/chain-service';
 import { _ChainConnectionStatus } from '@subwallet/extension-base/services/chain-service/types';
-import { fetchPatchData, randomizeProvider } from '@subwallet/extension-base/services/chain-service/utils';
+import { _isCustomAsset, _isCustomChain, _isEqualSmartContractAsset, fetchPatchData, randomizeProvider } from '@subwallet/extension-base/services/chain-service/utils';
 export class ChainOnlineService {
   constructor(chainService, settingService, eventService, dbService) {
     this.chainService = chainService;
@@ -14,6 +15,9 @@ export class ChainOnlineService {
     this.dbService = dbService;
     this.firstApplied = false;
   }
+  resetFirstApplied() {
+    this.firstApplied = false;
+  }
   validatePatchWithHash(latestPatch) {
     const {
       ChainAsset,
@@ -61,7 +65,7 @@ export 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
@@ -69,6 +73,26 @@ export 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;
@@ -88,31 +112,151 @@ export 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 (_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: 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: randomizeProvider(chainInfoMap[key].providers).providerKey,
-              manualTurnOff: false,
-              slug: key
-            };
-            currentChainStatusMap[key] = {
-              slug: key,
-              connectionStatus: _ChainConnectionStatus.DISCONNECTED,
-              lastUpdated: Date.now()
-            };
+            if (!currentChainStateMap[key] && !currentChainStatusMap[key]) {
+              currentChainStateMap[key] = {
+                active: false,
+                currentProvider: randomizeProvider(chainInfoMap[key].providers).providerKey,
+                manualTurnOff: false,
+                slug: key
+              };
+              currentChainStatusMap[key] = {
+                slug: key,
+                connectionStatus: _ChainConnectionStatus.DISCONNECTED,
+                lastUpdated: Date.now()
+              };
+            }
           });
         }
         if (latestAssetInfo && Object.keys(latestAssetInfo).length > 0) {
-          assetRegistry = 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 === _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 (_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 (_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 = filterAssetInfoMap(oldChainInfoMap, Object.assign({}, finalAssetRegistry, latestAssetInfo), addedChain);
         }
 
         // 3. validate data before write
@@ -130,6 +274,15 @@ export 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/services/chain-service/index.js

@@ -1229,8 +1229,11 @@ export class ChainService {
   async initAssetRegistry(deprecatedCustomChainMap) {
     const storedAssetRegistry = await this.dbService.getAllAssetStore();
     const latestAssetRegistry = filterAssetInfoMap(this.getChainInfoMap(), ChainAssetMap);
+    const assetSetting = await this.getAssetSettings();
     const availableChains = Object.values(this.dataMap.chainInfoMap).filter(info => info.chainStatus === _ChainStatus.ACTIVE).map(chainInfo => chainInfo.slug);
+    const customChains = Object.keys(deprecatedCustomChainMap).filter(chain => _isCustomChain(chain));
     let finalAssetRegistry = {};
+    const migratedAssetSetting = {};
     if (storedAssetRegistry.length === 0) {
       finalAssetRegistry = latestAssetRegistry;
     } else {
@@ -1240,15 +1243,18 @@ export class ChainService {
 
       // Update custom assets of merged custom chains
       Object.values(storedAssetRegistry).forEach(storedAsset => {
-        if (_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 (_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;
@@ -1257,25 +1263,48 @@ export 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 (_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/services/chain-service/utils/patch.d.ts

@@ -1,5 +1,5 @@
 import { _ChainAsset, _ChainInfo, _MultiChainAsset } from '@subwallet/chain-list/types';
-export declare const ChainListVersion = "0.2.111";
+export declare const ChainListVersion = "0.2.112";
 export interface PatchInfo {
     patchVersion: string;
     appliedVersion: string;

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

@@ -3,9 +3,9 @@
 
 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';
-export const ChainListVersion = '0.2.111'; // update this when build chain-list
+export const ChainListVersion = '0.2.112'; // update this when build chain-list
 
 // todo: move this interface to chainlist
 

package/services/earning-service/constants/chains.d.ts

@@ -23,4 +23,3 @@ export declare const MANTA_VALIDATOR_POINTS_PER_BLOCK = 20;
 export declare const MANTA_MIN_DELEGATION = 500;
 export declare const CHANNEL_ID = 7;
 export declare const STAKING_IDENTITY_API_SLUG: Record<string, string>;
-export declare const _SUPPORT_CHANGE_VALIDATOR_CHAIN: string[];

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

@@ -32,5 +32,4 @@ export const CHANNEL_ID = 7;
 export const STAKING_IDENTITY_API_SLUG = {
   polkadot: 'polkadot_people',
   kusama: 'peopleKusama'
-};
-export const _SUPPORT_CHANGE_VALIDATOR_CHAIN = ['polkadot', 'kusama'];
+};

package/services/earning-service/handlers/base.d.ts

@@ -3,8 +3,8 @@ import { TransactionError } from '@subwallet/extension-base/background/errors/Tr
 import { ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
 import { _EvmApi, _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
-import { BasePoolInfo, BaseYieldPoolMetadata, EarningRewardHistoryItem, EarningRewardItem, HandleYieldStepData, OptimalYieldPath, OptimalYieldPathParams, RequestEarlyValidateYield, RequestEarningSlippage, ResponseEarlyValidateYield, StakeCancelWithdrawalParams, SubmitChangeValidatorStaking, SubmitYieldJoinData, TransactionData, UnstakingInfo, YieldPoolInfo, YieldPoolMethodInfo, YieldPoolTarget, YieldPoolType, YieldPositionInfo, YieldStepBaseInfo, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
-import { EarningSlippageResult } from './native-staking/dtao';
+import { BasePoolInfo, BaseYieldPoolMetadata, EarningRewardHistoryItem, EarningRewardItem, HandleYieldStepData, OptimalYieldPath, OptimalYieldPathParams, RequestEarlyValidateYield, RequestEarningImpact, ResponseEarlyValidateYield, StakeCancelWithdrawalParams, SubmitChangeValidatorStaking, SubmitYieldJoinData, TransactionData, UnstakingInfo, YieldPoolInfo, YieldPoolMethodInfo, YieldPoolTarget, YieldPoolType, YieldPositionInfo, YieldStepBaseInfo, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
+import { EarningImpactResult } from './native-staking/dtao';
 /**
  * @class BasePoolHandler
  * @description Base pool handler
@@ -120,5 +120,5 @@ export default abstract class BasePoolHandler {
     abstract handleChangeEarningValidator(data: SubmitChangeValidatorStaking): Promise<TransactionData>;
     /** Check handler can handle slug */
     canHandleSlug(slug: string): boolean;
-    getEarningSlippage(params: RequestEarningSlippage): Promise<EarningSlippageResult>;
+    getEarningImpact(params: RequestEarningImpact): Promise<EarningImpactResult>;
 }

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

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

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

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

package/services/earning-service/handlers/native-staking/dtao.d.ts

@@ -1,6 +1,6 @@
 import { _ChainInfo } from '@subwallet/chain-list/types';
 import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
-import { BaseYieldPositionInfo, RequestEarningSlippage, YieldPoolInfo, YieldPoolType, YieldPositionInfo } from '@subwallet/extension-base/types';
+import { BaseYieldPositionInfo, RequestEarningImpact, YieldPoolInfo, YieldPoolType, YieldPositionInfo } from '@subwallet/extension-base/types';
 import TaoNativeStakingPoolHandler, { TaoStakingStakeOption } from './tao';
 export interface SubnetData {
     netuid: number;
@@ -20,9 +20,10 @@ export interface RawDelegateState {
         stake: string;
     }>;
 }
-export interface EarningSlippageResult {
+export interface EarningImpactResult {
     slippage: number;
     rate: number;
+    stakingTaoFee?: string;
 }
 export default class SubnetTaoStakingPoolHandler extends TaoNativeStakingPoolHandler {
     readonly type = YieldPoolType.SUBNET_STAKING;
@@ -33,7 +34,7 @@ export default class SubnetTaoStakingPoolHandler extends TaoNativeStakingPoolHan
     private isInit;
     constructor(state: KoniState, chain: string);
     canHandleSlug(slug: string): boolean;
-    getEarningSlippage(params: RequestEarningSlippage): Promise<EarningSlippageResult>;
+    getEarningImpact(params: RequestEarningImpact): Promise<EarningImpactResult>;
     private init;
     protected getDescription(): string;
     subscribePoolInfo(callback: (data: YieldPoolInfo) => void): Promise<VoidFunction>;