@subwallet/extension-base 1.3.70-2 → 1.3.72-0

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

@@ -356,7 +356,6 @@ const subscribePSP22Balance = _ref4 => {
       }
     });
   };
-
   getTokenBalances();
   const interval = setInterval(getTokenBalances, _constants.SUB_TOKEN_REFRESH_BALANCE_INTERVAL);
   return () => {
@@ -438,16 +437,27 @@ const subscribeAssetsAccountPallet = async _ref7 => {
     }
   });
   const unsubList = await Promise.all(Object.values(tokenMap).map(tokenInfo => {
+    if (tokenInfo.slug === 'energy_web_x-LOCAL-stEWT') {
+      return (0, _rxjs.timer)(0, _constants.CRON_REFRESH_PRICE_INTERVAL).subscribe(() => {
+        const getEwtFrozenBalance = async () => {
+          const ewtTokenBalances = await queryEwtFrozenBalance(substrateApi, addresses, assetMap[tokenInfo.slug], extrinsicType);
+          callback(ewtTokenBalances);
+        };
+        getEwtFrozenBalance().catch(console.error);
+      });
+    }
     try {
       const assetIndex = (0, _utils2._getTokenOnChainAssetId)(tokenInfo);
-      if (assetIndex === '-1') {
+      if (assetIndex === '-1' && !_constants2.USE_MULTILOCATION_INDEX.includes(chainInfo.slug)) {
         return undefined;
       }
+      const version = ['statemint', 'statemine', 'westend_assethub'].includes(chainInfo.slug) ? 4 : 3;
+      const index = _constants2.USE_MULTILOCATION_INDEX.includes(chainInfo.slug) ? (0, _xcmParser._adaptX1Interior)((0, _utils2._getXcmAssetMultilocation)(tokenInfo), version) : assetIndex;
       const params = [{
         section: 'query',
         module: assetsAccountKey.split('_')[1],
         method: assetsAccountKey.split('_')[2],
-        args: addresses.map(address => [assetIndex, address])
+        args: addresses.map(address => [index, address])
       }];
 
       // Get Token Balance
@@ -572,8 +582,8 @@ const subscribeSubnetAlphaPallet = async _ref9 => {
     }
     for (const chainAsset of Object.values(tokenMap)) {
       const netuid = (0, _utils2._getAssetNetuid)(chainAsset);
-      const items = Object.entries(converted).map(_ref10 => {
-        let [address, stakeMap] = _ref10;
+      const items = Object.entries(converted).map(_ref0 => {
+        let [address, stakeMap] = _ref0;
         const value = stakeMap[netuid] || (0, _bignumber.default)(0);
         return {
           address: address,
@@ -611,4 +621,37 @@ async function queryGigaTokenBalance(substrateApi, addresses, tokenInfo, extrins
       locked: totalLockedFromTransfer.toString()
     };
   }));
+}
+async function queryEwtFrozenBalance(substrateApi, addresses, tokenInfo, extrinsicType) {
+  const multilocation = (0, _utils2._getXcmAssetMultilocation)(tokenInfo);
+  return await Promise.all(addresses.map(async address => {
+    const [_frozenBalance, _balanceInfo] = await Promise.all([substrateApi.api.query.assetsFreezer.frozenBalances(multilocation, address), substrateApi.api.query.assets.account(multilocation, address)]);
+    const balanceInfo = _balanceInfo.toPrimitive();
+    if (!balanceInfo) {
+      // no balance info response
+      return {
+        address: address,
+        tokenSlug: tokenInfo.slug,
+        free: '0',
+        locked: '0',
+        state: _KoniTypes.APIItemState.READY
+      };
+    }
+    const transferableBalance = (0, _assetsPallet._getAssetsPalletTransferable)(balanceInfo, (0, _utils2._getAssetExistentialDeposit)(tokenInfo), extrinsicType);
+    const totalLockedFromTransfer = (0, _assetsPallet._getAssetsPalletLocked)(balanceInfo);
+    let freeBalance = transferableBalance;
+    let lockedBalance = totalLockedFromTransfer;
+    const frozenBalance = _frozenBalance.toPrimitive();
+    if (frozenBalance) {
+      freeBalance = transferableBalance - BigInt(frozenBalance);
+      lockedBalance = totalLockedFromTransfer + BigInt(frozenBalance);
+    }
+    return {
+      address: address,
+      tokenSlug: tokenInfo.slug,
+      free: freeBalance.toString(),
+      locked: lockedBalance.toString(),
+      state: _KoniTypes.APIItemState.READY
+    };
+  }));
 }

package/cjs/services/balance-service/helpers/subscribe/ton/utils.js

@@ -57,10 +57,8 @@ async function retryTonTxStatus(fn, options) {
       await new Promise(resolve => setTimeout(resolve, options.delay)); // wait for delay period, then recall the fn()
     }
   }
-
   throw lastError; // throw only last error, in case no successful result from fn()
 }
-
 function getMessageTxStatus(txByMsgInfo) {
   var _txDetailInfo$descrip, _txDetailInfo$descrip2, _txDetailInfo$descrip3, _txDetailInfo$descrip4, _txDetailInfo$descrip5, _txDetailInfo$descrip6, _txDetailInfo$out_msg, _txDetailInfo$out_msg2;
   const txDetailInfo = txByMsgInfo.transactions[0];
@@ -86,7 +84,6 @@ async function getJettonTxStatus(tonApi, jettonTransferMsgHash) {
     const jettonInternalTransferTxInfoRaw = await tonApi.getTxByInMsg(jettonInternalTransferHash);
     return getMessageTxStatus(jettonInternalTransferTxInfoRaw); // Jetton Internal Transfer success -> Receiver successfully receiver fund!
   }
-
   return false;
 }
 async function estimateTonTxFee(tonApi, messages, walletContract, _seqno) {

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

@@ -472,7 +472,7 @@ class BalanceService {
     const assetMap = this.state.chainService.getAssetRegistry();
     const promiseList = addresses.map(address => {
       const type = (0, _keyring.getKeypairTypeByAddress)(address);
-      const typeValid = [..._types3.SubstrateKeypairTypes, ..._types3.EthereumKeypairTypes].includes(type);
+      const typeValid = [..._types3.AllSubstrateKeypairTypes, ..._types3.EthereumKeypairTypes].includes(type);
       if (typeValid) {
         return this.state.subscanService.getMultiChainBalance(address).catch(e => {
           console.error(e);
@@ -553,12 +553,10 @@ class BalanceService {
           var _currentAssetSettings2;
           const chainSlug = tokenSlug.split('-')[0];
           const chainState = this.state.chainService.getChainStateByKey(chainSlug);
-          const existedKey = Object.keys(assetMap).find(v => v.toLowerCase() === tokenSlug.toLowerCase());
-
-          // Cancel if chain is turned off by user
-          if (chainState && chainState.manualTurnOff) {
+          if (chainState !== null && chainState !== void 0 && chainState.manualTurnOff) {
             continue;
           }
+          const existedKey = Object.keys(assetMap).find(v => v.toLowerCase() === tokenSlug.toLowerCase());
           if (existedKey && !((_currentAssetSettings2 = currentAssetSettings[existedKey]) !== null && _currentAssetSettings2 !== void 0 && _currentAssetSettings2.visible)) {
             needEnableChains.push(chainSlug);
             needActiveTokens.push(existedKey);
@@ -774,7 +772,7 @@ class BalanceService {
       const assetMap = this.state.chainService.getAssetRegistry();
       const addresses = _uiKeyring.default.getPairs().map(account => account.address);
       const evmAddresses = addresses.filter(address => [..._types3.EthereumKeypairTypes].includes((0, _keyring.getKeypairTypeByAddress)(address)));
-      const substrateAddresses = addresses.filter(address => [..._types3.SubstrateKeypairTypes].includes((0, _keyring.getKeypairTypeByAddress)(address)));
+      const substrateAddresses = addresses.filter(address => [..._types3.AllSubstrateKeypairTypes].includes((0, _keyring.getKeypairTypeByAddress)(address)));
       const [nonZeroBalanceEvmToken, nonZeroBalanceSubstrateToken] = await Promise.all([this.evmDetectBalanceToken(evmAddresses), this.substrateDetectBalanceToken(substrateAddresses)]);
       const substrateDetectChain = this.substrateDetectBalanceChain();
       const evmDetectChain = await this.evmDetectBalanceChain();
@@ -803,6 +801,104 @@ class BalanceService {
     }
   }
 
-  /** optimize token area **/
+  /** Return token slugs with balance in evm chain - only work with evm addresses & pure evm chains  **/
+  async getEvmTokensBalanceByChain(address, chainSlug) {
+    const tokenBalanceSlugs = await _subwalletServicesSdk.default.balanceDetectionApi.getSwEvmTokenBalanceByChain(address, chainSlug);
+    return tokenBalanceSlugs;
+  }
+
+  /** Return token slugs with balance in substrate chain - only work with substrate chains that have subscanSlug **/
+  async getSubstrateTokensBalanceByChain(address, chainSlug, assetsByChain) {
+    const tokenBalanceSlugs = [];
+    const balanceData = await this.state.subscanService.getMultiChainBalance(address);
+    if (!balanceData) {
+      return [];
+    }
+    for (const datum of balanceData) {
+      const {
+        balance,
+        bonded,
+        category,
+        locked,
+        network,
+        symbol
+      } = datum;
+      const chain = this.state.chainService.detectBalanceChainSlugMap[network];
+      if (chain !== chainSlug) {
+        continue;
+      }
+      const isBalanceEmpty = (!balance || balance === '0') && (!locked || locked === '0') && (!bonded || bonded === '0');
+      if (isBalanceEmpty) {
+        continue;
+      }
+      const tokenKey = `${chain}-${category === 'native' ? 'NATIVE' : 'LOCAL'}-${symbol.toUpperCase()}`;
+      const existedKey = Object.keys(assetsByChain).find(v => v.toLowerCase() === tokenKey.toLowerCase());
+      if (existedKey) {
+        tokenBalanceSlugs.push(existedKey);
+      }
+    }
+    return tokenBalanceSlugs;
+  }
+  getCurrentAccountAddressByChain(chainInfo) {
+    const proxyId = this.state.keyringService.context.currentAccount.proxyId;
+    const addresses = this.state.keyringService.context.addressesByProxyId(proxyId);
+    if ((0, _utils._isPureEvmChain)(chainInfo)) {
+      const evmAddress = addresses.find(address => {
+        const type = (0, _keyring.getKeypairTypeByAddress)(address);
+        return [..._types3.EthereumKeypairTypes].includes(type);
+      });
+      if (evmAddress) {
+        return evmAddress;
+      }
+    }
+    if ((0, _utils._isChainSubstrateCompatible)(chainInfo)) {
+      const substrateAddress = addresses.find(address => {
+        const type = (0, _keyring.getKeypairTypeByAddress)(address);
+        return [..._types3.AllSubstrateKeypairTypes, ..._types3.EthereumKeypairTypes].includes(type);
+      });
+      if (substrateAddress) {
+        return substrateAddress;
+      }
+    }
+    return undefined;
+  }
+
+  /** re-detect balance & enable custom, priority tokens when enabling chain again **/
+  async updatePriorityAssetsByChain(chainSlug, visible) {
+    const currentAssetSettings = await this.state.chainService.getAssetSettings();
+    const assetsByChain = this.state.chainService.getFungibleTokensByChain(chainSlug);
+    const priorityTokensMap = this.state.chainService.value.priorityTokens || {};
+    const chainInfo = this.state.chainService.getChainInfoByKey(chainSlug);
+    const address = this.getCurrentAccountAddressByChain(chainInfo);
+    const tokenSlugsWithBalance = [];
+    if (address && !(0, _utils._isCustomChain)(chainInfo.slug)) {
+      if ((0, _utils._isPureEvmChain)(chainInfo)) {
+        tokenSlugsWithBalance.push(...(await this.getEvmTokensBalanceByChain(address, chainSlug)));
+      } else if ((0, _utils._isChainSubstrateCompatible)(chainInfo)) {
+        tokenSlugsWithBalance.push(...(await this.getSubstrateTokensBalanceByChain(address, chainSlug, assetsByChain)));
+      }
+    }
+    tokenSlugsWithBalance.forEach(tokenSlug => {
+      currentAssetSettings[tokenSlug] = {
+        visible: true
+      };
+    });
+    const priorityTokensList = priorityTokensMap.token && typeof priorityTokensMap.token === 'object' ? Object.keys(priorityTokensMap.token) : [];
+    for (const asset of Object.values(assetsByChain)) {
+      if (visible) {
+        const isPriorityToken = priorityTokensList.includes(asset.slug) || (0, _utils._isCustomAsset)(asset.slug);
+        if (isPriorityToken || (0, _utils._isNativeToken)(asset)) {
+          currentAssetSettings[asset.slug] = {
+            visible: true
+          };
+        }
+      } else {
+        currentAssetSettings[asset.slug] = {
+          visible: false
+        };
+      }
+    }
+    this.state.chainService.setAssetSettings(currentAssetSettings);
+  }
 }
 exports.BalanceService = BalanceService;

package/cjs/services/balance-service/transfer/bitcoin-transfer.js

@@ -83,7 +83,6 @@ async function createBitcoinTransaction(params) {
             script: pair.bitcoin.output,
             value: input.value // UTXO value in satoshis
           },
-
           tapInternalKey: pair.bitcoin.internalPubkey // X-only public key (32 bytes)
         });
       } else {

package/cjs/services/balance-service/transfer/cardano-transfer.js

@@ -10,8 +10,7 @@ var _types = require("@subwallet/chain-list/types");
 var _utils = require("@subwallet/extension-base/services/balance-service/helpers/subscribe/cardano/utils");
 var _utils2 = require("@subwallet/extension-base/utils");
 var _subwalletServicesSdk = _interopRequireDefault(require("@subwallet-monorepos/subwallet-services-sdk"));
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 var POPULAR_CARDANO_ERROR_PHRASE;

package/cjs/services/balance-service/transfer/smart-contract.js

@@ -74,7 +74,6 @@ async function getEVMTransactionObject(props) {
     });
     gasLimit = Math.floor(gasEstimate * 1.1); // 10% buffer for fluctuations
   }
-
   transactionObject.gas = gasLimit;
   let estimateFee;
   if (feeCombine.maxFeePerGas) {

package/cjs/services/balance-service/transfer/token.js

@@ -4,9 +4,10 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getTransferMockTxFee = exports.getAccountNetuidTokenInfo = exports.createSubstrateExtrinsic = void 0;
+exports.getTransferMockTxFee = exports.createSubstrateExtrinsic = void 0;
 var _api = require("@gear-js/api");
 var _types = require("@subwallet/chain-list/types");
+var _xcmParser = require("@subwallet/extension-base/core/substrate/xcm-parser");
 var _wasm = require("@subwallet/extension-base/koni/api/contract-handler/wasm");
 var _utils = require("@subwallet/extension-base/koni/api/contract-handler/wasm/utils");
 var _utils2 = require("@subwallet/extension-base/services/balance-service/helpers/subscribe/ton/utils");
@@ -24,7 +25,7 @@ var _utilCrypto = require("@polkadot/util-crypto");
 // SPDX-License-Identifier: Apache-2.0
 
 const createSubstrateExtrinsic = async _ref => {
-  var _tokenInfo$metadata, _tokenInfo$metadata2;
+  var _tokenInfo$metadata;
   let {
     from,
     networkKey,
@@ -102,7 +103,15 @@ const createSubstrateExtrinsic = async _ref => {
   } else if (_constants._TRANSFER_CHAIN_GROUP.bitcountry.includes(networkKey) && !(0, _utils3._isNativeToken)(tokenInfo)) {
     transfer = api.tx.currencies.transfer(to, (0, _utils3._getTokenOnChainInfo)(tokenInfo), value);
   } else if (_constants._TRANSFER_CHAIN_GROUP.statemine.includes(networkKey) && !(0, _utils3._isNativeToken)(tokenInfo)) {
-    transfer = api.tx.assets.transfer((0, _utils3._getTokenOnChainAssetId)(tokenInfo), to, value);
+    if (_constants.USE_MULTILOCATION_INDEX.includes(networkKey)) {
+      const version = ['statemint', 'statemine', 'westend_assethub'].includes(networkKey) ? 4 : 3;
+      const multilocationIndex = (0, _xcmParser._adaptX1Interior)((0, _utils3._getXcmAssetMultilocation)(tokenInfo), version);
+
+      // @ts-ignore
+      transfer = api.tx.assets.transfer(multilocationIndex, to, value);
+    } else {
+      transfer = api.tx.assets.transfer((0, _utils3._getTokenOnChainAssetId)(tokenInfo), to, value);
+    }
   } else if (_constants._TRANSFER_CHAIN_GROUP.sora_substrate.includes(networkKey) && isTxAssetsSupported) {
     transfer = api.tx.assets.transfer((0, _utils3._getTokenOnChainAssetId)(tokenInfo), to, value);
   } else if (isTxBalancesSupported && (0, _utils3._isNativeToken)(tokenInfo)) {
@@ -120,18 +129,6 @@ const createSubstrateExtrinsic = async _ref => {
     }
   } else if (_constants._TRANSFER_CHAIN_GROUP.truth.includes(networkKey)) {
     transfer = api.tx.assetManager.transfer(to, (0, _utils3._getTokenOnChainInfo)(tokenInfo), value);
-  } else if (_constants._TRANSFER_CHAIN_GROUP.bittensor.includes(networkKey) && (_tokenInfo$metadata2 = tokenInfo.metadata) !== null && _tokenInfo$metadata2 !== void 0 && _tokenInfo$metadata2.netuid) {
-    var _tokenInfo$metadata3;
-    const {
-      accountHotKey,
-      isEnableTransferSubnet
-    } = await getAccountNetuidTokenInfo(from, tokenInfo, substrateApi);
-    const tokenNetuid = (_tokenInfo$metadata3 = tokenInfo.metadata) === null || _tokenInfo$metadata3 === void 0 ? void 0 : _tokenInfo$metadata3.netuid;
-    if (isEnableTransferSubnet && accountHotKey) {
-      transfer = api.tx.subtensorModule.transferStake(from, accountHotKey, tokenNetuid, tokenNetuid, value);
-    } else {
-      return [null, value];
-    }
   }
   return [transfer, transferAmount || value];
 };
@@ -167,7 +164,6 @@ const getTransferMockTxFee = async (address, chainInfo, tokenInfo, api) => {
         // estimate value
         bounce: false // anyMode
       });
-
       estimatedFee = new _bignumber.default((await (0, _utils2.estimateTonTxFee)(tonApi, [mockMessage], mockWalletContract)).toString());
     } else {
       var _paymentInfo$partialF;
@@ -185,30 +181,10 @@ const getTransferMockTxFee = async (address, chainInfo, tokenInfo, api) => {
       const paymentInfo = await (mockTx === null || mockTx === void 0 ? void 0 : mockTx.paymentInfo(address));
       estimatedFee = new _bignumber.default((paymentInfo === null || paymentInfo === void 0 ? void 0 : (_paymentInfo$partialF = paymentInfo.partialFee) === null || _paymentInfo$partialF === void 0 ? void 0 : _paymentInfo$partialF.toString()) || '0'); // todo: should handle error case instead of setting fee to 0
     }
-
     return estimatedFee;
   } catch (e) {
     console.error('error mocking tx fee', e);
     return new _bignumber.default(0);
   }
 };
-exports.getTransferMockTxFee = getTransferMockTxFee;
-const getAccountNetuidTokenInfo = async (address, tokenInfo, substrateApi) => {
-  var _tokenInfo$metadata4;
-  const tokenNetuid = (_tokenInfo$metadata4 = tokenInfo.metadata) === null || _tokenInfo$metadata4 === void 0 ? void 0 : _tokenInfo$metadata4.netuid;
-  if (!tokenNetuid) {
-    return {
-      isEnableTransferSubnet: false,
-      accountHotKey: undefined
-    };
-  }
-  const [isTransferToggle, rawStakeInfoForColdKey] = await Promise.all([substrateApi.api.query.subtensorModule.transferToggle(tokenNetuid), substrateApi.api.call.stakeInfoRuntimeApi.getStakeInfoForColdkey(address)]);
-  const isEnableTransferSubnet = isTransferToggle.toPrimitive();
-  const taoStakeInfos = rawStakeInfoForColdKey.toPrimitive();
-  const accountHotKey = taoStakeInfos.find(value => value.netuid === tokenNetuid);
-  return {
-    isEnableTransferSubnet,
-    accountHotKey: accountHotKey === null || accountHotKey === void 0 ? void 0 : accountHotKey.hotkey
-  };
-};
-exports.getAccountNetuidTokenInfo = getAccountNetuidTokenInfo;
+exports.getTransferMockTxFee = getTransferMockTxFee;

package/cjs/services/balance-service/transfer/ton-transfer.js

@@ -64,7 +64,6 @@ async function createTonNativeTransaction(_ref2) {
     value: (0, _core.fromNano)(value),
     bounce: false // todo: check and update the send bounced logic
   });
-
   const messagePayload = (0, _utils.cellToBase64Str)((0, _utils.messageRelaxedToCell)(messages));
   const estimateExternalFee = await (0, _utils.estimateTonTxFee)(tonApi, [messages], walletContract);
   const transactionObject = {

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

@@ -119,8 +119,6 @@ const dryRunXcmExtrinsicV2 = async function (request) {
     const originDryRunRs = dryRunResult.origin;
     if (originDryRunRs.success) {
       const {
-        assetHub,
-        bridgeHub,
         destination,
         hops
       } = dryRunResult;
@@ -129,12 +127,9 @@ const dryRunXcmExtrinsicV2 = async function (request) {
           return false;
         }
       }
-      if ((assetHub === null || assetHub === void 0 ? void 0 : assetHub.success) === false || (bridgeHub === null || bridgeHub === void 0 ? void 0 : bridgeHub.success) === false || (destination === null || destination === void 0 ? void 0 : destination.success) === false) {
-        if ((destination === null || destination === void 0 ? void 0 : destination.success) === false) {
-          // pass dry-run in these cases
-          return (0, _utils.isChainNotSupportDryRun)(destination.failureReason) || (0, _utils.isChainNotSupportPolkadotApi)(destination.failureReason);
-        }
-        return false;
+      if ((destination === null || destination === void 0 ? void 0 : destination.success) === false) {
+        // pass dry-run in these cases
+        return (0, _utils.isChainNotSupportDryRun)(destination.failureReason) || (0, _utils.isChainNotSupportPolkadotApi)(destination.failureReason);
       }
       return true;
     }

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

@@ -63,7 +63,6 @@ async function getSnowBridgeEvmTransfer(tokenInfo, originChainInfo, destinationC
   } catch (e) {
     gasLimit = 200000; // todo: handle this better
   }
-
   transactionConfig.gas = gasLimit;
   return transactionConfig;
 }

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

@@ -18,7 +18,7 @@ var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-const version = '/v4';
+const version = '/v5';
 const paraSpellApi = {
   buildXcm: `${version}/x-transfer`,
   feeXcm: `${version}/xcm-fee`,

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._ZK_ASSET_PREFIX = exports._TRANSFER_CHAIN_GROUP = exports._SUBSTRATE_DEFAULT_INFLATION_PARAMS = exports._STAKING_ERA_LENGTH_MAP = exports._PURE_EVM_CHAINS = exports._PREDEFINED_SINGLE_MODES = exports._PARACHAIN_INFLATION_DISTRIBUTION = exports._NFT_CHAIN_GROUP = exports._MANTA_ZK_CHAIN_GROUP = exports._KNOWN_CHAIN_INFLATION_PARAMS = exports._GOVERNANCE_CHAIN_GROUP = exports._EXPECTED_BLOCK_TIME = exports._DEFAULT_MANTA_ZK_CHAIN = exports._DEFAULT_ACTIVE_CHAINS = exports._BTC_SERVICE_TOKEN = exports._BITCOIN_TESTNET_NAME = exports._BITCOIN_TESTNET_CHAIN_SLUG = exports._BITCOIN_NAME = exports._BITCOIN_CHAIN_SLUG = exports._BALANCE_LOCKED_ID_GROUP = exports._BALANCE_CHAIN_GROUP = exports._API_OPTIONS_CHAIN_GROUP = exports.LATEST_CHAIN_DATA_FETCHING_INTERVAL = exports.EVM_REFORMAT_DECIMALS = exports.EVM_PASS_CONNECT_STATUS = exports.API_CONNECT_TIMEOUT = exports.API_AUTO_CONNECT_MS = void 0;
+exports._ZK_ASSET_PREFIX = exports._TRANSFER_CHAIN_GROUP = exports._SUBSTRATE_DEFAULT_INFLATION_PARAMS = exports._STAKING_ERA_LENGTH_MAP = exports._PURE_EVM_CHAINS = exports._PREDEFINED_SINGLE_MODES = exports._PARACHAIN_INFLATION_DISTRIBUTION = exports._NFT_CHAIN_GROUP = exports._MANTA_ZK_CHAIN_GROUP = exports._KNOWN_CHAIN_INFLATION_PARAMS = exports._GOVERNANCE_CHAIN_GROUP = exports._EXPECTED_BLOCK_TIME = exports._DEFAULT_MANTA_ZK_CHAIN = exports._DEFAULT_ACTIVE_CHAINS = exports._BTC_SERVICE_TOKEN = exports._BITCOIN_TESTNET_NAME = exports._BITCOIN_TESTNET_CHAIN_SLUG = exports._BITCOIN_NAME = exports._BITCOIN_CHAIN_SLUG = exports._BALANCE_LOCKED_ID_GROUP = exports._BALANCE_CHAIN_GROUP = exports._API_OPTIONS_CHAIN_GROUP = exports.USE_MULTILOCATION_INDEX = exports.LATEST_CHAIN_DATA_FETCHING_INTERVAL = exports.EVM_REFORMAT_DECIMALS = exports.EVM_PASS_CONNECT_STATUS = exports.API_CONNECT_TIMEOUT = exports.API_AUTO_CONNECT_MS = void 0;
 var _chainList = require("@subwallet/chain-list");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 // Copyright 2019-2022 @subwallet/extension-base
@@ -47,7 +47,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', 'hydradx_rococo', 'pendulum', 'amplitude', 'continuum_network', 'truth_network', 'jamton', 'hydradx_hollarnet'],
-  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network', 'rococo_assethub', 'liberlandTest', 'liberland', 'dentnet', 'pangolin', 'crust', 'phala', 'shibuya', 'dbcchain', 'westend_assethub', 'chainflip_assethub', 'origintrail', 'xode', 'paseo_assethub'],
+  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network', 'rococo_assethub', 'liberlandTest', 'liberland', 'dentnet', 'pangolin', 'crust', 'phala', 'shibuya', 'dbcchain', 'westend_assethub', 'chainflip_assethub', 'origintrail', 'xode', 'paseo_assethub', 'energy_web_x'],
   kusama: ['kusama', 'kintsugi', 'kintsugi_test', 'interlay', 'acala', 'statemint', 'karura', 'bifrost'],
   // perhaps there are some runtime updates
   centrifuge: ['centrifuge'],
@@ -306,17 +306,18 @@ const _TRANSFER_CHAIN_GROUP = {
   kintsugi: ['kintsugi', 'kintsugi_test', 'interlay', 'mangatax_para'],
   genshiro: ['genshiro_testnet', 'genshiro', 'equilibrium_parachain'],
   bitcountry: ['pioneer', 'bitcountry'],
-  statemine: ['statemint', 'statemine', 'darwinia2', 'astar', 'shiden', 'shibuya', 'parallel', 'liberland', 'liberlandTest', 'dentnet', 'dbcchain', 'westend_assethub', 'chainflip_assethub', 'origintrail', 'xode', 'paseo_assethub'],
+  statemine: ['statemint', 'statemine', 'darwinia2', 'astar', 'shiden', 'shibuya', 'parallel', 'liberland', 'liberlandTest', 'dentnet', 'dbcchain', 'westend_assethub', 'chainflip_assethub', 'origintrail', 'xode', 'paseo_assethub', 'energy_web_x'],
   riochain: ['riochain'],
   sora_substrate: ['sora_substrate'],
   avail: ['kate', 'goldberg_testnet'],
   pendulum: ['pendulum', 'amplitude', 'amplitude_test', 'hydradx_main', 'bifrost', 'bifrost_dot', 'jamton', 'hydradx_hollarnet'],
   centrifuge: ['centrifuge'],
   disable_transfer: ['crab', 'pangolin'],
-  truth: ['truth_network'],
-  bittensor: ['bittensor']
+  truth: ['truth_network']
 };
 exports._TRANSFER_CHAIN_GROUP = _TRANSFER_CHAIN_GROUP;
+const USE_MULTILOCATION_INDEX = ['energy_web_x'];
+exports.USE_MULTILOCATION_INDEX = USE_MULTILOCATION_INDEX;
 const _MANTA_ZK_CHAIN_GROUP = ['calamari'];
 exports._MANTA_ZK_CHAIN_GROUP = _MANTA_ZK_CHAIN_GROUP;
 const _ZK_ASSET_PREFIX = 'zk';

package/cjs/services/chain-service/handler/CardanoApi.js

@@ -26,6 +26,9 @@ class CardanoApi {
   connectionStatusSubject = new _rxjs.BehaviorSubject(_types._ChainConnectionStatus.DISCONNECTED);
   isApiReady = false;
   isApiReadyOnce = false;
+
+  // todo: add api with interface BlockFrostAPI to remove isTestnet check
+
   constructor(chainSlug, apiUrl, _ref) {
     let {
       isTestnet,
@@ -68,7 +71,6 @@ class CardanoApi {
     this.apiUrl = apiUrl;
     // this.api = this.createProvider();
   }
-
   async recoverConnect() {
     await this.disconnect();
     this.connect();

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

@@ -288,7 +288,6 @@ class SubstrateApi {
     // this.apiDefaultTx = api.tx[defaultSection][defaultMethod];
     // this.apiDefaultTxSudo = (api.tx.system && api.tx.system.setCode) || this.apiDefaultTx;
   }
-
   async makeRpcQuery(_ref) {
     let {
       args,
@@ -330,7 +329,6 @@ class SubstrateApi {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
       return (await this.api[section][module][method]()).toPrimitive(); // todo: improve this
     }
-
     if (isStateQuery) {
       if (!this.api[section][module]) {
         return undefined;

package/cjs/services/chain-service/handler/light-client/index.js

@@ -7,8 +7,7 @@ exports.getSubstrateConnectProvider = getSubstrateConnectProvider;
 exports.relayChainSpecs = exports.paraChainSpecs = void 0;
 var Sc = _interopRequireWildcard(require("@substrate/connect"));
 var _rpcProvider = require("@polkadot/rpc-provider");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 

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

@@ -30,7 +30,6 @@ async function checkSubstrateEndpoint(endpoint, timeout) {
     await wsProvider.disconnect(); // disconnect from the endpoint after the health check is complete
   }
 }
-
 async function checkEvmEndpoint(endpoint, timeout) {
   try {
     const web3 = new _web.default(endpoint);

package/cjs/services/chain-service/health-check/utils/new-utils/chain-asset-validate.js

@@ -20,7 +20,6 @@ function validateTokenHasValueByChain(chainAsset) {
   }
   return isTestnet !== chainAsset.hasValue; // todo: also check multichainAsset hasValue if has.
 }
-
 function validateNativeInfoByChain(chainAsset) {
   var _chainInfo$evmInfo, _chainInfo$substrateI, _chainInfo$bitcoinInf, _chainInfo$evmInfo2, _chainInfo$substrateI2, _chainInfo$bitcoinInf2, _chainInfo$evmInfo3, _chainInfo$substrateI3, _chainInfo$bitcoinInf3;
   const chainInfo = _chainList.ChainInfoMap[chainAsset.originChain];

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

@@ -55,6 +55,9 @@ class ChainService {
     assetRegistry: {},
     assetRefMap: {}
   };
+
+  // to save chain, token settings from user
+
   lockChainInfoMap = false; // prevent unwanted changes (edit, enable, disable) to chainInfoMap
 
   get mantaPay() {
@@ -730,7 +733,6 @@ class ChainService {
       .catch(e => console.error('Error enabling popular tokens:', e)); // Log error if enabling fails
     }
   }
-
   handleLatestSufficientChains(latestSufficientChains) {
     this.sufficientChainsSubject.next(latestSufficientChains);
     this.logger.log('Finished updating latest supported sufficient chains');
@@ -1234,8 +1236,8 @@ class ChainService {
       }
 
       // Fill in the missing chainState and storageData (new chains never before seen)
-      Object.entries(mergedChainInfoMap).forEach(_ref10 => {
-        let [slug, chainInfo] = _ref10;
+      Object.entries(mergedChainInfoMap).forEach(_ref0 => {
+        let [slug, chainInfo] = _ref0;
         if (!(slug in this.dataMap.chainStateMap)) {
           this.dataMap.chainStateMap[slug] = {
             currentProvider: Object.keys(chainInfo.providers)[0],
@@ -1346,8 +1348,8 @@ class ChainService {
     // Fill out zk assets from finalAssetRegistry if not supported
     if (!_utils2.MODULE_SUPPORT.MANTA_ZK) {
       const zkAssets = [];
-      Object.entries(finalAssetRegistry).forEach(_ref11 => {
-        let [slug, assets] = _ref11;
+      Object.entries(finalAssetRegistry).forEach(_ref1 => {
+        let [slug, assets] = _ref1;
         if ((0, _utils._isMantaZkAsset)(assets)) {
           zkAssets.push(slug);
           delete finalAssetRegistry[slug];
@@ -1380,7 +1382,18 @@ class ChainService {
 
       // Enable chain if not before
       if (!targetChainState.active) {
+        var _currentAssetSettings;
         targetChainState.active = true;
+
+        // enable native token
+        const nativeAsset = this.getNativeTokenInfo(chainSlug);
+        const currentAssetSettings = await this.getAssetSettings();
+        if (!((_currentAssetSettings = currentAssetSettings[nativeAsset.slug]) !== null && _currentAssetSettings !== void 0 && _currentAssetSettings.visible)) {
+          currentAssetSettings[nativeAsset.slug] = {
+            visible: true
+          };
+          this.setAssetSettings(currentAssetSettings);
+        }
       }
 
       // It auto detects the change of api url to create new instance or reuse existed one
@@ -1436,6 +1449,7 @@ class ChainService {
         relaySlug: null,
         hasNativeNft: false,
         supportStaking: params.chainSpec.paraId === null,
+        supportProxy: false,
         supportSmartContract: null
       };
     } else if (params.chainSpec.evmChainId !== null) {
@@ -1884,27 +1898,6 @@ class ChainService {
     });
     this.setAssetSettings(assetSettings);
   }
-  async updatePriorityAssetsByChain(chainSlug, visible) {
-    const currentAssetSettings = await this.getAssetSettings();
-    const assetsByChain = this.getFungibleTokensByChain(chainSlug);
-    const priorityTokensMap = this.priorityTokensSubject.value || {};
-    const priorityTokensList = priorityTokensMap.token && typeof priorityTokensMap.token === 'object' ? Object.keys(priorityTokensMap.token) : [];
-    for (const asset of Object.values(assetsByChain)) {
-      if (visible) {
-        const isPriorityToken = priorityTokensList.includes(asset.slug);
-        if (isPriorityToken || (0, _utils._isNativeToken)(asset)) {
-          currentAssetSettings[asset.slug] = {
-            visible: true
-          };
-        }
-      } else {
-        currentAssetSettings[asset.slug] = {
-          visible: false
-        };
-      }
-    }
-    this.setAssetSettings(currentAssetSettings);
-  }
   subscribeAssetSettings() {
     return this.assetSettingSubject;
   }