chore: upgrade rafiki to alpha 6 (#1176)

* chore: upgrade rafiki to alpha 6 * chore: upgrade open-payments * feat: get receiver from rafiki instead of local transaction * fix: remove optional check from receivedAmount * test: add mock method for get receiver * chore: set wait seconds env var
interledger · Mar 5, 2024 · 75d5663 · 75d5663
1 parent d29af27
commit 75d5663
Show file tree

Hide file tree

Showing 14 changed files with 286 additions and 149 deletions.
diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml
@@ -90,29 +90,30 @@ services:
   # Rafiki
   rafiki-auth:
     container_name: rafiki-auth
-    image: ghcr.io/interledger/rafiki-auth:v1.0.0-alpha.5
+    image: ghcr.io/interledger/rafiki-auth:v1.0.0-alpha.6
     restart: always
     networks:
       - testnet
     ports:
       - '3006:3006'
       - '3008:3008'
     environment:
-      PORT: 3006
+      AUTH_PORT: 3006
       INTROSPECTION_PORT: 3007
       ADMIN_PORT: 3008
       NODE_ENV: development
       AUTH_SERVER_DOMAIN: http://localhost:3006
       AUTH_DATABASE_URL: postgresql://rafiki_auth:rafiki_auth@postgres/rafiki_auth
       IDENTITY_SERVER_DOMAIN: http://localhost:4003/grant-interactions
       IDENTITY_SERVER_SECRET: ${AUTH_IDENTITY_SERVER_SECRET}
+      WAIT_SECONDS: 1
     depends_on:
       - postgres
     <<: *logging
 
   rafiki-backend:
     container_name: rafiki-backend
-    image: ghcr.io/interledger/rafiki-backend:v1.0.0-alpha.5
+    image: ghcr.io/interledger/rafiki-backend:v1.0.0-alpha.6
     restart: always
     privileged: true
     volumes:
@@ -140,7 +141,6 @@ services:
       ILP_ADDRESS: test.net
       STREAM_SECRET: BjPXtnd00G2mRQwP/8ZpwyZASOch5sUXT5o0iR5b5wU=
       ADMIN_KEY: admin
-      PUBLIC_HOST: http://rafiki-backend
       OPEN_PAYMENTS_URL: http://rafiki-backend
       REDIS_URL: redis://redis:6379/0
       WALLET_ADDRESS_URL: https://rafiki-backend/.well-known/pay
@@ -159,7 +159,7 @@ services:
 
   rafiki-frontend:
     container_name: rafiki-frontend
-    image: ghcr.io/interledger/rafiki-frontend:v1.0.0-alpha.5
+    image: ghcr.io/interledger/rafiki-frontend:v1.0.0-alpha.6
     depends_on:
       - rafiki-backend
     restart: always
@@ -175,7 +175,7 @@ services:
     <<: *logging
 
   tigerbeetle:
-    image: ghcr.io/tigerbeetle/tigerbeetle:0.13.57
+    image: ghcr.io/tigerbeetle/tigerbeetle:0.14.176
     privileged: true
     volumes:
       - tigerbeetle-data:/var/lib/tigerbeetle

diff --git a/docker/prod/.env.example b/docker/prod/.env.example
@@ -55,6 +55,7 @@ RAFIKI_AUTH_DATABASE_URL=
 RAFIKI_AUTH_IDENTITY_SERVER_DOMAIN=
 RAFIKI_AUTH_IDENTITY_SERVER_SECRET=
 RAFIKI_AUTH_SERVER_DOMAIN=
+RAFIKI_AUTH_WAIT_SECONDS=
 
 # RAFIKI BACKEND
 RAFIKI_BACKEND_LOG_LEVEL=
@@ -71,7 +72,6 @@ RAFIKI_BACKEND_AUTH_SERVER_INTROSPECTION_URL=
 RAFIKI_BACKEND_ILP_ADDRESS=
 RAFIKI_BACKEND_STREAM_SECRET=
 RAFIKI_BACKEND_ADMIN_KEY=
-RAFIKI_BACKEND_PUBLIC_HOST=
 RAFIKI_BACKEND_OPEN_PAYMENTS_URL=
 RAFIKI_BACKEND_REDIS_URL=
 RAFIKI_BACKEND_WALLET_ADDRESS_URL=

diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml
@@ -119,17 +119,18 @@ services:
     <<: *logging
 
   rafiki-auth:
-    image: ghcr.io/interledger/rafiki-auth:v1.0.0-alpha.5
+    image: ghcr.io/interledger/rafiki-auth:v1.0.0-alpha.6
     container_name: rafiki-auth
     environment:
       NODE_ENV: ${NODE_ENV}
-      PORT: ${RAFIKI_AUTH_PORT}
+      AUTH_PORT: ${RAFIKI_AUTH_PORT}
       ADMIN_PORT: ${RAFIKI_AUTH_ADMIN_PORT}
       INTROSPECTION_PORT: ${RAFIKI_AUTH_INTROSPECTION_PORT}
       AUTH_DATABASE_URL: ${RAFIKI_AUTH_DATABASE_URL}
       IDENTITY_SERVER_SECRET: ${RAFIKI_AUTH_IDENTITY_SERVER_SECRET}
       IDENTITY_SERVER_DOMAIN: ${RAFIKI_AUTH_IDENTITY_SERVER_DOMAIN}
       AUTH_SERVER_DOMAIN: ${RAFIKI_AUTH_SERVER_DOMAIN}
+      WAIT_SECONDS: ${RAFIKI_AUTH_WAIT_SECONDS}
       TRUST_PROXY: true
     depends_on:
       - postgres
@@ -142,7 +143,7 @@ services:
     <<: *logging
 
   rafiki-backend:
-    image: ghcr.io/interledger/rafiki-backend:v1.0.0-alpha.5
+    image: ghcr.io/interledger/rafiki-backend:v1.0.0-alpha.6
     container_name: rafiki-backend
     depends_on:
       - postgres
@@ -163,7 +164,6 @@ services:
       ILP_ADDRESS: ${RAFIKI_BACKEND_ILP_ADDRESS}
       STREAM_SECRET: ${RAFIKI_BACKEND_STREAM_SECRET}
       ADMIN_KEY: ${RAFIKI_BACKEND_ADMIN_KEY}
-      PUBLIC_HOST: ${RAFIKI_BACKEND_PUBLIC_HOST}
       OPEN_PAYMENTS_URL: ${RAFIKI_BACKEND_OPEN_PAYMENTS_URL}
       REDIS_URL: ${RAFIKI_BACKEND_REDIS_URL}
       WALLET_ADDRESS_URL: ${RAFIKI_BACKEND_WALLET_ADDRESS_URL}
@@ -190,7 +190,7 @@ services:
     <<: *logging
 
   rafiki-frontend:
-    image: ghcr.io/interledger/rafiki-frontend:v1.0.0-alpha.5
+    image: ghcr.io/interledger/rafiki-frontend:v1.0.0-alpha.6
     container_name: rafiki-frontend
     depends_on:
       - rafiki-backend
@@ -207,7 +207,7 @@ services:
     <<: *logging
 
   tigerbeetle:
-    image: ghcr.io/tigerbeetle/tigerbeetle:0.13.57
+    image: ghcr.io/tigerbeetle/tigerbeetle:0.14.176
     privileged: true
     volumes:
       - tigerbeetle-data:/var/lib/tigerbeetle

diff --git a/packages/boutique/backend/package.json b/packages/boutique/backend/package.json
@@ -7,7 +7,7 @@
   },
   "dependencies": {
     "@google-cloud/logging-winston": "^6.0.0",
-    "@interledger/open-payments": "^6.1.1",
+    "@interledger/open-payments": "^6.6.0",
     "awilix": "^10.0.1",
     "axios": "^1.6.7",
     "cors": "^2.8.5",

diff --git a/packages/boutique/backend/src/open-payments/service.ts b/packages/boutique/backend/src/open-payments/service.ts
@@ -11,7 +11,8 @@ import {
   WalletAddress,
   PendingGrant,
   Quote,
-  isPendingGrant
+  isPendingGrant,
+  GrantContinuation
 } from '@interledger/open-payments'
 import { randomUUID } from 'crypto'
 import { Logger } from 'winston'
@@ -309,6 +310,12 @@ export class OpenPayments implements IOpenPayments {
         throw new InternalServerError()
       })
 
