@subwallet/extension-base 1.0.7-1 → 1.0.7-2

package/background/KoniTypes.d.ts

@@ -4,7 +4,7 @@ import { TransactionError } from '@subwallet/extension-base/background/errors/Tr
 import { AuthUrls, Resolver } from '@subwallet/extension-base/background/handlers/State';
 import { AccountAuthType, AccountJson, AddressJson, AuthorizeRequest, ConfirmationRequestBase, RequestAccountList, RequestAccountSubscribe, RequestAuthorizeCancel, RequestAuthorizeReject, RequestAuthorizeSubscribe, RequestAuthorizeTab, RequestCurrentAccountAddress, ResponseAuthorizeList, ResponseJsonGetAccountInfo, SeedLengths } from '@subwallet/extension-base/background/types';
 import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chain-service/handler/types';
-import { _ChainState, _EvmApi, _NetworkUpsertParams, _SubstrateApi, _ValidateCustomAssetRequest, _ValidateCustomAssetResponse } from '@subwallet/extension-base/services/chain-service/types';
+import { _ChainState, _EvmApi, _NetworkUpsertParams, _SubstrateApi, _ValidateCustomAssetRequest, _ValidateCustomAssetResponse, EnableChainParams, EnableMultiChainParams } from '@subwallet/extension-base/services/chain-service/types';
 import { SWTransactionResponse, SWTransactionResult } from '@subwallet/extension-base/services/transaction-service/types';
 import { InjectedAccount, MetadataDefBase } from '@subwallet/extension-inject/types';
 import { KeyringPair$Json, KeyringPair$Meta } from '@subwallet/keyring/types';
@@ -1415,9 +1415,9 @@ export interface KoniRequestSignatures {
     'pri(chainService.subscribeMultiChainAssetMap)': [null, Record<string, _MultiChainAsset>, Record<string, _MultiChainAsset>];
     'pri(chainService.subscribeXcmRefMap)': [null, Record<string, _AssetRef>, Record<string, _AssetRef>];
     'pri(chainService.upsertChain)': [_NetworkUpsertParams, boolean];
-    'pri(chainService.enableChains)': [string[], boolean];
+    'pri(chainService.enableChains)': [EnableMultiChainParams, boolean];
+    'pri(chainService.enableChain)': [EnableChainParams, boolean];
     'pri(chainService.disableChains)': [string[], boolean];
-    'pri(chainService.enableChain)': [string, boolean];
     'pri(chainService.disableChain)': [string, boolean];
     'pri(chainService.removeChain)': [string, boolean];
     'pri(chainService.deleteCustomAsset)': [string, boolean];

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

@@ -184,14 +184,15 @@ async function getAstarNominatorMetadata(chainInfo, address, substrateApi) {
     const dAppInfoMap = {};
     const allDapps = await allDappsReq;
     allDapps.forEach(dappInfo => {
-      dAppInfoMap[dappInfo.address.toLowerCase()] = dappInfo;
+      const address = (0, _utilCrypto.isEthereumAddress)(dappInfo.address) ? dappInfo.address.toLowerCase() : dappInfo.address;
+      dAppInfoMap[address] = dappInfo;
     });
     for (const item of _stakerInfo) {
       const data = item[0].toHuman();
       const stakedDapp = data[1];
       const stakeData = item[1].toPrimitive();
       const stakeList = stakeData.stakes;
-      const dappAddress = stakedDapp.Evm.toLowerCase();
+      const dappAddress = (0, _utilCrypto.isEthereumAddress)(stakedDapp.Evm) ? stakedDapp.Evm.toLowerCase() : stakedDapp.Evm;
       const currentStake = stakeList.slice(-1)[0].staked.toString() || '0';
       const bnCurrentStake = new _util.BN(currentStake);
       if (bnCurrentStake.gt(_util.BN_ZERO)) {
@@ -201,7 +202,7 @@ async function getAstarNominatorMetadata(chainInfo, address, substrateApi) {
         nominationList.push({
           status: dappStakingStatus,
           chain,
-          validatorAddress: dappAddress.toLowerCase(),
+          validatorAddress: dappAddress,
           activeStake: currentStake,
           validatorMinStake: '0',
           validatorIdentity: dappInfo === null || dappInfo === void 0 ? void 0 : dappInfo.name,
@@ -334,7 +335,7 @@ async function getAstarClaimRewardExtrinsic(substrateApi, address) {
     const stakedDapp = data[1];
     const stakeData = item[1].toHuman();
     const stakes = stakeData.stakes;
-    const dappAddress = stakedDapp.Evm.toLowerCase();
+    const dappAddress = (0, _utilCrypto.isEthereumAddress)(stakedDapp.Evm) ? stakedDapp.Evm.toLowerCase() : stakedDapp.Evm;
     let numberOfUnclaimedEra = 0;
     const maxTx = 50;
     for (let i = 0; i < stakes.length; i++) {

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

@@ -162,7 +162,7 @@ async function getRelayChainStakingMetadata(chainInfo, substrateApi) {
     chain,
     type: _KoniTypes.StakingType.NOMINATED,
     era: parseInt(currentEra),
-    expectedReturn,
+    expectedReturn: !_constants._STAKING_CHAIN_GROUP.ternoa.includes(chain) ? expectedReturn : undefined,
     // in %, annually
     inflation,
     minStake: minStake.toString(),
@@ -503,7 +503,8 @@ async function getRelayValidatorsInfo(chain, substrateApi, decimals, chainStakin
   const currentEra = _era.toString();
   const allValidators = [];
   const validatorInfoList = [];
-  const [_totalEraStake, _eraStakers, _minBond] = await Promise.all([chainApi.api.query.staking.erasTotalStake(parseInt(currentEra)), chainApi.api.query.staking.erasStakers.entries(parseInt(currentEra)), chainApi.api.query.staking.minNominatorBond()]);
+  const [_totalEraStake, _eraStakers, _minBond, _stakingRewards] = await Promise.all([chainApi.api.query.staking.erasTotalStake(parseInt(currentEra)), chainApi.api.query.staking.erasStakers.entries(parseInt(currentEra)), chainApi.api.query.staking.minNominatorBond(), chainApi.api.query.stakingRewards && chainApi.api.query.stakingRewards.data()]);
+  const stakingRewards = _stakingRewards === null || _stakingRewards === void 0 ? void 0 : _stakingRewards.toPrimitive();
   const maxNominatorRewarded = chainApi.api.consts.staking.maxNominatorRewardedPerValidator.toString();
   const bnTotalEraStake = new _util.BN(_totalEraStake.toString());
   const eraStakers = _eraStakers;
@@ -566,7 +567,15 @@ async function getRelayValidatorsInfo(chain, substrateApi, decimals, chainStakin
   for (const validator of validatorInfoList) {
     const commission = extraInfoMap[validator.address].commission;
     const bnValidatorStake = totalStakeMap[validator.address].div(bnDecimals);
-    validator.expectedReturn = _constants._STAKING_CHAIN_GROUP.aleph.includes(chain) ? (0, _utils.calculateAlephZeroValidatorReturn)(chainStakingMetadata.expectedReturn, (0, _utils.getCommission)(commission)) : (0, _utils.calculateValidatorStakedReturn)(chainStakingMetadata.expectedReturn, bnValidatorStake, bnAvgStake, (0, _utils.getCommission)(commission));
+    if (_constants._STAKING_CHAIN_GROUP.aleph.includes(chain)) {
+      validator.expectedReturn = (0, _utils.calculateAlephZeroValidatorReturn)(chainStakingMetadata.expectedReturn, (0, _utils.getCommission)(commission));
+    } else if (_constants._STAKING_CHAIN_GROUP.ternoa.includes(chain)) {
+      const rewardPerValidator = new _util.BN(stakingRewards.sessionExtraRewardPayout).divn(allValidators.length).div(bnDecimals);
+      const validatorStake = totalStakeMap[validator.address].div(bnDecimals).toNumber();
+      validator.expectedReturn = (0, _utils.calculateTernoaValidatorReturn)(rewardPerValidator.toNumber(), validatorStake, (0, _utils.getCommission)(commission));
+    } else {
+      validator.expectedReturn = (0, _utils.calculateValidatorStakedReturn)(chainStakingMetadata.expectedReturn, bnValidatorStake, bnAvgStake, (0, _utils.getCommission)(commission));
+    }
     validator.commission = parseFloat(commission.split('%')[0]);
     validator.blocked = extraInfoMap[validator.address].blocked;
     validator.identity = extraInfoMap[validator.address].identity;

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

@@ -9,6 +9,7 @@ exports.calcInflationUniformEraPayout = calcInflationUniformEraPayout;
 exports.calculateAlephZeroValidatorReturn = calculateAlephZeroValidatorReturn;
 exports.calculateChainStakedReturn = calculateChainStakedReturn;
 exports.calculateInflation = calculateInflation;
+exports.calculateTernoaValidatorReturn = calculateTernoaValidatorReturn;
 exports.calculateValidatorStakedReturn = calculateValidatorStakedReturn;
 exports.getBondedValidators = getBondedValidators;
 exports.getCommission = getCommission;
@@ -113,6 +114,12 @@ function calculateChainStakedReturn(inflation, totalEraStake, totalIssuance, net
 function calculateAlephZeroValidatorReturn(chainStakedReturn, commission) {
   return chainStakedReturn * (100 - commission) / 100;
 }
+function calculateTernoaValidatorReturn(rewardPerValidator, validatorStake, commission) {
+  const percentRewardForNominators = (100 - commission) / 100;
+  const rewardForNominators = rewardPerValidator * percentRewardForNominators;
+  const stakeRatio = rewardForNominators / validatorStake;
+  return stakeRatio * 365 * 100;
+}
 function calculateValidatorStakedReturn(chainStakedReturn, totalValidatorStake, avgStake, commission) {
   const bnAdjusted = avgStake.mul(_util.BN_HUNDRED).div(totalValidatorStake);
   const adjusted = bnAdjusted.toNumber() * chainStakedReturn;

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

@@ -11,6 +11,7 @@ var _Extension = require("@subwallet/extension-base/background/handlers/Extensio
 var _helpers = require("@subwallet/extension-base/background/handlers/helpers");
 var _subscriptions = require("@subwallet/extension-base/background/handlers/subscriptions");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
+var _TransactionWarning = require("@subwallet/extension-base/background/warnings/TransactionWarning");
 var _constants = require("@subwallet/extension-base/constants");
 var _defaults = require("@subwallet/extension-base/defaults");
 var _parseTransaction = require("@subwallet/extension-base/koni/api/dotsama/parseTransaction");
@@ -1471,6 +1472,17 @@ class KoniExtension {
     }
     const transferNativeAmount = isTransferNativeToken ? transferAmount.value : '0';
     this.addContact(to);
+    const additionalValidator = async inputTransaction => {
+      if (!isTransferNativeToken) {
+        const {
+          value: balance
+        } = await this.#koniState.balanceService.getTokenFreeBalance(from, networkKey, tokenSlug);
+        const minAmount = tokenInfo.minAmount || '0';
+        if (new _bignumber.default(balance).minus(transferAmount.value).lt(minAmount)) {
+          inputTransaction.warnings.push(new _TransactionWarning.TransactionWarning(_KoniTypes.BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT, ''));
+        }
+      }
+    };
     return this.#koniState.transactionService.handleTransaction({
       errors,
       warnings,
@@ -1482,8 +1494,9 @@ class KoniExtension {
       data: inputData,
       extrinsicType: isTransferNativeToken ? _KoniTypes.ExtrinsicType.TRANSFER_BALANCE : _KoniTypes.ExtrinsicType.TRANSFER_TOKEN,
       ignoreWarnings: transferAll,
-      isTransferAll: transferAll,
-      edAsWarning: isTransferNativeToken
+      isTransferAll: isTransferNativeToken ? transferAll : false,
+      edAsWarning: true,
+      additionalValidator: additionalValidator
     });
   }
   validateCrossChainTransfer(destinationNetworkKey, sendingTokenSlug, sender, sendingValue) {
@@ -1572,14 +1585,18 @@ class KoniExtension {
   disableChain(networkKey) {
     return this.#koniState.disableChain(networkKey);
   }
-  async enableChain(networkKey) {
-    return await this.#koniState.enableChain(networkKey);
+  async enableChain(_ref39) {
+    let {
+      chainSlug,
+      enableTokens
+    } = _ref39;
+    return await this.#koniState.enableChain(chainSlug, enableTokens);
   }
-  async validateNetwork(_ref39) {
+  async validateNetwork(_ref40) {
     let {
       existedChainSlug,
       provider
-    } = _ref39;
+    } = _ref40;
     return await this.#koniState.validateCustomChain(provider, existedChainSlug);
   }
   resetDefaultNetwork() {
@@ -1617,22 +1634,22 @@ class KoniExtension {
   async validateCustomAsset(data) {
     return await this.#koniState.validateCustomAsset(data);
   }
-  async getAddressFreeBalance(_ref40) {
+  async getAddressFreeBalance(_ref41) {
     let {
       address,
       networkKey,
       token
-    } = _ref40;
+    } = _ref41;
     return await this.#koniState.balanceService.getTokenFreeBalance(address, networkKey, token);
   }
-  async transferGetMaxTransferable(_ref41) {
+  async transferGetMaxTransferable(_ref42) {
     let {
       address,
       destChain,
       isXcmTransfer,
       networkKey,
       token
-    } = _ref41;
+    } = _ref42;
     const freeBalance = await this.#koniState.balanceService.getTokenFreeBalance(address, networkKey, token);
     const tokenInfo = token ? this.#koniState.chainService.getAssetBySlug(token) : this.#koniState.chainService.getNativeTokenInfo(networkKey);
     if (!(0, _utils._isNativeToken)(tokenInfo)) {
@@ -1703,12 +1720,12 @@ class KoniExtension {
       };
     }
   }
-  async subscribeAddressFreeBalance(_ref42, id, port) {
+  async subscribeAddressFreeBalance(_ref43, id, port) {
     let {
       address,
       networkKey,
       token
-    } = _ref42;
+    } = _ref43;
     const cb = (0, _subscriptions.createSubscription)(id, port);
     const [unsub, currentFreeBalance] = await this.#koniState.balanceService.subscribeTokenFreeBalance(address, networkKey, token, cb);
     this.createUnsubscriptionHandle(id, unsub);
@@ -1717,26 +1734,26 @@ class KoniExtension {
     });
     return currentFreeBalance;
   }
-  async transferCheckReferenceCount(_ref43) {
+  async transferCheckReferenceCount(_ref44) {
     let {
       address,
       networkKey
-    } = _ref43;
+    } = _ref44;
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-return
     return await (0, _transfer.checkReferenceCount)(networkKey, address, this.#koniState.getSubstrateApiMap(), this.#koniState.getChainInfo(networkKey));
   }
-  async transferCheckSupporting(_ref44) {
+  async transferCheckSupporting(_ref45) {
     let {
       networkKey,
       tokenSlug
-    } = _ref44;
+    } = _ref45;
     const tokenInfo = this.#koniState.getAssetBySlug(tokenSlug);
     return await (0, _transfer.checkSupportTransfer)(networkKey, tokenInfo, this.#koniState.getSubstrateApiMap(), this.#koniState.getChainInfo(networkKey));
   }
-  transferGetExistentialDeposit(_ref45) {
+  transferGetExistentialDeposit(_ref46) {
     let {
       tokenSlug
-    } = _ref45;
+    } = _ref46;
     const tokenInfo = this.#koniState.getAssetBySlug(tokenSlug);
     return (0, _utils._getTokenMinAmount)(tokenInfo);
   }
@@ -1770,32 +1787,39 @@ class KoniExtension {
       isSendingSelf
     };
   }
-  async enableChains(targetKeys) {
+  async enableChains(_ref47) {
+    let {
+      chainSlugs,
+      enableTokens
+    } = _ref47;
     try {
-      await Promise.all(targetKeys.map(networkKey => this.enableChain(networkKey)));
+      await Promise.all(chainSlugs.map(chainSlug => this.enableChain({
+        chainSlug,
+        enableTokens
+      })));
     } catch (e) {
       return false;
     }
     return true;
   }
-  getAccountMeta(_ref46) {
+  getAccountMeta(_ref48) {
     let {
       address
-    } = _ref46;
+    } = _ref48;
     const pair = _uiKeyring.keyring.getPair(address);
     (0, _util.assert)(pair, 'Unable to find pair');
     return {
       meta: pair.meta
     };
   }
-  accountsTie2(_ref47) {
+  accountsTie2(_ref49) {
     let {
       address,
       genesisHash
-    } = _ref47;
+    } = _ref49;
     return this.#koniState.setAccountTie(address, genesisHash);
   }
-  async accountsCreateExternalV2(_ref48) {
+  async accountsCreateExternalV2(_ref50) {
     let {
       address,
       genesisHash,
@@ -1803,7 +1827,7 @@ class KoniExtension {
       isEthereum,
       isReadOnly,
       name
-    } = _ref48;
+    } = _ref50;
     try {
       let result;
       try {
@@ -1862,7 +1886,7 @@ class KoniExtension {
       }];
     }
   }
-  async accountsCreateHardwareV2(_ref49) {
+  async accountsCreateHardwareV2(_ref51) {
     let {
       accountIndex,
       address,
@@ -1871,7 +1895,7 @@ class KoniExtension {
       hardwareType,
       isAllowed,
       name
-    } = _ref49;
+    } = _ref51;
     const key = _uiKeyring.keyring.addHardware(address, hardwareType, {
       accountIndex,
       addressOffset,
@@ -1894,10 +1918,10 @@ class KoniExtension {
     });
     return true;
   }
-  async accountsCreateHardwareMultiple(_ref50) {
+  async accountsCreateHardwareMultiple(_ref52) {
     let {
       accounts
-    } = _ref50;
+    } = _ref52;
     const addresses = [];
     if (!accounts.length) {
       throw new Error('No accounts to import');
@@ -1948,14 +1972,14 @@ class KoniExtension {
     });
     return true;
   }
-  async accountsCreateWithSecret(_ref51) {
+  async accountsCreateWithSecret(_ref53) {
     let {
       isAllow,
       isEthereum,
       name,
       publicKey,
       secretKey
-    } = _ref51;
+    } = _ref53;
     try {
       let keyringPair = null;
       if (isEthereum) {
@@ -2098,30 +2122,30 @@ class KoniExtension {
 
   // Parse transaction
 
-  parseSubstrateTransaction(_ref52) {
+  parseSubstrateTransaction(_ref54) {
     let {
       data,
       networkKey
-    } = _ref52;
+    } = _ref54;
     const apiProps = this.#koniState.getSubstrateApi(networkKey);
     const apiPromise = apiProps.api;
     return (0, _parseTransaction.parseSubstrateTransaction)(data, apiPromise);
   }
-  async parseEVMRLP(_ref53) {
+  async parseEVMRLP(_ref55) {
     let {
       data
-    } = _ref53;
+    } = _ref55;
     return await (0, _parseTransaction2.parseEvmRlp)(data, this.#koniState.getChainInfoMap(), this.#koniState.getEvmApiMap());
   }
 
   // Sign
 
-  qrSignSubstrate(_ref54) {
+  qrSignSubstrate(_ref56) {
     let {
       address,
       data,
       networkKey
-    } = _ref54;
+    } = _ref56;
     const pair = _uiKeyring.keyring.getPair(address);
     (0, _util.assert)(pair, 'Unable to find pair');
     if (pair.isLocked) {
@@ -2138,13 +2162,13 @@ class KoniExtension {
       signature: signed
     };
   }
-  async qrSignEVM(_ref55) {
+  async qrSignEVM(_ref57) {
     let {
       address,
       chainId,
       message,
       type
-    } = _ref55;
+    } = _ref57;
     let signed;
     const network = this.getNetworkJsonByChainId(chainId);
     if (!network) {
@@ -2225,11 +2249,11 @@ class KoniExtension {
     });
     return this.#koniState.getNominatorMetadata();
   }
-  async getBondingOptions(_ref56) {
+  async getBondingOptions(_ref58) {
     let {
       chain,
       type
-    } = _ref56;
+    } = _ref58;
     const apiProps = this.#koniState.getSubstrateApi(chain);
     const chainInfo = this.#koniState.getChainInfo(chain);
     const chainStakingMetadata = await this.#koniState.getStakingMetadataByChain(chain, type);
@@ -2418,12 +2442,12 @@ class KoniExtension {
   }
 
   // EVM Transaction
-  async parseContractInput(_ref57) {
+  async parseContractInput(_ref59) {
     let {
       chainId,
       contract,
       data
-    } = _ref57;
+    } = _ref59;
     const network = this.getNetworkJsonByChainId(chainId);
     return await (0, _parseTransaction2.parseContractInput)(data, contract, network);
   }
@@ -2494,12 +2518,12 @@ class KoniExtension {
 
   // Change master password
 
-  keyringChangeMasterPassword(_ref58) {
+  keyringChangeMasterPassword(_ref60) {
     let {
       createNew,
       newPassword,
       oldPassword
-    } = _ref58;
+    } = _ref60;
     try {
       // Remove isMasterPassword meta if createNew
       if (createNew) {
@@ -2533,11 +2557,11 @@ class KoniExtension {
 
   // Migrate password
 
-  keyringMigrateMasterPassword(_ref59) {
+  keyringMigrateMasterPassword(_ref61) {
     let {
       address,
       password
-    } = _ref59;
+    } = _ref61;
     try {
       _uiKeyring.keyring.migrateWithMasterPassword(address, password);
     } catch (e) {
@@ -2555,10 +2579,10 @@ class KoniExtension {
 
   // Unlock wallet
 
-  keyringUnlock(_ref60) {
+  keyringUnlock(_ref62) {
     let {
       password
-    } = _ref60;
+    } = _ref62;
     try {
       _uiKeyring.keyring.unlockKeyring(password);
     } catch (e) {
@@ -2584,11 +2608,11 @@ class KoniExtension {
 
   // Export mnemonic
 
-  keyringExportMnemonic(_ref61) {
+  keyringExportMnemonic(_ref63) {
     let {
       address,
       password
-    } = _ref61;
+    } = _ref63;
     const pair = _uiKeyring.keyring.getPair(address);
     const result = pair.exportMnemonic(password);
     return {
@@ -2598,10 +2622,10 @@ class KoniExtension {
 
   // Reset wallet
 
-  async resetWallet(_ref62) {
+  async resetWallet(_ref64) {
     let {
       resetAll
-    } = _ref62;
+    } = _ref64;
     try {
       await this.#koniState.resetWallet(resetAll);
       return {
@@ -2617,10 +2641,10 @@ class KoniExtension {
   }
 
   /// Signing external request
-  signingApprovePasswordV2(_ref63) {
+  signingApprovePasswordV2(_ref65) {
     let {
       id
-    } = _ref63;
+    } = _ref65;
     const queued = this.#koniState.getSignRequest(id);
     (0, _util.assert)(queued, 'Unable to find request');
     const {
@@ -2673,22 +2697,22 @@ class KoniExtension {
 
   /// Derive account
 
-  derivationCreateMultiple(_ref64) {
+  derivationCreateMultiple(_ref66) {
     let {
       isAllowed,
       items,
       parentAddress
-    } = _ref64;
+    } = _ref66;
     const parentPair = _uiKeyring.keyring.getPair(parentAddress);
     const isEvm = parentPair.type === 'ethereum';
     if (parentPair.isLocked) {
       _uiKeyring.keyring.unlockPair(parentPair.address);
     }
-    const createChild = _ref65 => {
+    const createChild = _ref67 => {
       let {
         name,
         suri
-      } = _ref65;
+      } = _ref67;
       const meta = {
         name: name,
         parentAddress
@@ -2734,10 +2758,10 @@ class KoniExtension {
     }
     return true;
   }
-  derivationCreateV3(_ref66) {
+  derivationCreateV3(_ref68) {
     let {
       address: parentAddress
-    } = _ref66;
+    } = _ref68;
     const parentPair = _uiKeyring.keyring.getPair(parentAddress);
     const isEvm = parentPair.type === 'ethereum';
     if (parentPair.isLocked) {
@@ -2769,11 +2793,11 @@ class KoniExtension {
     });
     return true;
   }
-  validateDerivePath(_ref67) {
+  validateDerivePath(_ref69) {
     let {
       parentAddress,
       suri
-    } = _ref67;
+    } = _ref69;
     const parentPair = _uiKeyring.keyring.getPair(parentAddress);
     const isEvm = parentPair.type === 'ethereum';
     if (parentPair.isLocked) {
@@ -2806,12 +2830,12 @@ class KoniExtension {
       suri: meta.suri
     };
   }
-  getListDeriveAccounts(_ref68) {
+  getListDeriveAccounts(_ref70) {
     let {
       limit,
       page,
       parentAddress
-    } = _ref68;
+    } = _ref70;
     const parentPair = _uiKeyring.keyring.getPair(parentAddress);
     const isEvm = parentPair.type === 'ethereum';
     if (parentPair.isLocked) {
@@ -2902,10 +2926,10 @@ class KoniExtension {
   getSupportedSmartContractTypes() {
     return this.#koniState.getSupportedSmartContractTypes();
   }
-  getTransaction(_ref69) {
+  getTransaction(_ref71) {
     let {
       id
-    } = _ref69;
+    } = _ref71;
     const {
       transaction,
       ...transactionResult
@@ -2915,8 +2939,8 @@ class KoniExtension {
   subscribeTransactions(id, port) {
     const cb = (0, _subscriptions.createSubscription)(id, port);
     function convertRs(rs) {
-      return Object.fromEntries(Object.entries(rs).map(_ref70 => {
-        let [key, value] = _ref70;
+      return Object.fromEntries(Object.entries(rs).map(_ref72 => {
+        let [key, value] = _ref72;
         const {
           additionalValidator,
           transaction,
@@ -2947,10 +2971,10 @@ class KoniExtension {
     });
     return notificationSubject.value;
   }
-  async reloadCron(_ref71) {
+  async reloadCron(_ref73) {
     let {
       data
-    } = _ref71;
+    } = _ref73;
     if (data === 'nft') {
       return await this.#koniState.reloadNft();
     } else if (data === 'staking') {
@@ -2968,10 +2992,10 @@ class KoniExtension {
 
   // Phishing detect
 
-  async passPhishingPage(_ref72) {
+  async passPhishingPage(_ref74) {
     let {
       url
-    } = _ref72;
+    } = _ref74;
     return await this.#koniState.approvePassPhishingPage(url);
   }
 

package/cjs/packageInfo.js

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

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

@@ -66,7 +66,9 @@ const _STAKING_CHAIN_GROUP = {
   kilt: ['kilt', 'kilt_peregrine'],
   nominationPool: ['polkadot', 'kusama', 'westend', 'alephTest', 'aleph'],
   bifrost: ['bifrost', 'bifrost_testnet'],
-  aleph: ['aleph', 'alephTest'] // A0 has distinct tokenomics
+  aleph: ['aleph', 'alephTest'],
+  // A0 has distinct tokenomics
+  ternoa: ['ternoa', 'ternoa_alphanet']
 };
 exports._STAKING_CHAIN_GROUP = _STAKING_CHAIN_GROUP;
 const _STAKING_ERA_LENGTH_MAP = {

package/koni/api/staking/bonding/astar.js

@@ -168,14 +168,15 @@ export async function getAstarNominatorMetadata(chainInfo, address, substrateApi
     const dAppInfoMap = {};
     const allDapps = await allDappsReq;
     allDapps.forEach(dappInfo => {
-      dAppInfoMap[dappInfo.address.toLowerCase()] = dappInfo;
+      const address = isEthereumAddress(dappInfo.address) ? dappInfo.address.toLowerCase() : dappInfo.address;
+      dAppInfoMap[address] = dappInfo;
     });
     for (const item of _stakerInfo) {
       const data = item[0].toHuman();
       const stakedDapp = data[1];
       const stakeData = item[1].toPrimitive();
       const stakeList = stakeData.stakes;
-      const dappAddress = stakedDapp.Evm.toLowerCase();
+      const dappAddress = isEthereumAddress(stakedDapp.Evm) ? stakedDapp.Evm.toLowerCase() : stakedDapp.Evm;
       const currentStake = stakeList.slice(-1)[0].staked.toString() || '0';
       const bnCurrentStake = new BN(currentStake);
       if (bnCurrentStake.gt(BN_ZERO)) {
@@ -185,7 +186,7 @@ export async function getAstarNominatorMetadata(chainInfo, address, substrateApi
         nominationList.push({
           status: dappStakingStatus,
           chain,
-          validatorAddress: dappAddress.toLowerCase(),
+          validatorAddress: dappAddress,
           activeStake: currentStake,
           validatorMinStake: '0',
           validatorIdentity: dappInfo === null || dappInfo === void 0 ? void 0 : dappInfo.name,
@@ -318,7 +319,7 @@ export async function getAstarClaimRewardExtrinsic(substrateApi, address) {
     const stakedDapp = data[1];
     const stakeData = item[1].toHuman();
     const stakes = stakeData.stakes;
-    const dappAddress = stakedDapp.Evm.toLowerCase();
+    const dappAddress = isEthereumAddress(stakedDapp.Evm) ? stakedDapp.Evm.toLowerCase() : stakedDapp.Evm;
     let numberOfUnclaimedEra = 0;
     const maxTx = 50;
     for (let i = 0; i < stakes.length; i++) {

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

@@ -3,7 +3,7 @@
 
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { StakingStatus, StakingTxErrorType, StakingType, UnstakingStatus } from '@subwallet/extension-base/background/KoniTypes';
-import { calculateAlephZeroValidatorReturn, calculateChainStakedReturn, calculateInflation, calculateValidatorStakedReturn, getCommission, parseIdentity, parsePoolStashAddress, transformPoolName } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
+import { calculateAlephZeroValidatorReturn, calculateChainStakedReturn, calculateInflation, calculateTernoaValidatorReturn, calculateValidatorStakedReturn, getCommission, parseIdentity, parsePoolStashAddress, transformPoolName } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
 import { _STAKING_CHAIN_GROUP, _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
 import { _getChainSubstrateAddressPrefix } from '@subwallet/extension-base/services/chain-service/utils';
 import { reformatAddress } from '@subwallet/extension-base/utils';
@@ -138,7 +138,7 @@ export async function getRelayChainStakingMetadata(chainInfo, substrateApi) {
     chain,
     type: StakingType.NOMINATED,
     era: parseInt(currentEra),
-    expectedReturn,
+    expectedReturn: !_STAKING_CHAIN_GROUP.ternoa.includes(chain) ? expectedReturn : undefined,
     // in %, annually
     inflation,
     minStake: minStake.toString(),
@@ -477,7 +477,8 @@ export async function getRelayValidatorsInfo(chain, substrateApi, decimals, chai
   const currentEra = _era.toString();
   const allValidators = [];
   const validatorInfoList = [];
-  const [_totalEraStake, _eraStakers, _minBond] = await Promise.all([chainApi.api.query.staking.erasTotalStake(parseInt(currentEra)), chainApi.api.query.staking.erasStakers.entries(parseInt(currentEra)), chainApi.api.query.staking.minNominatorBond()]);
+  const [_totalEraStake, _eraStakers, _minBond, _stakingRewards] = await Promise.all([chainApi.api.query.staking.erasTotalStake(parseInt(currentEra)), chainApi.api.query.staking.erasStakers.entries(parseInt(currentEra)), chainApi.api.query.staking.minNominatorBond(), chainApi.api.query.stakingRewards && chainApi.api.query.stakingRewards.data()]);
+  const stakingRewards = _stakingRewards === null || _stakingRewards === void 0 ? void 0 : _stakingRewards.toPrimitive();
   const maxNominatorRewarded = chainApi.api.consts.staking.maxNominatorRewardedPerValidator.toString();
   const bnTotalEraStake = new BN(_totalEraStake.toString());
   const eraStakers = _eraStakers;
@@ -540,7 +541,15 @@ export async function getRelayValidatorsInfo(chain, substrateApi, decimals, chai
   for (const validator of validatorInfoList) {
     const commission = extraInfoMap[validator.address].commission;
     const bnValidatorStake = totalStakeMap[validator.address].div(bnDecimals);
-    validator.expectedReturn = _STAKING_CHAIN_GROUP.aleph.includes(chain) ? calculateAlephZeroValidatorReturn(chainStakingMetadata.expectedReturn, getCommission(commission)) : calculateValidatorStakedReturn(chainStakingMetadata.expectedReturn, bnValidatorStake, bnAvgStake, getCommission(commission));
+    if (_STAKING_CHAIN_GROUP.aleph.includes(chain)) {
+      validator.expectedReturn = calculateAlephZeroValidatorReturn(chainStakingMetadata.expectedReturn, getCommission(commission));
+    } else if (_STAKING_CHAIN_GROUP.ternoa.includes(chain)) {
+      const rewardPerValidator = new BN(stakingRewards.sessionExtraRewardPayout).divn(allValidators.length).div(bnDecimals);
+      const validatorStake = totalStakeMap[validator.address].div(bnDecimals).toNumber();
+      validator.expectedReturn = calculateTernoaValidatorReturn(rewardPerValidator.toNumber(), validatorStake, getCommission(commission));
+    } else {
+      validator.expectedReturn = calculateValidatorStakedReturn(chainStakingMetadata.expectedReturn, bnValidatorStake, bnAvgStake, getCommission(commission));
+    }
     validator.commission = parseFloat(commission.split('%')[0]);
     validator.blocked = extraInfoMap[validator.address].blocked;
     validator.identity = extraInfoMap[validator.address].identity;

package/koni/api/staking/bonding/utils.d.ts

@@ -102,6 +102,10 @@ export interface Unlocking {
     remainingEras: BN;
     value: BN;
 }
+export interface TernoaStakingRewardsStakingRewardsData {
+    sessionEraPayout: string;
+    sessionExtraRewardPayout: string;
+}
 export declare function parsePoolStashAddress(api: ApiPromise, index: number, poolId: number, poolsPalletId: string): string;
 export declare function transformPoolName(input: string): string;
 export declare function parseIdentity(identityInfo: PalletIdentityRegistration | null): string | undefined;
@@ -111,6 +115,7 @@ export declare function calcInflationRewardCurve(minInflation: number, stakedFra
 export declare function calculateInflation(totalEraStake: BN, totalIssuance: BN, numAuctions: number, networkKey: string): number;
 export declare function calculateChainStakedReturn(inflation: number, totalEraStake: BN, totalIssuance: BN, networkKey: string): number;
 export declare function calculateAlephZeroValidatorReturn(chainStakedReturn: number, commission: number): number;
+export declare function calculateTernoaValidatorReturn(rewardPerValidator: number, validatorStake: number, commission: number): number;
 export declare function calculateValidatorStakedReturn(chainStakedReturn: number, totalValidatorStake: BN, avgStake: BN, commission: number): number;
 export declare function getCommission(commissionString: string): number;
 export interface InflationConfig {

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

@@ -86,6 +86,12 @@ export function calculateChainStakedReturn(inflation, totalEraStake, totalIssuan
 export function calculateAlephZeroValidatorReturn(chainStakedReturn, commission) {
   return chainStakedReturn * (100 - commission) / 100;
 }
+export function calculateTernoaValidatorReturn(rewardPerValidator, validatorStake, commission) {
+  const percentRewardForNominators = (100 - commission) / 100;
+  const rewardForNominators = rewardPerValidator * percentRewardForNominators;
+  const stakeRatio = rewardForNominators / validatorStake;
+  return stakeRatio * 365 * 100;
+}
 export function calculateValidatorStakedReturn(chainStakedReturn, totalValidatorStake, avgStake, commission) {
   const bnAdjusted = avgStake.mul(BN_HUNDRED).div(totalValidatorStake);
   const adjusted = bnAdjusted.toNumber() * chainStakedReturn;

package/koni/background/handlers/Extension.js

@@ -6,7 +6,8 @@ import { TransactionError } from '@subwallet/extension-base/background/errors/Tr
 import { isJsonPayload, SEED_DEFAULT_LENGTH, SEED_LENGTHS } from '@subwallet/extension-base/background/handlers/Extension';
 import { withErrorLog } from '@subwallet/extension-base/background/handlers/helpers';
 import { createSubscription } from '@subwallet/extension-base/background/handlers/subscriptions';
-import { AccountExternalErrorCode, BasicTxErrorType, ChainType, ExternalRequestPromiseStatus, ExtrinsicType, StakingType, TransferTxErrorType } from '@subwallet/extension-base/background/KoniTypes';
+import { AccountExternalErrorCode, BasicTxErrorType, BasicTxWarningCode, ChainType, ExternalRequestPromiseStatus, ExtrinsicType, StakingType, TransferTxErrorType } from '@subwallet/extension-base/background/KoniTypes';
+import { TransactionWarning } from '@subwallet/extension-base/background/warnings/TransactionWarning';
 import { ALL_ACCOUNT_KEY, ALL_GENESIS_HASH } from '@subwallet/extension-base/constants';
 import { ALLOWED_PATH } from '@subwallet/extension-base/defaults';
 import { parseSubstrateTransaction } from '@subwallet/extension-base/koni/api/dotsama/parseTransaction';
@@ -1423,6 +1424,17 @@ export default class KoniExtension {
     }
     const transferNativeAmount = isTransferNativeToken ? transferAmount.value : '0';
     this.addContact(to);
+    const additionalValidator = async inputTransaction => {
+      if (!isTransferNativeToken) {
+        const {
+          value: balance
+        } = await this.#koniState.balanceService.getTokenFreeBalance(from, networkKey, tokenSlug);
+        const minAmount = tokenInfo.minAmount || '0';
+        if (new BigN(balance).minus(transferAmount.value).lt(minAmount)) {
+          inputTransaction.warnings.push(new TransactionWarning(BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT, ''));
+        }
+      }
+    };
     return this.#koniState.transactionService.handleTransaction({
       errors,
       warnings,
@@ -1434,8 +1446,9 @@ export default class KoniExtension {
       data: inputData,
       extrinsicType: isTransferNativeToken ? ExtrinsicType.TRANSFER_BALANCE : ExtrinsicType.TRANSFER_TOKEN,
       ignoreWarnings: transferAll,
-      isTransferAll: transferAll,
-      edAsWarning: isTransferNativeToken
+      isTransferAll: isTransferNativeToken ? transferAll : false,
+      edAsWarning: true,
+      additionalValidator: additionalValidator
     });
   }
   validateCrossChainTransfer(destinationNetworkKey, sendingTokenSlug, sender, sendingValue) {
@@ -1524,8 +1537,11 @@ export default class KoniExtension {
   disableChain(networkKey) {
     return this.#koniState.disableChain(networkKey);
   }
-  async enableChain(networkKey) {
-    return await this.#koniState.enableChain(networkKey);
+  async enableChain({
+    chainSlug,
+    enableTokens
+  }) {
+    return await this.#koniState.enableChain(chainSlug, enableTokens);
   }
   async validateNetwork({
     existedChainSlug,
@@ -1715,9 +1731,15 @@ export default class KoniExtension {
       isSendingSelf
     };
   }
-  async enableChains(targetKeys) {
+  async enableChains({
+    chainSlugs,
+    enableTokens
+  }) {
     try {
-      await Promise.all(targetKeys.map(networkKey => this.enableChain(networkKey)));
+      await Promise.all(chainSlugs.map(chainSlug => this.enableChain({
+        chainSlug,
+        enableTokens
+      })));
     } catch (e) {
       return false;
     }

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.0.7-1",
+  "version": "1.0.7-2",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1698,10 +1698,10 @@
     "@subsocial/types": "^0.6.8",
     "@substrate/connect": "^0.7.26",
     "@subwallet/chain-list": "^0.1.9",
-    "@subwallet/extension-base": "^1.0.7-1",
-    "@subwallet/extension-chains": "^1.0.7-1",
-    "@subwallet/extension-dapp": "^1.0.7-1",
-    "@subwallet/extension-inject": "^1.0.7-1",
+    "@subwallet/extension-base": "^1.0.7-2",
+    "@subwallet/extension-chains": "^1.0.7-2",
+    "@subwallet/extension-dapp": "^1.0.7-2",
+    "@subwallet/extension-inject": "^1.0.7-2",
     "@subwallet/keyring": "^0.0.9",
     "@subwallet/ui-keyring": "^0.0.9",
     "@unique-nft/types": "^0.6.0-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.0.7-1'
+  version: '1.0.7-2'
 };

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

@@ -36,6 +36,7 @@ export declare const _STAKING_CHAIN_GROUP: {
     nominationPool: string[];
     bifrost: string[];
     aleph: string[];
+    ternoa: string[];
 };
 export declare const _STAKING_ERA_LENGTH_MAP: Record<string, number>;
 export declare const _PARACHAIN_INFLATION_DISTRIBUTION: Record<string, Record<string, number>>;

package/services/chain-service/constants.js

@@ -55,9 +55,10 @@ export const _STAKING_CHAIN_GROUP = {
   kilt: ['kilt', 'kilt_peregrine'],
   nominationPool: ['polkadot', 'kusama', 'westend', 'alephTest', 'aleph'],
   bifrost: ['bifrost', 'bifrost_testnet'],
-  aleph: ['aleph', 'alephTest'] // A0 has distinct tokenomics
+  aleph: ['aleph', 'alephTest'],
+  // A0 has distinct tokenomics
+  ternoa: ['ternoa', 'ternoa_alphanet']
 };
-
 export const _STAKING_ERA_LENGTH_MAP = {
   // in hours
   alephTest: 24,

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

@@ -93,6 +93,14 @@ export declare type _NetworkUpsertParams = {
     providerError?: _CHAIN_VALIDATION_ERROR;
 };
 export declare const _CUSTOM_PREFIX = "custom-";
+export interface EnableChainParams {
+    chainSlug: string;
+    enableTokens?: boolean;
+}
+export interface EnableMultiChainParams {
+    chainSlugs: string[];
+    enableTokens?: boolean;
+}
 export interface _ValidateCustomAssetRequest {
     contractAddress: string;
     originChain: string;