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

package/services/earning-service/handlers/native-staking/tanssi.js

@@ -3,10 +3,33 @@
 
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { APIItemState, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
+import { _getAssetDecimals } from '@subwallet/extension-base/services/chain-service/utils';
 import { BasicTxErrorType, EarningStatus } from '@subwallet/extension-base/types';
+import { formatNumber } from '@subwallet/extension-base/utils';
 import BigN from 'bignumber.js';
 import { parseIdentity } from "../../utils/index.js";
 import BaseParaNativeStakingPoolHandler from "./base-para.js";
+// Constants
+const sequencersPerAppchain = new BigN(5);
+const rewardsForStakers = new BigN(0.8);
+const blocksPerYear = new BigN(5256000); // 6 seconds block time hence 365 * 24 * 60 * 60 / 6 (5.256.000) blocks per year
+
+function calculateCollatorApy(rewardsPerBlock, totalStake, nativeTokenDecimals) {
+  const rewardsPerChainPerYear = new BigN(rewardsPerBlock).times(blocksPerYear);
+  const rewardsPerSequencerPerYear = rewardsPerChainPerYear.div(sequencersPerAppchain);
+  const rewardsForStakersPerSequencerPerYear = rewardsPerSequencerPerYear.times(rewardsForStakers);
+  const formattedTotalStake = formatNumber(totalStake.toString(), nativeTokenDecimals);
+  if (formattedTotalStake === '0') {
+    return new BigN(0);
+  }
+  return rewardsForStakersPerSequencerPerYear.times(100).div(formattedTotalStake);
+}
+async function getActiveCollators(api) {
+  const collatorAssignment = await api.query.tanssiCollatorAssignment.collatorContainerChain();
+  const activeCollatorContainerChain = collatorAssignment.toPrimitive();
+  const activeCollators = Object.values(activeCollatorContainerChain.containerChains || {}).flat().map(c => c.toString());
+  return activeCollators;
+}
 function perbillToPercentBn(perbill) {
   const raw = new BigN((perbill === null || perbill === void 0 ? void 0 : perbill.toString()) || '0');
   const bnPercent = raw.multipliedBy(new BigN(100)).div(new BigN(1000000000));
@@ -124,9 +147,18 @@ export default class TanssiNativeStakingPoolHandler extends BaseParaNativeStakin
   async subscribePoolInfo(callback) {
     let cancel = false;
     const defaultCallback = async () => {
-      const api = await this.substrateApi.isReady;
-      const activeConfig = (await api.api.query.collatorConfiguration.activeConfig()).toPrimitive();
+      const chainApi = await this.substrateApi.isReady;
+      const activeConfig = (await chainApi.api.query.collatorConfiguration.activeConfig()).toPrimitive();
       const maxCollators = activeConfig.maxCollators;
+      const chainsToRewardOpt = await chainApi.api.query.inflationRewards.chainsToReward();
+      const chainsToReward = chainsToRewardOpt.toPrimitive();
+      const rewardsPerBlock = chainsToReward.rewardsPerChain;
+      const formatRewardsPerBlock = formatNumber(rewardsPerBlock, _getAssetDecimals(this.nativeToken));
+      const candidates = await chainApi.api.query.pooledStaking.sortedEligibleCandidates();
+      const activeCollators = await getActiveCollators(chainApi.api);
+      const decimals = _getAssetDecimals(this.nativeToken);
+      const apyList = candidates.filter(c => activeCollators.includes(c.candidate.toString())).map(c => calculateCollatorApy(formatRewardsPerBlock, new BigN(c.stake.toString()), decimals));
+      const totalApy = apyList.length ? BigN.max(...apyList).toNumber() : 0;
       const data = {
         ...this.baseInfo,
         type: this.type,
@@ -147,7 +179,8 @@ export default class TanssiNativeStakingPoolHandler extends BaseParaNativeStakin
           },
           era: 0,
           eraTime: 6 / 3600,
-          unstakingPeriod: 12
+          unstakingPeriod: 12,
+          totalApy
         }
       };
       if (!cancel) {
@@ -165,10 +198,10 @@ export default class TanssiNativeStakingPoolHandler extends BaseParaNativeStakin
   /* Subscribe pool position */
 
   async subscribePoolPosition(useAddresses, onUpdate) {
-    const substrateApi = this.substrateApi;
-    await substrateApi.isReady;
+    const substrateApi = await this.substrateApi.isReady;
     let cancel = false;
     const intervalIds = [];
+    const activeCollators = await getActiveCollators(substrateApi.api);
     for (const delegator of useAddresses) {
       const fetchAndUpdate = async () => {
         if (cancel) {
@@ -230,6 +263,19 @@ export default class TanssiNativeStakingPoolHandler extends BaseParaNativeStakin
             validatorMinStake: '0'
           });
         }
+        let status;
+        if (nominations.length === 0) {
+          status = EarningStatus.NOT_STAKING;
+        } else {
+          const activeCount = nominations.filter(n => activeCollators.includes(n.validatorAddress)).length;
+          if (activeCount === 0) {
+            status = EarningStatus.WAITING;
+          } else if (activeCount < nominations.length) {
+            status = EarningStatus.PARTIALLY_EARNING;
+          } else {
+            status = EarningStatus.EARNING_REWARD;
+          }
+        }
         onUpdate({
           ...this.baseInfo,
           type: this.type,
@@ -238,7 +284,7 @@ export default class TanssiNativeStakingPoolHandler extends BaseParaNativeStakin
           totalStake: bnTotalStake.toString(),
           activeStake: bnActiveStake.toString(),
           unstakeBalance: bnUnstakeBalance.toString(),
-          status: nominations.length > 0 ? EarningStatus.EARNING_REWARD : EarningStatus.NOT_STAKING,
+          status,
           isBondedBefore: nominations.length > 0,
           nominations,
           unstakings: [],
@@ -289,6 +335,11 @@ export default class TanssiNativeStakingPoolHandler extends BaseParaNativeStakin
       candidateSummariesMap[address] = summary.toJSON();
     });
     const candidateAddresses = candidates.map(c => c.candidate.toString());
+    const activeCollators = await getActiveCollators(chainApi.api);
+    const chainsToRewardOpt = await chainApi.api.query.inflationRewards.chainsToReward();
+    const chainsToReward = chainsToRewardOpt.toPrimitive();
+    const rewardsPerBlock = chainsToReward.rewardsPerChain;
+    const formatRewardsPerBlock = formatNumber(rewardsPerBlock, _getAssetDecimals(this.nativeToken));
     const targets = await Promise.all(candidates.map(async c => {
       const address = c.candidate.toString();
       const totalStake = new BigN(c.stake.toString());
@@ -299,6 +350,10 @@ export default class TanssiNativeStakingPoolHandler extends BaseParaNativeStakin
       const ownStake = ownStakeInfo ? new BigN(ownStakeInfo.totalStake) : new BigN(0);
       const otherStake = BigN.max(totalStake.minus(ownStake), 0);
       const [identity, isReasonable] = await parseIdentity(this.substrateApi, address);
+      let apy = new BigN(0);
+      if (activeCollators.includes(address)) {
+        apy = calculateCollatorApy(formatRewardsPerBlock, totalStake, _getAssetDecimals(this.nativeToken));
+      }
       const validator = {
         address,
         chain: this.chain,
@@ -311,6 +366,7 @@ export default class TanssiNativeStakingPoolHandler extends BaseParaNativeStakin
         blocked: false,
         isVerified: isReasonable,
         isCrowded: false,
+        expectedReturn: apy.toNumber(),
         identity
       };
       return validator;

package/services/migration-service/scripts/DeleteEarningData20251105.d.ts

@@ -0,0 +1,4 @@
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class DeleteEarningData20251105 extends BaseMigrationJob {
+    run(): Promise<void>;
+}

package/services/migration-service/scripts/DeleteEarningData20251105.js

@@ -0,0 +1,13 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class DeleteEarningData20251105 extends BaseMigrationJob {
+  async run() {
+    try {
+      await this.state.dbService.deleteYieldPoolInfo(['DOT___native_staking___polkadot', 'DOT___nomination_pool___polkadot']);
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}

package/services/migration-service/scripts/OptimizeEnableToken.d.ts

@@ -0,0 +1,4 @@
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class OptimizeEnableToken extends BaseMigrationJob {
+    run(): Promise<void>;
+}

package/services/migration-service/scripts/OptimizeEnableToken.js

@@ -0,0 +1,11 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class OptimizeEnableToken extends BaseMigrationJob {
+  async run() {
+    // Reset the hasOptimizedTokens flag to allow re-optimize tokens
+    this.state.balanceService.enableOptimizeTokenPromise();
+    return Promise.resolve();
+  }
+}

package/services/migration-service/scripts/index.js

@@ -20,6 +20,7 @@ import DeleteChain from "./DeleteChain.js";
 import DeleteChainStaking from "./DeleteChainStaking.js";
 import DeleteEarningData from "./DeleteEarningData.js";
 import DeleteEarningData20251010 from "./DeleteEarningData20251010.js";
+import DeleteEarningData20251105 from "./DeleteEarningData20251105.js";
 import DisableZeroBalanceTokens from "./DisableZeroBalanceTokens.js";
 import EnableVaraChain from "./EnableVaraChain.js";
 import MigrateAuthUrls from "./MigrateAuthUrls.js";
@@ -32,6 +33,7 @@ import MigrateTransactionHistoryBridge from "./MigrateTransactionHistoryBridge.j
 import MigrateTransactionHistoryBySymbol from "./MigrateTransactionHistoryBySymbol.js";
 import MigrateTransactionHistoryBySymbol20251027 from "./MigrateTransactionHistoryBySymbol20251027.js";
 import MigrateWalletReference from "./MigrateWalletReference.js";
+import OptimizeEnableToken from "./OptimizeEnableToken.js";
 export const EVERYTIME = '__everytime__';
 export const MYTHOS_MIGRATION_KEY = '1.3.21-01';
 export default {
@@ -72,6 +74,8 @@ export default {
   '1.3.42-01': MigrateNewUnifiedAccount,
   '1.3.54-01': MigrateChainPatrol,
   '1.3.62-01': DeleteEarningData20251010,
+  '1.3.58-01': OptimizeEnableToken,
   '1.3.64-01': MigrateAssetSetting20251027,
-  '1.3.64-02': MigrateTransactionHistoryBySymbol20251027
+  '1.3.64-02': MigrateTransactionHistoryBySymbol20251027,
+  '1.3.65-01': DeleteEarningData20251105
 };

package/utils/fee/transfer.js

@@ -10,7 +10,7 @@ import { getERC20TransactionObject, getEVMTransactionObject } from '@subwallet/e
 import { createSubstrateExtrinsic } from '@subwallet/extension-base/services/balance-service/transfer/token';
 import { createTonTransaction } from '@subwallet/extension-base/services/balance-service/transfer/ton-transfer';
 import { createAcrossBridgeExtrinsic, createAvailBridgeExtrinsicFromAvail, createAvailBridgeTxFromEth, createPolygonBridgeExtrinsic, createSnowBridgeExtrinsic, createXcmExtrinsicV2 } from '@subwallet/extension-base/services/balance-service/transfer/xcm';
-import { _isAcrossChainBridge, _isAcrossTestnetBridge } from '@subwallet/extension-base/services/balance-service/transfer/xcm/acrossBridge';
+import { _isAcrossChainBridge, _isAcrossTestnetBridge, getAcrossSendingValue } from '@subwallet/extension-base/services/balance-service/transfer/xcm/acrossBridge';
 import { isAvailChainBridge } from '@subwallet/extension-base/services/balance-service/transfer/xcm/availBridge';
 import { _isPolygonChainBridge } from '@subwallet/extension-base/services/balance-service/transfer/xcm/polygonBridge';
 import { _isPosChainBridge } from '@subwallet/extension-base/services/balance-service/transfer/xcm/posBridge';
@@ -375,11 +375,7 @@ export const calculateXcmMaxTransferable = async (id, request, freeBalance, fee)
       funcCreateExtrinsic = createPolygonBridgeExtrinsic;
     } else if (isAcrossBridgeTransfer) {
       funcCreateExtrinsic = createAcrossBridgeExtrinsic;
-      if (_isAcrossTestnetBridge(srcChain.slug)) {
-        params.sendingValue = BigN(0.0037).shiftedBy(_getAssetDecimals(srcToken)).toFixed(0, 1);
-      } else {
-        params.sendingValue = BigN(1).shiftedBy(_getAssetDecimals(srcToken)).toFixed(0, 1);
-      }
+      params.sendingValue = await getAcrossSendingValue(srcChain, srcToken, destChain, _isAcrossTestnetBridge(srcChain.slug));
     } else if (isSnowBridgeEvmTransfer) {
       funcCreateExtrinsic = createSnowBridgeExtrinsic;
     } else if (isAvailBridgeFromEvm) {

package/utils/staticData/buyTokenConfigs.json

@@ -1,50 +1,4 @@
 [
-  {
-    "serviceInfo": {
-      "transak": {
-        "network": "mainnet",
-        "symbol": "DOT",
-        "isSuspended": false
-      },
-      "banxa": {
-        "network": "DOT",
-        "symbol": "DOT",
-        "isSuspended": false
-      },
-      "coinbase": {
-        "network": "polkadot",
-        "symbol": "DOT",
-        "isSuspended": false
-      }
-    },
-    "network": "polkadot",
-    "slug": "polkadot-NATIVE-DOT",
-    "symbol": "DOT",
-    "support": "SUBSTRATE"
-  },
-  {
-    "serviceInfo": {
-      "transak": {
-        "network": "mainnet",
-        "symbol": "KSM",
-        "isSuspended": false
-      },
-      "banxa": {
-        "network": "KSM",
-        "symbol": "KSM",
-        "isSuspended": false
-      },
-      "coinbase": {
-        "network": "kusama",
-        "symbol": "KSM",
-        "isSuspended": false
-      }
-    },
-    "network": "kusama",
-    "slug": "kusama-NATIVE-KSM",
-    "symbol": "KSM",
-    "support": "SUBSTRATE"
-  },
   {
     "serviceInfo": {
       "transak": {