@subwallet/extension-base 1.3.31-0 → 1.3.32-0

package/page/cardano/index.js

@@ -0,0 +1,34 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { CIP30Api, ExtensionCIPsSupported } from '@subwallet/extension-base/page/cardano/cips';
+const WALLET_NAME = 'SubWallet';
+const WALLET_VERSION = process.env.PKG_VERSION;
+const WALLET_ICON = 'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTYwIiBoZWlnaHQ9IjE2MCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJNODAgNGM1Ny42MyAwIDc2IDE4LjM3IDc2IDc2IDAgNTcuNjMtMTguMzcgNzYtNzYgNzYtNTcuNjMgMC03Ni0xOC4zNy03Ni03NkM0IDIyLjM3IDIyLjM3IDQgODAgNFoiIGZpbGw9InVybCgjYSkiLz48ZyBjbGlwLXBhdGg9InVybCgjYikiPjxwYXRoIGQ9Ik0xMTIuNjE1IDY2LjcyVjUzLjM5OEw1OC43NiAzMiA0OCAzNy40MTJsLjA1NyA0MS40NjQgNDAuMjkyIDE2LjA3LTIxLjUyIDkuMDc1di03LjAxOEw1Ni45NSA5My4wM2wtOC44OTMgNC4xNjN2MjUuMzk1TDU4Ljc2OSAxMjhsNTMuODQ2LTI0LjA2MlY4Ni44NjlMNjQuMTU0IDY3LjY1N1Y1NmwzOC40NDkgMTUuMjE2IDEwLjAxMi00LjQ5NloiIGZpbGw9IiNmZmYiLz48L2c+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJhIiB4MT0iODAiIHkxPSI0IiB4Mj0iODAiIHkyPSIxNTYiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIj48c3RvcCBzdG9wLWNvbG9yPSIjMDA0QkZGIi8+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLWNvbG9yPSIjNENFQUFDIi8+PC9saW5lYXJHcmFkaWVudD48Y2xpcFBhdGggaWQ9ImIiPjxwYXRoIGZpbGw9IiNmZmYiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDQ4IDMyKSIgZD0iTTAgMGg2NC42MTV2OTZIMHoiLz48L2NsaXBQYXRoPjwvZGVmcz48L3N2Zz4=';
+export default class SubWalletCardanoProvider {
+  apiVersion = WALLET_VERSION;
+  icon = WALLET_ICON;
+  name = WALLET_NAME;
+  supportedExtensions = [...ExtensionCIPsSupported];
+  constructor(sendMessage) {
+    this.icon = WALLET_ICON;
+    this.sendMessage = sendMessage;
+  }
+  async enable() {
+    const isEnabled = await this.sendMessage('pub(authorize.tabV2)', {
+      origin,
+      accountAuthTypes: ['cardano']
+    });
+    if (!isEnabled) {
+      throw new Error('Access to the wallet is denied');
+    }
+    const CIP30 = new CIP30Api(this.sendMessage);
+    return Object.freeze(CIP30);
+  }
+  async isEnable() {
+    const accountList = await this.sendMessage('pub(accounts.list)', {
+      accountAuthType: 'cardano'
+    });
+    return accountList.length > 0;
+  }
+}

package/page/{SubWalleEvmProvider.d.ts → evm/index.d.ts}

@@ -3,10 +3,10 @@ import SafeEventEmitter from '@metamask/safe-event-emitter';
 import { SendRequest } from '@subwallet/extension-base/page/types';
 import { JsonRpcRequest, JsonRpcResponse } from 'json-rpc-engine';
 import { RequestArguments } from 'web3-core';
-export interface SendSyncJsonRpcRequest extends JsonRpcRequest<unknown> {
+interface SendSyncJsonRpcRequest extends JsonRpcRequest<unknown> {
     method: 'net_version';
 }
-export declare class SubWalletEvmProvider extends SafeEventEmitter implements EvmProvider {
+export default class SubWalletEvmProvider extends SafeEventEmitter implements EvmProvider {
     readonly isSubWallet = true;
     readonly isMetaMask = false;
     readonly version: string;
@@ -26,3 +26,4 @@ export declare class SubWalletEvmProvider extends SafeEventEmitter implements Ev
     send<T>(payload: SendSyncJsonRpcRequest): JsonRpcResponse<T>;
     sendAsync<T>(payload: JsonRpcRequest<T>, callback: (error: (Error | null), result?: JsonRpcResponse<T>) => void): void;
 }
+export {};

package/page/{SubWalleEvmProvider.js → evm/index.js}

@@ -3,7 +3,7 @@
 
 import SafeEventEmitter from '@metamask/safe-event-emitter';
 let subscribeFlag = false;
-export class SubWalletEvmProvider extends SafeEventEmitter {
+export default class SubWalletEvmProvider extends SafeEventEmitter {
   isSubWallet = true;
   isMetaMask = false;
   _connected = false;

package/page/index.d.ts

@@ -1,6 +1,6 @@
 import type { MessageTypes, MessageTypesWithNoSubscriptions, MessageTypesWithNullRequest, MessageTypesWithSubscriptions, RequestTypes, ResponseTypes, SubscriptionMessageTypes, TransportResponseMessage } from '../background/types';
-import { AuthRequestOption, EvmProvider } from '@subwallet/extension-inject/types';
-import Injected from './Injected';
+import Injected from '@subwallet/extension-base/page/substrate';
+import { AuthRequestOption, CardanoProvider, EvmProvider } from '@subwallet/extension-inject/types';
 export interface Handler {
     resolve: (data?: any) => void;
     reject: (error: Error) => void;
@@ -15,3 +15,4 @@ export declare function handleResponse<TMessageType extends MessageTypes>(data:
     subscription?: string;
 }): void;
 export declare function initEvmProvider(version: string): EvmProvider;
+export declare function initCardanoProvider(): CardanoProvider;

package/page/index.js

@@ -3,10 +3,11 @@
 
 import { ProviderError } from '@subwallet/extension-base/background/errors/ProviderError';
 import { ProviderErrorType } from '@subwallet/extension-base/background/KoniTypes';
-import { SubWalletEvmProvider } from '@subwallet/extension-base/page/SubWalleEvmProvider';
+import SubWalletCardanoProvider from '@subwallet/extension-base/page/cardano';
+import SubWalletEvmProvider from '@subwallet/extension-base/page/evm';
+import Injected from '@subwallet/extension-base/page/substrate';
 import { MESSAGE_ORIGIN_PAGE } from "../defaults.js";
 import { getId } from "../utils/getId.js";
-import Injected from "./Injected.js";
 // when sending a message from the injector to the extension, we
 //  - create an event - this we send to the loader
 //  - the loader takes this event and uses port.postMessage to background
@@ -68,4 +69,7 @@ export function handleResponse(data) {
 }
 export function initEvmProvider(version) {
   return new SubWalletEvmProvider(sendMessage, version);
+}
+export function initCardanoProvider() {
+  return new SubWalletCardanoProvider(sendMessage);
 }

package/page/{Accounts.d.ts → substrate/Accounts.d.ts}

@@ -1,5 +1,5 @@
 import type { InjectedAccount, InjectedAccounts, Unsubcall } from '@subwallet/extension-inject/types';
-import type { SendRequest } from './types';
+import type { SendRequest } from '../types';
 export default class Accounts implements InjectedAccounts {
     constructor(_sendRequest: SendRequest);
     get(anyType?: boolean): Promise<InjectedAccount[]>;

package/page/{Metadata.d.ts → substrate/Metadata.d.ts}

@@ -1,5 +1,5 @@
 import type { InjectedMetadata, InjectedMetadataKnown, MetadataDef } from '@subwallet/extension-inject/types';
-import type { SendRequest } from './types';
+import type { SendRequest } from '../types';
 import { RequestAddPspToken } from '@subwallet/extension-base/background/KoniTypes';
 export default class Metadata implements InjectedMetadata {
     constructor(_sendRequest: SendRequest);

package/page/{PostMessageProvider.d.ts → substrate/PostMessageProvider.d.ts}

@@ -1,7 +1,7 @@
 import type { InjectedProvider, ProviderList, ProviderMeta } from '@subwallet/extension-inject/types';
 import type { ProviderInterfaceEmitCb, ProviderInterfaceEmitted } from '@polkadot/rpc-provider/types';
 import type { AnyFunction } from '@polkadot/types/types';
-import type { SendRequest } from './types';
+import type { SendRequest } from '../types';
 declare type CallbackHandler = (error?: null | Error, value?: unknown) => void;
 interface SubscriptionHandler {
     callback: CallbackHandler;

package/page/{Signer.d.ts → substrate/Signer.d.ts}

@@ -1,6 +1,6 @@
 import type { Signer as SignerInterface, SignerResult } from '@polkadot/api/types';
 import type { SignerPayloadJSON, SignerPayloadRaw } from '@polkadot/types/types';
-import type { SendRequest } from './types';
+import type { SendRequest } from '../types';
 export default class Signer implements SignerInterface {
     constructor(_sendRequest: SendRequest);
     signPayload(payload: SignerPayloadJSON): Promise<SignerResult>;

package/page/{Injected.d.ts → substrate/index.d.ts}

@@ -1,5 +1,5 @@
 import type { Injected } from '@subwallet/extension-inject/types';
-import type { SendRequest } from './types';
+import type { SendRequest } from '../types';
 import Accounts from './Accounts';
 import Metadata from './Metadata';
 import PostMessageProvider from './PostMessageProvider';

package/services/balance-service/helpers/subscribe/cardano/types.d.ts

@@ -9,6 +9,20 @@ export interface CardanoBalanceItem {
     unit: string;
     quantity: string;
 }
+export interface CardanoUtxosItem {
+    address: string;
+    tx_hash: string;
+    output_index: number;
+    amount: CardanoBalanceItem[];
+    data_hash: string | null;
+    inline_datum: string | null;
+    reference_script_hash: string | null;
+}
+export interface TransactionUtxosItem {
+    hash: string;
+    inputs: CardanoUtxosItem[];
+    outputs: CardanoUtxosItem[];
+}
 export interface CardanoTxJson {
     body: {
         inputs: CardanoTxInput[];

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

@@ -3,7 +3,7 @@
 
 import { _AssetType } from '@subwallet/chain-list/types';
 import { APIItemState } from '@subwallet/extension-base/background/KoniTypes';
-import { SUB_TOKEN_REFRESH_BALANCE_INTERVAL } from '@subwallet/extension-base/constants';
+import { CRON_REFRESH_PRICE_INTERVAL, SUB_TOKEN_REFRESH_BALANCE_INTERVAL } from '@subwallet/extension-base/constants';
 import { _getAssetsPalletLocked, _getAssetsPalletTransferable } from '@subwallet/extension-base/core/substrate/assets-pallet';
 import { _getForeignAssetPalletLockedBalance, _getForeignAssetPalletTransferable } from '@subwallet/extension-base/core/substrate/foreign-asset-pallet';
 import { _getTotalStakeInNominationPool } from '@subwallet/extension-base/core/substrate/nominationpools-pallet';
@@ -17,6 +17,7 @@ import { _BALANCE_CHAIN_GROUP, _MANTA_ZK_CHAIN_GROUP, _ZK_ASSET_PREFIX } from '@
 import { _checkSmartContractSupportByChain, _getAssetExistentialDeposit, _getAssetNetuid, _getChainExistentialDeposit, _getChainNativeTokenSlug, _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _getTokenTypesSupportedByChain, _getXcmAssetMultilocation, _isBridgedToken, _isChainEvmCompatible } from '@subwallet/extension-base/services/chain-service/utils';
 import { filterAlphaAssetsByChain, filterAssetsByChainAndType } from '@subwallet/extension-base/utils';
 import BigN from 'bignumber.js';
+import { timer } from 'rxjs';
 import { subscribeERC20Interval } from "../evm.js";
 import { subscribeEquilibriumTokenBalance } from "./equilibrium.js";
 import { subscribeGRC20Balance, subscribeVftBalance } from "./gear.js";
@@ -323,7 +324,19 @@ const subscribeTokensAccountsPallet = async ({
   const tokensAccountsKey = 'query_tokens_accounts';
   const tokenTypes = includeNativeToken ? [_AssetType.NATIVE, _AssetType.LOCAL] : [_AssetType.LOCAL];
   const tokenMap = filterAssetsByChainAndType(assetMap, chainInfo.slug, tokenTypes);
+
+  // Hotfix balance for gdot
+  const getGdotBalance = async () => {
+    const gdotBalances = await queryGdotBalance(substrateApi, addresses, assetMap[gdotSlug], extrinsicType);
+    callback(gdotBalances);
+  };
   const unsubList = await Promise.all(Object.values(tokenMap).map(tokenInfo => {
+    // Hotfix balance for gdot
+    if (tokenInfo.slug === gdotSlug) {
+      return timer(0, CRON_REFRESH_PRICE_INTERVAL).subscribe(() => {
+        getGdotBalance().catch(console.error);
+      });
+    }
     try {
       const params = [{
         section: 'query',
@@ -529,4 +542,23 @@ const subscribeSubnetAlphaPallet = async ({
     cancel = true;
     clearInterval(interval);
   };
-};
+};
+
+// Hot fix for gdot balance
+
+const gdotSlug = 'hydradx_main-LOCAL-GDOT';
+async function queryGdotBalance(substrateApi, addresses, tokenInfo, extrinsicType) {
+  return await Promise.all(addresses.map(async address => {
+    const _balanceInfo = await substrateApi.api.call.currenciesApi.account(_getTokenOnChainAssetId(tokenInfo), address);
+    const balanceInfo = _balanceInfo.toPrimitive();
+    const transferableBalance = _getTokensPalletTransferable(balanceInfo, _getAssetExistentialDeposit(tokenInfo), extrinsicType);
+    const totalLockedFromTransfer = _getTokensPalletLocked(balanceInfo);
+    return {
+      address,
+      tokenSlug: tokenInfo.slug,
+      state: APIItemState.READY,
+      free: transferableBalance.toString(),
+      locked: totalLockedFromTransfer.toString()
+    };
+  }));
+}

package/services/balance-service/transfer/xcm/acrossBridge/index.d.ts

@@ -7,6 +7,10 @@ export declare const SpokePoolMapping: Record<number, {
         blockNumber: number;
     };
 }>;
+export declare const AcrossErrorMsg: {
+    AMOUNT_TOO_LOW: string;
+    AMOUNT_TOO_HIGH: string;
+};
 interface AcrossQuote {
     outputAmount: string;
     rate: string;

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

@@ -185,6 +185,10 @@ export const SpokePoolMapping = {
     }
   }
 };
+export const AcrossErrorMsg = {
+  AMOUNT_TOO_LOW: 'amount too low',
+  AMOUNT_TOO_HIGH: 'amount too high'
+};
 // Calculate fee for across bridge transfer
 export const getAcrossQuote = async ({
   destinationChain,
@@ -196,7 +200,6 @@ export const getAcrossQuote = async ({
   sendingValue
 }) => {
   const isAcrossBridgeXcm = _isAcrossBridgeXcm(originChain, destinationChain);
-  console.log('sendingValue', sendingValue);
   if (!isAcrossBridgeXcm) {
     throw new Error('This is not a valid AcrossBridge transfer');
   }

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

@@ -182,6 +182,8 @@ export const createAcrossBridgeExtrinsic = async ({
     const data = await ((_subwalletApiSdk$xcmA = subwalletApiSdk.xcmApi) === null || _subwalletApiSdk$xcmA === void 0 ? void 0 : _subwalletApiSdk$xcmA.fetchXcmData(sender, originTokenInfo.slug, destinationTokenInfo.slug, recipient, sendingValue));
     const _feeCustom = feeCustom;
     const feeCombine = combineEthFee(feeInfo, feeOption, _feeCustom);
+
+    // todo: validate data before sending
     const transactionConfig = {
       from: data === null || data === void 0 ? void 0 : data.sender,
       to: data === null || data === void 0 ? void 0 : data.to,

package/services/chain-service/handler/CardanoApi.d.ts

@@ -1,4 +1,4 @@
-import { CardanoBalanceItem } from '@subwallet/extension-base/services/balance-service/helpers/subscribe/cardano/types';
+import { CardanoBalanceItem, CardanoUtxosItem, TransactionUtxosItem } from '@subwallet/extension-base/services/balance-service/helpers/subscribe/cardano/types';
 import { _ApiOptions } from '@subwallet/extension-base/services/chain-service/handler/types';
 import { _CardanoApi, _ChainConnectionStatus } from '@subwallet/extension-base/services/chain-service/types';
 import { PromiseHandler } from '@subwallet/extension-base/utils';
@@ -33,6 +33,8 @@ export declare class CardanoApi implements _CardanoApi {
     onConnect(): void;
     onDisconnect(): void;
     getBalanceMap(address: string): Promise<CardanoBalanceItem[]>;
+    getUtxos(address: string, page: number, limit: number): Promise<CardanoUtxosItem[]>;
+    getSpecificUtxo(txHash: string): Promise<TransactionUtxosItem>;
     sendCardanoTxReturnHash(tx: string): Promise<string>;
     getStatusByTxHash(txHash: string, ttl: number): Promise<boolean>;
 }

package/services/chain-service/handler/CardanoApi.js

@@ -121,6 +121,39 @@ export class CardanoApi {
       return [];
     }
   }
+  async getUtxos(address, page, limit) {
+    try {
+      let url = this.isTestnet ? `https://cardano-preprod.blockfrost.io/api/v0/addresses/${address}/utxos` : `https://cardano-mainnet.blockfrost.io/api/v0/addresses/${address}/utxos`;
+      url += `?page=${page}&count=${limit}`;
+      const response = await fetch(url, {
+        method: 'GET',
+        headers: {
+          Project_id: this.projectId
+        }
+      });
+      const utxos = await response.json();
+      return utxos;
+    } catch (e) {
+      console.error('Error on getting account balance', e);
+      return [];
+    }
+  }
+  async getSpecificUtxo(txHash) {
+    try {
+      const url = this.isTestnet ? `https://cardano-preprod.blockfrost.io/api/v0/txs/${txHash}/utxos` : `https://cardano-mainnet.blockfrost.io/api/v0/txs/${txHash}/utxos`;
+      const response = await fetch(url, {
+        method: 'GET',
+        headers: {
+          Project_id: this.projectId
+        }
+      });
+      const utxo = await response.json();
+      return utxo;
+    } catch (e) {
+      console.error('Error on getting account balance', e);
+      return {};
+    }
+  }
   async sendCardanoTxReturnHash(tx) {
     try {
       const url = this.isTestnet ? 'https://cardano-preprod.blockfrost.io/api/v0/tx/submit' : 'https://cardano-mainnet.blockfrost.io/api/v0/tx/submit';

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

@@ -1,6 +1,8 @@
 /// <reference types="node" />
+import { TransactionUnspentOutput } from '@emurgo/cardano-serialization-lib-nodejs';
 import { _AssetRef, _AssetType, _ChainAsset, _ChainInfo, _MultiChainAsset } from '@subwallet/chain-list/types';
-import { AssetSetting, MetadataItem, SufficientChainsDetails, TokenPriorityDetails, ValidateNetworkResponse } from '@subwallet/extension-base/background/KoniTypes';
+import { AssetSetting, CardanoPaginate, MetadataItem, SufficientChainsDetails, TokenPriorityDetails, ValidateNetworkResponse } from '@subwallet/extension-base/background/KoniTypes';
+import { CardanoUtxosItem } from '@subwallet/extension-base/services/balance-service/helpers/subscribe/cardano/types';
 import { MantaPrivateHandler } from '@subwallet/extension-base/services/chain-service/handler/manta/MantaPrivateHandler';
 import { _ChainApiStatus, _ChainConnectionStatus, _ChainState, _NetworkUpsertParams, _SubstrateApi, _ValidateCustomAssetRequest, _ValidateCustomAssetResponse } from '@subwallet/extension-base/services/chain-service/types';
 import { EventService } from '@subwallet/extension-base/services/event-service';
@@ -59,6 +61,8 @@ export declare class ChainService {
     getTonApi(slug: string): import("./handler/TonApi").TonApi;
     getTonApiMap(): Record<string, import("./handler/TonApi").TonApi>;
     getCardanoApi(slug: string): import("./handler/CardanoApi").CardanoApi;
+    getUtxosByAddress(address: string, slug: string, paginate?: CardanoPaginate): Promise<TransactionUnspentOutput[]>;
+    getSpecificUtxo(slug: string): (txHash: string, txId: number) => Promise<CardanoUtxosItem | undefined>;
     getCardanoApiMap(): Record<string, import("./handler/CardanoApi").CardanoApi>;
     getChainCurrentProviderByKey(slug: string): {
         endpoint: string;

package/services/chain-service/index.js

@@ -13,10 +13,12 @@ import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chai
 import { _ChainConnectionStatus, _CUSTOM_PREFIX, _NFT_CONTRACT_STANDARDS, _SMART_CONTRACT_STANDARDS } from '@subwallet/extension-base/services/chain-service/types';
 import { _getAssetOriginChain, _getTokenOnChainAssetId, _isAssetAutoEnable, _isAssetCanPayTxFee, _isAssetFungibleToken, _isChainEnabled, _isCustomAsset, _isCustomChain, _isCustomProvider, _isEqualContractAddress, _isEqualSmartContractAsset, _isLocalToken, _isMantaZkAsset, _isNativeToken, _isPureEvmChain, _isPureSubstrateChain, _parseAssetRefKey, randomizeProvider, updateLatestChainInfo } from '@subwallet/extension-base/services/chain-service/utils';
 import { MYTHOS_MIGRATION_KEY } from '@subwallet/extension-base/services/migration-service/scripts';
+import { convertUtxoRawToUtxo } from '@subwallet/extension-base/services/request-service/helper';
 import AssetSettingStore from '@subwallet/extension-base/stores/AssetSetting';
-import { addLazy, calculateMetadataHash, fetchStaticData, filterAssetsByChainAndType, getShortMetadata, MODULE_SUPPORT } from '@subwallet/extension-base/utils';
+import { addLazy, calculateMetadataHash, fetchStaticData, filterAssetsByChainAndType, getShortMetadata, MODULE_SUPPORT, reformatAddress } from '@subwallet/extension-base/utils';
 import { BehaviorSubject, Subject } from 'rxjs';
 import Web3 from 'web3';
+import { isArray } from '@polkadot/util';
 import { logger as createLogger } from '@polkadot/util/logger';
 const filterChainInfoMap = (data, ignoredChains) => {
   return Object.fromEntries(Object.entries(data).filter(([slug, info]) => !info.bitcoinInfo && !ignoredChains.includes(slug)));
@@ -155,6 +157,35 @@ export class ChainService {
   getCardanoApi(slug) {
     return this.cardanoChainHandler.getCardanoApiByChain(slug);
   }
+  async getUtxosByAddress(address, slug, paginate) {
+    const cardanoApi = this.getCardanoApi(slug);
+    const isTestnet = slug === 'cardano_preproduction';
+    const formattedAddress = isTestnet ? reformatAddress(address, 0) : address;
+    const limit = (paginate === null || paginate === void 0 ? void 0 : paginate.limit) || 100;
+    const utxos = [];
+    let needStop = false;
+    let page = ((paginate === null || paginate === void 0 ? void 0 : paginate.page) || 0) + 1;
+    while (!needStop) {
+      const utxoRaw = await cardanoApi.getUtxos(formattedAddress, page, limit);
+      if (utxoRaw.length === 0 || !isArray(utxoRaw)) {
+        needStop = true;
+      } else {
+        utxos.push(...utxoRaw);
+        page++;
+      }
+    }
+    return convertUtxoRawToUtxo(utxos);
+  }
+  getSpecificUtxo(slug) {
+    const cardanoApi = this.getCardanoApi(slug);
+    return async (txHash, txId) => {
+      const utxoRaw = await cardanoApi.getSpecificUtxo(txHash);
+      if (!(utxoRaw !== null && utxoRaw !== void 0 && utxoRaw.outputs)) {
+        return undefined;
+      }
+      return utxoRaw.outputs[txId];
+    };
+  }
   getCardanoApiMap() {
     return this.cardanoChainHandler.getCardanoApiMap();
   }

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

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

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

@@ -16,7 +16,7 @@ export const getStellaswapLiquidStakingContract = (networkKey, assetAddress, evm
   // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-unsafe-member-access
   return new evmApi.api.eth.Contract(ST_LIQUID_TOKEN_ABI, assetAddress, options);
 };
-const APR_STATS_URL = 'https://apr-api.stellaswap.com/api/v1/stdot';
+const APR_STATS_URL = 'https://stdot-apr.stellaswap.com/';
 const SUBWALLET_REFERRAL = '0x7e6815f45E624768548d085231f2d453f16FD7DD';
 const TOP_HOLDER = '0x4300e09284e3bB4d9044DdAB31EfAF5f3301DABa';
 export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakingPoolHandler {
@@ -86,7 +86,7 @@ export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakin
       statistic: {
         assetEarning: [{
           slug: this.rewardAssets[0],
-          apr: aprObject.result,
+          apr: aprObject.stDOTAPR,
           exchangeRate: exchangeRate
         }],
         unstakingPeriod: 24 * 28,
@@ -97,7 +97,7 @@ export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakin
           defaultUnstake: '0',
           fastUnstake: '0'
         },
-        totalApr: aprObject.result,
+        totalApr: aprObject.stDOTAPR,
         tvl: tvl.toString()
       }
     };

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

@@ -453,7 +453,7 @@ export default class SubnetTaoStakingPoolHandler extends BaseParaStakingPoolHand
     const BNlimitPrice = new BigN(limitPrice.integerValue(BigN.ROUND_CEIL).toFixed());
     const selectedValidatorInfo = targetValidators[0];
     const hotkey = selectedValidatorInfo.address;
-    const extrinsic = chainApi.api.tx.subtensorModule.addStakeLimit(hotkey, netuid, binaryAmount, BNlimitPrice, false);
+    const extrinsic = chainApi.api.tx.subtensorModule.addStakeLimit(hotkey, netuid, binaryAmount.toFixed(), BNlimitPrice.toFixed(), false);
     return [extrinsic, {
       slug: this.nativeToken.slug,
       amount: '0'
@@ -486,7 +486,7 @@ export default class SubnetTaoStakingPoolHandler extends BaseParaStakingPoolHand
     const alphaToTaoPrice = new BigN(await getAlphaToTaoRate(this.substrateApi, netuid || 0));
     const limitPrice = alphaToTaoPrice.multipliedBy(10 ** _getAssetDecimals(this.nativeToken)).multipliedBy(1 - (slippage || DEFAULT_BITTENSOR_SLIPPAGE));
     const BNlimitPrice = new BigN(limitPrice.integerValue(BigN.ROUND_CEIL).toFixed());
-    const extrinsic = apiPromise.api.tx.subtensorModule.removeStakeLimit(selectedTarget, netuid, binaryAmount, BNlimitPrice, false);
+    const extrinsic = apiPromise.api.tx.subtensorModule.removeStakeLimit(selectedTarget, netuid, binaryAmount.toFixed(), BNlimitPrice.toFixed(), false);
     return [ExtrinsicType.STAKING_UNBOND, extrinsic];
   }
   async validateYieldLeave(amount, address, fastLeave, selectedTarget, slug, poolInfo) {

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

@@ -8,6 +8,21 @@ import { _EXPECTED_BLOCK_TIME, _STAKING_ERA_LENGTH_MAP } from '@subwallet/extens
 import BaseParaStakingPoolHandler from '@subwallet/extension-base/services/earning-service/handlers/native-staking/base-para';
 import { BasicTxErrorType, EarningStatus, UnstakingStatus } from '@subwallet/extension-base/types';
 import { balanceFormatter, formatNumber, reformatAddress } from '@subwallet/extension-base/utils';
+import BigN from 'bignumber.js';
+const FIXED_DAY_REWARD = '123287670000000000000000';
+const COMMISSION = 0.1;
+const DAYS_PER_YEAR = 365;
+function calculateCollatorApy(numberOfCollators, totalStakeStr) {
+  const totalStake = new BigN(totalStakeStr);
+  const collatorRewardPerDay = new BigN(FIXED_DAY_REWARD).div(numberOfCollators);
+  const dayRate = collatorRewardPerDay.div(totalStake);
+  const finalTokens = totalStake.multipliedBy(dayRate.multipliedBy(DAYS_PER_YEAR).plus(1));
+  const yearReward = finalTokens.minus(totalStake).multipliedBy(1 - COMMISSION);
+  return yearReward.div(totalStake).multipliedBy(100).toNumber();
+}
+function calculateNetworkApy(totalStake) {
+  return new BigN(FIXED_DAY_REWARD).multipliedBy(DAYS_PER_YEAR).multipliedBy(1 - COMMISSION).div(totalStake).multipliedBy(100).toNumber();
+}
 export default class MythosNativeStakingPoolHandler extends BaseParaStakingPoolHandler {
   availableMethod = {
     join: true,
@@ -56,7 +71,12 @@ export default class MythosNativeStakingPoolHandler extends BaseParaStakingPoolH
       const sessionTime = _STAKING_ERA_LENGTH_MAP[this.chain] || _STAKING_ERA_LENGTH_MAP.default; // in hours
       const blockTime = _EXPECTED_BLOCK_TIME[this.chain];
       const unstakingPeriod = parseInt(unstakeDelay) * blockTime / 60 / 60;
-      const _minStake = await substrateApi.api.query.collatorStaking.minStake();
+      const [_minStake, _candidates] = await Promise.all([substrateApi.api.query.collatorStaking.minStake(), substrateApi.api.query.collatorStaking.candidates.entries()]);
+      const bnTotalChainStake = _candidates.reduce((total, _candidate) => {
+        const collatorInfo = _candidate[1].toPrimitive();
+        const collatorTotalStake = new BigN(collatorInfo.stake);
+        return total.plus(collatorTotalStake);
+      }, new BigN(0));
       const minStake = _minStake.toString();
       const minStakeToHuman = formatNumber(minStake, nativeToken.decimals || 0, balanceFormatter);
       const data = {
@@ -80,7 +100,7 @@ export default class MythosNativeStakingPoolHandler extends BaseParaStakingPoolH
           era: parseInt(currentSession),
           eraTime: sessionTime,
           unstakingPeriod: unstakingPeriod,
-          totalApy: undefined
+          totalApy: calculateNetworkApy(bnTotalChainStake)
           // tvl: totalStake.toString(),
           // inflation
         },
@@ -208,27 +228,41 @@ export default class MythosNativeStakingPoolHandler extends BaseParaStakingPoolH
 
   async getPoolTargets() {
     const substrateApi = await this.substrateApi.isReady;
-    const [_allCollators, _minStake, _commission] = await Promise.all([substrateApi.api.query.collatorStaking.candidates.entries(), substrateApi.api.query.collatorStaking.minStake(), substrateApi.api.query.collatorStaking.collatorRewardPercentage()]);
+    const [_allCollators, _minStake, _commission, _desiredCandidates] = await Promise.all([substrateApi.api.query.collatorStaking.candidates.entries(), substrateApi.api.query.collatorStaking.minStake(), substrateApi.api.query.collatorStaking.collatorRewardPercentage(), substrateApi.api.query.collatorStaking.desiredCandidates()]);
     const maxStakersPerCollator = substrateApi.api.consts.collatorStaking.maxStakers.toPrimitive();
-    return _allCollators.map(_collator => {
+    const numberOfRewardCollators = parseInt(_desiredCandidates.toString());
+    const numberOfCollators = _allCollators.length;
+    const allTargets = _allCollators.map(_collator => {
       const _collatorAddress = _collator[0].toHuman();
       const collatorAddress = _collatorAddress[0];
       const collatorInfo = _collator[1].toPrimitive();
-      const bnTotalStake = BigInt(collatorInfo.stake);
+      const totalStake = collatorInfo.stake;
       const numOfStakers = parseInt(collatorInfo.stakers);
       const isCrowded = numOfStakers >= maxStakersPerCollator;
       return {
         address: collatorAddress,
         chain: this.chain,
-        totalStake: bnTotalStake.toString(),
+        totalStake: totalStake,
         ownStake: '0',
-        otherStake: bnTotalStake.toString(),
+        otherStake: totalStake,
         minBond: _minStake.toPrimitive(),
         nominatorCount: numOfStakers,
         commission: getCommission(_commission.toString()),
         blocked: false,
         isVerified: false,
-        isCrowded
+        isCrowded,
+        expectedReturn: calculateCollatorApy(numberOfCollators, totalStake)
+      };
+    });
+    const sortTargetsByStake = allTargets.sort((a, b) => BigN(b.totalStake).minus(BigN(a.totalStake)).toNumber());
+    return sortTargetsByStake.map((target, rank) => {
+      let expectedReturn = target.expectedReturn;
+      if (rank >= numberOfRewardCollators) {
+        expectedReturn = 0.000000000000001;
+      }
+      return {
+        ...target,
+        expectedReturn
       };
     });
   }

package/services/earning-service/handlers/native-staking/relay-chain.js

@@ -75,7 +75,7 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
       const bnTotalEraStake = new BN(rawTotalEraStake);
       const bnTotalIssuance = new BN(rawTotalIssuance);
       const inflation = calculateInflation(bnTotalEraStake, bnTotalIssuance, numAuctions, chainInfo.slug);
-      const expectedReturn = calculateChainStakedReturnV2(chainInfo, rawTotalIssuance, erasPerDay, lastTotalStaked, validatorEraReward, new BigN(inflation), true);
+      const expectedReturn = await calculateChainStakedReturnV2(chainInfo, rawTotalIssuance, erasPerDay, lastTotalStaked, validatorEraReward, new BigN(inflation), true);
       const eraTime = _STAKING_ERA_LENGTH_MAP[chainInfo.slug] || _STAKING_ERA_LENGTH_MAP.default; // in hours
       const unlockingPeriod = parseInt(unlockingEras) * eraTime; // in hours
       const farmerCount = _counterForNominators.toPrimitive();