Jon/worst-quote

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- added: `minReceiveAmount` passed in `EdgeSwapQuotes` for lifi and rango
+
 ## 2.7.5 (2024-08-12)
 
 - fixed: Implemented max quotes for 0xGasless swap plugin

src/swap/defi/lifi.ts

@@ -135,7 +135,7 @@ const asExchangeInfo = asObject({
 const asEstimate = asObject({
   fromAmount: asNumberString, // "400000",
   toAmount: asNumberString, // "237318132569913",
-  // toAmountMin: asNumberString, // "225452225941418",
+  toAmountMin: asNumberString, // "225452225941418",
   approvalAddress: asString, // "0x1231DEB6f5749EF6cE6943a275A1D3E7486F4EaE",
   executionDuration: asNumber // 1168,
   // feeCosts: asArray(asFeeCost)
@@ -320,7 +320,7 @@ export function makeLifiPlugin(opts: EdgeCorePluginOptions): EdgeSwapPlugin {
     const providers = includedSteps.map(s => s.toolDetails.name)
     const providersStr = providers.join(' -> ')
     const metadataNotes = `DEX Providers: ${providersStr}`
-    const { approvalAddress, toAmount } = estimate
+    const { approvalAddress, toAmount, toAmountMin } = estimate
 
     let preTx: EdgeTransaction | undefined
     let spendInfo: EdgeSpendInfo
@@ -459,13 +459,14 @@ export function makeLifiPlugin(opts: EdgeCorePluginOptions): EdgeSwapPlugin {
     }
 
     return {
-      request,
-      spendInfo,
-      swapInfo,
-      fromNativeAmount: nativeAmount,
       expirationDate: new Date(Date.now() + EXPIRATION_MS),
+      fromNativeAmount: nativeAmount,
+      metadataNotes,
+      minReceiveAmount: toAmountMin,
       preTx,
-      metadataNotes
+      request,
+      spendInfo,
+      swapInfo
     }
   }
 

src/swap/defi/rango.ts

@@ -547,13 +547,14 @@ export function makeRangoPlugin(opts: EdgeCorePluginOptions): EdgeSwapPlugin {
     const metadataNotes = `DEX Providers: ${providersStr}`
 
     return {
-      request,
-      spendInfo,
-      swapInfo,
-      fromNativeAmount: nativeAmount,
       expirationDate: new Date(Date.now() + EXPIRATION_MS),
+      fromNativeAmount: nativeAmount,
+      metadataNotes,
+      minReceiveAmount: route.outputAmountMin,
       preTx,
-      metadataNotes
+      request,
+      spendInfo,
+      swapInfo
     }
   }
 

src/util/swapHelpers.ts

@@ -46,13 +46,14 @@ type SwapOrderInner = SwapOrderMakeTx | SwapOrderSpendInfo
 export type SwapOrder = SwapOrderInner & {
   addTxidToOrderUri?: boolean
   canBePartial?: boolean
+  expirationDate?: Date
+  fromNativeAmount: string
   maxFulfillmentSeconds?: number
+  metadataNotes?: string
+  minReceiveAmount?: string
+  preTx?: EdgeTransaction
   request: EdgeSwapRequestPlugin
   swapInfo: EdgeSwapInfo
-  fromNativeAmount: string
-  expirationDate?: Date
-  preTx?: EdgeTransaction
-  metadataNotes?: string
 }
 
 export async function makeSwapPluginQuote(
@@ -61,13 +62,14 @@ export async function makeSwapPluginQuote(
   const {
     addTxidToOrderUri = false,
     canBePartial,
-    maxFulfillmentSeconds,
-    fromNativeAmount,
-    request,
-    swapInfo,
     expirationDate,
+    fromNativeAmount,
+    maxFulfillmentSeconds,
+    metadataNotes,
+    minReceiveAmount,
     preTx,
-    metadataNotes
+    request,
+    swapInfo
   } = order
   const { fromWallet, toWallet } = request
 
@@ -121,18 +123,19 @@ export async function makeSwapPluginQuote(
 
   const out: EdgeSwapQuote = {
     canBePartial,
-    maxFulfillmentSeconds,
-    request,
-    swapInfo,
+    expirationDate,
     fromNativeAmount,
-    toNativeAmount,
+    isEstimate,
+    maxFulfillmentSeconds,
+    minReceiveAmount,
     networkFee: {
       currencyCode: fromWallet.currencyInfo.currencyCode,
       nativeAmount
     },
     pluginId: swapInfo.pluginId,
-    expirationDate,
-    isEstimate,
+    request,
+    swapInfo,
+    toNativeAmount,
     async approve(opts?: EdgeSwapApproveOptions): Promise<EdgeSwapResult> {
       if (preTx != null) {
         const signedTransaction = await fromWallet.signTx(preTx)