Merge branch 'main' into mk/1999/ilp-peers

interledger · Oct 17, 2023 · 393cc11 · 393cc11
2 parents 416afe8 + 8405951
commit 393cc11
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/packages/backend/migrations/20230927223235_make_quotes_generic.js b/packages/backend/migrations/20230927223235_make_quotes_generic.js
@@ -5,7 +5,7 @@
 exports.up = function (knex) {
   return knex.schema.alterTable('quotes', (table) => {
     table.json('additionalFields').nullable()
-    table.decimal('estimatedExchangeRate', 20, 10).notNullable()
+    table.decimal('estimatedExchangeRate', 20, 10).nullable()
   })
 }
 

diff --git a/packages/backend/src/open_payments/quote/model.ts b/packages/backend/src/open_payments/quote/model.ts
@@ -29,7 +29,7 @@ export class Quote extends PaymentPointerSubresource {
   public asset!: Asset
   public additionalFields!: Record<string, unknown>
 
-  public estimatedExchangeRate!: number
+  public estimatedExchangeRate?: number
   public feeId?: string
   public fee?: Fee
 

diff --git a/packages/backend/src/open_payments/quote/service.ts b/packages/backend/src/open_payments/quote/service.ts
@@ -218,9 +218,10 @@ function calculateQuoteAmountsAfterFees(
   } else {
     // FixedSend
     const fees = quote.fee?.calculate(receiveAmountValue) ?? 0n
-    const exchangeAdjustedFees = BigInt(
-      Number(fees) * quote.estimatedExchangeRate.valueOf()
-    )
+    const estimatedExchangeRate =
+      quote.estimatedExchangeRate || quote.lowEstimatedExchangeRate.valueOf()
+
+    const exchangeAdjustedFees = BigInt(Number(fees) * estimatedExchangeRate)
     receiveAmountValue = BigInt(receiveAmountValue) - exchangeAdjustedFees
 
     if (receiveAmountValue <= exchangeAdjustedFees) {