@subwallet/extension-base 1.2.32-0 → 1.2.33-0

package/cjs/core/utils.js

@@ -4,10 +4,24 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports._getAppliedExistentialDeposit = _getAppliedExistentialDeposit;
+exports._isAddress = _isAddress;
+exports._isNotDuplicateAddress = _isNotDuplicateAddress;
+exports._isNotNull = _isNotNull;
+exports._isSupportLedgerAccount = _isSupportLedgerAccount;
+exports._isValidAddressForEcosystem = _isValidAddressForEcosystem;
+exports._isValidSubstrateAddressFormat = _isValidSubstrateAddressFormat;
+exports._isValidTonAddressFormat = _isValidTonAddressFormat;
 exports.getMaxBigInt = getMaxBigInt;
 exports.getStrictMode = getStrictMode;
+exports.ledgerMustCheckNetwork = ledgerMustCheckNetwork;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
+var _consts = require("@subwallet/extension-base/core/consts");
 var _types = require("@subwallet/extension-base/core/substrate/types");
+var _utils = require("@subwallet/extension-base/services/balance-service/helpers/subscribe/ton/utils");
+var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
+var _utils3 = require("@subwallet/extension-base/utils");
+var _keyring = require("@subwallet/keyring");
+var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -22,4 +36,103 @@ function _getAppliedExistentialDeposit(existentialDeposit, strictMode) {
 }
 function getMaxBigInt(a, b) {
   return a > b ? a : b;
+}
+function ledgerMustCheckNetwork(account) {
+  if (account && account.isHardware && account.isGeneric && !(0, _utilCrypto.isEthereumAddress)(account.address)) {
+    return account.originGenesisHash ? 'migration' : 'polkadot';
+  } else {
+    return 'unnecessary';
+  }
+}
+
+// --- recipient address validation --- //
+
+function _isNotNull(validateRecipientParams) {
+  const {
+    toAddress
+  } = validateRecipientParams;
+  if (!toAddress) {
+    return 'Recipient address is required';
+  }
+  return '';
+}
+function _isAddress(validateRecipientParams) {
+  const {
+    toAddress
+  } = validateRecipientParams;
+  if (!(0, _keyring.isAddress)(toAddress)) {
+    return 'Invalid recipient address';
+  }
+  return '';
+}
+function _isValidAddressForEcosystem(validateRecipientParams) {
+  const {
+    destChainInfo,
+    toAddress
+  } = validateRecipientParams;
+  if (!(0, _utils3.isAddressAndChainCompatible)(toAddress, destChainInfo)) {
+    if ((0, _utils2._isChainEvmCompatible)(destChainInfo) || (0, _utils2._isChainSubstrateCompatible)(destChainInfo) || (0, _utils2._isChainTonCompatible)(destChainInfo)) {
+      return 'Recipient address must be the same type as sender address';
+    }
+    return 'Unknown chain type';
+  }
+  return '';
+}
+function _isValidSubstrateAddressFormat(validateRecipientParams) {
+  var _destChainInfo$substr, _destChainInfo$substr2;
+  const {
+    destChainInfo,
+    toAddress
+  } = validateRecipientParams;
+  const addressPrefix = (_destChainInfo$substr = destChainInfo === null || destChainInfo === void 0 ? void 0 : (_destChainInfo$substr2 = destChainInfo.substrateInfo) === null || _destChainInfo$substr2 === void 0 ? void 0 : _destChainInfo$substr2.addressPrefix) !== null && _destChainInfo$substr !== void 0 ? _destChainInfo$substr : 42;
+  const toAddressFormatted = (0, _utils3.reformatAddress)(toAddress, addressPrefix);
+  if (toAddressFormatted !== toAddress) {
+    return `Recipient address must be a valid ${destChainInfo.name} address`;
+  }
+  return '';
+}
+function _isValidTonAddressFormat(validateRecipientParams) {
+  const {
+    destChainInfo,
+    toAddress
+  } = validateRecipientParams;
+  const tonInfoData = (0, _keyring.isTonAddress)(toAddress) && (0, _utils.tonAddressInfo)(toAddress);
+  if (tonInfoData && tonInfoData.isTestOnly !== destChainInfo.isTestnet) {
+    return `Recipient address must be a valid ${destChainInfo.name} address`;
+  }
+  return '';
+}
+function _isNotDuplicateAddress(validateRecipientParams) {
+  const {
+    fromAddress,
+    toAddress
+  } = validateRecipientParams;
+  if ((0, _utils3.isSameAddress)(fromAddress, toAddress)) {
+    return 'Recipient address must be different from sender address';
+  }
+  return '';
+}
+function _isSupportLedgerAccount(validateRecipientParams) {
+  const {
+    account,
+    destChainInfo
+  } = validateRecipientParams;
+  if (account !== null && account !== void 0 && account.isHardware) {
+    if (!account.isGeneric) {
+      var _destChainInfo$substr3;
+      // For ledger legacy
+      const availableGen = account.availableGenesisHashes || [];
+      const destChainName = (destChainInfo === null || destChainInfo === void 0 ? void 0 : destChainInfo.name) || 'Unknown';
+      if (!availableGen.includes((destChainInfo === null || destChainInfo === void 0 ? void 0 : (_destChainInfo$substr3 = destChainInfo.substrateInfo) === null || _destChainInfo$substr3 === void 0 ? void 0 : _destChainInfo$substr3.genesisHash) || '')) {
+        return 'Your Ledger account is not supported by {{network}} network.'.replace('{{network}}', destChainName);
+      }
+    } else {
+      // For ledger generic
+      const ledgerCheck = ledgerMustCheckNetwork(account);
+      if (ledgerCheck !== 'unnecessary' && !_consts.LEDGER_GENERIC_ALLOW_NETWORKS.includes(destChainInfo.slug)) {
+        return `Ledger ${ledgerCheck === 'polkadot' ? 'Polkadot' : 'Migration'} address is not supported for this transfer`;
+      }
+    }
+  }
+  return '';
 }

package/cjs/koni/api/dotsama/crowdloan.js

@@ -172,7 +172,7 @@ async function subscribeCrowdloan(addresses, substrateApiMap, callback) {
     const now = Date.now();
     const polkadotAPI = await substrateApiMap[_chainList.COMMON_CHAIN_SLUGS.POLKADOT].isReady;
     const kusamaAPI = await substrateApiMap[_chainList.COMMON_CHAIN_SLUGS.KUSAMA].isReady;
-    const substrateAddresses = (0, _utils.categoryAddresses)(addresses)[0];
+    const substrateAddresses = (0, _utils.categoryAddresses)(addresses).substrate;
     const hexAddresses = substrateAddresses.map(address => {
       return _typeRegistry.default.createType('AccountId', address).toHex();
     });

package/cjs/koni/api/nft/index.js

@@ -26,7 +26,10 @@ var _assethub_nft = _interopRequireDefault(require("./assethub_nft"));
 // import UniqueNftApi from '@subwallet/extension-base/koni/api/nft/unique_nft';
 
 function createSubstrateNftApi(chain, substrateApi, addresses) {
-  const [substrateAddresses, evmAddresses] = (0, _utils2.categoryAddresses)(addresses);
+  const {
+    evm: evmAddresses,
+    substrate: substrateAddresses
+  } = (0, _utils2.categoryAddresses)(addresses);
   if (_constants._NFT_CHAIN_GROUP.acala.includes(chain)) {
     return [new _acala_nft.AcalaNftApi(substrateApi, substrateAddresses, chain)];
   } else if (_constants._NFT_CHAIN_GROUP.karura.includes(chain)) {
@@ -51,11 +54,11 @@ function createSubstrateNftApi(chain, substrateApi, addresses) {
   return null;
 }
 function createWasmNftApi(chain, apiProps, addresses) {
-  const [substrateAddresses] = (0, _utils2.categoryAddresses)(addresses);
+  const substrateAddresses = (0, _utils2.categoryAddresses)(addresses).substrate;
   return new _wasm_nft.WasmNftApi(apiProps, substrateAddresses, chain);
 }
 function createWeb3NftApi(chain, evmApi, addresses) {
-  const [, evmAddresses] = (0, _utils2.categoryAddresses)(addresses);
+  const evmAddresses = (0, _utils2.categoryAddresses)(addresses).evm;
   return new _evm_nft.EvmNftApi(evmApi, evmAddresses, chain);
 }
 const createOrdinalApi = (chain, subscanChain, addresses) => {
@@ -89,7 +92,10 @@ class NftHandler {
   }
   setAddresses(addresses) {
     this.addresses = addresses;
-    const [substrateAddresses, evmAddresses] = (0, _utils2.categoryAddresses)(addresses);
+    const {
+      evm: evmAddresses,
+      substrate: substrateAddresses
+    } = (0, _utils2.categoryAddresses)(addresses);
     for (const handler of this.handlers) {
       const useAddresses = handler.isEthereum ? evmAddresses : substrateAddresses;
       handler.setAddresses(useAddresses);
@@ -114,7 +120,10 @@ class NftHandler {
       if (this.needSetupApi) {
         // setup connections for first time use
         this.handlers = [];
-        const [substrateAddresses, evmAddresses] = (0, _utils2.categoryAddresses)(this.addresses);
+        const {
+          evm: evmAddresses,
+          substrate: substrateAddresses
+        } = (0, _utils2.categoryAddresses)(this.addresses);
         Object.entries(this.chainInfoMap).forEach(_ref => {
           let [chain, chainInfo] = _ref;
           if ((0, _utils._isChainSupportNativeNft)(chainInfo)) {

package/cjs/koni/api/staking/bonding/paraChain.js

@@ -39,7 +39,7 @@ function validateParaChainUnbondingCondition(amount, nominatorMetadata, chainSta
     }
   }
   if (!targetNomination) {
-    errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR));
+    errors.push(new _TransactionError.TransactionError(_types.BasicTxErrorType.INTERNAL_ERROR));
     return errors;
   }
   const bnActiveStake = new _util.BN(targetNomination.activeStake);
@@ -49,10 +49,10 @@ function validateParaChainUnbondingCondition(amount, nominatorMetadata, chainSta
   const bnMinStake = _util.BN.max(bnCollatorMinStake, bnChainMinStake);
   const existUnstakeErrorMessage = (0, _utils.getExistUnstakeErrorMessage)(chainStakingMetadata.chain, nominatorMetadata === null || nominatorMetadata === void 0 ? void 0 : nominatorMetadata.type);
   if (targetNomination.hasUnstaking) {
-    errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.EXIST_UNSTAKING_REQUEST, existUnstakeErrorMessage));
+    errors.push(new _TransactionError.TransactionError(_types.StakingTxErrorType.EXIST_UNSTAKING_REQUEST, existUnstakeErrorMessage));
   }
   if (!(bnRemainingStake.isZero() || bnRemainingStake.gte(bnMinStake))) {
-    errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.INVALID_ACTIVE_STAKE));
+    errors.push(new _TransactionError.TransactionError(_types.StakingTxErrorType.INVALID_ACTIVE_STAKE));
   }
   return errors;
 }
@@ -68,7 +68,7 @@ function validateParaChainBondingCondition(chainInfo, amount, selectedCollators,
   const existUnstakeErrorMessage = (0, _utils.getExistUnstakeErrorMessage)(chainInfo.slug, nominatorMetadata === null || nominatorMetadata === void 0 ? void 0 : nominatorMetadata.type, true);
   if (!nominatorMetadata || nominatorMetadata.status === _types.EarningStatus.NOT_STAKING) {
     if (!bnTotalStake.gte(bnMinStake)) {
-      errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.NOT_ENOUGH_MIN_STAKE, minStakeErrorMessage));
+      errors.push(new _TransactionError.TransactionError(_types.StakingTxErrorType.NOT_ENOUGH_MIN_STAKE, minStakeErrorMessage));
     }
     return errors;
   }
@@ -79,11 +79,11 @@ function validateParaChainBondingCondition(chainInfo, amount, selectedCollators,
   if (!bondedValidators.includes(parsedSelectedCollatorAddress)) {
     // new delegation
     if (!bnTotalStake.gte(bnMinStake)) {
-      errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.NOT_ENOUGH_MIN_STAKE, minStakeErrorMessage));
+      errors.push(new _TransactionError.TransactionError(_types.StakingTxErrorType.NOT_ENOUGH_MIN_STAKE, minStakeErrorMessage));
     }
     const delegationCount = nominatorMetadata.nominations.length + 1;
     if (delegationCount > chainStakingMetadata.maxValidatorPerNominator) {
-      errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.EXCEED_MAX_NOMINATIONS, maxValidatorErrorMessage));
+      errors.push(new _TransactionError.TransactionError(_types.StakingTxErrorType.EXCEED_MAX_NOMINATIONS, maxValidatorErrorMessage));
     }
   } else {
     let currentDelegationAmount = '0';
@@ -97,10 +97,10 @@ function validateParaChainBondingCondition(chainInfo, amount, selectedCollators,
     }
     bnTotalStake = bnTotalStake.add(new _util.BN(currentDelegationAmount));
     if (!bnTotalStake.gte(bnMinStake)) {
-      errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.NOT_ENOUGH_MIN_STAKE, minStakeErrorMessage));
+      errors.push(new _TransactionError.TransactionError(_types.StakingTxErrorType.NOT_ENOUGH_MIN_STAKE, minStakeErrorMessage));
     }
     if (hasUnstaking) {
-      errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.EXIST_UNSTAKING_REQUEST, existUnstakeErrorMessage));
+      errors.push(new _TransactionError.TransactionError(_types.StakingTxErrorType.EXIST_UNSTAKING_REQUEST, existUnstakeErrorMessage));
     }
   }
   return errors;