+    if (!this.isGrant(continuation)) {
+      this.logger.error('Expected grant response.')
+      this.logger.debug(continuation)
+      throw new InternalServerError()
+    }
+
     return {
       accessToken: continuation.access_token.value,
       manageUrl: continuation.access_token.manage.replace(
@@ -318,6 +325,12 @@ export class OpenPayments implements IOpenPayments {
     }
   }
 
+  private isGrant(
+    continuation: GrantContinuation | Grant
+  ): continuation is Grant {
+    return (continuation as Grant).access_token !== undefined
+  }
+
   public async instantBuy(
     params: InstantBuyParams
   ): Promise<TokenInfo & { walletAddressurl: string }> {

diff --git a/packages/wallet/backend/src/incomingPayment/service.ts b/packages/wallet/backend/src/incomingPayment/service.ts
@@ -3,11 +3,9 @@ import { NotFound } from '@/errors'
 import { PaymentDetails } from '@/incomingPayment/controller'
 import { WalletAddress } from '@/walletAddress/model'
 import { RafikiClient } from '@/rafiki/rafiki-client'
-import { Transaction } from '@/transaction/model'
-import { extractUuidFromUrl, transformAmount } from '@/utils/helpers'
+import { transformAmount } from '@/utils/helpers'
 import { Amount, Asset } from '@/rafiki/backend/generated/graphql'
 import { add, Duration } from 'date-fns'
-import { Logger } from 'winston'
 import axios from 'axios'
 import { Env } from '@/config/env'
 
@@ -50,7 +48,6 @@ export class IncomingPaymentService implements IIncomingPaymentService {
   constructor(
     private accountService: AccountService,
     private rafikiClient: RafikiClient,
-    private logger: Logger,
     private env: Env
   ) {}
 
@@ -96,49 +93,24 @@ export class IncomingPaymentService implements IIncomingPaymentService {
     return response.id
   }
 
-  // Instead of querying our Transaction model, should we fetch this information from Rafiki?
-  // Reasoning:
-  // - An incoming payment can be fulfilled by multiple outgoing payments;
-  // - If we have an incoming payment that awaits $10 and we send $5 initially,
-  //   inserting the IP URL in the receiver field again, currently shows that the incoming amount
-  //   is still $10.
-  // - By fetching the IP details from Rafiki, we can calculate how much more is needed
-  //   to fulfill this specific IP (after making an initial outgoing payment of $5).
   async getPaymentDetailsByUrl(url: string): Promise<PaymentDetails> {
-    const id = extractUuidFromUrl(url)
-
-    const transaction = await Transaction.query()
-      .where('paymentId', id)
-      .where('status', 'PENDING')
-      .first()
-      .withGraphFetched({ walletAddress: { account: true } })
-
-    if (!transaction) {
-      throw new NotFound(
-        'The provided incoming payment URL could not be found.'
-      )
+    const receiver = await this.rafikiClient.getReceiverById(url)
+    const asset = {
+      scale:
+        receiver.incomingAmount?.assetScale ??
+        receiver.receivedAmount.assetScale,
+      code:
+        receiver.incomingAmount?.assetCode ?? receiver.receivedAmount.assetCode
     }
 
-    const asset = await this.rafikiClient.getAssetById(
-      transaction.walletAddress?.account.assetId
-    )
-    if (!asset) {
-      throw new NotFound()
-    }
+    const value = receiver.incomingAmount?.value
+      ? receiver.incomingAmount.value - receiver.receivedAmount.value
+      : 0n
 
     return {
-      description: transaction.description,
-      value: parseFloat(transformAmount(transaction.value ?? 0n, asset.scale)),
-      assetCode: transaction.assetCode
-    }
-  }
-
-  public async getReceiver(receiver: string) {
-    try {
-      // @TODO: replace with get receiver from rafiki when implemented
-      return await this.getPaymentDetailsByUrl(receiver)
-    } catch (_e) {
-      this.logger.info(`Could not find transaction for ${receiver}`)
+      description: receiver.metadata.description,
+      value: parseFloat(transformAmount(value, asset.scale)),
+      assetCode: asset.code
     }
   }
 

diff --git a/packages/wallet/backend/src/outgoingPayment/service.ts b/packages/wallet/backend/src/outgoingPayment/service.ts
@@ -15,9 +15,8 @@ export class OutgoingPaymentService implements IOutgoingPaymentService {
     const quote = await this.rafikiClient.getQuote(quoteId)
     const walletAddressId = quote.walletAddressId
 
-    const incomingPayment = await this.incomingPaymentService.getReceiver(
-      quote.receiver
-    )
+    const incomingPayment =
+      await this.incomingPaymentService.getPaymentDetailsByUrl(quote.receiver)
     const description = incomingPayment?.description
 
     await this.rafikiClient.createOutgoingPayment({

diff --git a/packages/wallet/backend/src/quote/service.ts b/packages/wallet/backend/src/quote/service.ts
@@ -125,9 +125,10 @@ export class QuoteService implements IQuoteService {
         amount: value
       })
       if (isIncomingPayment) {
-        const payment = await this.incomingPaymentService.getReceiver(
-          params.receiver
-        )
+        const payment =
+          await this.incomingPaymentService.getPaymentDetailsByUrl(
+            params.receiver
+          )
 
         const amount = payment?.value
           ? transformBalance(payment?.value, assetDetails.assetScale)

diff --git a/packages/wallet/backend/src/rafiki/auth/generated/graphql.ts b/packages/wallet/backend/src/rafiki/auth/generated/graphql.ts
@@ -175,6 +175,7 @@ export type QueryGrantsArgs = {
   filter?: InputMaybe<GrantFilter>;
   first?: InputMaybe<Scalars['Int']['input']>;
   last?: InputMaybe<Scalars['Int']['input']>;
+  sortOrder?: InputMaybe<SortOrder>;
 };
 
 export type RevokeGrantInput = {
@@ -188,6 +189,13 @@ export type RevokeGrantMutationResponse = MutationResponse & {
   success: Scalars['Boolean']['output'];
 };
 
+export enum SortOrder {
+  /** Choose ascending order for results. */
+  Asc = 'ASC',
+  /** Choose descending order for results. */
+  Desc = 'DESC'
+}
+
 export type GetGrantsQueryVariables = Exact<{
   after?: InputMaybe<Scalars['String']['input']>;
   before?: InputMaybe<Scalars['String']['input']>;