feat(backend): tenanted assets

packages/backend/migrations/20241216160130_backfill_tenant_on_assets.js

@@ -0,0 +1,30 @@
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.up = function (knex) {
+  return knex.schema
+    .alterTable('assets', (table) => {
+      table.uuid('tenantId').references('tenants.id').index()
+    })
+    .then(() => {
+      return knex.raw(
+        `UPDATE "assets" SET "tenantId" = (SELECT id from "tenants" LIMIT 1)`
+      )
+    })
+    .then(() => {
+      return knex.schema.alterTable('assets', (table) => {
+        table.uuid('tenantId').notNullable().alter()
+      })
+    })
+}
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.down = function (knex) {
+  return knex.schema.alterTable('assets', (table) => {
+    table.dropColumn('tenantId')
+  })
+}

packages/backend/src/accounting/psql/balance.test.ts

@@ -4,23 +4,26 @@ import { createTestApp, TestContainer } from '../../tests/app'
 import { Config } from '../../config/app'
 import { initIocContainer } from '../../'
 import { Asset } from '../../asset/model'
-import { randomAsset } from '../../tests/asset'
+import { createAsset } from '../../tests/asset'
 import { truncateTables } from '../../tests/tableManager'
 import { LedgerAccount } from './ledger-account/model'
 import { createLedgerAccount } from '../../tests/ledgerAccount'
 import { getAccountBalances } from './balance'
 import { ServiceDependencies } from './service'
 import { LedgerTransferState } from '../service'
 import { createLedgerTransfer } from '../../tests/ledgerTransfer'