package/cjs/koni/api/staking/bonding/relayChain.js

@@ -46,10 +46,10 @@ function validateRelayUnbondingCondition(amount, chainStakingMetadata, nominator
   const bnRemainingStake = bnActiveStake.sub(new _util.BN(amount));
   const minStake = new _util.BN(chainStakingMetadata.minJoinNominationPool || '0');
   if (!(bnRemainingStake.isZero() || bnRemainingStake.gte(minStake))) {
-    errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.INVALID_ACTIVE_STAKE));
+    errors.push(new _TransactionError.TransactionError(_types.StakingTxErrorType.INVALID_ACTIVE_STAKE));
   }
   if (nominatorMetadata.unstakings.length > chainStakingMetadata.maxWithdrawalRequestPerValidator) {
-    errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.EXCEED_MAX_UNSTAKING, (0, _i18next.t)('You cannot unstake more than {{number}} times', {
+    errors.push(new _TransactionError.TransactionError(_types.StakingTxErrorType.EXCEED_MAX_UNSTAKING, (0, _i18next.t)('You cannot unstake more than {{number}} times', {
       replace: {
         number: chainStakingMetadata.maxWithdrawalRequestPerValidator
       }
@@ -66,17 +66,17 @@ function validatePoolBondingCondition(chainInfo, amount, selectedPool, address,
   const minStakeErrorMessage = (0, _utils.getMinStakeErrorMessage)(chainInfo, bnMinStake);
   const existUnstakeErrorMessage = (0, _utils.getExistUnstakeErrorMessage)(chainInfo.slug, nominatorMetadata === null || nominatorMetadata === void 0 ? void 0 : nominatorMetadata.type, true);
   if (selectedPool.state !== 'Open') {
-    errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.INACTIVE_NOMINATION_POOL));
+    errors.push(new _TransactionError.TransactionError(_types.StakingTxErrorType.INACTIVE_NOMINATION_POOL));
   }
   if (nominatorMetadata) {
     const bnCurrentActiveStake = new _util.BN(nominatorMetadata.activeStake);
     bnTotalStake = bnTotalStake.add(bnCurrentActiveStake);
     if (nominatorMetadata.unstakings.length > 0 && bnCurrentActiveStake.isZero()) {
-      errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.EXIST_UNSTAKING_REQUEST, existUnstakeErrorMessage));
+      errors.push(new _TransactionError.TransactionError(_types.StakingTxErrorType.EXIST_UNSTAKING_REQUEST, existUnstakeErrorMessage));
     }
   }
   if (!bnTotalStake.gte(bnMinStake)) {
-    errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.NOT_ENOUGH_MIN_STAKE, minStakeErrorMessage));
+    errors.push(new _TransactionError.TransactionError(_types.StakingTxErrorType.NOT_ENOUGH_MIN_STAKE, minStakeErrorMessage));
   }
   return errors;
 }
@@ -88,20 +88,20 @@ function validateRelayBondingCondition(chainInfo, amount, selectedValidators, ad
   const maxValidatorErrorMessage = (0, _utils.getMaxValidatorErrorMessage)(chainInfo, chainStakingMetadata.maxValidatorPerNominator);
   if (!nominatorMetadata || nominatorMetadata.status === _types.EarningStatus.NOT_STAKING) {
     if (!bnTotalStake.gte(bnMinStake)) {
-      errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.NOT_ENOUGH_MIN_STAKE, minStakeErrorMessage));
+      errors.push(new _TransactionError.TransactionError(_types.StakingTxErrorType.NOT_ENOUGH_MIN_STAKE, minStakeErrorMessage));
     }
     if (selectedValidators.length > chainStakingMetadata.maxValidatorPerNominator) {
-      errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.EXCEED_MAX_NOMINATIONS, maxValidatorErrorMessage));
+      errors.push(new _TransactionError.TransactionError(_types.StakingTxErrorType.EXCEED_MAX_NOMINATIONS, maxValidatorErrorMessage));
     }
     return errors;
   }
   const bnCurrentActiveStake = new _util.BN(nominatorMetadata.activeStake);
   bnTotalStake = bnTotalStake.add(bnCurrentActiveStake);
   if (!bnTotalStake.gte(bnMinStake)) {
-    errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.NOT_ENOUGH_MIN_STAKE, minStakeErrorMessage));
+    errors.push(new _TransactionError.TransactionError(_types.StakingTxErrorType.NOT_ENOUGH_MIN_STAKE, minStakeErrorMessage));
   }
   if (selectedValidators.length > chainStakingMetadata.maxValidatorPerNominator) {
-    errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.EXCEED_MAX_NOMINATIONS, maxValidatorErrorMessage));
+    errors.push(new _TransactionError.TransactionError(_types.StakingTxErrorType.EXCEED_MAX_NOMINATIONS, maxValidatorErrorMessage));
   }
   return errors;
 }

package/cjs/koni/api/staking/index.js

@@ -18,7 +18,10 @@ var _utils2 = require("@subwallet/extension-base/utils");
 
 function stakingOnChainApi(addresses, substrateApiMap, chainInfoMap, stakingCallback, nominatorStateCallback) {
   const filteredApiMap = [];
-  const [substrateAddresses, evmAddresses] = (0, _utils2.categoryAddresses)(addresses);
+  const {
+    evm: evmAddresses,
+    substrate: substrateAddresses
+  } = (0, _utils2.categoryAddresses)(addresses);
   Object.entries(chainInfoMap).forEach(_ref => {
     let [networkKey, chainInfo] = _ref;
     if (_constants._PURE_EVM_CHAINS.indexOf(networkKey) < 0 && (0, _utils._isChainSupportSubstrateStaking)(chainInfo)) {

package/cjs/koni/background/cron.js

@@ -63,7 +63,7 @@ class KoniCron {
       return;
     }
     await Promise.all([this.state.eventService.waitKeyringReady, this.state.eventService.waitAssetReady]);
-    const currentAccountInfo = this.state.keyringService.currentAccount;
+    const currentAccountInfo = this.state.keyringService.context.currentAccount;
     const commonReloadEvents = ['account.add', 'account.remove', 'account.updateCurrent', 'chain.add', 'asset.updateState'];
     const mktCampaignReloadEvents = ['account.add', 'account.remove'];
     this.eventHandler = (events, eventTypes) => {
@@ -85,7 +85,7 @@ class KoniCron {
       if (!commonReload && !chainUpdated && !reloadMantaPay) {
         return;
       }
-      const address = (_serviceInfo$currentA = serviceInfo.currentAccountInfo) === null || _serviceInfo$currentA === void 0 ? void 0 : _serviceInfo$currentA.address;
+      const address = (_serviceInfo$currentA = serviceInfo.currentAccountInfo) === null || _serviceInfo$currentA === void 0 ? void 0 : _serviceInfo$currentA.proxyId;
       if (!address) {
         return;
       }
@@ -120,12 +120,12 @@ class KoniCron {
     this.state.eventService.onLazy(this.eventHandler);
     this.addCron('fetchPoolInfo', this.fetchPoolInfo, _constants.CRON_REFRESH_CHAIN_STAKING_METADATA);
     this.addCron('fetchMktCampaignData', this.fetchMktCampaignData, _constants.CRON_REFRESH_MKT_CAMPAIGN_INTERVAL);
-    if (!(currentAccountInfo !== null && currentAccountInfo !== void 0 && currentAccountInfo.address)) {
+    if (!(currentAccountInfo !== null && currentAccountInfo !== void 0 && currentAccountInfo.proxyId)) {
       return;
     }
     if (Object.keys(this.state.getSubstrateApiMap()).length !== 0 || Object.keys(this.state.getEvmApiMap()).length !== 0) {
-      this.resetNft(currentAccountInfo.address);
-      this.addCron('refreshNft', this.refreshNft(currentAccountInfo.address, this.state.getApiMap(), this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), _constants.CRON_REFRESH_NFT_INTERVAL);
+      this.resetNft(currentAccountInfo.proxyId);
+      this.addCron('refreshNft', this.refreshNft(currentAccountInfo.proxyId, this.state.getApiMap(), this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), _constants.CRON_REFRESH_NFT_INTERVAL);
       // this.addCron('refreshStakingReward', this.refreshStakingReward(currentAccountInfo.address), CRON_REFRESH_STAKING_REWARD_INTERVAL);
       this.addCron('syncMantaPay', this.syncMantaPay, _constants.CRON_SYNC_MANTA_PAY);
     }
@@ -176,7 +176,7 @@ class KoniCron {
     return Object.keys(serviceInfo.chainApiMap.substrate).length > 0 || Object.keys(serviceInfo.chainApiMap.evm).length > 0;
   };
   async reloadNft() {
-    const address = this.state.keyringService.currentAccount.address;
+    const address = this.state.keyringService.context.currentAccount.proxyId;
     const serviceInfo = this.state.getServiceInfo();
     this.resetNft(address);
     this.removeCron('refreshNft');
@@ -185,7 +185,7 @@ class KoniCron {
     return true;
   }
   async reloadStaking() {
-    const address = this.state.keyringService.currentAccount.address;
+    const address = this.state.keyringService.context.currentAccount.proxyId;
     console.log('reload staking', address);
     await (0, _utils2.waitTimeout)(1800);
     return true;