@subwallet/extension-base 1.3.2-0 → 1.3.3-0

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

@@ -30,6 +30,21 @@ class AssetHubNftsPalletApi extends _nft.BaseNftApi {
       }
     }).then(res => res.json());
   }
+  processImageUrl(image, isKodadot, isTokenInfo) {
+    if (!image) {
+      return undefined;
+    }
+    if (isKodadot) {
+      return isTokenInfo ? image.replace('ipfs://ipfs/', 'https://image.w.kodadot.xyz/ipfs/') : image.replace('ipfs://', 'https://image.w.kodadot.xyz/ipfs/');
+    }
+    return this.parseUrl(image);
+  }
+  parseTokenInfo(tokenInfo, classId) {
+    if (classId === '244' && tokenInfo) {
+      return JSON.parse(tokenInfo);
+    }
+    return tokenInfo;
+  }
 
   /**
    * Retrieve id of NFTs
@@ -87,8 +102,6 @@ class AssetHubNftsPalletApi extends _nft.BaseNftApi {
     return this.getMetadata(collectionMetadata === null || collectionMetadata === void 0 ? void 0 : collectionMetadata.data);
   }
   async handleNft(address, params) {
-    // const start = performance.now();
-
     const assetIds = await this.getNfts([address]);
     try {
       if (!assetIds || assetIds.length === 0) {
@@ -97,18 +110,28 @@ class AssetHubNftsPalletApi extends _nft.BaseNftApi {
       const collectionIds = [];
       const nftIds = [];
       await Promise.all(assetIds.map(async assetId => {
+        var _tokenInfo2, _tokenInfo3, _tokenInfo4;
         const parsedClassId = this.parseTokenId(assetId.classId);
         const parsedTokenId = this.parseTokenId(assetId.tokenId);
         if (!collectionIds.includes(parsedClassId)) {
           collectionIds.push(parsedClassId);
         }
         nftIds.push(parsedTokenId);
-        const [tokenInfo, collectionMeta] = await Promise.all([this.getTokenDetails(assetId), this.getCollectionDetail(parseInt(parsedClassId))]);
+        let [tokenInfo, collectionMeta] = await Promise.all([this.getTokenDetails(assetId), this.getCollectionDetail(parseInt(parsedClassId))]);
+        const isKodadot = assetId.classId === '244';
+        tokenInfo = this.parseTokenInfo(tokenInfo, assetId.classId);
+        if (tokenInfo) {
+          var _tokenInfo;
+          tokenInfo.image = this.processImageUrl((_tokenInfo = tokenInfo) === null || _tokenInfo === void 0 ? void 0 : _tokenInfo.image, isKodadot, true);
+        }
+        if (collectionMeta) {
+          collectionMeta.image = this.processImageUrl(collectionMeta === null || collectionMeta === void 0 ? void 0 : collectionMeta.image, isKodadot, false);
+        }
         const parsedNft = {
           id: parsedTokenId,
-          name: tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.name,
-          description: tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.description,
-          image: tokenInfo && tokenInfo.image ? this.parseUrl(tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.image) : undefined,
+          name: (_tokenInfo2 = tokenInfo) === null || _tokenInfo2 === void 0 ? void 0 : _tokenInfo2.name,
+          description: (_tokenInfo3 = tokenInfo) === null || _tokenInfo3 === void 0 ? void 0 : _tokenInfo3.description,
+          image: (_tokenInfo4 = tokenInfo) === null || _tokenInfo4 === void 0 ? void 0 : _tokenInfo4.image,
           collectionId: this.parseTokenId(parsedClassId),
           chain: this.chain,
           owner: address,
@@ -119,7 +142,7 @@ class AssetHubNftsPalletApi extends _nft.BaseNftApi {
           collectionId: parsedClassId,
           chain: this.chain,
           collectionName: collectionMeta === null || collectionMeta === void 0 ? void 0 : collectionMeta.name,
-          image: collectionMeta && collectionMeta.image ? this.parseUrl(collectionMeta === null || collectionMeta === void 0 ? void 0 : collectionMeta.image) : undefined
+          image: collectionMeta === null || collectionMeta === void 0 ? void 0 : collectionMeta.image
         };
         params.updateCollection(this.chain, parsedCollection);
       }));

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.2-0'
+  version: '1.3.3-0'
 };
 exports.packageInfo = packageInfo;

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

@@ -19,9 +19,7 @@ var _wasm = require("@subwallet/extension-base/koni/api/contract-handler/wasm");
 var _utils = require("@subwallet/extension-base/koni/api/contract-handler/wasm/utils");
 var _constants2 = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
-var _tao = require("@subwallet/extension-base/services/earning-service/handlers/native-staking/tao");
-var _utils3 = require("@subwallet/extension-base/services/earning-service/utils");
-var _utils4 = require("@subwallet/extension-base/utils");
+var _utils3 = require("@subwallet/extension-base/utils");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _evm = require("../evm");
 var _equilibrium = require("./equilibrium");
@@ -140,11 +138,11 @@ const subscribeWithSystemAccountPallet = async _ref => {
       args: addresses
     });
   }
-  let bittensorStakingBalances = new Array(addresses.length).fill(BigInt(0));
+  let bittensorStakingBalances = new Array(addresses.length).fill(new _bignumber.default(0));
   if (['bittensor'].includes(chainInfo.slug)) {
     bittensorStakingBalances = await Promise.all(addresses.map(async address => {
-      const rawDelegateState = await (0, _tao.fetchTaoDelegateState)(address);
-      return (0, _utils3.getTaoTotalStake)(rawDelegateState);
+      const TaoTotalStake = await substrateApi.api.query.subtensorModule.totalColdkeyStake(address);
+      return new _bignumber.default(TaoTotalStake.toString());
     }));
   }
   const subscription = substrateApi.subscribeDataWithMulti(params, rs => {
@@ -160,7 +158,8 @@ const subscribeWithSystemAccountPallet = async _ref => {
         const nominationPoolBalance = poolMemberInfo ? (0, _nominationpoolsPallet._getTotalStakeInNominationPool)(poolMemberInfo) : BigInt(0);
         totalLockedFromTransfer += nominationPoolBalance;
       }
-      totalLockedFromTransfer += bittensorStakingBalances[index];
+      const stakeValue = BigInt(bittensorStakingBalances[index].toString());
+      totalLockedFromTransfer += stakeValue;
       return {
         address: addresses[index],
         tokenSlug: (0, _utils2._getChainNativeTokenSlug)(chainInfo),
@@ -199,7 +198,7 @@ const subscribeForeignAssetBalance = async _ref2 => {
     substrateApi
   } = _ref2;
   const foreignAssetsAccountKey = 'query_foreignAssets_account';
-  const tokenMap = (0, _utils4.filterAssetsByChainAndType)(assetMap, chainInfo.slug, [_types._AssetType.LOCAL]);
+  const tokenMap = (0, _utils3.filterAssetsByChainAndType)(assetMap, chainInfo.slug, [_types._AssetType.LOCAL]);
   const unsubList = await Promise.all(Object.values(tokenMap).map(tokenInfo => {
     try {
       if ((0, _utils2._isBridgedToken)(tokenInfo)) {
@@ -266,7 +265,7 @@ const subscribePSP22Balance = _ref3 => {
   } = _ref3;
   const chain = chainInfo.slug;
   const psp22ContractMap = {};
-  const tokenList = (0, _utils4.filterAssetsByChainAndType)(assetMap, chain, [_types._AssetType.PSP22]);
+  const tokenList = (0, _utils3.filterAssetsByChainAndType)(assetMap, chain, [_types._AssetType.PSP22]);
   Object.entries(tokenList).forEach(_ref4 => {
     let [slug, tokenInfo] = _ref4;
     psp22ContractMap[slug] = (0, _wasm.getPSP22ContractPromise)(substrateApi.api, (0, _utils2._getContractAddressOfToken)(tokenInfo));
@@ -327,7 +326,7 @@ const subscribeTokensAccountsPallet = async _ref5 => {
   } = _ref5;
   const tokensAccountsKey = 'query_tokens_accounts';
   const tokenTypes = includeNativeToken ? [_types._AssetType.NATIVE, _types._AssetType.LOCAL] : [_types._AssetType.LOCAL];
-  const tokenMap = (0, _utils4.filterAssetsByChainAndType)(assetMap, chainInfo.slug, tokenTypes);
+  const tokenMap = (0, _utils3.filterAssetsByChainAndType)(assetMap, chainInfo.slug, tokenTypes);
   const unsubList = await Promise.all(Object.values(tokenMap).map(tokenInfo => {
     try {
       const params = [{
@@ -373,7 +372,7 @@ const subscribeAssetsAccountPallet = async _ref6 => {
     substrateApi
   } = _ref6;
   const assetsAccountKey = 'query_assets_account';
-  const tokenMap = (0, _utils4.filterAssetsByChainAndType)(assetMap, chainInfo.slug, [_types._AssetType.LOCAL]);
+  const tokenMap = (0, _utils3.filterAssetsByChainAndType)(assetMap, chainInfo.slug, [_types._AssetType.LOCAL]);
   Object.values(tokenMap).forEach(token => {
     if (_constants2._MANTA_ZK_CHAIN_GROUP.includes(token.originChain) && token.symbol.startsWith(_constants2._ZK_ASSET_PREFIX)) {
       delete tokenMap[token.slug];
@@ -442,7 +441,7 @@ const subscribeOrmlTokensPallet = async _ref7 => {
     substrateApi
   } = _ref7;
   const ormlTokensAccountsKey = 'query_ormlTokens_accounts';
-  const tokenMap = (0, _utils4.filterAssetsByChainAndType)(assetMap, chainInfo.slug, [_types._AssetType.LOCAL]);
+  const tokenMap = (0, _utils3.filterAssetsByChainAndType)(assetMap, chainInfo.slug, [_types._AssetType.LOCAL]);
   const unsubList = Object.values(tokenMap).map(tokenInfo => {
     try {
       const params = [{

package/cjs/services/earning-service/handlers/base.js

@@ -82,7 +82,8 @@ class BasePoolHandler {
     const decimals = this.nativeToken.decimals || 0;
     const defaultMaintainBalance = new _util.BN(1).mul(_util.BN_TEN.pow(new _util.BN(decimals)));
     const ed = new _util.BN(this.nativeToken.minAmount || '0');
-    const maintainBalance = ed.gte(defaultMaintainBalance) ? new _util.BN(15).mul(ed).div(_util.BN_TEN) : defaultMaintainBalance;
+    const calculateMaintainBalance = new _util.BN(15).mul(ed).div(_util.BN_TEN);
+    const maintainBalance = ed.gte(defaultMaintainBalance) ? calculateMaintainBalance : defaultMaintainBalance;
     return maintainBalance.toString();
   }
   get metadataInfo() {

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

@@ -20,12 +20,6 @@ var _utils3 = require("../../utils");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-// interface ValidatorName {
-//   count: number;
-//   delegates: {
-//     name: string;
-//   }[];
-// }
 const BITTENSOR_API_KEY_1 = process.env.BITTENSOR_API_KEY_1 || '';
 exports.BITTENSOR_API_KEY_1 = BITTENSOR_API_KEY_1;
 const BITTENSOR_API_KEY_2 = process.env.BITTENSOR_API_KEY_2 || '';
@@ -47,7 +41,7 @@ exports.bittensorApiKey = bittensorApiKey;
 async function fetchDelegates() {
   const apiKey = bittensorApiKey();
   return new Promise(function (resolve) {
-    fetch('https://api.taostats.io/api/v1/validator?order=amount%3Adesc&limit=100', {
+    fetch('https://api-prod-v2.taostats.io/api/validator/latest/v1', {
       method: 'GET',
       headers: {
         'Content-Type': 'application/json',
@@ -61,7 +55,7 @@ async function fetchDelegates() {
 async function fetchTaoDelegateState(address) {
   const apiKey = bittensorApiKey();
   return new Promise(function (resolve) {
-    fetch(`https://api.taostats.io/api/v1/delegate/balance?nominator_address=${address}`, {
+    fetch(`https://api-prod-v2.taostats.io/api/delegation/balance/latest/v1?nominator=${address}`, {
       method: 'GET',
       headers: {
         'Content-Type': 'application/json',
@@ -95,21 +89,12 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
   }
   /* Unimplemented function  */
 
-  // async fetchDelegatesInfo (address: string): Promise<ValidatorName> {
-  //   const apiKey = this.bittensorApiKey;
-
-  //   return new Promise(function (resolve) {
-  //     fetch(`https://api.taostats.io/api/v1/delegate/info?address=${address}`, {
-  //       method: 'GET',
-  //       headers: {
-  //         'Content-Type': 'application/json',
-  //         Authorization: `${apiKey}`
-  //       }
-  //     }).then((resp) => {
-  //       resolve(resp.json());
-  //     }).catch(console.error);
-  //   });
-  // }
+  get maintainBalance() {
+    const ed = new _util.BN(this.nativeToken.minAmount || '0');
+    const calculateMaintainBalance = new _util.BN(15).mul(ed).div(_util.BN_TEN);
+    const maintainBalance = calculateMaintainBalance;
+    return maintainBalance.toString();
+  }
 
   /* Subscribe pool info */
 
@@ -242,11 +227,11 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
           const owner = (0, _utils2.reformatAddress)(useAddresses[i], 42);
           const delegatorState = [];
           let bnTotalBalance = _util.BN_ZERO;
-          const delegateStateInfo = rawDelegateStateInfo.items;
+          const delegateStateInfo = rawDelegateStateInfo.data;
           for (const delegate of delegateStateInfo) {
             bnTotalBalance = bnTotalBalance.add(new _util.BN(delegate.balance));
             delegatorState.push({
-              owner: delegate.delegate_address.ss58,
+              owner: delegate.delegate.ss58,
               amount: delegate.balance.toString()
             });
           }
@@ -329,11 +314,11 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
     const getNominatorMinRequiredStake = this.substrateApi.api.query.subtensorModule.nominatorMinRequiredStake();
     const nominatorMinRequiredStake = (await getNominatorMinRequiredStake).toString();
     const bnMinBond = new _util.BN(nominatorMinRequiredStake);
-    const validatorList = topValidator.validators;
+    const validatorList = topValidator.data;
     const validatorAddresses = Object.keys(validatorList);
     const results = await Promise.all(validatorAddresses.map(i => {
-      const address = validatorList[i].hot_key.ss58;
-      const bnTotalStake = new _util.BN(validatorList[i].amount);
+      const address = validatorList[i].hotkey.ss58;
+      const bnTotalStake = new _util.BN(validatorList[i].stake);
       const bnOwnStake = new _util.BN(validatorList[i].validator_stake);
       const otherStake = bnTotalStake.sub(bnOwnStake);
       const nominatorCount = validatorList[i].nominators;
@@ -341,12 +326,7 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
       const roundedCommission = (parseFloat(commission) * 100).toFixed(0);
       const apr = (parseFloat(validatorList[i].apr) / 10 ** 9 * 100).toFixed(2);
       const apyCalculate = (0, _utils3.calculateReward)(parseFloat(apr));
-
-      // let name = '';
-      // const delegateInfo = await this.fetchDelegatesInfo(address);
-
-      // name = delegateInfo.delegates[0]?.name || address;
-
+      const name = validatorList[i].name || address;
       return {
         address: address,
         totalStake: bnTotalStake.toString(),
@@ -360,10 +340,9 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
         isVerified: false,
         chain: this.chain,
         isCrowded: false,
-        identity: address // name
+        identity: name
       };
     }));
