feat: update payload for events

rango-exchange · Jan 27, 2025 · 36a11b6 · 36a11b6
1 parent a112171
commit 36a11b6
Show file tree

Hide file tree

Showing 5 changed files with 90 additions and 5 deletions.
diff --git a/queue-manager/rango-preset/src/actions/checkStatus.ts b/queue-manager/rango-preset/src/actions/checkStatus.ts
@@ -9,6 +9,9 @@ import {
   getCurrentStep,
   getCurrentStepTx,
   getCurrentStepTxType,
+  getLastSuccessfulStepInput,
+  getLastSuccessfulStepInputUsd,
+  getLastSuccessfulStepOutputUsd,
   inMemoryTransactionsData,
   resetNetworkStatus,
   setCurrentStepTx,
@@ -222,7 +225,10 @@ async function checkTransactionStatus({
     notifier({
       event: {
         type: StepEventType.SUCCEEDED,
+        inputAmount: getLastSuccessfulStepInput(swap),
+        inputAmountUsd: getLastSuccessfulStepInputUsd(swap),
         outputAmount: currentStep.outputAmount ?? '',
+        outputAmountUsd: getLastSuccessfulStepOutputUsd(swap),
       },
       swap,
       step: currentStep,

diff --git a/queue-manager/rango-preset/src/actions/scheduleNextStep.ts b/queue-manager/rango-preset/src/actions/scheduleNextStep.ts
@@ -5,6 +5,9 @@ import type { PendingSwapStep } from 'rango-types';
 import {
   getCurrentStep,
   getLastSuccessfulStep,
+  getLastSuccessfulStepInput,
+  getLastSuccessfulStepInputUsd,
+  getLastSuccessfulStepOutputUsd,
   isTxAlreadyCreated,
 } from '../helpers';
 import { notifier } from '../services/eventEmitter';
@@ -76,8 +79,11 @@ export function scheduleNextStep({
         : {
             event: {
               type: StepEventType.SUCCEEDED,
+              inputAmount: getLastSuccessfulStepInput(swap),
+              inputAmountUsd: getLastSuccessfulStepInputUsd(swap),
               outputAmount:
                 getLastSuccessfulStep(swap.steps)?.outputAmount ?? '',
+              outputAmountUsd: getLastSuccessfulStepOutputUsd(swap),
             },
           }),
       swap: swap,

diff --git a/queue-manager/rango-preset/src/helpers.ts b/queue-manager/rango-preset/src/helpers.ts
@@ -44,6 +44,7 @@ import {
   getEvmProvider,
   splitWalletNetwork,
 } from '@rango-dev/wallets-shared';
+import BigNumber from 'bignumber.js';
 import { TransactionType } from 'rango-sdk';
 import { PendingSwapNetworkStatus, SignerError } from 'rango-types';
 
@@ -1518,3 +1519,62 @@ export function isApprovalTX(step: Step): boolean {
 
   return approvalTx;
 }
+
+export function getTokenAmountInUsd(
+  amount: string | number,
+  usdPrice: string | number
+): string {
+  const usdValue = new BigNumber(amount).multipliedBy(usdPrice);
+  if (isNaN(usdValue.toNumber())) {
+    return '';
+  }
+  return usdValue.toString();
+}
+
+export function getSwapInputUsd(swap: PendingSwap): string {
+  return getTokenAmountInUsd(
+    swap.inputAmount,
+    swap.steps[0].fromUsdPrice ?? ''
+  );
+}
+
+export function getSwapOutputUsd(swap: PendingSwap): string {
+  const lastStep = swap.steps[swap.steps.length - 1];
+
+  return getTokenAmountInUsd(
+    lastStep.outputAmount ?? '',
+    lastStep.toUsdPrice ?? ''
+  );
+}
+
+export function getLastSuccessfulStepInput(swap: PendingSwap): string {
+  const lastSuccessfulStepIndex = swap.steps.findLastIndex(
+    (step) => step.status === 'success'
+  );
+
+  if (lastSuccessfulStepIndex < 0) {
+    return '';
+  }
+
+  return lastSuccessfulStepIndex === 0
+    ? swap.inputAmount
+    : swap.steps[lastSuccessfulStepIndex - 1].outputAmount ?? '';
+}
+
+export function getLastSuccessfulStepInputUsd(swap: PendingSwap): string {
+  const lastSuccessfulStep = getLastSuccessfulStep(swap.steps);
+
+  return getTokenAmountInUsd(
+    getLastSuccessfulStepInput(swap),
+    lastSuccessfulStep?.fromUsdPrice ?? ''
+  );
+}
+
+export function getLastSuccessfulStepOutputUsd(swap: PendingSwap): string {
+  const lastSuccessfulStep = getLastSuccessfulStep(swap.steps);
+
+  return getTokenAmountInUsd(
+    lastSuccessfulStep?.outputAmount ?? '',
+    lastSuccessfulStep?.toUsdPrice ?? ''
+  );
+}
diff --git a/queue-manager/rango-preset/src/services/eventEmitter.ts b/queue-manager/rango-preset/src/services/eventEmitter.ts
@@ -12,6 +12,8 @@ import {
   getCurrentStepTx,
   getFailedStep,
   getLastSuccessfulStep,
+  getSwapInputUsd,
+  getSwapOutputUsd,
   isApprovalCurrentStepTx,
 } from '../helpers';
 import { getCurrentBlockchainOfOrNull } from '../shared';
@@ -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;
   }
@@ -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);
   }
 }
diff --git a/queue-manager/rango-preset/src/types.ts b/queue-manager/rango-preset/src/types.ts
@@ -189,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: