@rango-dev/queue-manager-rango-preset 0.41.1-next.0 → 0.42.0

package/src/services/eventEmitter.ts

@@ -12,9 +12,11 @@ import {
   getCurrentStepTx,
   getFailedStep,
   getLastSuccessfulStep,
+  getSwapInputUsd,
+  getSwapOutputUsd,
   isApprovalCurrentStepTx,
 } from '../helpers';
-import { getCurrentNamespaceOfOrNull } from '../shared';
+import { getCurrentBlockchainOfOrNull } from '../shared';
 import {
   EventSeverity,
   RouteEventType,
@@ -140,7 +142,7 @@ function getEventPayload(
   return result;
 }
 
-function emitRouteEvent(stepEvent: StepEvent, route: Route) {
+function emitRouteEvent(stepEvent: StepEvent, route: Route, swap: PendingSwap) {
   let routeEvent: RouteEvent | undefined;
   const { type } = stepEvent;
   switch (type) {
@@ -150,9 +152,17 @@ function emitRouteEvent(stepEvent: StepEvent, route: Route) {
     case StepEventType.FAILED:
       routeEvent = { ...stepEvent, type: RouteEventType.FAILED };
       break;
-    case StepEventType.SUCCEEDED:
-      routeEvent = { ...stepEvent, type: RouteEventType.SUCCEEDED };
+    case StepEventType.SUCCEEDED: {
+      routeEvent = {
+        ...stepEvent,
+        type: RouteEventType.SUCCEEDED,
+        inputAmount: swap.inputAmount,
+        inputAmountUsd: getSwapInputUsd(swap),
+        outputAmount: swap.steps[swap.steps.length - 1].outputAmount ?? '',
+        outputAmountUsd: getSwapOutputUsd(swap),
+      };
       break;
+    }
     default:
       break;
   }
@@ -178,8 +188,8 @@ export function notifier(params: NotifierParams) {
   const fromAsset = `${step.fromBlockchain}.${step.fromSymbol}`;
   const toAsset = `${step.toBlockchain}.${step.toSymbol}`;
   const outputAmount = step.outputAmount ?? '';
-  const currentFromNamespace = !!params.step
-    ? getCurrentNamespaceOfOrNull(params.swap, params.step)
+  const currentFromBlockchain = !!params.step
+    ? getCurrentBlockchainOfOrNull(params.swap, params.step)
     : null;
   let message = '';
   let messageSeverity: StepEvent['messageSeverity'] = EventSeverity.INFO;
@@ -254,7 +264,7 @@ export function notifier(params: NotifierParams) {
         event.status ===
         StepExecutionBlockedEventStatus.WAITING_FOR_NETWORK_CHANGE
       ) {
-        message = `Please change your wallet network to ${currentFromNamespace?.network}.`;
+        message = `Please change your wallet network to ${currentFromBlockchain}.`;
         messageSeverity = EventSeverity.WARNING;
       }
       break;
@@ -267,6 +277,6 @@ export function notifier(params: NotifierParams) {
     emitStepEvent({ ...event, message, messageSeverity }, route, step);
   }
   if (params.event.type === StepEventType.FAILED || !params.step) {
-    emitRouteEvent({ ...event, message, messageSeverity }, route);
+    emitRouteEvent({ ...event, message, messageSeverity }, route, params.swap);
   }
 }

package/src/shared.ts

@@ -1,4 +1,3 @@
-import type { NamespaceInputForConnect } from '@rango-dev/wallets-core/dist/legacy/types';
 import type { Network, WalletType } from '@rango-dev/wallets-shared';
 import type {
   BlockchainMeta,
@@ -38,6 +37,7 @@ export type WalletBalance = {
 };
 
 export type Account = {
+  balances: WalletBalance[] | null;
   address: string;
   loading: boolean;
   walletType: WalletType;
@@ -87,91 +87,49 @@ export enum MessageSeverity {
 
 export type SwapStatus = 'running' | 'failed' | 'success';
 
-export interface TargetNamespace {
-  namespace: NamespaceInputForConnect['namespace'];
-  network: string;
-}
-export const getCurrentNamespaceOfOrNull = (
+export const getCurrentBlockchainOfOrNull = (
   swap: PendingSwap,
   step: PendingSwapStep
-): TargetNamespace | null => {
+): Network | null => {
   try {
-    return getCurrentNamespaceOf(swap, step);
+    return getCurrentBlockchainOf(swap, step);
   } catch (e) {
     return null;
   }
 };
 
-export const getCurrentNamespaceOf = (
+export const getCurrentBlockchainOf = (
   swap: PendingSwap,
   step: PendingSwapStep
-): TargetNamespace => {
-  const evmNetwork =
-    step.evmTransaction?.blockChain || step.evmApprovalTransaction?.blockChain;
-  const starknetNetwork =
+): Network => {
+  const b1 =
+    step.evmTransaction?.blockChain ||
+    step.evmApprovalTransaction?.blockChain ||
     step.starknetTransaction?.blockChain ||
-    step.starknetApprovalTransaction?.blockChain;
-  const tronNetwork =
+    step.starknetApprovalTransaction?.blockChain ||
     step.tronTransaction?.blockChain ||
-    step.tronApprovalTransaction?.blockChain;
-  const cosmosNetwork = step.cosmosTransaction?.blockChain;
-  const solanaNetwork = step.solanaTransaction?.blockChain;
-  const tonNetwork = step.tonTransaction?.blockChain;
-
-  if (evmNetwork) {
-    return {
-      namespace: 'EVM',
-      network: evmNetwork,
-    };
-  } else if (starknetNetwork) {
-    return {
-      namespace: 'Starknet',
-      network: starknetNetwork,
-    };
-  } else if (tronNetwork) {
-    return {
-      namespace: 'Tron',
-      network: tronNetwork,
-    };
-  } else if (cosmosNetwork) {
-    return {
-      namespace: 'Cosmos',
-      network: cosmosNetwork,
-    };
-  } else if (solanaNetwork) {
-    return {
-      namespace: 'Solana',
-      network: solanaNetwork,
-    };
-  } else if (tonNetwork) {
-    return {
-      namespace: 'Ton',
-      network: tonNetwork,
-    };
-  } else if (!!step.transferTransaction) {
-    const transferAddress = step.transferTransaction.fromWalletAddress;
-    if (!transferAddress) {
-      throw PrettyError.BlockchainMissing();
-    }
-    const utxoNetwork = Object.keys(swap.wallets).find(
-      (network) => swap.wallets[network]?.address === transferAddress
-    );
-    if (!utxoNetwork) {
-      throw PrettyError.BlockchainMissing();
-    }
+    step.tronApprovalTransaction?.blockChain ||
+    step.cosmosTransaction?.blockChain ||
+    step.solanaTransaction?.blockChain ||
+    step.tonTransaction?.blockChain;
+  if (b1) {
+    return b1;
+  }
 
-    return {
-      namespace: 'UTXO',
-      network: utxoNetwork,
-    };
+  const transferAddress = step.transferTransaction?.fromWalletAddress;
+  if (!transferAddress) {
+    throw PrettyError.BlockchainMissing();
   }
 
-  throw new Error(
-    'Unsupported transaction type has been included in your swap.',
-    {
-      cause: step,
-    }
-  );
+  const blockchain =
+    Object.keys(swap.wallets).find(
+      (b) => swap.wallets[b]?.address === transferAddress
+    ) || null;
+  if (blockchain == null) {
+    throw PrettyError.BlockchainMissing();
+  }
+
+  return blockchain;
 };
 
 export const getScannerUrl = (

package/src/types.ts

@@ -1,4 +1,4 @@
-import type { TargetNamespace, Wallet } from './shared';
+import type { Wallet } from './shared';
 import type {
   QueueContext,
   QueueDef,
@@ -70,9 +70,13 @@ export interface SwapQueueContext extends QueueContext {
   getSigners: (type: WalletType) => Promise<SignerFactory>;
   switchNetwork: (
     wallet: WalletType,
-    namespaces: TargetNamespace
-  ) => Promise<ConnectResult | ConnectResult[] | undefined> | undefined;
+    network: Network
+  ) => Promise<ConnectResult | undefined> | undefined;
   canSwitchNetworkTo: (type: WalletType, network: Network) => boolean;
+  connect: (
+    wallet: WalletType,
+    network: Network
+  ) => Promise<ConnectResult> | undefined;
   state: (type: WalletType) => WalletState;
   isMobileWallet: (type: WalletType) => boolean;
 
@@ -185,12 +189,15 @@ export type FailedRouteEventPayload = {
 export type FailedStepEventPayload = FailedRouteEventPayload;
 
 export type SucceededRouteEventPayload = {
+  inputAmount: string;
+  inputAmountUsd: string;
   outputAmount: string;
+  outputAmountUsd: string;
 };
 
 export type SucceededStepEventPayload = SucceededRouteEventPayload;
 
-export type OutputRevealedEventPayload = SucceededRouteEventPayload;
+export type OutputRevealedEventPayload = { outputAmount: string };
 
 export type StepExecutionEventPayload = {
   status: