@subwallet/extension-base 1.3.10-0 → 1.3.11-0

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

@@ -2,8 +2,9 @@ import { TransactionError } from '@subwallet/extension-base/background/errors/Tr
 import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
 import { ServiceStatus, ServiceWithProcessInterface, StoppableServiceInterface } from '@subwallet/extension-base/services/base/types';
 import { CommonOptimalPath } from '@subwallet/extension-base/types/service-base';
-import { OptimalSwapPathParams, SwapPair, SwapQuoteResponse, SwapRequest, SwapRequestResult, SwapSubmitParams, SwapSubmitStepData, ValidateSwapProcessParams } from '@subwallet/extension-base/types/swap';
+import { OptimalSwapPathParams, SwapPair, SwapProviderId, SwapQuoteResponse, SwapRequest, SwapRequestResult, SwapSubmitParams, SwapSubmitStepData, ValidateSwapProcessParams } from '@subwallet/extension-base/types/swap';
 import { PromiseHandler } from '@subwallet/extension-base/utils';
+export declare const _isChainSupportedByProvider: (providerSlug: SwapProviderId, chain: string) => boolean;
 export declare class SwapService implements ServiceWithProcessInterface, StoppableServiceInterface {
     protected readonly state: KoniState;
     private eventService;

package/services/swap-service/index.js

@@ -13,6 +13,11 @@ import { DEFAULT_FIRST_STEP, MOCK_STEP_FEE } from '@subwallet/extension-base/typ
 import { _SUPPORTED_SWAP_PROVIDERS, SwapErrorType, SwapProviderId, SwapStepType } from '@subwallet/extension-base/types/swap';
 import { createPromiseHandler } from '@subwallet/extension-base/utils';
 import { BehaviorSubject } from 'rxjs';
+import { SimpleSwapHandler } from "./handler/simpleswap-handler.js";
+export const _isChainSupportedByProvider = (providerSlug, chain) => {
+  const supportedChains = _PROVIDER_TO_SUPPORTED_PAIR_MAP[providerSlug];
+  return supportedChains ? supportedChains.includes(chain) : false;
+};
 export class SwapService {
   swapPairSubject = new BehaviorSubject([]);
   handlers = {};
@@ -29,7 +34,7 @@ export class SwapService {
     const swappingSrcChain = this.chainService.getAssetBySlug(request.pair.from).originChain;
     await Promise.all(Object.values(this.handlers).map(async handler => {
       // temporary solution to reduce number of requests to providers, will work as long as there's only 1 provider for 1 chain
-      if (!_PROVIDER_TO_SUPPORTED_PAIR_MAP[handler.providerSlug].includes(swappingSrcChain)) {
+      if (!_isChainSupportedByProvider(handler.providerSlug, swappingSrcChain)) {
         return;
       }
       if (handler.init && handler.isReady === false) {
@@ -116,7 +121,10 @@ export class SwapService {
       quoteError = (preferredErrorResp === null || preferredErrorResp === void 0 ? void 0 : preferredErrorResp.error) || (defaultErrorResp === null || defaultErrorResp === void 0 ? void 0 : defaultErrorResp.error);
     } else {
       var _selectedQuote;
-      selectedQuote = availableQuotes[0];
+      selectedQuote = availableQuotes.find(quote => {
+        var _request$currentQuote;
+        return quote.provider.id === ((_request$currentQuote = request.currentQuote) === null || _request$currentQuote === void 0 ? void 0 : _request$currentQuote.id);
+      }) || availableQuotes[0];
       aliveUntil = ((_selectedQuote = selectedQuote) === null || _selectedQuote === void 0 ? void 0 : _selectedQuote.aliveUntil) || +Date.now() + SWAP_QUOTE_TIMEOUT_MAP.default;
     }
     return {
@@ -150,6 +158,9 @@ export class SwapService {
         case SwapProviderId.ROCOCO_ASSET_HUB:
           this.handlers[providerId] = new AssetHubSwapHandler(this.chainService, this.state.balanceService, 'rococo_assethub');
           break;
+        case SwapProviderId.SIMPLE_SWAP:
+          this.handlers[providerId] = new SimpleSwapHandler(this.chainService, this.state.balanceService);
+          break;
         default:
           throw new Error('Unsupported provider');
       }

package/services/swap-service/utils.d.ts

@@ -3,10 +3,12 @@ import { _ChainAsset } from '@subwallet/chain-list/types';
 import { SwapPair } from '@subwallet/extension-base/types/swap';
 export declare const CHAIN_FLIP_TESTNET_EXPLORER = "https://blocks-perseverance.chainflip.io";
 export declare const CHAIN_FLIP_MAINNET_EXPLORER = "https://scan.chainflip.io";
+export declare const SIMPLE_SWAP_EXPLORER = "https://simpleswap.io";
 export declare const CHAIN_FLIP_SUPPORTED_MAINNET_MAPPING: Record<string, Chain>;
 export declare const CHAIN_FLIP_SUPPORTED_TESTNET_MAPPING: Record<string, Chain>;
 export declare const CHAIN_FLIP_SUPPORTED_MAINNET_ASSET_MAPPING: Record<string, Asset>;
 export declare const CHAIN_FLIP_SUPPORTED_TESTNET_ASSET_MAPPING: Record<string, Asset>;
+export declare const SIMPLE_SWAP_SUPPORTED_TESTNET_ASSET_MAPPING: Record<string, string>;
 export declare const SWAP_QUOTE_TIMEOUT_MAP: Record<string, number>;
 export declare const _PROVIDER_TO_SUPPORTED_PAIR_MAP: Record<string, string[]>;
 export declare function getSwapAlternativeAsset(swapPair: SwapPair): string | undefined;

package/services/swap-service/utils.js

@@ -9,6 +9,7 @@ import { SwapProviderId } from '@subwallet/extension-base/types/swap';
 import BigN from 'bignumber.js';
 export const CHAIN_FLIP_TESTNET_EXPLORER = 'https://blocks-perseverance.chainflip.io';
 export const CHAIN_FLIP_MAINNET_EXPLORER = 'https://scan.chainflip.io';
+export const SIMPLE_SWAP_EXPLORER = 'https://simpleswap.io';
 export const CHAIN_FLIP_SUPPORTED_MAINNET_MAPPING = {
   [COMMON_CHAIN_SLUGS.POLKADOT]: Chains.Polkadot,
   [COMMON_CHAIN_SLUGS.ETHEREUM]: Chains.Ethereum,
@@ -29,6 +30,13 @@ export const CHAIN_FLIP_SUPPORTED_TESTNET_ASSET_MAPPING = {
   [COMMON_ASSETS.ETH_SEPOLIA]: Assets.ETH,
   [COMMON_ASSETS.USDC_SEPOLIA]: Assets.USDC
 };
+export const SIMPLE_SWAP_SUPPORTED_TESTNET_ASSET_MAPPING = {
+  'bittensor-NATIVE-TAO': 'tao',
+  [COMMON_ASSETS.ETH]: 'eth',
+  [COMMON_ASSETS.DOT]: 'dot',
+  [COMMON_ASSETS.USDC_ETHEREUM]: 'usdc',
+  [COMMON_ASSETS.USDT_ETHEREUM]: 'usdterc20'
+};
 export const SWAP_QUOTE_TIMEOUT_MAP = {
   // in milliseconds
   default: 30000,
@@ -42,7 +50,8 @@ export const _PROVIDER_TO_SUPPORTED_PAIR_MAP = {
   [SwapProviderId.CHAIN_FLIP_TESTNET]: [COMMON_CHAIN_SLUGS.CHAINFLIP_POLKADOT, COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA],
   [SwapProviderId.POLKADOT_ASSET_HUB]: [COMMON_CHAIN_SLUGS.POLKADOT_ASSET_HUB],
   [SwapProviderId.KUSAMA_ASSET_HUB]: [COMMON_CHAIN_SLUGS.KUSAMA_ASSET_HUB],
-  [SwapProviderId.ROCOCO_ASSET_HUB]: [COMMON_CHAIN_SLUGS.ROCOCO_ASSET_HUB]
+  [SwapProviderId.ROCOCO_ASSET_HUB]: [COMMON_CHAIN_SLUGS.ROCOCO_ASSET_HUB],
+  [SwapProviderId.SIMPLE_SWAP]: ['bittensor', COMMON_CHAIN_SLUGS.ETHEREUM, COMMON_CHAIN_SLUGS.POLKADOT]
 };
 export function getSwapAlternativeAsset(swapPair) {
   var _swapPair$metadata;

package/services/transaction-service/index.js

@@ -15,7 +15,7 @@ import { getBaseTransactionInfo, getTransactionId, isSubstrateTransaction, isTon
 import { getExplorerLink, parseTransactionData } from '@subwallet/extension-base/services/transaction-service/utils';
 import { isWalletConnectRequest } from '@subwallet/extension-base/services/wallet-connect-service/helpers';
 import { BasicTxErrorType, YieldPoolType } from '@subwallet/extension-base/types';
-import { _isRuntimeUpdated, anyNumberToBN, pairToAccount, reformatAddress } from '@subwallet/extension-base/utils';
+import { anyNumberToBN, pairToAccount, reformatAddress } from '@subwallet/extension-base/utils';
 import { mergeTransactionAndSignature } from '@subwallet/extension-base/utils/eth/mergeTransactionAndSignature';
 import { isContractAddress, parseContractInput } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { BN_ZERO } from '@subwallet/extension-base/utils/number';
@@ -1047,7 +1047,7 @@ export default class TransactionService {
     }
     return emitter;
   }
-  async signAndSendSubstrateTransaction({
+  signAndSendSubstrateTransaction({
     address,
     chain,
     id,
@@ -1062,8 +1062,9 @@ export default class TransactionService {
       extrinsicHash: id
     };
     const extrinsic = transaction;
-    const registry = extrinsic.registry;
-    const signedExtensions = registry.signedExtensions;
+    // const registry = extrinsic.registry;
+    // const signedExtensions = registry.signedExtensions;
+
     const signerOption = {
       signer: {
         signPayload: async payload => {
@@ -1080,13 +1081,16 @@ export default class TransactionService {
       },
       withSignedTransaction: true
     };
-    if (_isRuntimeUpdated(signedExtensions)) {
-      const metadataHash = await this.state.chainService.calculateMetadataHash(chain);
-      if (metadataHash) {
-        signerOption.mode = 1;
-        signerOption.metadataHash = metadataHash;
-      }
-    }
+
+    // if (_isRuntimeUpdated(signedExtensions)) {
+    //   const metadataHash = await this.state.chainService.calculateMetadataHash(chain);
+    //
+    //   if (metadataHash) {
+    //     signerOption.mode = 1;
+    //     signerOption.metadataHash = metadataHash;
+    //   }
+    // }
+
     extrinsic.signAsync(address, signerOption).then(async rs => {
       // Emit signed event
       emitter.emit('signed', eventData);

package/services/transaction-service/utils.d.ts

@@ -1,6 +1,7 @@
 import { _ChainInfo } from '@subwallet/chain-list/types';
 import { ExtrinsicDataTypeMap, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
-import { ChainflipSwapTxData } from '@subwallet/extension-base/types/swap';
+import { ChainflipSwapTxData, SimpleSwapTxData } from '@subwallet/extension-base/types/swap';
 export declare function parseTransactionData<T extends ExtrinsicType>(data: unknown): ExtrinsicDataTypeMap[T];
 export declare function getExplorerLink(chainInfo: _ChainInfo, value: string, type: 'account' | 'tx'): string | undefined;
 export declare function getChainflipExplorerLink(data: ChainflipSwapTxData, chainInfo: _ChainInfo): string;
+export declare function getSimpleSwapExplorerLink(data: SimpleSwapTxData): string;

package/services/transaction-service/utils.js

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { _getBlockExplorerFromChain, _isChainTestNet, _isPureEvmChain } from '@subwallet/extension-base/services/chain-service/utils';
-import { CHAIN_FLIP_MAINNET_EXPLORER, CHAIN_FLIP_TESTNET_EXPLORER } from '@subwallet/extension-base/services/swap-service/utils';
+import { CHAIN_FLIP_MAINNET_EXPLORER, CHAIN_FLIP_TESTNET_EXPLORER, SIMPLE_SWAP_EXPLORER } from '@subwallet/extension-base/services/swap-service/utils';
 // @ts-ignore
 export function parseTransactionData(data) {
   // @ts-ignore
@@ -46,7 +46,7 @@ function getBlockExplorerTxRoute(chainInfo) {
   if (['aventus', 'deeper_network'].includes(chainInfo.slug)) {
     return 'transaction';
   }
-  if (['invarch'].includes(chainInfo.slug)) {
+  if (['invarch', 'tangle'].includes(chainInfo.slug)) {
     return '#/extrinsics';
   }
   return 'extrinsic';
@@ -62,6 +62,9 @@ export function getExplorerLink(chainInfo, value, type) {
       return undefined;
     }
     const route = getBlockExplorerTxRoute(chainInfo);
+    if (chainInfo.slug === 'tangle') {
+      return `${explorerLink}${explorerLink.endsWith('/') ? '' : '/'}extrinsic/${value}${route}/${value}`;
+    }
     return `${explorerLink}${explorerLink.endsWith('/') ? '' : '/'}${route}/${value}`;
   }
   return undefined;
@@ -69,4 +72,8 @@ export function getExplorerLink(chainInfo, value, type) {
 export function getChainflipExplorerLink(data, chainInfo) {
   const chainflipDomain = _isChainTestNet(chainInfo) ? CHAIN_FLIP_TESTNET_EXPLORER : CHAIN_FLIP_MAINNET_EXPLORER;
   return `${chainflipDomain}/channels/${data.depositChannelId}`;
+}
+export function getSimpleSwapExplorerLink(data) {
+  const simpleswapDomain = SIMPLE_SWAP_EXPLORER;
+  return `${simpleswapDomain}/exchange?id=${data.id}`;
 }

package/types/swap/index.d.ts

@@ -40,7 +40,8 @@ export declare enum SwapErrorType {
     SWAP_NOT_ENOUGH_BALANCE = "SWAP_NOT_ENOUGH_BALANCE",
     NOT_ENOUGH_LIQUIDITY = "NOT_ENOUGH_LIQUIDITY",
     MAKE_POOL_NOT_ENOUGH_EXISTENTIAL_DEPOSIT = "MAKE_POOL_NOT_ENOUGH_EXISTENTIAL_DEPOSIT",
-    AMOUNT_CANNOT_BE_ZERO = "AMOUNT_CANNOT_BE_ZERO"
+    AMOUNT_CANNOT_BE_ZERO = "AMOUNT_CANNOT_BE_ZERO",
+    NOT_MEET_MIN_EXPECTED = "NOT_MEET_MIN_EXPECTED"
 }
 export declare enum SwapStepType {
     SWAP = "SWAP"
@@ -52,7 +53,8 @@ export declare enum SwapProviderId {
     HYDRADX_TESTNET = "HYDRADX_TESTNET",
     POLKADOT_ASSET_HUB = "POLKADOT_ASSET_HUB",
     KUSAMA_ASSET_HUB = "KUSAMA_ASSET_HUB",
-    ROCOCO_ASSET_HUB = "ROCOCO_ASSET_HUB"
+    ROCOCO_ASSET_HUB = "ROCOCO_ASSET_HUB",
+    SIMPLE_SWAP = "SIMPLE_SWAP"
 }
 export declare const _SUPPORTED_SWAP_PROVIDERS: SwapProviderId[];
 export interface SwapProvider {
@@ -65,7 +67,7 @@ export declare enum SwapFeeType {
     NETWORK_FEE = "NETWORK_FEE",
     WALLET_FEE = "WALLET_FEE"
 }
-export declare type SwapTxData = ChainflipSwapTxData | HydradxSwapTxData;
+export declare type SwapTxData = ChainflipSwapTxData | HydradxSwapTxData | SimpleSwapTxData;
 export interface SwapBaseTxData {
     provider: SwapProvider;
     quote: SwapQuote;
@@ -79,6 +81,9 @@ export interface ChainflipSwapTxData extends SwapBaseTxData {
     depositAddress: string;
     estimatedDepositChannelExpiryTime?: number;
 }
+export interface SimpleSwapTxData extends SwapBaseTxData {
+    id: string;
+}
 export interface HydradxSwapTxData extends SwapBaseTxData {
     txHex: string;
 }
@@ -98,6 +103,11 @@ export interface AssetHubPreValidationMetadata {
     quoteRate: string;
     priceImpactPct?: string;
 }
+export interface SimpleSwapValidationMetadata {
+    minSwap: AmountData;
+    maxSwap: AmountData;
+    chain: _ChainInfo;
+}
 export interface QuoteAskResponse {
     quote?: SwapQuote;
     error?: SwapError;
@@ -109,6 +119,7 @@ export interface SwapRequest {
     slippage: number;
     recipient?: string;
     feeToken?: string;
+    currentQuote?: SwapProvider;
 }
 export interface SwapRequestResult {
     process: CommonOptimalPath;
@@ -158,3 +169,4 @@ export interface SlippageType {
     isCustomType: boolean;
 }
 export declare const CHAINFLIP_SLIPPAGE = 0.02;
+export declare const SIMPLE_SWAP_SLIPPAGE = 0.05;

package/types/swap/index.js

@@ -16,6 +16,7 @@ export let SwapErrorType;
   SwapErrorType["NOT_ENOUGH_LIQUIDITY"] = "NOT_ENOUGH_LIQUIDITY";
   SwapErrorType["MAKE_POOL_NOT_ENOUGH_EXISTENTIAL_DEPOSIT"] = "MAKE_POOL_NOT_ENOUGH_EXISTENTIAL_DEPOSIT";
   SwapErrorType["AMOUNT_CANNOT_BE_ZERO"] = "AMOUNT_CANNOT_BE_ZERO";
+  SwapErrorType["NOT_MEET_MIN_EXPECTED"] = "NOT_MEET_MIN_EXPECTED";
 })(SwapErrorType || (SwapErrorType = {}));
 export let SwapStepType;
 (function (SwapStepType) {
@@ -30,8 +31,9 @@ export let SwapProviderId;
   SwapProviderId["POLKADOT_ASSET_HUB"] = "POLKADOT_ASSET_HUB";
   SwapProviderId["KUSAMA_ASSET_HUB"] = "KUSAMA_ASSET_HUB";
   SwapProviderId["ROCOCO_ASSET_HUB"] = "ROCOCO_ASSET_HUB";
+  SwapProviderId["SIMPLE_SWAP"] = "SIMPLE_SWAP";
 })(SwapProviderId || (SwapProviderId = {}));
-export const _SUPPORTED_SWAP_PROVIDERS = [SwapProviderId.CHAIN_FLIP_TESTNET, SwapProviderId.CHAIN_FLIP_MAINNET, SwapProviderId.HYDRADX_MAINNET, SwapProviderId.HYDRADX_TESTNET, SwapProviderId.POLKADOT_ASSET_HUB, SwapProviderId.KUSAMA_ASSET_HUB, SwapProviderId.ROCOCO_ASSET_HUB];
+export const _SUPPORTED_SWAP_PROVIDERS = [SwapProviderId.CHAIN_FLIP_TESTNET, SwapProviderId.CHAIN_FLIP_MAINNET, SwapProviderId.HYDRADX_MAINNET, SwapProviderId.HYDRADX_TESTNET, SwapProviderId.POLKADOT_ASSET_HUB, SwapProviderId.KUSAMA_ASSET_HUB, SwapProviderId.ROCOCO_ASSET_HUB, SwapProviderId.SIMPLE_SWAP];
 // process handling
 export let SwapFeeType;
 (function (SwapFeeType) {
@@ -39,4 +41,5 @@ export let SwapFeeType;
   SwapFeeType["NETWORK_FEE"] = "NETWORK_FEE";
   SwapFeeType["WALLET_FEE"] = "WALLET_FEE";
 })(SwapFeeType || (SwapFeeType = {}));
-export const CHAINFLIP_SLIPPAGE = 0.02; // Example: 0.01 for 1%
+export const CHAINFLIP_SLIPPAGE = 0.02; // Example: 0.01 for 1%
+export const SIMPLE_SWAP_SLIPPAGE = 0.05;

package/utils/number.d.ts

@@ -9,5 +9,13 @@ export interface NumberFormatter {
 export declare const balanceFormatter: NumberFormatter;
 export declare const balanceNoPrefixFormater: NumberFormatter;
 export declare const PREDEFINED_FORMATTER: Record<string, NumberFormatter>;
-export declare const toBNString: (input: string | number | BigNumber, decimal: number) => string;
+/** @function formatNumber
+ * Convert number to a formatted string by dividing by 10^decimal
+ * @param {string | number | BigNumber} input - Input number
+ * @param {number} decimal - Decimal number
+ * @param {NumberFormatter} [formatter] - Formatter function
+ * - Default: balanceFormatter: With number > 1, show decimal with 2 numbers,
+ * with number < 1, show decimal with 6 (default) number
+ * @param {Record<string, number>} [metadata] - Metadata for formatter
+ */
 export declare const formatNumber: (input: string | number | BigNumber, decimal: number, formatter?: NumberFormatter, metadata?: Record<string, number>) => string;

package/utils/number.js

@@ -182,10 +182,16 @@ export const balanceNoPrefixFormater = (input, metadata) => {
 export const PREDEFINED_FORMATTER = {
   balance: balanceFormatter
 };
-export const toBNString = (input, decimal) => {
-  const raw = new BigNumber(input);
-  return raw.multipliedBy(BN_TEN.pow(decimal)).toFixed();
-};
+
+/** @function formatNumber
+ * Convert number to a formatted string by dividing by 10^decimal
+ * @param {string | number | BigNumber} input - Input number
+ * @param {number} decimal - Decimal number
+ * @param {NumberFormatter} [formatter] - Formatter function
+ * - Default: balanceFormatter: With number > 1, show decimal with 2 numbers,
+ * with number < 1, show decimal with 6 (default) number
+ * @param {Record<string, number>} [metadata] - Metadata for formatter
+ */
 export const formatNumber = (input, decimal, formatter = balanceFormatter, metadata) => {
   const raw = new BigNumber(input).dividedBy(BN_TEN.pow(decimal)).toFixed();
   return formatter(raw, metadata);