WIP

packages/backend/migrations/20241223104532_add_tenant_id_to_outgoing_payments.js

@@ -0,0 +1,21 @@
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.up = function (knex) {
+  return knex.schema.alterTable('outgoingPayments', function (table) {
+    table.uuid('tenantId').notNullable()
+    table.foreign('tenantId').references('tenants.id').onDelete('CASCADE')
+  })
+}
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.down = function (knex) {
+  return knex.schema.alterTable('outgoingPayments', function (table) {
+    table.dropForeign('tenantId')
+    table.dropColumn('tenantId')
+  })
+}

packages/backend/src/graphql/resolvers/liquidity.ts

@@ -377,6 +377,7 @@ export const depositEventLiquidity: MutationResolvers<ApolloContext>['depositEve
     )
     const paymentOrErr = await outgoingPaymentService.fund({
       id: event.data.id,
+      tenantId: args.input.tenantId,
       amount: BigInt(event.data.debitAmount.value),
       transferId: event.id
     })
@@ -478,6 +479,7 @@ export const depositOutgoingPaymentLiquidity: MutationResolvers<ApolloContext>['
       })
       const paymentOrErr = await outgoingPaymentService.fund({
         id: outgoingPaymentId,
+        tenantId: args.input.tenantId,
         amount: BigInt(event.data.debitAmount.value),
         transferId: event.id
       })

packages/backend/src/graphql/schema.graphql

@@ -527,6 +527,8 @@ input VoidLiquidityWithdrawalInput {
 input DepositOutgoingPaymentLiquidityInput {
   "Unique identifier of the outgoing payment to deposit liquidity into."
   outgoingPaymentId: String!
+  "Unique identifier of the tenant under which the quote was created."
+  tenantId: String!
   "Unique key to ensure duplicate or retried requests are processed only once. For more information, refer to [idempotency](https://rafiki.dev/apis/graphql/admin-api-overview/#idempotency)."
   idempotencyKey: String!
 }
@@ -552,6 +554,8 @@ input CreateOutgoingPaymentWithdrawalInput {
 input DepositEventLiquidityInput {
   "Unique identifier of the event to deposit liquidity into."
   eventId: String!
+  "Unique identifier of the tenant under which the quote was created."
+  tenantId: String!
   "Unique key to ensure duplicate or retried requests are processed only once. For more information, refer to [idempotency](https://rafiki.dev/apis/graphql/admin-api-overview/#idempotency)."
   idempotencyKey: String!
 }

packages/backend/src/open_payments/payment/outgoing/model.ts

@@ -15,6 +15,7 @@ import {
   OutgoingPayment as OpenPaymentsOutgoingPayment,
   OutgoingPaymentWithSpentAmounts
 } from '@interledger/open-payments'
+import { Tenant } from '../../../tenants/model'
 
 export class OutgoingPaymentGrant extends DbErrors(Model) {
   public static get modelPaths(): string[] {
@@ -125,6 +126,8 @@ export class OutgoingPayment
   // Outgoing peer
   public peerId?: string
 
+  public tenantId!: string
+
   static get relationMappings() {
     return {
       ...super.relationMappings,
@@ -135,6 +138,14 @@ export class OutgoingPayment
           from: 'outgoingPayments.id',
           to: 'quotes.id'
         }
+      },
+      tenant: {
+        relation: Model.BelongsToOneRelation,
+        modelClass: Tenant,
+        join: {
+          from: 'outgoingPayments.tenantId',
+          to: 'tenants.id'
+        }
       }
     }
   }

packages/backend/src/open_payments/payment/outgoing/service.test.ts

@@ -370,6 +370,7 @@ describe('OutgoingPaymentService', (): void => {
       ).resolves.toEqual(payment)
       await expect(
         outgoingPaymentService.fund({
+          tenantId,
           id: payment.id,
           amount: payment.debitAmount.value,
           transferId: uuid()
@@ -538,6 +539,7 @@ describe('OutgoingPaymentService', (): void => {
       await expect(
         outgoingPaymentService.fund({
           id: payment.id,
+          tenantId,
           amount: payment.debitAmount.value,
           transferId: uuid()
         })
@@ -1336,6 +1338,7 @@ describe('OutgoingPaymentService', (): void => {
       await expect(
         outgoingPaymentService.fund({
           id: payment.id,
+          tenantId,
           amount: payment.debitAmount.value,
           transferId: uuid()
         })
@@ -1842,6 +1845,7 @@ describe('OutgoingPaymentService', (): void => {
       await expect(
         outgoingPaymentService.fund({
           id: uuid(),
+          tenantId,
           amount: quoteAmount,
           transferId: uuid()
         })
@@ -1852,6 +1856,7 @@ describe('OutgoingPaymentService', (): void => {
       await expect(
         outgoingPaymentService.fund({
           id: payment.id,
+          tenantId,
           amount: quoteAmount,
           transferId: uuid()
         })
@@ -1871,6 +1876,7 @@ describe('OutgoingPaymentService', (): void => {
       await expect(
         outgoingPaymentService.fund({
           id: payment.id,
+          tenantId,
           amount: quoteAmount - BigInt(1),
           transferId: uuid()
         })
@@ -1890,6 +1896,7 @@ describe('OutgoingPaymentService', (): void => {
         await expect(
           outgoingPaymentService.fund({
             id: payment.id,
+            tenantId,
             amount: quoteAmount,
             transferId: uuid()
           })

packages/backend/src/open_payments/payment/outgoing/service.ts

@@ -200,15 +200,20 @@ export function isCreateFromIncomingPayment(
 ): options is CreateFromIncomingPayment {
   return 'incomingPayment' in options && 'debitAmount' in options
 }
-//TODO use tenantId in outgoing payment changes
+
 async function cancelOutgoingPayment(
   deps: ServiceDependencies,
   options: CancelOutgoingPaymentOptions
 ): Promise<OutgoingPayment | OutgoingPaymentError> {
-  const { id } = options
+  const { id, tenantId } = options
 
   return deps.knex.transaction(async (trx) => {
-    let payment = await OutgoingPayment.query(trx).findById(id).forUpdate()
+    let payment = await OutgoingPayment.query(trx)
+      .findOne({
+        id,
+        tenantId
+      })
+      .forUpdate()
 
     if (!payment) return OutgoingPaymentError.UnknownPayment
     if (payment.state !== OutgoingPaymentState.Funding) {
@@ -247,7 +252,7 @@ async function createOutgoingPayment(
       description: 'Time to create an outgoing payment'
     }
   )
-  const { walletAddressId } = options
+  const { walletAddressId, tenantId } = options
   let quoteId: string
 
   if (isCreateFromIncomingPayment(options)) {
@@ -260,7 +265,7 @@ async function createOutgoingPayment(
     )
     const { debitAmount, incomingPayment } = options
     const quoteOrError = await deps.quoteService.create({
-      tenantId: options.tenantId,
+      tenantId,
       receiver: incomingPayment,
       debitAmount,
       method: 'ilp',
@@ -321,6 +326,7 @@ async function createOutgoingPayment(
       const payment = await OutgoingPayment.query(trx)
         .insertAndFetch({
           id: quoteId,
+          tenantId,
           walletAddressId: walletAddressId,
           client: options.client,
           metadata: options.metadata,
@@ -626,17 +632,21 @@ async function validateGrantAndAddSpentAmountsToPayment(
 
 export interface FundOutgoingPaymentOptions {
   id: string
+  tenantId: string
   amount: bigint
   transferId: string
 }
 
 async function fundPayment(
   deps: ServiceDependencies,
-  { id, amount, transferId }: FundOutgoingPaymentOptions
+  { id, tenantId, amount, transferId }: FundOutgoingPaymentOptions
 ): Promise<OutgoingPayment | FundingError> {
   return await deps.knex.transaction(async (trx) => {
     const payment = await OutgoingPayment.query(trx)
-      .findById(id)
+      .findOne({
+        id,
+        tenantId
+      })
       .forUpdate()
       .withGraphFetched('quote')
     if (!payment) return FundingError.UnknownPayment

packages/backend/src/tests/outgoingPayment.ts

@@ -131,7 +131,7 @@ export async function createOutgoingPaymentWithReceiver(
   )
 
   const outgoingPayment = await createOutgoingPayment(deps, {
-    //TODO fix this in outgoing payments changes
+    //TODO get this from WA
     tenantId: args.quoteOptions?.tenantId || uuid(),
     walletAddressId: args.sendingWalletAddress.id,
     method: args.method,
@@ -143,6 +143,8 @@ export async function createOutgoingPaymentWithReceiver(
     const outgoingPaymentService = await deps.use('outgoingPaymentService')
     await outgoingPaymentService.fund({
       id: outgoingPayment.id,
+      //TODO
+      tenantId: '',
       amount: outgoingPayment.debitAmount.value,
       transferId: uuid()
     })