@subwallet/extension-base 1.3.16-0 → 1.3.18-0

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

@@ -13,9 +13,9 @@ exports.isClaimedPosBridge = isClaimedPosBridge;
 var _chainList = require("@subwallet/chain-list");
 var _web = require("@subwallet/extension-base/koni/api/contract-handler/evm/web3");
 var _utils = require("@subwallet/extension-base/koni/api/contract-handler/utils");
-var _utils2 = require("@subwallet/extension-base/services/fee-service/utils");
-var _utils3 = require("@subwallet/extension-base/services/inapp-notification-service/utils");
+var _utils2 = require("@subwallet/extension-base/services/inapp-notification-service/utils");
 var _types = require("@subwallet/extension-base/types");
+var _utils3 = require("@subwallet/extension-base/utils");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -24,52 +24,53 @@ const POS_EXIT_PAYLOAD_INDEXER = {
   TESTNET: 'https://proof-generator.polygon.technology/api/v1/amoy/exit-payload'
 };
 exports.POS_EXIT_PAYLOAD_INDEXER = POS_EXIT_PAYLOAD_INDEXER;
-async function _createPosBridgeL1toL2Extrinsic(tokenInfo, originChainInfo, sender, recipientAddress, value, evmApi) {
-  var _priority$maxFeePerGa, _priority$maxPriority;
+async function _createPosBridgeL1toL2Extrinsic(tokenInfo, originChainInfo, sender, recipientAddress, value, evmApi, _feeInfo, feeCustom, feeOption) {
   const posBridgeContractAddress = (0, _utils.getPosL1BridgeContract)(originChainInfo.slug);
   const posBridgeContract = (0, _web.getWeb3Contract)(posBridgeContractAddress, evmApi, _utils._POS_BRIDGE_ABI);
+  const _feeCustom = feeCustom;
+  const feeInfo = _feeInfo;
+  const feeCombine = (0, _utils3.combineEthFee)(feeInfo, feeOption, _feeCustom);
 
   // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
   const transferCall = posBridgeContract.methods.depositEtherFor(recipientAddress);
   const transferEncodedCall = transferCall.encodeABI();
-  const priority = await (0, _utils2.calculateGasFeeParams)(evmApi, evmApi.chainSlug);
+
+  // const priority = await calculateGasFeeParams(evmApi, evmApi.chainSlug);
+
   const transactionConfig = {
     from: sender,
     to: posBridgeContractAddress,
     value: value,
     data: transferEncodedCall,
-    gasPrice: priority.gasPrice,
-    maxFeePerGas: priority === null || priority === void 0 ? void 0 : (_priority$maxFeePerGa = priority.maxFeePerGas) === null || _priority$maxFeePerGa === void 0 ? void 0 : _priority$maxFeePerGa.toString(),
-    maxPriorityFeePerGas: priority === null || priority === void 0 ? void 0 : (_priority$maxPriority = priority.maxPriorityFeePerGas) === null || _priority$maxPriority === void 0 ? void 0 : _priority$maxPriority.toString()
+    ...feeCombine
   };
   const gasLimit = await evmApi.api.eth.estimateGas(transactionConfig).catch(() => 200000);
   transactionConfig.gas = gasLimit.toString();
   return transactionConfig;
 }
-async function _createPosBridgeL2toL1Extrinsic(tokenInfo, originChainInfo, sender, recipientAddress, value, evmApi) {
-  var _priority$maxFeePerGa2, _priority$maxPriority2;
+async function _createPosBridgeL2toL1Extrinsic(tokenInfo, originChainInfo, sender, recipientAddress, value, evmApi, _feeInfo, feeCustom, feeOption) {
   const posBridgeContractAddress = (0, _utils.getPosL2BridgeContract)(originChainInfo.slug);
   const posBridgeContract = (0, _web.getWeb3Contract)(posBridgeContractAddress, evmApi, _utils._POS_BRIDGE_L2_ABI);
 
   // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
   const transferCall = posBridgeContract.methods.withdraw(value);
   const transferEncodedCall = transferCall.encodeABI();
-  const priority = await (0, _utils2.calculateGasFeeParams)(evmApi, evmApi.chainSlug);
+  const _feeCustom = feeCustom;
+  const feeInfo = _feeInfo;
+  const feeCombine = (0, _utils3.combineEthFee)(feeInfo, feeOption, _feeCustom);
   const transactionConfig = {
     from: sender,
     to: posBridgeContractAddress,
     value: undefined,
     data: transferEncodedCall,
-    gasPrice: priority.gasPrice,
-    maxFeePerGas: priority === null || priority === void 0 ? void 0 : (_priority$maxFeePerGa2 = priority.maxFeePerGas) === null || _priority$maxFeePerGa2 === void 0 ? void 0 : _priority$maxFeePerGa2.toString(),
-    maxPriorityFeePerGas: priority === null || priority === void 0 ? void 0 : (_priority$maxPriority2 = priority.maxPriorityFeePerGas) === null || _priority$maxPriority2 === void 0 ? void 0 : _priority$maxPriority2.toString()
+    ...feeCombine
   };
   const gasLimit = await evmApi.api.eth.estimateGas(transactionConfig).catch(() => 200000);
   transactionConfig.gas = gasLimit.toString();
   return transactionConfig;
 }
-async function getClaimPosBridge(chainSlug, notification, evmApi) {
-  var _event$arguments, _event$arguments$, _event$arguments$$top, _priority$maxFeePerGa3, _priority$maxPriority3;
+async function getClaimPosBridge(chainSlug, notification, evmApi, feeInfo) {
+  var _event$arguments, _event$arguments$, _event$arguments$$top;
   const posBridgeContractAddress = (0, _utils.getPosL2BridgeContract)(chainSlug);
   const posBridgeContract = (0, _web.getWeb3Contract)(posBridgeContractAddress, evmApi, _utils._POS_BRIDGE_L2_ABI);
   const metadata = notification.metadata;
@@ -96,15 +97,13 @@ async function getClaimPosBridge(chainSlug, notification, evmApi) {
   // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
   const transferCall = posClaimContract.methods.exit(inputData.result);
   const transferEncodedCall = transferCall.encodeABI();
-  const priority = await (0, _utils2.calculateGasFeeParams)(evmApi, evmApi.chainSlug);
+  const feeCombine = (0, _utils3.combineEthFee)(feeInfo);
   const transactionConfig = {
     from: metadata.userAddress,
     to: posClaimContractAddress,
     value: '0',
     data: transferEncodedCall,
-    gasPrice: priority.gasPrice,
-    maxFeePerGas: (_priority$maxFeePerGa3 = priority.maxFeePerGas) === null || _priority$maxFeePerGa3 === void 0 ? void 0 : _priority$maxFeePerGa3.toString(),
-    maxPriorityFeePerGas: (_priority$maxPriority3 = priority.maxPriorityFeePerGas) === null || _priority$maxPriority3 === void 0 ? void 0 : _priority$maxPriority3.toString()
+    ...feeCombine
   };
   const gasLimit = await evmApi.api.eth.estimateGas(transactionConfig).catch(() => 200000);
   transactionConfig.gas = gasLimit.toString();
@@ -112,7 +111,7 @@ async function getClaimPosBridge(chainSlug, notification, evmApi) {
 }
 async function isClaimedPosBridge(id, address, isTestnet) {
   try {
-    const isClaimableBridge = await (0, _utils3.fetchPolygonBridgeTransactions)(address, isTestnet);
+    const isClaimableBridge = await (0, _utils2.fetchPolygonBridgeTransactions)(address, isTestnet);
     if (isClaimableBridge && isClaimableBridge.success) {
       const isIdClaimable = isClaimableBridge.result.some(transaction => transaction._id === id);
       return !isIdClaimable;

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

@@ -7,7 +7,7 @@ exports.getSnowBridgeEvmTransfer = getSnowBridgeEvmTransfer;
 var _web = require("@subwallet/extension-base/koni/api/contract-handler/evm/web3");
 var _utils = require("@subwallet/extension-base/koni/api/contract-handler/utils");
 var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
-var _utils3 = require("@subwallet/extension-base/services/fee-service/utils");
+var _utils3 = require("@subwallet/extension-base/utils");
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-base
@@ -20,8 +20,7 @@ async function getSendFeeToken(contract, tokenContract, destChainParaId, destina
   // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
   return await quoteSendTokenFee.call();
 }
-async function getSnowBridgeEvmTransfer(tokenInfo, originChainInfo, destinationChainInfo, sender, recipientAddress, value, evmApi) {
-  var _priority$maxFeePerGa, _priority$maxPriority;
+async function getSnowBridgeEvmTransfer(tokenInfo, originChainInfo, destinationChainInfo, sender, recipientAddress, value, evmApi, _feeInfo, feeCustom, feeOption) {
   const snowBridgeContractAddress = (0, _utils.getSnowBridgeGatewayContract)(originChainInfo.slug);
   const snowBridgeContract = (0, _web.getWeb3Contract)(snowBridgeContractAddress, evmApi, _utils._SNOWBRIDGE_GATEWAY_ABI);
   const tokenContract = (0, _utils2._getContractAddressOfToken)(tokenInfo);
@@ -36,15 +35,16 @@ async function getSnowBridgeEvmTransfer(tokenInfo, originChainInfo, destinationC
   const transferCall = snowBridgeContract.methods.sendToken(tokenContract, destinationChainParaId, recipient, destinationFee, value);
   // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
   const transferEncodedCall = transferCall.encodeABI();
-  const [priority, sendTokenFee] = await Promise.all([(0, _utils3.calculateGasFeeParams)(evmApi, evmApi.chainSlug), getSendFeeToken(snowBridgeContract, tokenContract, destinationChainParaId, destinationFee)]);
+  const feeInfo = _feeInfo;
+  const _feeCustom = feeCustom;
+  const feeCombine = (0, _utils3.combineEthFee)(feeInfo, feeOption, _feeCustom);
+  const sendTokenFee = await getSendFeeToken(snowBridgeContract, tokenContract, destinationChainParaId, destinationFee);
   const transactionConfig = {
     from: sender,
     to: snowBridgeContractAddress,
     value: sendTokenFee,
     data: transferEncodedCall,
-    gasPrice: priority.gasPrice,
-    maxFeePerGas: (_priority$maxFeePerGa = priority.maxFeePerGas) === null || _priority$maxFeePerGa === void 0 ? void 0 : _priority$maxFeePerGa.toString(),
-    maxPriorityFeePerGas: (_priority$maxPriority = priority.maxPriorityFeePerGas) === null || _priority$maxPriority === void 0 ? void 0 : _priority$maxPriority.toString()
+    ...feeCombine
   };
   let gasLimit;
   try {

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

@@ -11,8 +11,8 @@ exports.isUseTeleportProtocol = isUseTeleportProtocol;
 const STABLE_XCM_VERSION = 3;
 exports.STABLE_XCM_VERSION = STABLE_XCM_VERSION;
 function isUseTeleportProtocol(originChainInfo, destChainInfo, tokenSlug) {
-  const relayChainToSystemChain = ['polkadot'].includes(originChainInfo.slug) && ['statemint'].includes(destChainInfo.slug) || ['kusama'].includes(originChainInfo.slug) && ['statemine'].includes(destChainInfo.slug) || ['rococo'].includes(originChainInfo.slug) && ['rococo_assethub'].includes(destChainInfo.slug);
-  const systemChainToRelayChain = ['polkadot'].includes(destChainInfo.slug) && ['statemint'].includes(originChainInfo.slug) || ['kusama'].includes(destChainInfo.slug) && ['statemine'].includes(originChainInfo.slug) || ['rococo'].includes(destChainInfo.slug) && ['rococo_assethub'].includes(originChainInfo.slug);
+  const relayChainToSystemChain = ['polkadot'].includes(originChainInfo.slug) && ['statemint'].includes(destChainInfo.slug) || ['kusama'].includes(originChainInfo.slug) && ['statemine'].includes(destChainInfo.slug) || ['rococo'].includes(originChainInfo.slug) && ['rococo_assethub'].includes(destChainInfo.slug) || ['westend'].includes(originChainInfo.slug) && ['westend_assethub'].includes(destChainInfo.slug);
+  const systemChainToRelayChain = ['polkadot'].includes(destChainInfo.slug) && ['statemint'].includes(originChainInfo.slug) || ['kusama'].includes(destChainInfo.slug) && ['statemine'].includes(originChainInfo.slug) || ['rococo'].includes(destChainInfo.slug) && ['rococo_assethub'].includes(originChainInfo.slug) || ['westend'].includes(destChainInfo.slug) && ['westend_assethub'].includes(originChainInfo.slug);
   const isXcmMythos = originChainInfo.slug === 'mythos' && destChainInfo.slug === 'statemint' && tokenSlug === 'mythos-NATIVE-MYTH' || originChainInfo.slug === 'statemint' && destChainInfo.slug === 'mythos' && tokenSlug === 'statemint-LOCAL-MYTH';
   return relayChainToSystemChain || systemChainToRelayChain || isXcmMythos;
 }

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

@@ -41,7 +41,7 @@ const _BALANCE_CHAIN_GROUP = {
   genshiro: ['genshiro_testnet', 'genshiro'],
   equilibrium_parachain: ['equilibrium_parachain'],
   bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main', 'hydradx_rococo', 'pendulum', 'amplitude', 'continuum_network'],
-  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network', 'rococo_assethub', 'liberlandTest', 'liberland', 'dentnet', 'pangolin', 'crust', 'phala', 'shibuya', 'dbcchain'],
+  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network', 'rococo_assethub', 'liberlandTest', 'liberland', 'dentnet', 'pangolin', 'crust', 'phala', 'shibuya', 'dbcchain', 'westend_assethub'],
   kusama: ['kusama', 'kintsugi', 'kintsugi_test', 'interlay', 'acala', 'statemint', 'karura', 'bifrost'],
   // perhaps there are some runtime updates
   centrifuge: ['centrifuge'],
@@ -288,9 +288,9 @@ const _DEFAULT_MANTA_ZK_CHAIN = 'calamari';
 // XCM------------------------------------------------------------------------------------------------------------------
 exports._DEFAULT_MANTA_ZK_CHAIN = _DEFAULT_MANTA_ZK_CHAIN;
 const _XCM_CHAIN_GROUP = {
-  polkadotXcm: ['statemine', 'statemint', 'equilibrium_parachain', 'rococo_assethub', 'mythos'],
+  polkadotXcm: ['statemine', 'statemint', 'equilibrium_parachain', 'rococo_assethub', 'mythos', 'westend_assethub'],
   polkadotXcmSpecialCases: ['astar', 'shiden'],
-  xcmPallet: ['polkadot', 'kusama', 'rococo']
+  xcmPallet: ['polkadot', 'kusama', 'rococo', 'westend']
   // default is xTokens pallet
 };
 exports._XCM_CHAIN_GROUP = _XCM_CHAIN_GROUP;

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

@@ -61,6 +61,7 @@ class ChainService {
   assetLogoMapSubject = new _rxjs.BehaviorSubject(_chainList.AssetLogoMap);
   chainLogoMapSubject = new _rxjs.BehaviorSubject(_chainList.ChainLogoMap);
   ledgerGenericAllowChainsSubject = new _rxjs.BehaviorSubject([]);
+  priorityTokensSubject = new _rxjs.BehaviorSubject({});
 
   // Todo: Update to new store indexed DB
   store = new _AssetSetting.default();
@@ -84,17 +85,25 @@ class ChainService {
   }
   get value() {
     const ledgerGenericAllowChains = this.ledgerGenericAllowChainsSubject;
+    const priorityTokens = this.priorityTokensSubject;
     return {
       get ledgerGenericAllowChains() {
         return ledgerGenericAllowChains.value;
+      },
+      get priorityTokens() {
+        return priorityTokens.value;
       }
     };
   }
   get observable() {
     const ledgerGenericAllowChains = this.ledgerGenericAllowChainsSubject;
+    const priorityTokens = this.priorityTokensSubject;
     return {
       get ledgerGenericAllowChains() {
         return ledgerGenericAllowChains.asObservable();
+      },
+      get priorityTokens() {
+        return priorityTokens.asObservable();
       }
     };
   }
@@ -605,6 +614,10 @@ class ChainService {
     this.eventService.emit('ledger.ready', true);
     this.logger.log('Finished updating latest ledger generic allow chains');
   }
+  handleLatestPriorityTokens(latestPriorityTokens) {
+    this.priorityTokensSubject.next(latestPriorityTokens);
+    this.logger.log('Finished updating latest popular tokens');
+  }
   handleLatestData() {
     this.fetchLatestChainData().then(latestChainInfo => {
       this.lockChainInfoMap = true; // do not need to check current lockChainInfoMap because all remains action is fast enough and don't affect this feature.
@@ -622,6 +635,9 @@ class ChainService {
     this.fetchLatestLedgerGenericAllowChains().then(latestledgerGenericAllowChains => {
       this.handleLatestLedgerGenericAllowChains(latestledgerGenericAllowChains);
     }).catch(console.error);
+    this.fetchLatestPriorityTokens().then(latestPriorityTokens => {
+      this.handleLatestPriorityTokens(latestPriorityTokens);
+    }).catch(console.error);
   }
   async initApis() {
     const chainInfoMap = this.getChainInfoMap();
@@ -885,6 +901,12 @@ class ChainService {
   async fetchLatestLedgerGenericAllowChains() {
     return (await (0, _utils2.fetchStaticData)('chains/ledger-generic-allow-chains')) || [];
   }
+  async fetchLatestPriorityTokens() {
+    return (await (0, _utils2.fetchStaticData)('chain-assets/priority-tokens')) || {
+      tokenGroup: {},
+      token: {}
+    };
+  }
   async initChains() {
     const storedChainSettings = await this.dbService.getAllChainStore();
     const defaultChainInfoMap = filterChainInfoMap(_chainList.ChainInfoMap, ignoredList);

package/cjs/services/earning-service/handlers/liquid-staking/stella-swap.js

@@ -11,6 +11,7 @@ var _web = require("@subwallet/extension-base/koni/api/contract-handler/evm/web3
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _utils2 = require("@subwallet/extension-base/services/fee-service/utils");
 var _types = require("@subwallet/extension-base/types");
+var _utils3 = require("@subwallet/extension-base/utils");
 var _util = require("@polkadot/util");
 var _constants = require("../../constants");
 var _base = _interopRequireDefault(require("./base"));
@@ -280,7 +281,6 @@ class StellaSwapLiquidStakingPoolHandler extends _base.default {
     });
   }
   async handleSubmitStep(data, path) {
-    var _priority$maxFeePerGa, _priority$maxPriority;
     const {
       address,
       amount
@@ -300,14 +300,13 @@ class StellaSwapLiquidStakingPoolHandler extends _base.default {
       from: address
     });
     const priority = await (0, _utils2.calculateGasFeeParams)(evmApi, this.chain);
+    const feeCombine = (0, _utils3.combineEthFee)(priority);
     const transactionObject = {
       from: address,
       to: (0, _utils._getContractAddressOfToken)(derivativeTokenInfo),
       data: depositEncodedCall,
       gas: gasLimit,
-      gasPrice: priority.gasPrice,
-      maxFeePerGas: (_priority$maxFeePerGa = priority.maxFeePerGas) === null || _priority$maxFeePerGa === void 0 ? void 0 : _priority$maxFeePerGa.toString(),
-      maxPriorityFeePerGas: (_priority$maxPriority = priority.maxPriorityFeePerGas) === null || _priority$maxPriority === void 0 ? void 0 : _priority$maxPriority.toString()
+      ...feeCombine
     };
     return {
       txChain: this.chain,
@@ -327,7 +326,6 @@ class StellaSwapLiquidStakingPoolHandler extends _base.default {
     return Promise.reject(new _TransactionError.TransactionError(_types.BasicTxErrorType.UNSUPPORTED));
   }
   async handleYieldUnstake(amount, address, selectedTarget) {
-    var _priority$maxFeePerGa2, _priority$maxPriority2;
     const evmApi = this.evmApi;
     const derivativeTokenSlug = this.derivativeAssets[0];
     const derivativeTokenInfo = this.state.getAssetBySlug(derivativeTokenSlug);
@@ -343,14 +341,13 @@ class StellaSwapLiquidStakingPoolHandler extends _base.default {
       from: address
     });
     const priority = await (0, _utils2.calculateGasFeeParams)(evmApi, this.chain);
+    const feeCombine = (0, _utils3.combineEthFee)(priority);
     const transaction = {
       from: address,
       to: (0, _utils._getContractAddressOfToken)(derivativeTokenInfo),
       data: redeemEncodedCall,
       gas: gasLimit,
-      gasPrice: priority.gasPrice,
-      maxFeePerGas: (_priority$maxFeePerGa2 = priority.maxFeePerGas) === null || _priority$maxFeePerGa2 === void 0 ? void 0 : _priority$maxFeePerGa2.toString(),
-      maxPriorityFeePerGas: (_priority$maxPriority2 = priority.maxPriorityFeePerGas) === null || _priority$maxPriority2 === void 0 ? void 0 : _priority$maxPriority2.toString()
+      ...feeCombine
     };
     return [_KoniTypes.ExtrinsicType.UNSTAKE_STDOT, transaction];
   }
@@ -360,7 +357,6 @@ class StellaSwapLiquidStakingPoolHandler extends _base.default {
   /* Other actions */
 
   async handleYieldWithdraw(address, unstakingInfo) {
-    var _priority$maxFeePerGa3, _priority$maxPriority3;
     const evmApi = this.evmApi;
     const derivativeTokenSlug = this.derivativeAssets[0];
     const derivativeTokenInfo = this.state.getAssetBySlug(derivativeTokenSlug);
@@ -376,14 +372,13 @@ class StellaSwapLiquidStakingPoolHandler extends _base.default {
       from: address
     });
     const priority = await (0, _utils2.calculateGasFeeParams)(evmApi, this.chain);
+    const feeCombine = (0, _utils3.combineEthFee)(priority);
     return {
       from: address,
       to: (0, _utils._getContractAddressOfToken)(derivativeTokenInfo),
       data: withdrawEncodedCall,
       gas: gasLimit,
-      gasPrice: priority.gasPrice,
-      maxFeePerGas: (_priority$maxFeePerGa3 = priority.maxFeePerGas) === null || _priority$maxFeePerGa3 === void 0 ? void 0 : _priority$maxFeePerGa3.toString(),
-      maxPriorityFeePerGas: (_priority$maxPriority3 = priority.maxPriorityFeePerGas) === null || _priority$maxPriority3 === void 0 ? void 0 : _priority$maxPriority3.toString()
+      ...feeCombine
     }; // TODO: check tx history parsing
   }
 

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

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.bittensorApiKey = exports.BITTENSOR_API_KEY_9 = exports.BITTENSOR_API_KEY_8 = exports.BITTENSOR_API_KEY_7 = exports.BITTENSOR_API_KEY_6 = exports.BITTENSOR_API_KEY_5 = exports.BITTENSOR_API_KEY_4 = exports.BITTENSOR_API_KEY_3 = exports.BITTENSOR_API_KEY_2 = exports.BITTENSOR_API_KEY_10 = exports.BITTENSOR_API_KEY_1 = void 0;
 exports.fetchDelegates = fetchDelegates;
-exports.fetchTaoDelegateState = fetchTaoDelegateState;
+exports.getTaoToAlphaMapping = void 0;
 var _TransactionError = require("@subwallet/extension-base/background/errors/TransactionError");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/constants");
@@ -20,6 +20,26 @@ var _utils3 = require("../../utils");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
+const getTaoToAlphaMapping = async substrateApi => {
+  const allSubnets = (await substrateApi.api.call.subnetInfoRuntimeApi.getAllDynamicInfo()).toJSON();
+  if (!allSubnets) {
+    return {};
+  }
+  return allSubnets.reduce((acc, subnet) => {
+    const netuid = subnet === null || subnet === void 0 ? void 0 : subnet.netuid;
+    const taoIn = subnet !== null && subnet !== void 0 && subnet.taoIn ? new _bignumber.default(subnet.taoIn) : new _bignumber.default(0);
+    const alphaIn = subnet !== null && subnet !== void 0 && subnet.alphaIn ? new _bignumber.default(subnet.alphaIn) : new _bignumber.default(0);
+    if (netuid === 0) {
+      acc[netuid] = '1';
+    } else if (alphaIn.gt(0)) {
+      acc[netuid] = taoIn.dividedBy(alphaIn).toString();
+    } else {
+      acc[netuid] = '1';
+    }
+    return acc;
+  }, {});
+};
+exports.getTaoToAlphaMapping = getTaoToAlphaMapping;
 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 || '';
@@ -49,7 +69,7 @@ function random() {
   return validKeys[randomIndex];
 }
 const bittensorApiKey = () => {
-  return random(BITTENSOR_API_KEY_1, BITTENSOR_API_KEY_2, BITTENSOR_API_KEY_3, BITTENSOR_API_KEY_4, BITTENSOR_API_KEY_5, BITTENSOR_API_KEY_6);
+  return random(BITTENSOR_API_KEY_1, BITTENSOR_API_KEY_2, BITTENSOR_API_KEY_3, BITTENSOR_API_KEY_4, BITTENSOR_API_KEY_5, BITTENSOR_API_KEY_6, BITTENSOR_API_KEY_7, BITTENSOR_API_KEY_8, BITTENSOR_API_KEY_9, BITTENSOR_API_KEY_10);
 };
 
 /* Fetch data */
@@ -68,20 +88,22 @@ async function fetchDelegates() {
     }).catch(console.error);
   });
 }
-async function fetchTaoDelegateState(address) {
-  const apiKey = bittensorApiKey();
-  return new Promise(function (resolve) {
-    fetch(`https://api.taostats.io/api/stake_balance/latest/v1?coldkey=${address}`, {
-      method: 'GET',
-      headers: {
-        'Content-Type': 'application/json',
-        Authorization: `${apiKey}`
-      }
-    }).then(resp => {
-      resolve(resp.json());
-    }).catch(console.error);
-  });
-}
+
+// export async function fetchTaoDelegateState (address: string): Promise<RawDelegateState> {
+//   const apiKey = bittensorApiKey();
+
+//   return new Promise(function (resolve) {
+//     fetch(`https://api.taostats.io/api/stake_balance/latest/v1?coldkey=${address}`, {
+//       method: 'GET',
+//       headers: {
+//         'Content-Type': 'application/json',
+//         Authorization: `${apiKey}`
+//       }
+//     }).then((resp) => {
+//       resolve(resp.json());
+//     }).catch(console.error);
+//   });
+// }
 
 /* Fetch data */
 
@@ -182,11 +204,12 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
           chain: chainInfo.slug,
           validatorAddress: delegate.owner,
           activeStake: activeStake,
-          validatorMinStake: minDelegatorStake,
-          validatorIdentity: delegate.identity
+          validatorMinStake: minDelegatorStake
+          // validatorIdentity: delegate.identity
         });
       }
     }
+
     const stakingStatus = (0, _utils.getEarningStatusByNominations)(allActiveStake, nominationList);
     return {
       status: stakingStatus,
@@ -214,9 +237,10 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
         bnTotalBalance = bnTotalBalance.add(bnStakeAmount);
         delegatorState.push({
           owner: testnetAddress,
-          amount: bnStakeAmount.toString(),
-          identity: testnetAddress
+          amount: bnStakeAmount.toString()
+          // identity: testnetAddress
         });
+
         rsCallback({
           ...defaultInfo,
           type: this.type,
@@ -239,20 +263,32 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
       await Promise.all(stakePromises);
     };
     const getMainnetPoolPosition = async () => {
-      const rawDelegateStateInfos = await Promise.all(useAddresses.map(address => fetchTaoDelegateState(address)));
-      if (rawDelegateStateInfos.length > 0) {
+      const rawDelegateStateInfos = await Promise.all(useAddresses.map(async address => (await substrateApi.api.call.stakeInfoRuntimeApi.getStakeInfoForColdkey(address)).toJSON()));
+      const price = await getTaoToAlphaMapping(this.substrateApi);
+      if (rawDelegateStateInfos && rawDelegateStateInfos.length > 0) {
         rawDelegateStateInfos.forEach((rawDelegateStateInfo, i) => {
           const owner = (0, _utils2.reformatAddress)(useAddresses[i], 42);
           const delegatorState = [];
           let bnTotalBalance = _util.BN_ZERO;
-          const delegateStateInfo = rawDelegateStateInfo.data;
+          const delegateStateInfo = rawDelegateStateInfo;
+          const totalDelegate = {};
           for (const delegate of delegateStateInfo) {
-            const name = delegate.hotkey_name || delegate.hotkey.ss58;
-            bnTotalBalance = bnTotalBalance.add(new _util.BN(delegate.stake));
+            const hotkey = delegate.hotkey;
+            const netuid = delegate.netuid;
+            const stake = new _bignumber.default(delegate.stake);
+            const taoToAlphaPrice = price[netuid] ? new _bignumber.default(price[netuid]) : new _bignumber.default(1);
+            const taoStake = stake.multipliedBy(taoToAlphaPrice).toFixed(0).toString();
+            if (totalDelegate[hotkey]) {
+              totalDelegate[hotkey] = new _bignumber.default(totalDelegate[hotkey]).plus(taoStake).toString();
+            } else {
+              totalDelegate[hotkey] = taoStake;
+            }
+          }
+          for (const hotkey in totalDelegate) {
+            bnTotalBalance = bnTotalBalance.add(new _util.BN(totalDelegate[hotkey]));
             delegatorState.push({
-              owner: delegate.hotkey.ss58,
-              amount: delegate.stake,
-              identity: name
+              owner: hotkey,
+              amount: totalDelegate[hotkey]
             });
           }
           if (delegateStateInfo && delegateStateInfo.length > 0) {
@@ -282,6 +318,61 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
         });
       }
     };
+
+    // const getMainnetPoolPosition = async () => {
+    //   const rawDelegateStateInfos = await Promise.all(
+    //     useAddresses.map((address) => fetchTaoDelegateState(address))
+    //   );
+
+    //   if (rawDelegateStateInfos.length > 0) {
+    //     rawDelegateStateInfos.forEach((rawDelegateStateInfo, i) => {
+    //       const owner = reformatAddress(useAddresses[i], 42);
+    //       const delegatorState: TaoStakingStakeOption[] = [];
+    //       let bnTotalBalance = BN_ZERO;
+    //       const delegateStateInfo = rawDelegateStateInfo.data;
+
+    //       for (const delegate of delegateStateInfo) {
+    //         const name = delegate.hotkey_name || delegate.hotkey.ss58;
+
+    //         bnTotalBalance = bnTotalBalance.add(new BN(delegate.stake));
+
+    //         delegatorState.push({
+    //           owner: delegate.hotkey.ss58,
+    //           amount: delegate.stake,
+    //           identity: name
+    //         });
+    //       }
+
+    //       if (delegateStateInfo && delegateStateInfo.length > 0) {
+    //         this.parseNominatorMetadata(chainInfo, owner, delegatorState)
+    //           .then((nominatorMetadata) => {
+    //             rsCallback({
+    //               ...defaultInfo,
+    //               ...nominatorMetadata,
+    //               address: owner,
+    //               type: this.type
+    //             });
+    //           })
+    //           .catch(console.error);
+    //       } else {
+    //         rsCallback({
+    //           ...defaultInfo,
+    //           type: this.type,
+    //           address: owner,
+    //           balanceToken: this.nativeToken.slug,
+    //           totalStake: '0',
+    //           activeStake: '0',
+    //           unstakeBalance: '0',
+    //           status: EarningStatus.NOT_STAKING,
+    //           isBondedBefore: false,
+    //           nominations: [],
+    //           unstakings: []
+    //         });
+    //       }
+    //     });
+    //   }
+    // };
+
     const getStakingPositionInterval = async () => {
       if (cancel) {
         return;
@@ -387,7 +478,7 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
     const binaryAmount = new _util.BN(amount);
     const selectedValidatorInfo = targetValidators[0];
     const hotkey = selectedValidatorInfo.address;
-    const extrinsic = chainApi.api.tx.subtensorModule.addStake(hotkey, binaryAmount);
+    const extrinsic = chainApi.api.tx.subtensorModule.addStake(hotkey, 0, binaryAmount);
     return [extrinsic, {
       slug: this.nativeToken.slug,
       amount: '0'
@@ -405,7 +496,7 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
     if (!selectedTarget || !poolPosition) {
       return Promise.reject(new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS));
     }
-    const extrinsic = apiPromise.api.tx.subtensorModule.removeStake(selectedTarget, binaryAmount);
+    const extrinsic = apiPromise.api.tx.subtensorModule.removeStake(selectedTarget, 0, binaryAmount);
     return [_KoniTypes.ExtrinsicType.STAKING_UNBOND, extrinsic];
   }
 

package/cjs/services/earning-service/handlers/nomination-pool/index.js

@@ -91,7 +91,7 @@ class NominationPoolHandler extends _base.default {
 
       const supportedDays = (0, _utils.getSupportedDaysByHistoryDepth)(erasPerDay, parseInt(maxSupportedEras), parseInt(currentEra) / erasPerDay);
       const startEra = parseInt(currentEra) - supportedDays * erasPerDay;
-      const [_maxPoolMember, _EraStakeInfo, _totalIssuance, _auctionCounter, _minPoolJoin, ..._eraReward] = await Promise.all([(_substrateApi$api$que2 = substrateApi.api.query.nominationPools) === null || _substrateApi$api$que2 === void 0 ? void 0 : _substrateApi$api$que2.maxPoolMembersPerPool(), substrateApi.api.query.staking.erasTotalStake.multi([parseInt(currentEra), parseInt(currentEra) - 1]), substrateApi.api.query.balances.totalIssuance(), (_substrateApi$api$que3 = substrateApi.api.query.auctions) === null || _substrateApi$api$que3 === void 0 ? void 0 : _substrateApi$api$que3.auctionCounter(), (_substrateApi$api$que4 = substrateApi.api.query.nominationPools) === null || _substrateApi$api$que4 === void 0 ? void 0 : _substrateApi$api$que4.minJoinBond(), substrateApi.api.query.staking.erasValidatorReward.multi([...Array(supportedDays.toString()).keys()].map(i => i + startEra))]);
+      const [_maxPoolMember, _EraStakeInfo, _totalIssuance, _auctionCounter, _minPoolJoin, ..._eraReward] = await Promise.all([(_substrateApi$api$que2 = substrateApi.api.query.nominationPools) === null || _substrateApi$api$que2 === void 0 ? void 0 : _substrateApi$api$que2.maxPoolMembersPerPool(), substrateApi.api.query.staking.erasTotalStake.multi([parseInt(currentEra), parseInt(currentEra) - 1]), substrateApi.api.query.balances.totalIssuance(), (_substrateApi$api$que3 = substrateApi.api.query.auctions) === null || _substrateApi$api$que3 === void 0 ? void 0 : _substrateApi$api$que3.auctionCounter(), (_substrateApi$api$que4 = substrateApi.api.query.nominationPools) === null || _substrateApi$api$que4 === void 0 ? void 0 : _substrateApi$api$que4.minJoinBond(), substrateApi.api.query.staking.erasValidatorReward.multi([...Array(supportedDays).keys()].map(i => i + startEra))]);
       const maxPoolMembers = _maxPoolMember ? parseInt(_maxPoolMember.toString()) : undefined;
       const [_totalEraStake, _lastTotalStaked] = _EraStakeInfo;
       const validatorEraReward = (0, _utils.getAvgValidatorEraReward)(supportedDays, _eraReward[0]);