+import { IocContract } from '@adonisjs/fold'
+import { AppServices } from '../../app'
 
 describe('Balances', (): void => {
+  let deps: IocContract<AppServices>
   let serviceDeps: ServiceDependencies
   let appContainer: TestContainer
   let knex: Knex
   let asset: Asset
 
   beforeAll(async (): Promise<void> => {
-    const deps = initIocContainer({ ...Config, useTigerBeetle: false })
+    deps = initIocContainer({ ...Config, useTigerBeetle: false })
     appContainer = await createTestApp(deps)
     serviceDeps = {
       logger: await deps.use('logger'),
@@ -31,7 +34,7 @@ describe('Balances', (): void => {
   })
 
   beforeEach(async (): Promise<void> => {
-    asset = await Asset.query().insertAndFetch(randomAsset())
+    asset = await createAsset(deps)
   })
 
   afterEach(async (): Promise<void> => {
@@ -48,7 +51,7 @@ describe('Balances', (): void => {
     let peerAccount: LedgerAccount
 
     beforeEach(async (): Promise<void> => {
-      asset = await Asset.query(knex).insertAndFetch(randomAsset())
+      asset = await createAsset(deps)
       ;[account, peerAccount] = await Promise.all([
         createLedgerAccount({ ledger: asset.ledger }, knex),
         createLedgerAccount({ ledger: asset.ledger }, knex)

packages/backend/src/accounting/psql/ledger-account/index.test.ts

@@ -32,7 +32,10 @@ describe('Ledger Account', (): void => {
   })
 
   beforeEach(async (): Promise<void> => {
-    asset = await Asset.query().insertAndFetch(randomAsset())
+    asset = await Asset.query().insertAndFetch({
+      ...randomAsset(),
+      tenantId: Config.operatorTenantId
+    })
   })
 
   afterEach(async (): Promise<void> => {

packages/backend/src/accounting/psql/ledger-transfer/index.test.ts

@@ -45,7 +45,10 @@ describe('Ledger Transfer', (): void => {
   let settlementAccount: LedgerAccount
 
   beforeEach(async (): Promise<void> => {
-    asset = await Asset.query(knex).insertAndFetch(randomAsset())
+    asset = await Asset.query(knex).insertAndFetch({
+      ...randomAsset(),
+      tenantId: Config.operatorTenantId
+    })
     ;[account, peerAccount, settlementAccount] = await Promise.all([
       createLedgerAccount({ ledger: asset.ledger }, knex),
       createLedgerAccount({ ledger: asset.ledger }, knex),

packages/backend/src/accounting/psql/ledger-transfer/model.test.ts

@@ -9,14 +9,17 @@ import { LedgerAccount, LedgerAccountType } from '../ledger-account/model'
 import { createLedgerAccount } from '../../../tests/ledgerAccount'
 import { LedgerTransferState } from '../../service'
 import { createLedgerTransfer } from '../../../tests/ledgerTransfer'
+import { IocContract } from '@adonisjs/fold'
+import { AppServices } from '../../../app'
 
 describe('Ledger Transfer Model', (): void => {
+  let deps: IocContract<AppServices>
   let appContainer: TestContainer
   let knex: Knex
   let asset: Asset
 
   beforeAll(async (): Promise<void> => {
-    const deps = initIocContainer({ ...Config, useTigerBeetle: false })
+    deps = initIocContainer({ ...Config, useTigerBeetle: false })
     appContainer = await createTestApp(deps)
     knex = appContainer.knex
   })
@@ -25,7 +28,10 @@ describe('Ledger Transfer Model', (): void => {
   let debitAccount: LedgerAccount
 
   beforeEach(async (): Promise<void> => {
-    asset = await Asset.query(knex).insertAndFetch(randomAsset())
+    asset = await Asset.query(knex).insertAndFetch({
+      ...randomAsset(),
+      tenantId: Config.operatorTenantId
+    })
     ;[creditAccount, debitAccount] = await Promise.all([
       createLedgerAccount({ ledger: asset.ledger }, knex),
       createLedgerAccount(

packages/backend/src/accounting/psql/service.test.ts

@@ -54,7 +54,10 @@ describe('Psql Accounting Service', (): void => {
   })
 
   beforeEach(async (): Promise<void> => {
-    asset = await Asset.query().insertAndFetch(randomAsset())
+    asset = await Asset.query().insertAndFetch({
+      ...randomAsset(),
+      tenantId: Config.operatorTenantId
+    })
   })
 
   afterEach(async (): Promise<void> => {
@@ -892,7 +895,10 @@ describe('Psql Accounting Service', (): void => {
       const timeout = 10 // 10 seconds
 
       beforeEach(async (): Promise<void> => {
-        const sourceAsset = await assetService.create(randomAsset())
+        const sourceAsset = await assetService.create({
+          ...randomAsset(),
+          tenantId: Config.operatorTenantId
+        })
         assert.ok(!isAssetError(sourceAsset))
 
         sourceAccount = await accountFactory.build({
@@ -902,7 +908,10 @@ describe('Psql Accounting Service', (): void => {
 
         const destinationAsset = sameAsset
           ? sourceAsset
-          : await assetService.create(randomAsset())
+          : await assetService.create({
+              ...randomAsset(),
+              tenantId: Config.operatorTenantId
+            })
 
         assert.ok(!isAssetError(destinationAsset))
 

packages/backend/src/app.ts

@@ -105,6 +105,7 @@ import {
   getTenantFromApiSignature,
   TenantApiSignatureResult
 } from './shared/utils'
+import { TenantService } from './tenants/service'
 export interface AppContextData {
   logger: Logger
   container: AppContainer
@@ -265,6 +266,7 @@ export interface AppServices {
   paymentMethodHandlerService: Promise<PaymentMethodHandlerService>
   ilpPaymentService: Promise<IlpPaymentService>
   localPaymentService: Promise<LocalPaymentService>
+  tenantService: Promise<TenantService>
 }
 
 export type AppContainer = IocContract<AppServices>
@@ -393,21 +395,52 @@ export class App {
     )
 
     let tenantApiSignatureResult: TenantApiSignatureResult
-    if (this.config.env !== 'test') {
-      koa.use(async (ctx, next: Koa.Next): Promise<void> => {
-        const result = await getTenantFromApiSignature(ctx, this.config)
-        if (!result) {
-          ctx.throw(401, 'Unauthorized')
-        } else {
+    const tenantSignatureMiddleware = async (
+      ctx: AppContext,
+      next: Koa.Next
+    ): Promise<void> => {
+      const result = await getTenantFromApiSignature(ctx, this.config)
+      if (!result) {
+        ctx.throw(401, 'Unauthorized')
+      } else {
+        tenantApiSignatureResult = {
+          tenant: result.tenant,
+          isOperator: result.isOperator ? true : false
+        }
+      }
+      return next()
+    }
+
+    const testTenantSignatureMiddleware = async (
+      ctx: AppContext,
+      next: Koa.Next
+    ): Promise<void> => {
+      if (ctx.headers['tenant-id']) {
+        const tenantService = await ctx.container.use('tenantService')
+        const tenant = await tenantService.get(
+          ctx.headers['tenant-id'] as string
+        )
+
+        if (tenant) {
           tenantApiSignatureResult = {
-            tenant: result.tenant,
-            isOperator: result.isOperator ? true : false
+            tenant,
+            isOperator: tenant.apiSecret === this.config.adminApiSecret
           }
+        } else {
+          ctx.throw(401, 'Unauthorized')
         }
-        return next()
-      })
+      }
+      return next()
     }
 
+    // For tests, we still need to get the tenant in the middleware, but
+    // we don't need to verify the signature nor prevent replay attacks
+    koa.use(
+      this.config.env !== 'test'
+        ? tenantSignatureMiddleware
+        : testTenantSignatureMiddleware
+    )
+
     koa.use(
       koaMiddleware(this.apolloServer, {
         context: async (): Promise<TenantedApolloContext> => {

packages/backend/src/asset/model.test.ts

@@ -38,6 +38,7 @@ describe('Models', (): void => {
       beforeEach(async (): Promise<void> => {
         const options = {
           ...randomAsset(),
+          tenantId: Config.operatorTenantId,
           liquidityThreshold: BigInt(100)
         }
         const assetOrError = await assetService.create(options)

packages/backend/src/asset/model.ts

@@ -13,6 +13,7 @@ export class Asset extends BaseModel implements LiquidityAccount {
 
   // TigerBeetle account 2 byte ledger field representing account's asset
   public readonly ledger!: number
+  public readonly tenantId!: string
 
   public readonly withdrawalThreshold!: bigint | null