[Issue-4078] feat: find first found process

Author: bluezdot

packages/extension-base/src/koni/background/handlers/Extension.ts

@@ -48,8 +48,8 @@ import { EXTENSION_REQUEST_URL } from '@subwallet/extension-base/services/reques
 import { AuthUrls } from '@subwallet/extension-base/services/request-service/types';
 import { DEFAULT_AUTO_LOCK_TIME } from '@subwallet/extension-base/services/setting-service/constants';
 import { checkLiquidityForPool, estimateTokensForPool, getReserveForPool } from '@subwallet/extension-base/services/swap-service/handler/asset-hub/utils';
+import { generateAllDestinations } from '@subwallet/extension-base/services/swap-service/utils';
 import { SWPermitTransaction, SWTransaction, SWTransactionInput, SWTransactionResponse, SWTransactionResult, TransactionEmitter, TransactionEventResponse, ValidateTransactionResponseInput } from '@subwallet/extension-base/services/transaction-service/types';
-import { generateSwapPairs } from '@subwallet/extension-base/services/swap-service/utils';
 import { isProposalExpired, isSupportWalletConnectChain, isSupportWalletConnectNamespace } from '@subwallet/extension-base/services/wallet-connect-service/helpers';
 import { ResultApproveWalletConnectSession, WalletConnectNotSupportRequest, WalletConnectSessionRequest } from '@subwallet/extension-base/services/wallet-connect-service/types';
 import { SWStorage } from '@subwallet/extension-base/storage';
@@ -1345,7 +1345,8 @@ export default class KoniExtension {
     const warnings: TransactionWarning[] = [];
     const chainInfo = this.#koniState.getChainInfo(chain);
 
-    const test = generateSwapPairs(this.#koniState.getSubstrateApi(chain), this.#koniState.chainService, transferTokenInfo, 3).map((asset) => asset.slug);
+    // todo: remove test:
+    const test = generateAllDestinations(this.#koniState.getSubstrateApi(chain), this.#koniState.chainService, transferTokenInfo, 3).map((asset) => asset.slug);
 
     console.log('test', test);
 
@@ -4069,6 +4070,16 @@ export default class KoniExtension {
   }
 
   private async handleSwapRequest (request: SwapRequest): Promise<SwapRequestResult> {
+    // todo: remove test:
+    const testSwapRequest = this.#koniState.swapService.handleSwapRequestV2({
+      address: '1BzDB5n2rfSJwvuCW9deKY9XnUyys8Gy44SoX8tRNDCFBhx',
+      fromAmount: '1',
+      fromToken: 'hydradx_main-LOCAL-PINK',
+      toToken: 'ethereum-NATIVE-ETH'
+    });
+
+    console.log('testSwapRequest', testSwapRequest);
+
     return this.#koniState.swapService.handleSwapRequest(request);
   }
 

packages/extension-base/src/services/swap-service/index.ts

@@ -6,13 +6,14 @@ 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 { ChainService } from '@subwallet/extension-base/services/chain-service';
+import { _getAssetPriceId, _getAssetSymbol, _getMultiChainAsset } from '@subwallet/extension-base/services/chain-service/utils';
 import { EventService } from '@subwallet/extension-base/services/event-service';
 import { AssetHubSwapHandler } from '@subwallet/extension-base/services/swap-service/handler/asset-hub';
 import { SwapBaseInterface } from '@subwallet/extension-base/services/swap-service/handler/base-handler';
 import { ChainflipSwapHandler } from '@subwallet/extension-base/services/swap-service/handler/chainflip-handler';
 import { HydradxHandler } from '@subwallet/extension-base/services/swap-service/handler/hydradx-handler';
-import { _PROVIDER_TO_SUPPORTED_PAIR_MAP, getSwapAltToken, SWAP_QUOTE_TIMEOUT_MAP } from '@subwallet/extension-base/services/swap-service/utils';
-import { BasicTxErrorType } from '@subwallet/extension-base/types';
+import { _PROVIDER_TO_SUPPORTED_PAIR_MAP, findSwapDestinations, findXcmDestinations, getInitStep, getSwapAltToken, getSwapStep, getXcmStep, SWAP_QUOTE_TIMEOUT_MAP } from '@subwallet/extension-base/services/swap-service/utils';
+import { BasicTxErrorType, SwapRequestV2 } from '@subwallet/extension-base/types';
 import { CommonOptimalPath, DEFAULT_FIRST_STEP, MOCK_STEP_FEE } from '@subwallet/extension-base/types/service-base';
 import { _SUPPORTED_SWAP_PROVIDERS, OptimalSwapPathParams, QuoteAskResponse, SwapErrorType, SwapPair, SwapProviderId, SwapQuote, SwapQuoteResponse, SwapRequest, SwapRequestResult, SwapStepType, SwapSubmitParams, SwapSubmitStepData, ValidateSwapProcessParams } from '@subwallet/extension-base/types/swap';
 import { createPromiseHandler, PromiseHandler } from '@subwallet/extension-base/utils';
@@ -131,6 +132,94 @@ export class SwapService implements ServiceWithProcessInterface, StoppableServic
     } as SwapRequestResult;
   }
 
+  public handleSwapRequestV2 (request: SwapRequestV2) {
+    const { fromToken, toToken } = request;
+    const fromTokenInfo = this.chainService.getAssetBySlug(fromToken);
+    const toTokenInfo = this.chainService.getAssetBySlug(toToken);
+    const fromChain = fromTokenInfo.originChain;
+    const toChain = toTokenInfo.originChain;
+
+    const firstSwapDes = findSwapDestinations(this.chainService, fromTokenInfo);
+    const firstXcmDes = findXcmDestinations(this.chainService, fromTokenInfo);
+
+    if (!firstSwapDes.length && !firstXcmDes.length) {
+      return [];
+    }
+
+    const steps = [getInitStep(fromToken)];
+
+    // todo: try find swap
+    if (fromChain === toChain) {
+      if (firstSwapDes.includes(toTokenInfo)) {
+        steps.push(getSwapStep(toToken));
+
+        return steps;
+      }
+    }
+
+    // todo: try find xcm
+    if (_getMultiChainAsset(fromTokenInfo) === _getMultiChainAsset(toTokenInfo) || _getAssetPriceId(fromTokenInfo) === _getAssetPriceId(toTokenInfo) || _getAssetSymbol(fromTokenInfo) === _getAssetSymbol(toTokenInfo)) {
+      if (firstXcmDes.includes(toTokenInfo)) {
+        steps.push(getXcmStep(toToken));
+
+        return steps;
+      }
+    }
+
+    // todo: brute force find process
+    for (const xcmAsset of firstXcmDes) {
+      const swapDesChild = findSwapDestinations(this.chainService, xcmAsset);
+
+      if (!swapDesChild.length) {
+        /* empty */
+      } else if (swapDesChild.includes(toTokenInfo)) {
+        steps.push(getXcmStep(xcmAsset.slug));
+        steps.push(getSwapStep(toToken));
+
+        return steps;
+      } else {
+        for (const swapAsset of swapDesChild) {
+          const xcmDesChild = findXcmDestinations(this.chainService, swapAsset);
+
+          if (xcmDesChild.includes(toTokenInfo)) {
+            steps.push(getXcmStep(xcmAsset.slug));
+            steps.push(getSwapStep(swapAsset.slug));
+            steps.push(getXcmStep(toToken));
+
+            return steps;
+          }
+        }
+      }
+    }
+
+    for (const swapAsset of firstSwapDes) {
+      const xcmDesChild = findXcmDestinations(this.chainService, swapAsset);
+
+      if (!xcmDesChild.length) {
+        /* empty */
+      } else if (xcmDesChild.includes(toTokenInfo)) {
+        steps.push(getSwapStep(swapAsset.slug));
+        steps.push(getXcmStep(toToken));
+
+        return steps;
+      } else {
+        for (const xcmAsset of xcmDesChild) {
+          const swapDesChild = findSwapDestinations(this.chainService, xcmAsset);
+
+          if (swapDesChild.includes(toTokenInfo)) {
+            steps.push(getSwapStep(swapAsset.slug));
+            steps.push(getXcmStep(xcmAsset.slug));
+            steps.push(getSwapStep(toToken));
+
+            return steps;
+          }
+        }
+      }
+    }
+
+    return [];
+  }
+
   public async getLatestQuotes (request: SwapRequest): Promise<SwapQuoteResponse> {
     request.pair.metadata = this.getSwapPairMetadata(request.pair.slug); // todo: improve this
     const quoteAskResponses = await this.askProvidersForQuote(request);

packages/extension-base/src/services/swap-service/utils.ts

@@ -103,7 +103,7 @@ export function getChainflipSwap (isTestnet: boolean) {
   }
 }
 
-export function generateSwapPairs (substrateApi: _SubstrateApi, chainService: ChainService, fromAsset: _ChainAsset, maxPathLength = 1) {
+export function generateAllDestinations (substrateApi: _SubstrateApi, chainService: ChainService, fromAsset: _ChainAsset, maxPathLength = 1) {
   if (maxPathLength < 1) {
     return [];
   }
@@ -138,7 +138,7 @@ function findDestinations (chainService: ChainService, chainAsset: _ChainAsset)
   return mergeWithoutDuplicate<_ChainAsset>(xcmTargets, swapTargets);
 }
 
-function findXcmDestinations (chainService: ChainService, chainAsset: _ChainAsset) {
+export function findXcmDestinations (chainService: ChainService, chainAsset: _ChainAsset) {
   const xcmTargets: _ChainAsset[] = [];
   const multichainAssetSlug = _getMultiChainAsset(chainAsset);
 
@@ -154,10 +154,10 @@ function findXcmDestinations (chainService: ChainService, chainAsset: _ChainAsse
     }
   }
 
-  return xcmTargets;
+  return xcmTargets.filter((candidate) => candidate.slug !== chainAsset.slug);
 }
 
-function findSwapDestinations (chainService: ChainService, chainAsset: _ChainAsset) {
+export function findSwapDestinations (chainService: ChainService, chainAsset: _ChainAsset) {
   const chain = chainAsset.originChain;
   const swapTargets: _ChainAsset[] = [];
 
@@ -177,7 +177,7 @@ function findSwapDestinations (chainService: ChainService, chainAsset: _ChainAss
     swapTargets.push(...Object.values(assets));
   });
 
-  return swapTargets;
+  return swapTargets.filter((candidate) => candidate.slug !== chainAsset.slug);
 }
 
 // @ts-ignore
@@ -230,3 +230,35 @@ export async function getAllXcmChannelSubstrate (substrateApi: _SubstrateApi) {
 function mergeWithoutDuplicate<T> (arr1: T[], arr2: T[]): T[] {
   return Array.from(new Set([...arr1, ...arr2]));
 }
+
+export enum transferTokenType {
+  INIT = 'INIT',
+  SWAP = 'SWAP',
+  XCM = 'XCM' // todo: rename XCM to a better name to describe cross chain transfer action;
+}
+
+export interface TransferTokenAction {
+  action: transferTokenType;
+  toToken: string;
+}
+
+export function getInitStep (tokenSlug: string): TransferTokenAction {
+  return {
+    action: transferTokenType.INIT,
+    toToken: tokenSlug
+  }
+}
+
+export function getXcmStep (tokenSlug: string): TransferTokenAction {
+  return {
+    action: transferTokenType.XCM,
+    toToken: tokenSlug
+  }
+}
+
+export function getSwapStep (tokenSlug: string): TransferTokenAction {
+  return {
+    action: transferTokenType.SWAP,
+    toToken: tokenSlug
+  }
+}

packages/extension-base/src/types/swap/index.ts

@@ -169,6 +169,13 @@ export interface SwapRequest {
   currentQuote?: SwapProvider
 }
 
+export interface SwapRequestV2 {
+  address: string;
+  fromAmount: string;
+  fromToken: string;
+  toToken: string;
+}
+
 export interface SwapRequestResult {
   process: CommonOptimalPath;
   quote: SwapQuoteResponse;