-
     return results;
   }
   async getPoolTargets() {

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

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.applyDecimal = applyDecimal;
 exports.calculateReward = calculateReward;
-exports.getTaoTotalStake = getTaoTotalStake;
 exports.isActionFromValidator = isActionFromValidator;
 exports.isNominationPool = exports.isNativeStakingPool = exports.isLiquidPool = exports.isLendingPool = void 0;
 exports.parseIdentity = parseIdentity;
@@ -141,14 +140,4 @@ exports.isLendingPool = isLendingPool;
 function applyDecimal(bnNumber, decimals) {
   const bnDecimals = new _util.BN((10 ** decimals).toString());
   return bnNumber.div(bnDecimals);
-}
-function getTaoTotalStake(rawDelegateState) {
-  const nodeInfos = rawDelegateState.items;
-  const stakes = nodeInfos.map(stake => stake.balance);
-  let totalStake = BigInt(0);
-  for (const _stake of stakes) {
-    const stakeAmount = BigInt(_stake);
-    totalStake += stakeAmount;
-  }
-  return totalStake;
 }

package/cjs/services/transaction-service/utils.js

@@ -60,6 +60,9 @@ function getExplorerLink(chainInfo, value, type) {
     return `${explorerLink}${explorerLink.endsWith('/') ? '' : '/'}${route}/${value}`;
   }
   if (explorerLink && value.startsWith('0x')) {
+    if (chainInfo.slug === 'bittensor') {
+      return undefined;
+    }
     const route = getBlockExplorerTxRoute(chainInfo);
     return `${explorerLink}${explorerLink.endsWith('/') ? '' : '/'}${route}/${value}`;
   }

package/koni/api/nft/assethub_nft/index.d.ts

@@ -3,6 +3,8 @@ import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/
 export default class AssetHubNftsPalletApi extends BaseNftApi {
     constructor(api: _SubstrateApi | null, addresses: string[], chain: string);
     private getMetadata;
+    private processImageUrl;
+    private parseTokenInfo;
     /**
      * Retrieve id of NFTs
      *

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

@@ -24,6 +24,21 @@ export default class AssetHubNftsPalletApi extends BaseNftApi {
       }
     }).then(res => res.json());
   }
+  processImageUrl(image, isKodadot, isTokenInfo) {
+    if (!image) {
+      return undefined;
+    }
+    if (isKodadot) {
+      return isTokenInfo ? image.replace('ipfs://ipfs/', 'https://image.w.kodadot.xyz/ipfs/') : image.replace('ipfs://', 'https://image.w.kodadot.xyz/ipfs/');
+    }
+    return this.parseUrl(image);
+  }
+  parseTokenInfo(tokenInfo, classId) {
+    if (classId === '244' && tokenInfo) {
+      return JSON.parse(tokenInfo);
+    }
+    return tokenInfo;
+  }
 
   /**
    * Retrieve id of NFTs
@@ -81,8 +96,6 @@ export default class AssetHubNftsPalletApi extends BaseNftApi {
     return this.getMetadata(collectionMetadata === null || collectionMetadata === void 0 ? void 0 : collectionMetadata.data);
   }
   async handleNft(address, params) {
-    // const start = performance.now();
-
     const assetIds = await this.getNfts([address]);
     try {
       if (!assetIds || assetIds.length === 0) {
@@ -91,18 +104,28 @@ export default class AssetHubNftsPalletApi extends BaseNftApi {
       const collectionIds = [];
       const nftIds = [];
       await Promise.all(assetIds.map(async assetId => {
+        var _tokenInfo2, _tokenInfo3, _tokenInfo4;
         const parsedClassId = this.parseTokenId(assetId.classId);
         const parsedTokenId = this.parseTokenId(assetId.tokenId);
         if (!collectionIds.includes(parsedClassId)) {
           collectionIds.push(parsedClassId);
         }
         nftIds.push(parsedTokenId);
-        const [tokenInfo, collectionMeta] = await Promise.all([this.getTokenDetails(assetId), this.getCollectionDetail(parseInt(parsedClassId))]);
+        let [tokenInfo, collectionMeta] = await Promise.all([this.getTokenDetails(assetId), this.getCollectionDetail(parseInt(parsedClassId))]);
+        const isKodadot = assetId.classId === '244';
+        tokenInfo = this.parseTokenInfo(tokenInfo, assetId.classId);
+        if (tokenInfo) {
+          var _tokenInfo;
+          tokenInfo.image = this.processImageUrl((_tokenInfo = tokenInfo) === null || _tokenInfo === void 0 ? void 0 : _tokenInfo.image, isKodadot, true);
+        }
+        if (collectionMeta) {
+          collectionMeta.image = this.processImageUrl(collectionMeta === null || collectionMeta === void 0 ? void 0 : collectionMeta.image, isKodadot, false);
+        }
         const parsedNft = {
           id: parsedTokenId,
-          name: tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.name,
-          description: tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.description,
-          image: tokenInfo && tokenInfo.image ? this.parseUrl(tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.image) : undefined,
+          name: (_tokenInfo2 = tokenInfo) === null || _tokenInfo2 === void 0 ? void 0 : _tokenInfo2.name,
+          description: (_tokenInfo3 = tokenInfo) === null || _tokenInfo3 === void 0 ? void 0 : _tokenInfo3.description,
+          image: (_tokenInfo4 = tokenInfo) === null || _tokenInfo4 === void 0 ? void 0 : _tokenInfo4.image,
           collectionId: this.parseTokenId(parsedClassId),
           chain: this.chain,
           owner: address,
@@ -113,7 +136,7 @@ export default class AssetHubNftsPalletApi extends BaseNftApi {
           collectionId: parsedClassId,
           chain: this.chain,
           collectionName: collectionMeta === null || collectionMeta === void 0 ? void 0 : collectionMeta.name,
-          image: collectionMeta && collectionMeta.image ? this.parseUrl(collectionMeta === null || collectionMeta === void 0 ? void 0 : collectionMeta.image) : undefined
+          image: collectionMeta === null || collectionMeta === void 0 ? void 0 : collectionMeta.image
         };
         params.updateCollection(this.chain, parsedCollection);
       }));

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.2-0",
+  "version": "1.3.3-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -2381,11 +2381,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.89",
-    "@subwallet/extension-base": "^1.3.2-0",
-    "@subwallet/extension-chains": "^1.3.2-0",
-    "@subwallet/extension-dapp": "^1.3.2-0",
-    "@subwallet/extension-inject": "^1.3.2-0",
+    "@subwallet/chain-list": "0.2.90",
+    "@subwallet/extension-base": "^1.3.3-0",
+    "@subwallet/extension-chains": "^1.3.3-0",
+    "@subwallet/extension-dapp": "^1.3.3-0",
+    "@subwallet/extension-inject": "^1.3.3-0",
     "@subwallet/keyring": "^0.1.8-beta.0",
     "@subwallet/ui-keyring": "^0.1.8-beta.0",
     "@ton/core": "^0.56.3",

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.3.2-0'
+  version: '1.3.3-0'
 };

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

@@ -15,8 +15,6 @@ import { getPSP22ContractPromise } from '@subwallet/extension-base/koni/api/cont
 import { getDefaultWeightV2 } from '@subwallet/extension-base/koni/api/contract-handler/wasm/utils';
 import { _BALANCE_CHAIN_GROUP, _MANTA_ZK_CHAIN_GROUP, _ZK_ASSET_PREFIX } from '@subwallet/extension-base/services/chain-service/constants';
 import { _checkSmartContractSupportByChain, _getAssetExistentialDeposit, _getChainExistentialDeposit, _getChainNativeTokenSlug, _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _getTokenTypesSupportedByChain, _getXcmAssetMultilocation, _isBridgedToken, _isChainEvmCompatible } from '@subwallet/extension-base/services/chain-service/utils';
-import { fetchTaoDelegateState } from '@subwallet/extension-base/services/earning-service/handlers/native-staking/tao';
-import { getTaoTotalStake } from '@subwallet/extension-base/services/earning-service/utils';
 import { filterAssetsByChainAndType } from '@subwallet/extension-base/utils';
 import BigN from 'bignumber.js';
 import { subscribeERC20Interval } from "../evm.js";
@@ -131,11 +129,11 @@ const subscribeWithSystemAccountPallet = async ({
       args: addresses
     });
   }
-  let bittensorStakingBalances = new Array(addresses.length).fill(BigInt(0));
+  let bittensorStakingBalances = new Array(addresses.length).fill(new BigN(0));
   if (['bittensor'].includes(chainInfo.slug)) {
     bittensorStakingBalances = await Promise.all(addresses.map(async address => {
-      const rawDelegateState = await fetchTaoDelegateState(address);
-      return getTaoTotalStake(rawDelegateState);
+      const TaoTotalStake = await substrateApi.api.query.subtensorModule.totalColdkeyStake(address);
+      return new BigN(TaoTotalStake.toString());
     }));
   }
   const subscription = substrateApi.subscribeDataWithMulti(params, rs => {
@@ -151,7 +149,8 @@ const subscribeWithSystemAccountPallet = async ({
         const nominationPoolBalance = poolMemberInfo ? _getTotalStakeInNominationPool(poolMemberInfo) : BigInt(0);
         totalLockedFromTransfer += nominationPoolBalance;
       }
-      totalLockedFromTransfer += bittensorStakingBalances[index];
+      const stakeValue = BigInt(bittensorStakingBalances[index].toString());
+      totalLockedFromTransfer += stakeValue;
       return {
         address: addresses[index],
         tokenSlug: _getChainNativeTokenSlug(chainInfo),

package/services/earning-service/handlers/base.js

@@ -77,7 +77,8 @@ export default class BasePoolHandler {
     const decimals = this.nativeToken.decimals || 0;
     const defaultMaintainBalance = new BN(1).mul(BN_TEN.pow(new BN(decimals)));
     const ed = new BN(this.nativeToken.minAmount || '0');
-    const maintainBalance = ed.gte(defaultMaintainBalance) ? new BN(15).mul(ed).div(BN_TEN) : defaultMaintainBalance;
+    const calculateMaintainBalance = new BN(15).mul(ed).div(BN_TEN);
+    const maintainBalance = ed.gte(defaultMaintainBalance) ? calculateMaintainBalance : defaultMaintainBalance;
     return maintainBalance.toString();
   }
   get metadataInfo() {

package/services/earning-service/handlers/native-staking/tao.d.ts

@@ -7,27 +7,26 @@ interface TaoStakingStakeOption {
     amount: string;
 }
 export interface RawDelegateState {
-    items: Array<{
-        balance: string;
-        delegate_address: {
+    data: Array<{
+        delegate: {
             ss58: string;
         };
+        balance: string;
     }>;
 }
 interface ValidatorResponse {
-    count: number;
-    validators: Validator[];
+    data: Validator[];
 }
 interface Validator {
-    validator_stake: string;
-    amount: string;
-    nominators: number;
-    apr: string;
-    hot_key: {
+    hotkey: {
         ss58: string;
     };
+    name: string;
+    nominators: number;
+    stake: string;
+    validator_stake: string;
     take: string;
-    system_total_stake: string;
+    apr: string;
 }
 export declare const BITTENSOR_API_KEY_1: string;
 export declare const BITTENSOR_API_KEY_2: string;
@@ -37,6 +36,7 @@ export declare function fetchTaoDelegateState(address: string): Promise<RawDeleg
 export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHandler {
     handleYieldWithdraw(address: string, unstakingInfo: UnstakingInfo): Promise<TransactionData>;
     handleYieldCancelUnstake(params: StakeCancelWithdrawalParams): Promise<TransactionData>;
+    get maintainBalance(): string;
     subscribePoolInfo(callback: (data: YieldPoolInfo) => void): Promise<VoidFunction>;
     parseNominatorMetadata(chainInfo: _ChainInfo, address: string, delegatorState: TaoStakingStakeOption[]): Promise<Omit<YieldPositionInfo, keyof BaseYieldPositionInfo>>;
     subscribePoolPosition(useAddresses: string[], rsCallback: (rs: YieldPositionInfo) => void): Promise<VoidFunction>;

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

@@ -9,14 +9,8 @@ import BaseParaStakingPoolHandler from '@subwallet/extension-base/services/earni
 import { BasicTxErrorType, EarningStatus } from '@subwallet/extension-base/types';
 import { reformatAddress } from '@subwallet/extension-base/utils';
 import BigN from 'bignumber.js';
-import { BN, BN_ZERO } from '@polkadot/util';
+import { BN, BN_TEN, BN_ZERO } from '@polkadot/util';
 import { calculateReward } from "../../utils/index.js";
-// interface ValidatorName {
-//   count: number;
-//   delegates: {
-//     name: string;
-//   }[];
-// }
 export const BITTENSOR_API_KEY_1 = process.env.BITTENSOR_API_KEY_1 || '';
 export const BITTENSOR_API_KEY_2 = process.env.BITTENSOR_API_KEY_2 || '';
 function random(...keys) {
@@ -33,7 +27,7 @@ export const bittensorApiKey = () => {
 export async function fetchDelegates() {
   const apiKey = bittensorApiKey();
   return new Promise(function (resolve) {
-    fetch('https://api.taostats.io/api/v1/validator?order=amount%3Adesc&limit=100', {
+    fetch('https://api-prod-v2.taostats.io/api/validator/latest/v1', {
       method: 'GET',
       headers: {
         'Content-Type': 'application/json',
@@ -47,7 +41,7 @@ export async function fetchDelegates() {
 export async function fetchTaoDelegateState(address) {
   const apiKey = bittensorApiKey();
   return new Promise(function (resolve) {
-    fetch(`https://api.taostats.io/api/v1/delegate/balance?nominator_address=${address}`, {
+    fetch(`https://api-prod-v2.taostats.io/api/delegation/balance/latest/v1?nominator=${address}`, {
       method: 'GET',
       headers: {
         'Content-Type': 'application/json',
@@ -81,21 +75,12 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
   }
   /* Unimplemented function  */
 
-  // async fetchDelegatesInfo (address: string): Promise<ValidatorName> {
-  //   const apiKey = this.bittensorApiKey;
-
-  //   return new Promise(function (resolve) {
-  //     fetch(`https://api.taostats.io/api/v1/delegate/info?address=${address}`, {
-  //       method: 'GET',
-  //       headers: {
-  //         'Content-Type': 'application/json',
-  //         Authorization: `${apiKey}`
-  //       }
-  //     }).then((resp) => {
-  //       resolve(resp.json());
-  //     }).catch(console.error);
-  //   });
-  // }
+  get maintainBalance() {
+    const ed = new BN(this.nativeToken.minAmount || '0');
+    const calculateMaintainBalance = new BN(15).mul(ed).div(BN_TEN);
+    const maintainBalance = calculateMaintainBalance;
+    return maintainBalance.toString();
+  }
 
   /* Subscribe pool info */
 
@@ -228,11 +213,11 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
           const owner = reformatAddress(useAddresses[i], 42);
           const delegatorState = [];
           let bnTotalBalance = BN_ZERO;
-          const delegateStateInfo = rawDelegateStateInfo.items;
+          const delegateStateInfo = rawDelegateStateInfo.data;
           for (const delegate of delegateStateInfo) {
             bnTotalBalance = bnTotalBalance.add(new BN(delegate.balance));
             delegatorState.push({
-              owner: delegate.delegate_address.ss58,
+              owner: delegate.delegate.ss58,
               amount: delegate.balance.toString()
             });
           }
@@ -315,11 +300,11 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
     const getNominatorMinRequiredStake = this.substrateApi.api.query.subtensorModule.nominatorMinRequiredStake();
     const nominatorMinRequiredStake = (await getNominatorMinRequiredStake).toString();
     const bnMinBond = new BN(nominatorMinRequiredStake);
-    const validatorList = topValidator.validators;
+    const validatorList = topValidator.data;
     const validatorAddresses = Object.keys(validatorList);
     const results = await Promise.all(validatorAddresses.map(i => {
-      const address = validatorList[i].hot_key.ss58;
-      const bnTotalStake = new BN(validatorList[i].amount);
+      const address = validatorList[i].hotkey.ss58;
+      const bnTotalStake = new BN(validatorList[i].stake);
       const bnOwnStake = new BN(validatorList[i].validator_stake);
       const otherStake = bnTotalStake.sub(bnOwnStake);
       const nominatorCount = validatorList[i].nominators;
@@ -327,12 +312,7 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
       const roundedCommission = (parseFloat(commission) * 100).toFixed(0);
       const apr = (parseFloat(validatorList[i].apr) / 10 ** 9 * 100).toFixed(2);
       const apyCalculate = calculateReward(parseFloat(apr));
-
-      // let name = '';
-      // const delegateInfo = await this.fetchDelegatesInfo(address);
-
-      // name = delegateInfo.delegates[0]?.name || address;
-
+      const name = validatorList[i].name || address;
       return {
         address: address,
         totalStake: bnTotalStake.toString(),
@@ -346,10 +326,9 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
         isVerified: false,
         chain: this.chain,
         isCrowded: false,
-        identity: address // name
+        identity: name
       };
     }));
-
     return results;
   }
   async getPoolTargets() {

package/services/earning-service/utils/index.d.ts

@@ -1,5 +1,4 @@
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
-import { RawDelegateState } from '@subwallet/extension-base/services/earning-service/handlers/native-staking/tao';
 import { LendingYieldPoolInfo, LiquidYieldPoolInfo, NativeYieldPoolInfo, NominationYieldPoolInfo, YieldAssetExpectedEarning, YieldCompoundingPeriod, YieldPoolInfo, YieldPoolType } from '@subwallet/extension-base/types';
 import { BN } from '@polkadot/util';
 export declare function calculateReward(apr: number, amount?: number, compoundingPeriod?: YieldCompoundingPeriod, isApy?: boolean): YieldAssetExpectedEarning;
@@ -19,4 +18,3 @@ export declare const isNativeStakingPool: (pool: YieldPoolInfo) => pool is Nativ
 export declare const isLiquidPool: (pool: YieldPoolInfo) => pool is LiquidYieldPoolInfo;
 export declare const isLendingPool: (pool: YieldPoolInfo) => pool is LendingYieldPoolInfo;
 export declare function applyDecimal(bnNumber: BN, decimals: number): BN;
-export declare function getTaoTotalStake(rawDelegateState: RawDelegateState): bigint;

package/services/earning-service/utils/index.js

@@ -123,14 +123,4 @@ export const isLendingPool = pool => {
 export function applyDecimal(bnNumber, decimals) {
   const bnDecimals = new BN((10 ** decimals).toString());
   return bnNumber.div(bnDecimals);
-}
-export function getTaoTotalStake(rawDelegateState) {
-  const nodeInfos = rawDelegateState.items;
-  const stakes = nodeInfos.map(stake => stake.balance);
-  let totalStake = BigInt(0);
-  for (const _stake of stakes) {
-    const stakeAmount = BigInt(_stake);
-    totalStake += stakeAmount;
-  }
-  return totalStake;
 }

package/services/transaction-service/utils.js

@@ -52,6 +52,9 @@ export function getExplorerLink(chainInfo, value, type) {
     return `${explorerLink}${explorerLink.endsWith('/') ? '' : '/'}${route}/${value}`;
   }
   if (explorerLink && value.startsWith('0x')) {
+    if (chainInfo.slug === 'bittensor') {
+      return undefined;
+    }
     const route = getBlockExplorerTxRoute(chainInfo);
     return `${explorerLink}${explorerLink.endsWith('/') ? '' : '/'}${route}/${value}`;
   }