@subwallet/extension-base 1.1.48-0 → 1.1.50-0

package/background/KoniTypes.d.ts

@@ -1744,6 +1744,8 @@ export interface KoniRequestSignatures {
     'pri(settings.saveLanguage)': [RequestChangeLanguage, boolean];
     'pri(settings.saveShowZeroBalance)': [RequestChangeShowZeroBalance, boolean];
     'pri(settings.saveShowBalance)': [RequestChangeShowBalance, boolean];
+    'pri(settings.logo.assets.subscribe)': [null, Record<string, string>, Record<string, string>];
+    'pri(settings.logo.chains.subscribe)': [null, Record<string, string>, Record<string, string>];
     'pri(yield.subscribePoolInfo)': [null, YieldPoolInfo[], YieldPoolInfo[]];
     'pri(yield.subscribeYieldPosition)': [null, YieldPositionInfo[], YieldPositionInfo[]];
     'pri(yield.subscribeYieldReward)': [null, EarningRewardJson, EarningRewardJson];

package/cjs/constants/index.js

@@ -113,7 +113,7 @@ const IGNORE_QR_SIGNER = [];
 exports.IGNORE_QR_SIGNER = IGNORE_QR_SIGNER;
 const XCM_MIN_AMOUNT_RATIO = 1.2;
 exports.XCM_MIN_AMOUNT_RATIO = XCM_MIN_AMOUNT_RATIO;
-const XCM_FEE_RATIO = 1.2;
+const XCM_FEE_RATIO = 2;
 exports.XCM_FEE_RATIO = XCM_FEE_RATIO;
 const GAS_PRICE_RATIO = 1 + 2 / 100;
 exports.GAS_PRICE_RATIO = GAS_PRICE_RATIO;

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

@@ -1944,7 +1944,7 @@ class KoniExtension {
           if (!destinationTokenInfo) {
             estimatedFee = '0';
           } else {
-            maxTransferable = maxTransferable.minus(new _bignumber.default(tokenInfo.minAmount || '0').multipliedBy(_constants.XCM_FEE_RATIO));
+            maxTransferable = maxTransferable.minus(new _bignumber.default(tokenInfo.minAmount || '0').multipliedBy(_constants.XCM_MIN_AMOUNT_RATIO));
             const desChainInfo = chainInfoMap[destChain];
             const orgChainInfo = chainInfoMap[networkKey];
             const recipient = !(0, _utilCrypto.isEthereumAddress)(address) && (0, _utils2._isChainEvmCompatible)(desChainInfo) && !(0, _utils2._isChainEvmCompatible)(orgChainInfo) ? (0, _util.u8aToHex)((0, _utilCrypto.addressToEvm)(address)) : address;
@@ -2001,10 +2001,10 @@ class KoniExtension {
         estimatedFee = '0';
         console.warn('Unable to estimate fee', e);
       }
-      maxTransferable = maxTransferable.minus(new _bignumber.default(estimatedFee));
+      maxTransferable = maxTransferable.minus(new _bignumber.default(estimatedFee).multipliedBy(isXcmTransfer ? _constants.XCM_FEE_RATIO : 1));
       return {
         ...freeBalance,
-        value: maxTransferable.gt(_utils4.BN_ZERO) ? maxTransferable.toFixed() || '0' : '0'
+        value: maxTransferable.gt(_utils4.BN_ZERO) ? maxTransferable.toFixed(0) || '0' : '0'
       };
     }
   }
@@ -3383,6 +3383,28 @@ class KoniExtension {
       assetLogoMap
     };
   }
+  subscribeAssetLogoMap(id, port) {
+    const cb = (0, _subscriptions.createSubscription)(id, port);
+    const subscription = this.#koniState.chainService.subscribeAssetLogoMap().subscribe(rs => {
+      cb(rs);
+    });
+    port.onDisconnect.addListener(() => {
+      subscription.unsubscribe();
+      this.cancelSubscription(id);
+    });
+    return this.#koniState.chainService.getAssetLogoMap();
+  }
+  subscribeChainLogoMap(id, port) {
+    const cb = (0, _subscriptions.createSubscription)(id, port);
+    const subscription = this.#koniState.chainService.subscribeChainLogoMap().subscribe(rs => {
+      cb(rs);
+    });
+    port.onDisconnect.addListener(() => {
+      subscription.unsubscribe();
+      this.cancelSubscription(id);
+    });
+    return this.#koniState.chainService.getChainLogoMap();
+  }
 
   // Phishing detect
 
@@ -4483,6 +4505,10 @@ class KoniExtension {
         return await this.reloadCron(request);
       case 'pri(settings.getLogoMaps)':
         return await this.getLogoMap();
+      case 'pri(settings.logo.assets.subscribe)':
+        return this.subscribeAssetLogoMap(id, port);
+      case 'pri(settings.logo.chains.subscribe)':
+        return this.subscribeChainLogoMap(id, port);
 
       /// Wallet Connect
       case 'pri(walletConnect.connect)':

package/cjs/packageInfo.js

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

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

@@ -284,22 +284,19 @@ async function subscribeAssetsAccountPallet(addresses, chain, api, callBack) {
       // Get Token Balance
       return await api.query.assets.account.multi(addresses.map(address => [assetIndex, address]), balances => {
         const items = balances.map((balance, index) => {
-          // @ts-ignore
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-assignment
-          const bdata = balance === null || balance === void 0 ? void 0 : balance.toHuman();
+          const bdata = balance === null || balance === void 0 ? void 0 : balance.toPrimitive();
           let frozen = _util.BN_ZERO;
           let total = _util.BN_ZERO;
           if (bdata) {
             // @ts-ignore
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-argument
             const addressBalance = new _util.BN(String(bdata === null || bdata === void 0 ? void 0 : bdata.balance).replaceAll(',', '') || '0');
 
             // @ts-ignore
-            if (bdata !== null && bdata !== void 0 && bdata.isFrozen) {
+            if (bdata !== null && bdata !== void 0 && bdata.isFrozen || ['Blocked', 'Frozen'].includes(bdata === null || bdata === void 0 ? void 0 : bdata.status)) {
+              // Status 'Frozen' and 'Blocked' are for frozen balance
               frozen = addressBalance;
-            } else {
-              total = addressBalance;
             }
+            total = addressBalance;
           }
           const free = total.sub(frozen);
           return {

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

@@ -40,7 +40,7 @@ const _BALANCE_CHAIN_GROUP = {
   genshiro: ['genshiro_testnet', 'genshiro'],
   equilibrium_parachain: ['equilibrium_parachain'],
   bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main', 'pendulum', 'amplitude', 'continuum_network'],
-  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network', 'rococo_assethub', 'liberlandTest', 'liberland', 'dentnet', 'pangolin', 'crust', 'phala'],
+  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network', 'rococo_assethub', 'liberlandTest', 'liberland', 'dentnet', 'pangolin', 'crust', 'phala', 'shibuya'],
   kusama: ['kusama', 'kintsugi', 'kintsugi_test', 'interlay', 'acala', 'statemint', 'karura', 'bifrost'],
   // perhaps there are some runtime updates
   centrifuge: ['centrifuge'],

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

@@ -42,6 +42,10 @@ class ChainService {
   assetRegistrySubject = new _rxjs.Subject();
   multiChainAssetMapSubject = new _rxjs.Subject();
   xcmRefMapSubject = new _rxjs.Subject();
+  assetLogoMapSubject = new _rxjs.BehaviorSubject(_chainList.AssetLogoMap);
+  chainLogoMapSubject = new _rxjs.BehaviorSubject(_chainList.ChainLogoMap);
+  assetMapPatch = JSON.stringify({});
+  assetLogoPatch = JSON.stringify({});
 
   // Todo: Update to new store indexed DB
   store = new _AssetSetting.default();
@@ -451,27 +455,12 @@ class ChainService {
     this.xcmRefMapSubject.next(this.xcmRefMap);
     await this.initApis();
     await this.initAssetSettings();
-    await this.initAssetRefMap();
+    this.initAssetRefMap();
+    await this.autoEnableTokens();
     this.checkLatestData();
   }
-  async initAssetRefMap() {
-    try {
-      const fetchPromise = this.fetchLatestBlockedAssetRef();
-      const timeout = new Promise(resolve => {
-        const id = setTimeout(() => {
-          clearTimeout(id);
-          resolve(null);
-        }, 1000);
-      });
-      const disabledAssetRefs = (await Promise.race([timeout, fetchPromise])) || null;
-      if (disabledAssetRefs) {
-        this.handleLatestBlockedAssetRef(disabledAssetRefs);
-      } else {
-        this.dataMap.assetRefMap = _chainList.AssetRefMap;
-      }
-    } catch (e) {
-      this.dataMap.assetRefMap = _chainList.AssetRefMap;
-    }
+  initAssetRefMap() {
+    this.dataMap.assetRefMap = _chainList.AssetRefMap;
   }
   checkLatestData() {
     clearInterval(this.refreshLatestChainDataTimeOut);
@@ -500,10 +489,15 @@ class ChainService {
       console.error('Error fetching latest chain data');
     }
   }
-  handleLatestBlockedAssetRef(latestBlockedAssetRefList) {
+  handleLatestAssetRef(latestBlockedAssetRefList, latestAssetRefMap) {
     const updatedAssetRefMap = {
       ..._chainList.AssetRefMap
     };
+    if (latestAssetRefMap) {
+      for (const [assetRefKey, assetRef] of Object.entries(latestAssetRefMap)) {
+        updatedAssetRefMap[assetRefKey] = assetRef;
+      }
+    }
     latestBlockedAssetRefList.forEach(blockedAssetRef => {
       delete updatedAssetRefMap[blockedAssetRef];
     });
@@ -526,12 +520,77 @@ class ChainService {
     }
     this.logger.log('Finished updating latest price IDs');
   }
+  handleLatestAssetData(_latestAssetInfo, _latestAssetLogoMap) {
+    try {
+      let needUpdate = false;
+      const latestAssetInfo = _latestAssetInfo || {};
+      const latestAssetLogoMap = _latestAssetLogoMap || {};
+      const latestAssetPatch = JSON.stringify(latestAssetInfo);
+      const latestAssetLogoPatch = JSON.stringify(latestAssetLogoMap);
+      if (this.assetMapPatch !== latestAssetPatch) {
+        needUpdate = true;
+        const assetRegistry = {
+          ..._chainList.ChainAssetMap,
+          ...latestAssetInfo
+        };
+        this.assetMapPatch = latestAssetPatch;
+        this.dataMap.assetRegistry = assetRegistry;
+        this.assetRegistrySubject.next(assetRegistry);
+      }
+      if (this.assetLogoPatch !== latestAssetLogoPatch) {
+        const logoMap = {
+          ..._chainList.AssetLogoMap,
+          ...latestAssetLogoMap
+        };
+        this.assetLogoPatch = latestAssetLogoPatch;
+        this.assetLogoMapSubject.next(logoMap);
+      }
+      if (needUpdate) {
+        this.autoEnableTokens().then(() => {
+          this.eventService.emit('asset.updateState', '');
+        }).catch(console.error);
+      }
+    } catch (e) {
+      console.error('Error fetching latest asset data');
+    }
+    this.logger.log('Finished updating latest asset');
+  }
+  async autoEnableTokens() {
+    const autoEnableTokens = Object.values(this.dataMap.assetRegistry).filter(asset => (0, _utils._isAssetAutoEnable)(asset));
+    const assetSettings = this.assetSettingSubject.value;
+    const chainStateMap = this.getChainStateMap();
+    for (const asset of autoEnableTokens) {
+      const {
+        originChain,
+        slug: assetSlug
+      } = asset;
+      const assetState = assetSettings[assetSlug];
+      const chainState = chainStateMap[originChain];
+      if (!assetState) {
+        // If this asset not has asset setting, this token is not enabled before (not turned off before)
+        // @ts-ignore
+        // TODO: Merge issue detect balance to define manualTurnOff props
+        if (!chainState || !chainState.manualTurnOff) {
+          await this.updateAssetSetting(assetSlug, {
+            visible: true
+          });
+        }
+      }
+    }
+  }
   handleLatestData() {
+    this.fetchLatestAssetData().then(_ref6 => {
+      let [latestAssetInfo, latestAssetLogoMap] = _ref6;
+      this.eventService.waitAssetReady.then(() => {
+        this.handleLatestAssetData(latestAssetInfo, latestAssetLogoMap);
+      }).catch(console.error);
+    }).catch(console.error);
     this.fetchLatestChainData().then(latestChainInfo => {
       this.handleLatestProviderData(latestChainInfo);
     }).catch(console.error);
-    this.fetchLatestBlockedAssetRef().then(latestAssetRef => {
-      this.handleLatestBlockedAssetRef(latestAssetRef);
+    this.fetchLatestAssetRef().then(_ref7 => {
+      let [latestAssetRef, latestAssetRefMap] = _ref7;
+      this.handleLatestAssetRef(latestAssetRef, latestAssetRefMap);
     }).catch(console.error);
     this.fetchLatestPriceIdsData().then(latestPriceIds => {
       this.handleLatestPriceId(latestPriceIds);
@@ -540,12 +599,12 @@ class ChainService {
   async initApis() {
     const chainInfoMap = this.getChainInfoMap();
     const chainStateMap = this.getChainStateMap();
-    await Promise.all(Object.entries(chainInfoMap).filter(_ref6 => {
+    await Promise.all(Object.entries(chainInfoMap).filter(_ref8 => {
       var _chainStateMap$slug;
-      let [slug] = _ref6;
+      let [slug] = _ref8;
       return (_chainStateMap$slug = chainStateMap[slug]) === null || _chainStateMap$slug === void 0 ? void 0 : _chainStateMap$slug.active;
-    }).map(_ref7 => {
-      let [, chainInfo] = _ref7;
+    }).map(_ref9 => {
+      let [, chainInfo] = _ref9;
       try {
         return this.initApiForChain(chainInfo);
       } catch (e) {
@@ -727,12 +786,16 @@ class ChainService {
     // }
   }
 
+  async fetchLatestAssetData() {
+    return await Promise.all([(0, _utils.fetchPatchData)('ChainAsset.json'), (0, _utils.fetchPatchData)('AssetLogoMap.json')]);
+  }
+
   // @ts-ignore
   async fetchLatestPriceIdsData() {
     return await (0, _utils2.fetchStaticData)('chain-assets/price-map');
   }
-  async fetchLatestBlockedAssetRef() {
-    return await (0, _utils2.fetchStaticData)('chain-assets/disabled-xcm-channels');
+  async fetchLatestAssetRef() {
+    return await Promise.all([(0, _utils2.fetchStaticData)('chain-assets/disabled-xcm-channels'), (0, _utils.fetchPatchData)('AssetRef.json')]);
   }
   async initChains() {
     const storedChainSettings = await this.dbService.getAllChainStore();
@@ -870,8 +933,8 @@ class ChainService {
       }
 
       // Fill in the missing chainState and storageData (new chains never before seen)
-      Object.entries(mergedChainInfoMap).forEach(_ref8 => {
-        let [slug, chainInfo] = _ref8;
+      Object.entries(mergedChainInfoMap).forEach(_ref10 => {
+        let [slug, chainInfo] = _ref10;
         if (!(slug in this.dataMap.chainStateMap)) {
           this.dataMap.chainStateMap[slug] = {
             currentProvider: Object.keys(chainInfo.providers)[0],
@@ -1467,11 +1530,17 @@ class ChainService {
   subscribeAssetSettings() {
     return this.assetSettingSubject;
   }
-  async getChainLogoMap() {
-    return Promise.resolve(_chainList.ChainLogoMap);
+  getAssetLogoMap() {
+    return this.assetLogoMapSubject.value;
+  }
+  subscribeAssetLogoMap() {
+    return this.assetLogoMapSubject;
+  }
+  getChainLogoMap() {
+    return this.chainLogoMapSubject.value;
   }
-  async getAssetLogoMap() {
-    return Promise.resolve(_chainList.AssetLogoMap);
+  subscribeChainLogoMap() {
+    return this.chainLogoMapSubject;
   }
   resetWallet(resetAll) {
     if (resetAll) {

package/cjs/services/chain-service/{utils.js → utils/index.js}

@@ -3,6 +3,78 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+var _exportNames = {
+  _isCustomChain: true,
+  _isCustomAsset: true,
+  _getCustomAssets: true,
+  _isEqualContractAddress: true,
+  _isEqualSmartContractAsset: true,
+  _isPureEvmChain: true,
+  _isPureSubstrateChain: true,
+  _getOriginChainOfAsset: true,
+  _getContractAddressOfToken: true,
+  _isTokenTransferredByEvm: true,
+  _checkSmartContractSupportByChain: true,
+  _getTokenOnChainAssetId: true,
+  _getTokenOnChainInfo: true,
+  _isBridgedToken: true,
+  _getTokenMinAmount: true,
+  _isChainEvmCompatible: true,
+  _isNativeToken: true,
+  _isNativeTokenBySlug: true,
+  _isSmartContractToken: true,
+  _isSubstrateChain: true,
+  _getEvmChainId: true,
+  _getSubstrateParaId: true,
+  _getSubstrateRelayParent: true,
+  _getSubstrateGenesisHash: true,
+  _isChainSupportSubstrateStaking: true,
+  _isChainEnabled: true,
+  _getChainSubstrateAddressPrefix: true,
+  _isChainSupportNativeNft: true,
+  _isChainSupportEvmNft: true,
+  _isChainSupportWasmNft: true,
+  _isSupportOrdinal: true,
+  _getNftTypesSupportedByChain: true,
+  _getTokenTypesSupportedByChain: true,
+  _getChainNativeTokenBasicInfo: true,
+  _getChainNativeTokenSlug: true,
+  _isLocalToken: true,
+  _isTokenEvmSmartContract: true,
+  _isTokenWasmSmartContract: true,
+  _isAssetSmartContractNft: true,
+  _parseAssetRefKey: true,
+  _isXcmPathSupported: true,
+  _getXcmAssetType: true,
+  _getXcmAssetId: true,
+  _getXcmAssetMultilocation: true,
+  _getXcmTransferType: true,
+  _isSubstrateRelayChain: true,
+  _isSubstrateParaChain: true,
+  _getEvmAbiExplorer: true,
+  _isAssetValuable: true,
+  _getMultiChainAsset: true,
+  _getAssetPriceId: true,
+  _getMultiChainAssetPriceId: true,
+  _getAssetSymbol: true,
+  _getMultiChainAssetSymbol: true,
+  _getAssetOriginChain: true,
+  _getChainName: true,
+  _getAssetDecimals: true,
+  _getBlockExplorerFromChain: true,
+  _parseMetadataForSmartContractAsset: true,
+  _isChainTestNet: true,
+  _isAssetFungibleToken: true,
+  _isAssetAutoEnable: true,
+  _getCrowdloanUrlFromChain: true,
+  _isCustomProvider: true,
+  _generateCustomProviderKey: true,
+  findChainInfoByHalfGenesisHash: true,
+  findChainInfoByChainId: true,
+  _isMantaZkAsset: true,
+  randomizeProvider: true,
+  updateLatestChainInfo: true
+};
 exports._checkSmartContractSupportByChain = _checkSmartContractSupportByChain;
 exports._generateCustomProviderKey = _generateCustomProviderKey;
 exports._getAssetDecimals = _getAssetDecimals;
@@ -35,6 +107,7 @@ exports._getXcmAssetId = _getXcmAssetId;
 exports._getXcmAssetMultilocation = _getXcmAssetMultilocation;
 exports._getXcmAssetType = _getXcmAssetType;
 exports._getXcmTransferType = _getXcmTransferType;
+exports._isAssetAutoEnable = void 0;
 exports._isAssetFungibleToken = _isAssetFungibleToken;
 exports._isAssetSmartContractNft = _isAssetSmartContractNft;
 exports._isAssetValuable = _isAssetValuable;
@@ -75,6 +148,18 @@ var _types = require("@subwallet/chain-list/types");
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
 var _types2 = require("@subwallet/extension-base/services/chain-service/types");
 var _utilCrypto = require("@polkadot/util-crypto");
+var _patch = require("./patch");
+Object.keys(_patch).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _patch[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _patch[key];
+    }
+  });
+});
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -404,6 +489,10 @@ function _isChainTestNet(chainInfo) {
 function _isAssetFungibleToken(chainAsset) {
   return ![_types._AssetType.ERC721, _types._AssetType.PSP34, _types._AssetType.UNKNOWN].includes(chainAsset.assetType);
 }
+const _isAssetAutoEnable = chainAsset => {
+  return chainAsset.metadata ? !!chainAsset.metadata.autoEnable : false;
+};
+exports._isAssetAutoEnable = _isAssetAutoEnable;
 function _getCrowdloanUrlFromChain(chainInfo) {
   var _chainInfo$substrateI13;
   return (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI13 = chainInfo.substrateInfo) === null || _chainInfo$substrateI13 === void 0 ? void 0 : _chainInfo$substrateI13.crowdloanUrl) || '';

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

@@ -0,0 +1,33 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.fetchPatchData = fetchPatchData;
+var _packageInfo = require("@subwallet/chain-list/packageInfo");
+var _crossFetch = _interopRequireDefault(require("cross-fetch"));
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+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';
+async function fetchPatchData(slug) {
+  try {
+    const fetchPromise = (0, _crossFetch.default)(`${fetchDomain}/patch/${_packageInfo.packageInfo.version}/${slug}`);
+    const timeout = new Promise(resolve => {
+      const id = setTimeout(() => {
+        clearTimeout(id);
+        resolve(null);
+      }, 1000);
+    });
+    const rs = await Promise.race([timeout, fetchPromise]);
+    if (!rs) {
+      return null;
+    }
+    return await rs.json();
+  } catch (e) {
+    return null;
+  }
+}

package/constants/index.d.ts

@@ -23,7 +23,7 @@ export declare const ALL_GENESIS_HASH: null;
 export declare const IGNORE_GET_SUBSTRATE_FEATURES_LIST: string[];
 export declare const IGNORE_QR_SIGNER: string[];
 export declare const XCM_MIN_AMOUNT_RATIO = 1.2;
-export declare const XCM_FEE_RATIO = 1.2;
+export declare const XCM_FEE_RATIO = 2;
 export declare const GAS_PRICE_RATIO: number;
 export declare const NETWORK_MULTI_GAS_FEE: string[];
 export declare const ORDINAL_COLLECTION = "__Ordinal__";

package/constants/index.js

@@ -26,7 +26,7 @@ export const ALL_GENESIS_HASH = null;
 export const IGNORE_GET_SUBSTRATE_FEATURES_LIST = ['astarEvm', 'ethereum', 'ethereum_goerli', 'binance', 'binance_test', 'boba_rinkeby', 'boba', 'bobabase', 'bobabeam'];
 export const IGNORE_QR_SIGNER = [];
 export const XCM_MIN_AMOUNT_RATIO = 1.2;
-export const XCM_FEE_RATIO = 1.2;
+export const XCM_FEE_RATIO = 2;
 export const GAS_PRICE_RATIO = 1 + 2 / 100;
 export const NETWORK_MULTI_GAS_FEE = ['*'];
 export const ORDINAL_COLLECTION = '__Ordinal__';

package/koni/background/handlers/Extension.d.ts

@@ -195,6 +195,8 @@ export default class KoniExtension {
     private subscribeNotifications;
     private reloadCron;
     private getLogoMap;
+    private subscribeAssetLogoMap;
+    private subscribeChainLogoMap;
     private passPhishingPage;
     private connectWalletConnect;
     private connectWCSubscribe;

package/koni/background/handlers/Extension.js

@@ -1886,7 +1886,7 @@ export default class KoniExtension {
           if (!destinationTokenInfo) {
             estimatedFee = '0';
           } else {
-            maxTransferable = maxTransferable.minus(new BigN(tokenInfo.minAmount || '0').multipliedBy(XCM_FEE_RATIO));
+            maxTransferable = maxTransferable.minus(new BigN(tokenInfo.minAmount || '0').multipliedBy(XCM_MIN_AMOUNT_RATIO));
             const desChainInfo = chainInfoMap[destChain];
             const orgChainInfo = chainInfoMap[networkKey];
             const recipient = !isEthereumAddress(address) && _isChainEvmCompatible(desChainInfo) && !_isChainEvmCompatible(orgChainInfo) ? u8aToHex(addressToEvm(address)) : address;
@@ -1943,10 +1943,10 @@ export default class KoniExtension {
         estimatedFee = '0';
         console.warn('Unable to estimate fee', e);
       }
-      maxTransferable = maxTransferable.minus(new BigN(estimatedFee));
+      maxTransferable = maxTransferable.minus(new BigN(estimatedFee).multipliedBy(isXcmTransfer ? XCM_FEE_RATIO : 1));
       return {
         ...freeBalance,
-        value: maxTransferable.gt(BN_ZERO) ? maxTransferable.toFixed() || '0' : '0'
+        value: maxTransferable.gt(BN_ZERO) ? maxTransferable.toFixed(0) || '0' : '0'
       };
     }
   }
@@ -3294,6 +3294,28 @@ export default class KoniExtension {
       assetLogoMap
     };
   }
+  subscribeAssetLogoMap(id, port) {
+    const cb = createSubscription(id, port);
+    const subscription = this.#koniState.chainService.subscribeAssetLogoMap().subscribe(rs => {
+      cb(rs);
+    });
+    port.onDisconnect.addListener(() => {
+      subscription.unsubscribe();
+      this.cancelSubscription(id);
+    });
+    return this.#koniState.chainService.getAssetLogoMap();
+  }
+  subscribeChainLogoMap(id, port) {
+    const cb = createSubscription(id, port);
+    const subscription = this.#koniState.chainService.subscribeChainLogoMap().subscribe(rs => {
+      cb(rs);
+    });
+    port.onDisconnect.addListener(() => {
+      subscription.unsubscribe();
+      this.cancelSubscription(id);
+    });
+    return this.#koniState.chainService.getChainLogoMap();
+  }
 
   // Phishing detect
 
@@ -4379,6 +4401,10 @@ export default class KoniExtension {
         return await this.reloadCron(request);
       case 'pri(settings.getLogoMaps)':
         return await this.getLogoMap();
+      case 'pri(settings.logo.assets.subscribe)':
+        return this.subscribeAssetLogoMap(id, port);
+      case 'pri(settings.logo.chains.subscribe)':
+        return this.subscribeChainLogoMap(id, port);
 
       /// Wallet Connect
       case 'pri(walletConnect.connect)':

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.48-0",
+  "version": "1.1.50-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -714,9 +714,14 @@
       "default": "./services/chain-service/types.js"
     },
     "./services/chain-service/utils": {
-      "types": "./services/chain-service/utils.d.ts",
-      "require": "./cjs/services/chain-service/utils.js",
-      "default": "./services/chain-service/utils.js"
+      "types": "./services/chain-service/utils/index.d.ts",
+      "require": "./cjs/services/chain-service/utils/index.js",
+      "default": "./services/chain-service/utils/index.js"
+    },
+    "./services/chain-service/utils/patch": {
+      "types": "./services/chain-service/utils/patch.d.ts",
+      "require": "./cjs/services/chain-service/utils/patch.js",
+      "default": "./services/chain-service/utils/patch.js"
     },
     "./services/earning-service/constants": {
       "types": "./services/earning-service/constants/index.d.ts",
@@ -1796,11 +1801,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "0.2.52",
-    "@subwallet/extension-base": "^1.1.48-0",
-    "@subwallet/extension-chains": "^1.1.48-0",
-    "@subwallet/extension-dapp": "^1.1.48-0",
-    "@subwallet/extension-inject": "^1.1.48-0",
+    "@subwallet/chain-list": "0.2.53",
+    "@subwallet/extension-base": "^1.1.50-0",
+    "@subwallet/extension-chains": "^1.1.50-0",
+    "@subwallet/extension-dapp": "^1.1.50-0",
+    "@subwallet/extension-inject": "^1.1.50-0",
     "@subwallet/keyring": "^0.1.3",
     "@subwallet/ui-keyring": "^0.1.3",
     "@walletconnect/sign-client": "^2.8.4",

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

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

@@ -276,22 +276,19 @@ async function subscribeAssetsAccountPallet(addresses, chain, api, callBack) {
       // Get Token Balance
       return await api.query.assets.account.multi(addresses.map(address => [assetIndex, address]), balances => {
         const items = balances.map((balance, index) => {
-          // @ts-ignore
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-assignment
-          const bdata = balance === null || balance === void 0 ? void 0 : balance.toHuman();
+          const bdata = balance === null || balance === void 0 ? void 0 : balance.toPrimitive();
           let frozen = BN_ZERO;
           let total = BN_ZERO;
           if (bdata) {
             // @ts-ignore
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-argument
             const addressBalance = new BN(String(bdata === null || bdata === void 0 ? void 0 : bdata.balance).replaceAll(',', '') || '0');
 
             // @ts-ignore
-            if (bdata !== null && bdata !== void 0 && bdata.isFrozen) {
+            if (bdata !== null && bdata !== void 0 && bdata.isFrozen || ['Blocked', 'Frozen'].includes(bdata === null || bdata === void 0 ? void 0 : bdata.status)) {
+              // Status 'Frozen' and 'Blocked' are for frozen balance
               frozen = addressBalance;
-            } else {
-              total = addressBalance;
             }
+            total = addressBalance;
           }
           const free = total.sub(frozen);
           return {

package/services/chain-service/constants.js

@@ -29,7 +29,7 @@ export const _BALANCE_CHAIN_GROUP = {
   genshiro: ['genshiro_testnet', 'genshiro'],
   equilibrium_parachain: ['equilibrium_parachain'],
   bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main', 'pendulum', 'amplitude', 'continuum_network'],
-  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network', 'rococo_assethub', 'liberlandTest', 'liberland', 'dentnet', 'pangolin', 'crust', 'phala'],
+  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network', 'rococo_assethub', 'liberlandTest', 'liberland', 'dentnet', 'pangolin', 'crust', 'phala', 'shibuya'],
   kusama: ['kusama', 'kintsugi', 'kintsugi_test', 'interlay', 'acala', 'statemint', 'karura', 'bifrost'],
   // perhaps there are some runtime updates
   centrifuge: ['centrifuge'],

package/services/chain-service/index.d.ts

@@ -23,6 +23,10 @@ export declare class ChainService {
     private assetRegistrySubject;
     private multiChainAssetMapSubject;
     private xcmRefMapSubject;
+    private assetLogoMapSubject;
+    private chainLogoMapSubject;
+    private assetMapPatch;
+    private assetLogoPatch;
     private store;
     private assetSettingSubject;
     private logger;
@@ -76,12 +80,14 @@ export declare class ChainService {
     deleteAssetsByChain(chainSlug: string): void;
     deleteCustomAssets(targetAssets: string[]): void;
     init(): Promise<void>;
-    initAssetRefMap(): Promise<void>;
+    initAssetRefMap(): void;
     checkLatestData(): void;
     stopCheckLatestChainData(): void;
     handleLatestProviderData(latestChainInfo: _ChainInfo[]): void;
-    handleLatestBlockedAssetRef(latestBlockedAssetRefList: string[]): void;
+    handleLatestAssetRef(latestBlockedAssetRefList: string[], latestAssetRefMap: Record<string, _AssetRef> | null): void;
     handleLatestPriceId(latestPriceIds: Record<string, string | null>): void;
+    handleLatestAssetData(_latestAssetInfo: Record<string, _ChainAsset> | null, _latestAssetLogoMap: Record<string, string> | null): void;
+    autoEnableTokens(): Promise<void>;
     handleLatestData(): void;
     private initApis;
     private initApiForChain;
@@ -92,8 +98,9 @@ export declare class ChainService {
     disableChain(chainSlug: string): boolean;
     private checkExistedPredefinedChain;
     private fetchLatestChainData;
+    private fetchLatestAssetData;
     private fetchLatestPriceIdsData;
-    private fetchLatestBlockedAssetRef;
+    private fetchLatestAssetRef;
     private initChains;
     private initAssetRegistry;
     private updateChainStateMapSubscription;
@@ -122,8 +129,10 @@ export declare class ChainService {
     updateAssetSetting(assetSlug: string, assetSetting: AssetSetting, autoEnableNativeToken?: boolean): Promise<boolean | undefined>;
     updateAssetSettingByChain(chainSlug: string, visible: boolean): Promise<void>;
     subscribeAssetSettings(): BehaviorSubject<Record<string, AssetSetting>>;
-    getChainLogoMap(): Promise<Record<string, string>>;
-    getAssetLogoMap(): Promise<Record<string, string>>;
+    getAssetLogoMap(): Record<string, string>;
+    subscribeAssetLogoMap(): BehaviorSubject<Record<string, string>>;
+    getChainLogoMap(): Record<string, string>;
+    subscribeChainLogoMap(): BehaviorSubject<Record<string, string>>;
     resetWallet(resetAll: boolean): void;
     getMetadata(chain: string): import("dexie").PromiseExtended<IMetadataItem | undefined>;
     upsertMetadata(chain: string, metadata: IMetadataItem): import("dexie").PromiseExtended<unknown>;

package/services/chain-service/index.js

@@ -9,7 +9,7 @@ import { MantaPrivateHandler } from '@subwallet/extension-base/services/chain-se
 import { SubstrateChainHandler } from '@subwallet/extension-base/services/chain-service/handler/SubstrateChainHandler';
 import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chain-service/handler/types';
 import { _ChainConnectionStatus, _CUSTOM_PREFIX, _NFT_CONTRACT_STANDARDS, _SMART_CONTRACT_STANDARDS } from '@subwallet/extension-base/services/chain-service/types';
-import { _isAssetFungibleToken, _isChainEnabled, _isCustomAsset, _isCustomChain, _isCustomProvider, _isEqualContractAddress, _isEqualSmartContractAsset, _isMantaZkAsset, _isPureEvmChain, _isPureSubstrateChain, _parseAssetRefKey, randomizeProvider, updateLatestChainInfo } from '@subwallet/extension-base/services/chain-service/utils';
+import { _isAssetAutoEnable, _isAssetFungibleToken, _isChainEnabled, _isCustomAsset, _isCustomChain, _isCustomProvider, _isEqualContractAddress, _isEqualSmartContractAsset, _isMantaZkAsset, _isPureEvmChain, _isPureSubstrateChain, _parseAssetRefKey, fetchPatchData, randomizeProvider, updateLatestChainInfo } from '@subwallet/extension-base/services/chain-service/utils';
 import AssetSettingStore from '@subwallet/extension-base/stores/AssetSetting';
 import { addLazy, fetchStaticData, MODULE_SUPPORT } from '@subwallet/extension-base/utils';
 import { BehaviorSubject, Subject } from 'rxjs';
@@ -35,6 +35,10 @@ export class ChainService {
   assetRegistrySubject = new Subject();
   multiChainAssetMapSubject = new Subject();
   xcmRefMapSubject = new Subject();
+  assetLogoMapSubject = new BehaviorSubject(AssetLogoMap);
+  chainLogoMapSubject = new BehaviorSubject(ChainLogoMap);
+  assetMapPatch = JSON.stringify({});
+  assetLogoPatch = JSON.stringify({});
 
   // Todo: Update to new store indexed DB
   store = new AssetSettingStore();
@@ -435,27 +439,12 @@ export class ChainService {
     this.xcmRefMapSubject.next(this.xcmRefMap);
     await this.initApis();
     await this.initAssetSettings();
-    await this.initAssetRefMap();
+    this.initAssetRefMap();
+    await this.autoEnableTokens();
     this.checkLatestData();
   }
-  async initAssetRefMap() {
-    try {
-      const fetchPromise = this.fetchLatestBlockedAssetRef();
-      const timeout = new Promise(resolve => {
-        const id = setTimeout(() => {
-          clearTimeout(id);
-          resolve(null);
-        }, 1000);
-      });
-      const disabledAssetRefs = (await Promise.race([timeout, fetchPromise])) || null;
-      if (disabledAssetRefs) {
-        this.handleLatestBlockedAssetRef(disabledAssetRefs);
-      } else {
-        this.dataMap.assetRefMap = AssetRefMap;
-      }
-    } catch (e) {
-      this.dataMap.assetRefMap = AssetRefMap;
-    }
+  initAssetRefMap() {
+    this.dataMap.assetRefMap = AssetRefMap;
   }
   checkLatestData() {
     clearInterval(this.refreshLatestChainDataTimeOut);
@@ -484,10 +473,15 @@ export class ChainService {
       console.error('Error fetching latest chain data');
     }
   }
-  handleLatestBlockedAssetRef(latestBlockedAssetRefList) {
+  handleLatestAssetRef(latestBlockedAssetRefList, latestAssetRefMap) {
     const updatedAssetRefMap = {
       ...AssetRefMap
     };
+    if (latestAssetRefMap) {
+      for (const [assetRefKey, assetRef] of Object.entries(latestAssetRefMap)) {
+        updatedAssetRefMap[assetRefKey] = assetRef;
+      }
+    }
     latestBlockedAssetRefList.forEach(blockedAssetRef => {
       delete updatedAssetRefMap[blockedAssetRef];
     });
@@ -509,12 +503,75 @@ export class ChainService {
     }
     this.logger.log('Finished updating latest price IDs');
   }
+  handleLatestAssetData(_latestAssetInfo, _latestAssetLogoMap) {
+    try {
+      let needUpdate = false;
+      const latestAssetInfo = _latestAssetInfo || {};
+      const latestAssetLogoMap = _latestAssetLogoMap || {};
+      const latestAssetPatch = JSON.stringify(latestAssetInfo);
+      const latestAssetLogoPatch = JSON.stringify(latestAssetLogoMap);
+      if (this.assetMapPatch !== latestAssetPatch) {
+        needUpdate = true;
+        const assetRegistry = {
+          ...ChainAssetMap,
+          ...latestAssetInfo
+        };
+        this.assetMapPatch = latestAssetPatch;
+        this.dataMap.assetRegistry = assetRegistry;
+        this.assetRegistrySubject.next(assetRegistry);
+      }
+      if (this.assetLogoPatch !== latestAssetLogoPatch) {
+        const logoMap = {
+          ...AssetLogoMap,
+          ...latestAssetLogoMap
+        };
+        this.assetLogoPatch = latestAssetLogoPatch;
+        this.assetLogoMapSubject.next(logoMap);
+      }
+      if (needUpdate) {
+        this.autoEnableTokens().then(() => {
+          this.eventService.emit('asset.updateState', '');
+        }).catch(console.error);
+      }
+    } catch (e) {
+      console.error('Error fetching latest asset data');
+    }
+    this.logger.log('Finished updating latest asset');
+  }
+  async autoEnableTokens() {
+    const autoEnableTokens = Object.values(this.dataMap.assetRegistry).filter(asset => _isAssetAutoEnable(asset));
+    const assetSettings = this.assetSettingSubject.value;
+    const chainStateMap = this.getChainStateMap();
+    for (const asset of autoEnableTokens) {
+      const {
+        originChain,
+        slug: assetSlug
+      } = asset;
+      const assetState = assetSettings[assetSlug];
+      const chainState = chainStateMap[originChain];
+      if (!assetState) {
+        // If this asset not has asset setting, this token is not enabled before (not turned off before)
+        // @ts-ignore
+        // TODO: Merge issue detect balance to define manualTurnOff props
+        if (!chainState || !chainState.manualTurnOff) {
+          await this.updateAssetSetting(assetSlug, {
+            visible: true
+          });
+        }
+      }
+    }
+  }
   handleLatestData() {
+    this.fetchLatestAssetData().then(([latestAssetInfo, latestAssetLogoMap]) => {
+      this.eventService.waitAssetReady.then(() => {
+        this.handleLatestAssetData(latestAssetInfo, latestAssetLogoMap);
+      }).catch(console.error);
+    }).catch(console.error);
     this.fetchLatestChainData().then(latestChainInfo => {
       this.handleLatestProviderData(latestChainInfo);
     }).catch(console.error);
-    this.fetchLatestBlockedAssetRef().then(latestAssetRef => {
-      this.handleLatestBlockedAssetRef(latestAssetRef);
+    this.fetchLatestAssetRef().then(([latestAssetRef, latestAssetRefMap]) => {
+      this.handleLatestAssetRef(latestAssetRef, latestAssetRefMap);
     }).catch(console.error);
     this.fetchLatestPriceIdsData().then(latestPriceIds => {
       this.handleLatestPriceId(latestPriceIds);
@@ -708,12 +765,16 @@ export class ChainService {
     // }
   }
 
+  async fetchLatestAssetData() {
+    return await Promise.all([fetchPatchData('ChainAsset.json'), fetchPatchData('AssetLogoMap.json')]);
+  }
+
   // @ts-ignore
   async fetchLatestPriceIdsData() {
     return await fetchStaticData('chain-assets/price-map');
   }
-  async fetchLatestBlockedAssetRef() {
-    return await fetchStaticData('chain-assets/disabled-xcm-channels');
+  async fetchLatestAssetRef() {
+    return await Promise.all([fetchStaticData('chain-assets/disabled-xcm-channels'), fetchPatchData('AssetRef.json')]);
   }
   async initChains() {
     const storedChainSettings = await this.dbService.getAllChainStore();
@@ -1446,11 +1507,17 @@ export class ChainService {
   subscribeAssetSettings() {
     return this.assetSettingSubject;
   }
-  async getChainLogoMap() {
-    return Promise.resolve(ChainLogoMap);
+  getAssetLogoMap() {
+    return this.assetLogoMapSubject.value;
+  }
+  subscribeAssetLogoMap() {
+    return this.assetLogoMapSubject;
+  }
+  getChainLogoMap() {
+    return this.chainLogoMapSubject.value;
   }
-  async getAssetLogoMap() {
-    return Promise.resolve(AssetLogoMap);
+  subscribeChainLogoMap() {
+    return this.chainLogoMapSubject;
   }
   resetWallet(resetAll) {
     if (resetAll) {

package/services/chain-service/{utils.d.ts → utils/index.d.ts}

@@ -63,6 +63,7 @@ export declare function _getBlockExplorerFromChain(chainInfo: _ChainInfo): strin
 export declare function _parseMetadataForSmartContractAsset(contractAddress: string): Record<string, string>;
 export declare function _isChainTestNet(chainInfo: _ChainInfo): boolean;
 export declare function _isAssetFungibleToken(chainAsset: _ChainAsset): boolean;
+export declare const _isAssetAutoEnable: (chainAsset: _ChainAsset) => boolean;
 export declare function _getCrowdloanUrlFromChain(chainInfo: _ChainInfo): string;
 export declare function _isCustomProvider(providerKey: string): boolean;
 export declare function _generateCustomProviderKey(index: number): string;
@@ -77,3 +78,4 @@ export declare function updateLatestChainInfo(currentDataMap: _DataMap, latestCh
     storedChainInfoList: IChain[];
     needUpdateChainApiList: _ChainInfo[];
 };
+export * from './patch';

package/services/chain-service/{utils.js → utils/index.js}

@@ -330,6 +330,9 @@ export function _isChainTestNet(chainInfo) {
 export function _isAssetFungibleToken(chainAsset) {
   return ![_AssetType.ERC721, _AssetType.PSP34, _AssetType.UNKNOWN].includes(chainAsset.assetType);
 }
+export const _isAssetAutoEnable = chainAsset => {
+  return chainAsset.metadata ? !!chainAsset.metadata.autoEnable : false;
+};
 export function _getCrowdloanUrlFromChain(chainInfo) {
   var _chainInfo$substrateI13;
   return (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI13 = chainInfo.substrateInfo) === null || _chainInfo$substrateI13 === void 0 ? void 0 : _chainInfo$substrateI13.crowdloanUrl) || '';
@@ -431,4 +434,5 @@ export function updateLatestChainInfo(currentDataMap, latestChainInfoList) {
     storedChainInfoList,
     needUpdateChainApiList
   };
-}
+}
+export * from "./patch.js";

package/services/chain-service/utils/patch.d.ts

@@ -0,0 +1 @@
+export declare function fetchPatchData<T>(slug: string): Promise<T | null>;

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

@@ -0,0 +1,26 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+import { packageInfo as chainListInfo } from '@subwallet/chain-list/packageInfo';
+import fetch from 'cross-fetch';
+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';
+export async function fetchPatchData(slug) {
+  try {
+    const fetchPromise = fetch(`${fetchDomain}/patch/${chainListInfo.version}/${slug}`);
+    const timeout = new Promise(resolve => {
+      const id = setTimeout(() => {
+        clearTimeout(id);
+        resolve(null);
+      }, 1000);
+    });
+    const rs = await Promise.race([timeout, fetchPromise]);
+    if (!rs) {
+      return null;
+    }
+    return await rs.json();
+  } catch (e) {
+    return null;
+  }
+}