663/mk/use open payments client

.github/workflows/lint_test_build.yml

@@ -27,6 +27,7 @@ jobs:
       - uses: ./.github/workflows/rafiki/env-setup
       - run: pnpm --filter openapi build
       - run: pnpm --filter auth build
+      - run: pnpm --filter open-payments build
       - run: pnpm --filter backend test
 
   frontend:

packages/backend/package.json

@@ -4,7 +4,7 @@
     "test": "jest --passWithNoTests --maxWorkers=50%",
     "knex": "knex",
     "generate": "graphql-codegen --config codegen.yml",
-    "build:deps": "pnpm --filter openapi build && pnpm --filter auth build",
+    "build:deps": "pnpm --filter openapi build && pnpm --filter auth build && pnpm --filter open-payments build",
     "build": "pnpm build:deps && tsc --build tsconfig.json && pnpm copy-files",
     "clean": "rm -fr dist/",
     "copy-files": "cp src/graphql/schema.graphql dist/graphql/",
@@ -54,7 +54,6 @@
     "@koa/cors": "^3.1.0",
     "@koa/router": "^12.0.0",
     "@poppinss/file-generator": "^1.0.2",
-    "@shopify/jest-koa-mocks": "^5.0.1",
     "@types/bcrypt": "^5.0.0",
     "add": "^2.0.6",
     "ajv": "^8.11.0",
@@ -82,6 +81,7 @@
     "objection-db-errors": "^1.1.2",
     "oer-utils": "5.1.3-alpha.1",
     "openapi": "workspace:../openapi",
+    "open-payments": "workspace:../open-payments",
     "pg": "^8.6.0",
     "pino": "^8.4.2",
     "pino-pretty": "^9.0.1",

packages/backend/src/app.ts

@@ -49,6 +49,7 @@ import { Session } from './session/util'
 import { createValidatorMiddleware, HttpMethod, isHttpMethod } from 'openapi'
 import { PaymentPointerKeyService } from './paymentPointerKey/service'
 import { GrantReferenceService } from './open_payments/grantReference/service'
+import { OpenPaymentsClient } from 'open-payments'
 
 export interface AppContextData {
   logger: Logger
@@ -146,6 +147,7 @@ export interface AppServices {
   sessionService: Promise<SessionService>
   paymentPointerKeyService: Promise<PaymentPointerKeyService>
   grantReferenceService: Promise<GrantReferenceService>
+  openPaymentsClient: Promise<OpenPaymentsClient>
 }
 
 export type AppContainer = IocContract<AppServices>

packages/backend/src/index.ts

@@ -24,7 +24,7 @@ import { createAssetService } from './asset/service'
 import { createAccountingService } from './accounting/service'
 import { createPeerService } from './peer/service'
 import { createAuthService } from './open_payments/auth/service'
-import { createOpenPaymentsClientService } from './open_payments/client/service'
+
 import { createPaymentPointerService } from './open_payments/payment_pointer/service'
 import { createSPSPRoutes } from './spsp/routes'
 import { createPaymentPointerKeyRoutes } from './paymentPointerKey/routes'
@@ -37,10 +37,12 @@ import { createConnectorService } from './connector'
 import { createSessionService } from './session/service'
 import { createApiKeyService } from './apiKey/service'
 import { createOpenAPI } from 'openapi'
+import { createClient as createOpenPaymentsClient } from 'open-payments'
 import { createConnectionService } from './open_payments/connection/service'
 import { createConnectionRoutes } from './open_payments/connection/routes'
 import { createPaymentPointerKeyService } from './paymentPointerKey/service'
 import { createGrantReferenceService } from './open_payments/grantReference/service'
+import { createReceiverService } from './open_payments/receiver/service'
 
 BigInt.prototype.toJSON = function () {
   return this.toString()
@@ -112,6 +114,10 @@ export function initIocContainer(
     const config = await deps.use('config')
     return await createOpenAPI(config.authServerSpec)
   })
+  container.singleton('openPaymentsClient', async (deps) => {
+    const logger = await deps.use('logger')
+    return createOpenPaymentsClient({ logger })
+  })
 
   /**
    * Add services to the container.
@@ -228,17 +234,17 @@ export function initIocContainer(
       connectionService: await deps.use('connectionService')
     })
   })
-  container.singleton('openPaymentsClientService', async (deps) => {
+  container.singleton('receiverService', async (deps) => {
     const config = await deps.use('config')
-    return await createOpenPaymentsClientService({
+    return await createReceiverService({
       logger: await deps.use('logger'),
       // TODO: https://github.com/interledger/rafiki/issues/583
       accessToken: config.devAccessToken,
-      connectionRoutes: await deps.use('connectionRoutes'),
-      incomingPaymentRoutes: await deps.use('incomingPaymentRoutes'),
-      openApi: await deps.use('openApi'),
+      connectionService: await deps.use('connectionService'),
+      incomingPaymentService: await deps.use('incomingPaymentService'),
       openPaymentsUrl: config.openPaymentsUrl,
-      paymentPointerService: await deps.use('paymentPointerService')
+      paymentPointerService: await deps.use('paymentPointerService'),
+      openPaymentsClient: await deps.use('openPaymentsClient')
     })
   })
 
@@ -281,7 +287,7 @@ export function initIocContainer(
       logger: await deps.use('logger'),
       knex: await deps.use('knex'),
       makeIlpPlugin: await deps.use('makeIlpPlugin'),
-      clientService: await deps.use('openPaymentsClientService'),
+      receiverService: await deps.use('receiverService'),
       paymentPointerService: await deps.use('paymentPointerService'),
       ratesService: await deps.use('ratesService')
     })
@@ -301,7 +307,7 @@ export function initIocContainer(
       logger: await deps.use('logger'),
       knex: await deps.use('knex'),
       accountingService: await deps.use('accountingService'),
-      clientService: await deps.use('openPaymentsClientService'),
+      receiverService: await deps.use('receiverService'),
       grantReferenceService: await deps.use('grantReferenceService'),
       makeIlpPlugin: await deps.use('makeIlpPlugin'),
       peerService: await deps.use('peerService')