@subwallet/extension-base 1.3.62-0 → 1.3.64-0

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

@@ -11,6 +11,7 @@ exports.calculateAlephZeroValidatorReturn = calculateAlephZeroValidatorReturn;
 exports.calculateAnalogChainStakedReturn = calculateAnalogChainStakedReturn;
 exports.calculateChainStakedReturn = calculateChainStakedReturn;
 exports.calculateChainStakedReturnV2 = calculateChainStakedReturnV2;
+exports.calculateEnergyWebCollatorReturn = calculateEnergyWebCollatorReturn;
 exports.calculateInflation = calculateInflation;
 exports.calculateTernoaValidatorReturn = calculateTernoaValidatorReturn;
 exports.calculateValidatorStakedReturn = calculateValidatorStakedReturn;
@@ -139,6 +140,11 @@ async function calculateChainStakedReturnV2(chainInfo, totalIssuance, erasPerDay
 function calculateAlephZeroValidatorReturn(chainStakedReturn, commission) {
   return chainStakedReturn * (100 - commission) / 100;
 }
+function calculateEnergyWebCollatorReturn(annualReward, collatorCommission, numberCollators, totalStake) {
+  const rewardForNominators = new _bignumber.default(annualReward).multipliedBy(1 - collatorCommission);
+  const rewardPerNominator = rewardForNominators.div(numberCollators);
+  return rewardPerNominator.div(totalStake).shiftedBy(2).toNumber();
+}
 function calculateTernoaValidatorReturn(rewardPerValidator, validatorStake, commission) {
   const percentRewardForNominators = (100 - commission) / 100;
   const rewardForNominators = rewardPerValidator * percentRewardForNominators;

package/cjs/packageInfo.js

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

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

@@ -19,9 +19,10 @@ var _i18next = require("i18next");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-async function getEVMTransactionObject(_ref) {
-  let {
+async function getEVMTransactionObject(props) {
+  const {
     chain,
+    data,
     evmApi,
     fallbackFee,
     feeCustom: _feeCustom,
@@ -31,18 +32,19 @@ async function getEVMTransactionObject(_ref) {
     to,
     transferAll,
     value
-  } = _ref;
+  } = props;
   const feeCustom = _feeCustom;
   const feeInfo = _feeInfo;
   const feeCombine = (0, _utils3.combineEthFee)(feeInfo, feeOption, feeCustom);
   let errorOnEstimateFee = '';
   const transactionObject = {
-    to: to,
-    value: value,
-    from: from,
+    to,
+    value,
+    from,
+    data,
     ...feeCombine
   };
-  const gasLimit = await evmApi.api.eth.estimateGas(transactionObject).catch(e => {
+  const gasEstimate = await evmApi.api.eth.estimateGas(transactionObject).catch(e => {
     console.log('Cannot estimate fee with native transfer on', chain, e);
     if (fallbackFee) {
       errorOnEstimateFee = e.message;
@@ -51,6 +53,8 @@ async function getEVMTransactionObject(_ref) {
       throw Error('Unable to estimate fee for this transaction. Edit fee and try again.');
     }
   });
+  const gasLimit = Math.floor(gasEstimate * 1.1); // 10% buffer for fluctuations
+
   transactionObject.gas = gasLimit;
   let estimateFee;
   if (feeCombine.maxFeePerGas) {
@@ -66,8 +70,8 @@ async function getEVMTransactionObject(_ref) {
   }
   return [transactionObject, transactionObject.value.toString(), errorOnEstimateFee];
 }
-async function getERC20TransactionObject(_ref2) {
-  let {
+async function getERC20TransactionObject(props) {
+  const {
     assetAddress,
     chain,
     evmApi,
@@ -79,7 +83,7 @@ async function getERC20TransactionObject(_ref2) {
     to,
     transferAll,
     value
-  } = _ref2;
+  } = props;
   const erc20Contract = (0, _web.getERC20Contract)(assetAddress, evmApi);
   const feeCustom = _feeCustom;
   let freeAmount = new _bignumber.default(0);

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

@@ -4,7 +4,6 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.AcrossErrorMsg = void 0;
 exports._isAcrossChainBridge = _isAcrossChainBridge;
 exports._isAcrossTestnetBridge = _isAcrossTestnetBridge;
 exports.getAcrossQuote = void 0;
@@ -25,11 +24,6 @@ function _isAcrossChainBridge(srcChain, destChain) {
 function _isAcrossTestnetBridge(srcChain) {
   return srcChain === 'base_sepolia' || srcChain === 'arbitrum_sepolia' || srcChain === _chainList.COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA;
 }
-const AcrossErrorMsg = {
-  AMOUNT_TOO_LOW: 'amount too low',
-  AMOUNT_TOO_HIGH: 'amount too high'
-};
-exports.AcrossErrorMsg = AcrossErrorMsg;
 // Calculate fee for across bridge transfer
 const getAcrossQuote = async _ref => {
   let {

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

@@ -81,6 +81,7 @@ async function buildXcm(request) {
     originChain,
     originTokenInfo,
     recipient,
+    sender,
     sendingValue,
     substrateApi
   } = request;
@@ -93,6 +94,7 @@ async function buildXcm(request) {
   }
   const paraSpellChainMap = await (0, _paraspellChainMap.fetchParaSpellChainMap)();
   const bodyData = {
+    senderAddress: sender,
     address: recipient,
     from: paraSpellChainMap[originChain.slug],
     to: paraSpellChainMap[destinationChain.slug],

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

@@ -80,6 +80,8 @@ const _STAKING_ERA_LENGTH_MAP = {
   aleph: 24,
   polkadot: 24,
   kusama: 6,
+  statemint: 24,
+  statemine: 6,
   westend: 6,
   hydradx: 24,
   default: 24,
@@ -135,6 +137,8 @@ const _EXPECTED_BLOCK_TIME = {
   aleph: 1,
   polkadot: 6,
   kusama: 6,
+  statemint: 6,
+  statemine: 6,
   polkadex: 12,
   ternoa: 6,
   ternoa_alphanet: 6,
@@ -241,6 +245,13 @@ const _KNOWN_CHAIN_INFLATION_PARAMS = {
     auctionMax: 60,
     stakeTarget: 0.75
   },
+  statemine: {
+    ..._SUBSTRATE_DEFAULT_INFLATION_PARAMS,
+    auctionAdjust: 0.3 / 60,
+    auctionMax: 60,
+    stakeTarget: 0.75
+  },
+  // todo: recheck
   neatcoin: {
     ..._SUBSTRATE_DEFAULT_INFLATION_PARAMS,
     stakeTarget: 0.75
@@ -254,6 +265,11 @@ const _KNOWN_CHAIN_INFLATION_PARAMS = {
     ..._SUBSTRATE_DEFAULT_INFLATION_PARAMS,
     stakeTarget: 0.75
   },
+  statemint: {
+    ..._SUBSTRATE_DEFAULT_INFLATION_PARAMS,
+    stakeTarget: 0.75
+  },
+  // todo: recheck
   vara_network: {
     ..._SUBSTRATE_DEFAULT_INFLATION_PARAMS,
     stakeTarget: 0.8

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

@@ -104,11 +104,12 @@ var _exportNames = {
   randomizeProvider: true,
   _isAssetCanPayTxFee: true,
   updateLatestChainInfo: true,
+  _chainInfoToAccountChainType: true,
   _chainInfoToChainType: true,
   _isChainInfoCompatibleWithAccountInfo: true,
   _getAssetNetuid: true
 };
-exports._chainInfoToChainType = void 0;
+exports._chainInfoToChainType = exports._chainInfoToAccountChainType = void 0;
 exports._checkSmartContractSupportByChain = _checkSmartContractSupportByChain;
 exports._generateCustomProviderKey = _generateCustomProviderKey;
 exports._getAssetDecimals = _getAssetDecimals;
@@ -207,11 +208,11 @@ exports._isXcmPathSupported = _isXcmPathSupported;
 exports._parseAssetRefKey = _parseAssetRefKey;
 exports._parseMetadataForAssetId = _parseMetadataForAssetId;
 exports._parseMetadataForSmartContractAsset = _parseMetadataForSmartContractAsset;
-exports.findChainInfoByChainId = void 0;
-exports.findChainInfoByHalfGenesisHash = void 0;
+exports.findChainInfoByHalfGenesisHash = exports.findChainInfoByChainId = void 0;
 exports.randomizeProvider = randomizeProvider;
 exports.updateLatestChainInfo = updateLatestChainInfo;
 var _types = require("@subwallet/chain-list/types");
+var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
 var _types2 = require("@subwallet/extension-base/services/chain-service/types");
 var _types3 = require("@subwallet/extension-base/types");
@@ -826,7 +827,7 @@ function updateLatestChainInfo(currentDataMap, latestChainInfoList) {
     needUpdateChainApiList
   };
 }
-const _chainInfoToChainType = chainInfo => {
+const _chainInfoToAccountChainType = chainInfo => {
   if (_isPureSubstrateChain(chainInfo)) {
     return _types3.AccountChainType.SUBSTRATE;
   }
@@ -844,6 +845,25 @@ const _chainInfoToChainType = chainInfo => {
   }
   return _types3.AccountChainType.SUBSTRATE;
 };
+exports._chainInfoToAccountChainType = _chainInfoToAccountChainType;
+const _chainInfoToChainType = chainInfo => {
+  if (_isChainSubstrateCompatible(chainInfo)) {
+    return _KoniTypes.ChainType.SUBSTRATE;
+  }
+  if (_isPureEvmChain(chainInfo)) {
+    return _KoniTypes.ChainType.EVM;
+  }
+  if (_isPureTonChain(chainInfo)) {
+    return _KoniTypes.ChainType.TON;
+  }
+  if (_isPureCardanoChain(chainInfo)) {
+    return _KoniTypes.ChainType.CARDANO;
+  }
+  if (_isPureBitcoinChain(chainInfo)) {
+    return _KoniTypes.ChainType.BITCOIN;
+  }
+  return undefined;
+};
 exports._chainInfoToChainType = _chainInfoToChainType;
 const _isChainInfoCompatibleWithAccountInfo = (chainInfo, accountInfo) => {
   const {

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

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

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

@@ -25,7 +25,8 @@ const _STAKING_CHAIN_GROUP = {
   manta: ['manta_network'],
   bittensor: ['bittensor', 'bittensor_testnet'],
   energy: ['energy_web_x_testnet', 'energy_web_x'],
-  mythos: ['mythos', 'muse_testnet']
+  mythos: ['mythos', 'muse_testnet'],
+  tanssi: ['tanssi', 'dancelight']
 };
 exports._STAKING_CHAIN_GROUP = _STAKING_CHAIN_GROUP;
 const RELAY_HANDLER_DIRECT_STAKING_CHAINS = [..._STAKING_CHAIN_GROUP.relay, ..._STAKING_CHAIN_GROUP.assetHub];

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

@@ -13,6 +13,7 @@ var _types = require("@subwallet/extension-base/types");
 var _utils2 = require("@subwallet/extension-base/utils");
 var _i18next = require("i18next");
 var _util = require("@polkadot/util");
+var _constants = require("../../constants");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -132,9 +133,11 @@ class BaseParaNativeStakingPoolHandler extends _base.default {
     const bnChainMinStake = new _util.BN(poolInfo.statistic.earningThreshold.join || '0');
     const bnCollatorMinStake = new _util.BN(targetNomination.validatorMinStake || '0');
     const bnMinStake = _util.BN.max(bnCollatorMinStake, bnChainMinStake);
-    const existUnstakeErrorMessage = (0, _utils.getExistUnstakeErrorMessage)(this.chain, _KoniTypes.StakingType.NOMINATED);
-    if (targetNomination.hasUnstaking) {
-      errors.push(new _TransactionError.TransactionError(_types.StakingTxErrorType.EXIST_UNSTAKING_REQUEST, existUnstakeErrorMessage));
+    if (!_constants._STAKING_CHAIN_GROUP.tanssi.includes(this.chain)) {
+      const existUnstakeErrorMessage = (0, _utils.getExistUnstakeErrorMessage)(this.chain, _KoniTypes.StakingType.NOMINATED);
+      if (targetNomination.hasUnstaking) {
+        errors.push(new _TransactionError.TransactionError(_types.StakingTxErrorType.EXIST_UNSTAKING_REQUEST, existUnstakeErrorMessage));
+      }
     }
     if (!(bnRemainingStake.isZero() || bnRemainingStake.gte(bnMinStake))) {
       errors.push(new _TransactionError.TransactionError(_types.StakingTxErrorType.INVALID_ACTIVE_STAKE));

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

@@ -17,6 +17,9 @@ var _basePara = _interopRequireDefault(require("./base-para"));
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
+const DEFAULT_ANNUAL_REWARD = {
+  energy_web_x: 2000000
+};
 class EnergyNativeStakingPoolHandler extends _basePara.default {
   /* Subscribe pool info */
 
@@ -60,6 +63,13 @@ class EnergyNativeStakingPoolHandler extends _basePara.default {
       const unstakingPeriod = parseInt(unstakingDelay.toString()) * eraTime;
       const minStake = '0';
       const minToHuman = (0, _utils3.formatNumber)(minStake.toString(), nativeToken.decimals || 0, _utils3.balanceFormatter);
+      const collators = await this.getPoolTargets();
+      let maxApy = 0;
+      for (const collator of collators) {
+        if (collator.expectedReturn && collator.expectedReturn > maxApy) {
+          maxApy = collator.expectedReturn;
+        }
+      }
       const data = {
         ...this.baseInfo,
         type: this.type,
@@ -83,8 +93,7 @@ class EnergyNativeStakingPoolHandler extends _basePara.default {
           // TODO recheck
           era,
           eraTime,
-          totalApy: undefined,
-          // not have
+          totalApy: maxApy,
           tvl: totalStake.toString(),
           unstakingPeriod: unstakingPeriod
         },
@@ -257,12 +266,21 @@ class EnergyNativeStakingPoolHandler extends _basePara.default {
     const apiProps = await this.substrateApi.isReady;
     const substrateIdentityApi = this.substrateIdentityApi;
     const allCollators = [];
-    const [_allCollators, _selectedCandidates] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo.entries(),
-    // use it when energy support collatorCommission
-    // apiProps.api.query.parachainStaking.collatorCommission(),
-    apiProps.api.query.parachainStaking.selectedCandidates()]);
+    const [_allCollators, _selectedCandidates, _eraInfo, unstakingDelay] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo.entries(), apiProps.api.query.parachainStaking.selectedCandidates(), apiProps.api.query.parachainStaking.era(), apiProps.api.query.parachainStaking.delay()]);
+    const delay = parseInt(unstakingDelay.toString()); // in era unit
+    const roundInfo = _eraInfo.toPrimitive();
+    const currentRound = roundInfo.current;
+    let defaultCommission = 0;
+    if (apiProps.api.query.parachainStaking.defaultCollatorCommission) {
+      const _defaultCommission = await apiProps.api.query.parachainStaking.defaultCollatorCommission();
+      const {
+        current
+      } = _defaultCommission.toPrimitive();
+      defaultCommission = current / 1000000000;
+    }
     const maxNominationPerCollator = apiProps.api.consts.parachainStaking.maxTopNominationsPerCandidate.toString();
     const selectedCollators = _selectedCandidates.toPrimitive();
+    const selectedCollatorsCount = selectedCollators.length;
     for (const collator of _allCollators) {
       const _collatorAddress = collator[0].toHuman();
       const collatorAddress = _collatorAddress[0];
@@ -289,6 +307,41 @@ class EnergyNativeStakingPoolHandler extends _basePara.default {
         });
       }
     }
+    const annualReward = DEFAULT_ANNUAL_REWARD[this.chain] ? new _util.BN(DEFAULT_ANNUAL_REWARD[this.chain]).mul(_util.BN_TEN.pow(new _util.BN(this.nativeToken.decimals || 18))) : _util.BN_ZERO;
+
+    // calculate expected return
+    await Promise.all(allCollators.map(async collator => {
+      if (!selectedCollators.includes(collator.address) || annualReward.lte(_util.BN_ZERO)) {
+        return;
+      }
+      const [_topNominations, _nominationScheduledRequests] = await Promise.all([apiProps.api.query.parachainStaking.topNominations(collator.address), apiProps.api.query.parachainStaking.nominationScheduledRequests(collator.address)]);
+      const nominationScheduledRequests = _nominationScheduledRequests.toPrimitive();
+      const topNominations = _topNominations.toPrimitive();
+      const topNominationsRecord = topNominations.nominations.reduce((record, _ref) => {
+        let {
+          amount,
+          owner
+        } = _ref;
+        record[owner] = amount || '0';
+        return record;
+      }, {});
+      let bnTotalActiveStake = new _util.BN(collator.totalStake);
+      if (nominationScheduledRequests !== null && nominationScheduledRequests !== void 0 && nominationScheduledRequests.length) {
+        const bnTotalInactiveStake = nominationScheduledRequests.reduce((partialSum, _ref2) => {
+          let {
+            action,
+            nominator,
+            whenExecutable
+          } = _ref2;
+          if (whenExecutable + delay - parseInt(currentRound) < 0 && action) {
+            return partialSum.add(new _util.BN(topNominationsRecord[nominator] || Object.values(action)[0] || _util.BN_ZERO));
+          }
+          return partialSum;
+        }, _util.BN_ZERO);
+        bnTotalActiveStake = bnTotalActiveStake.sub(bnTotalInactiveStake);
+      }
+      collator.expectedReturn = (0, _utils.calculateEnergyWebCollatorReturn)(annualReward.toString(), defaultCommission, selectedCollatorsCount, bnTotalActiveStake.toString());
+    }));
     const extraInfoMap = {};
     await Promise.all(allCollators.map(async collator => {
       const [_info, [identity, isReasonable]] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo(collator.address), (0, _utils2.parseIdentity)(substrateIdentityApi, collator.address)]);
@@ -304,6 +357,7 @@ class EnergyNativeStakingPoolHandler extends _basePara.default {
       validator.blocked = !extraInfoMap[validator.address].active;
       validator.identity = extraInfoMap[validator.address].identity;
       validator.isVerified = extraInfoMap[validator.address].isVerified;
+      validator.commission = defaultCommission * 100;
     }
     return allCollators;
   }