feat: support peer service adding initial amount of liquidity

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

@@ -32,18 +32,20 @@ export async function createAccount(
 
 export async function getLiquidityAccount(
   deps: ServiceDependencies,
-  accountRef: string
+  accountRef: string,
+  trx?: TransactionOrKnex
 ): Promise<LedgerAccount | undefined> {
-  return LedgerAccount.query(deps.knex)
+  return LedgerAccount.query(trx ?? deps.knex)
     .findOne({ accountRef })
     .whereNot({ type: LedgerAccountType.SETTLEMENT })
 }
 
 export async function getSettlementAccount(
   deps: ServiceDependencies,
-  accountRef: string
+  accountRef: string,
+  trx?: TransactionOrKnex
 ): Promise<LedgerAccount | undefined> {
-  return LedgerAccount.query(deps.knex)
+  return LedgerAccount.query(trx ?? deps.knex)
     .findOne({ accountRef })
     .where({ type: LedgerAccountType.SETTLEMENT })
 }

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

@@ -151,25 +151,27 @@ function validateTransferStateUpdate(
 
 export async function createTransfers(
   deps: ServiceDependencies,
-  transfers: CreateLedgerTransferArgs[]
+  transfers: CreateLedgerTransferArgs[],
+  trx?: TransactionOrKnex
 ): Promise<CreateTransfersResult> {
-  const trx = await deps.knex.transaction()
+  const transaction =
+    (await trx?.transaction()) ?? (await deps.knex.transaction())
 
   const errors: CreateTransferError[] = []
   const results: LedgerTransfer[] = []
 
   for (const [index, transfer] of transfers.entries()) {
-    const error = await validateTransfer(deps, transfer, trx)
+    const error = await validateTransfer(deps, transfer, transaction)
 
     if (error) {
       errors.push({ index, error })
       break
     }
 
     try {
-      const createdTransfer = await LedgerTransfer.query(trx).insertAndFetch(
-        prepareTransfer(transfer)
-      )
+      const createdTransfer = await LedgerTransfer.query(
+        transaction
+      ).insertAndFetch(prepareTransfer(transfer))
 
       results.push(createdTransfer)
     } catch (error) {
@@ -183,16 +185,16 @@ export async function createTransfers(
   }
 
   if (errors.length > 0) {
-    await trx.rollback()
+    await transaction.rollback()
     return { results: [], errors }
   }
 
   try {
-    await trx.commit()
+    await transaction.commit()
 
     return { results, errors: [] }
   } catch (error) {
-    await trx.rollback()
+    await transaction.rollback()
 
     const errorMessage = 'Could not create transfer(s)'
     deps.logger.error(

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

@@ -60,7 +60,7 @@ export function createAccountingService(
       getAccountsTotalReceived(deps, accountRefs),
     getSettlementBalance: (ledger) => getSettlementBalance(deps, ledger),
     createTransfer: (options) => createTransfer(deps, options),
-    createDeposit: (transfer) => createAccountDeposit(deps, transfer),
+    createDeposit: (transfer, trx) => createAccountDeposit(deps, transfer, trx),
     createWithdrawal: (transfer) => createAccountWithdrawal(deps, transfer),
     postWithdrawal: (withdrawalRef) => postTransfers(deps, [withdrawalRef]),
     voidWithdrawal: (withdrawalRef) => voidTransfers(deps, [withdrawalRef])
@@ -290,7 +290,8 @@ function handleTransferCreateResults(
 
 async function createAccountDeposit(
   deps: ServiceDependencies,
-  args: Deposit
+  args: Deposit,
+  trx?: TransactionOrKnex
 ): Promise<void | TransferError> {
   const {
     id: transferRef,
@@ -302,8 +303,8 @@ async function createAccountDeposit(
   } = args
 
   const [account, settlementAccount] = await Promise.all([
-    getLiquidityAccount(deps, accountRef),
-    getSettlementAccount(deps, assetRef)
+    getLiquidityAccount(deps, accountRef, trx),
+    getSettlementAccount(deps, assetRef, trx)
   ])
 
   if (!account) {
@@ -322,7 +323,7 @@ async function createAccountDeposit(
     type: LedgerTransferType.DEPOSIT
   }
 
-  const { errors } = await createTransfers(deps, [transfer])
+  const { errors } = await createTransfers(deps, [transfer], trx)
 
   if (errors[0]) {
     return errors[0].error

packages/backend/src/accounting/service.ts

@@ -69,7 +69,10 @@ export interface AccountingService {
   getAccountsTotalReceived(ids: string[]): Promise<(bigint | undefined)[]>
   getSettlementBalance(ledger: number): Promise<bigint | undefined>
   createTransfer(options: TransferOptions): Promise<Transaction | TransferError>
-  createDeposit(deposit: Deposit): Promise<void | TransferError>
+  createDeposit(
+    deposit: Deposit,
+    trx?: TransactionOrKnex
+  ): Promise<void | TransferError>
   createWithdrawal(withdrawal: Withdrawal): Promise<void | TransferError>
   postWithdrawal(id: string): Promise<void | TransferError>
   voidWithdrawal(id: string): Promise<void | TransferError>

packages/backend/src/app.ts

@@ -80,6 +80,7 @@ import { FeeService } from './fee/service'
 import { AutoPeeringService } from './auto-peering/service'
 import { AutoPeeringRoutes } from './auto-peering/routes'
 import { Rafiki as ConnectorApp } from './connector/core'
+import { AxiosInstance } from 'axios'
 
 export interface AppContextData {
   logger: Logger
@@ -189,6 +190,7 @@ const PAYMENT_POINTER_PATH = '/:paymentPointerPath+'
 export interface AppServices {
   logger: Promise<Logger>
   knex: Promise<Knex>
+  axios: Promise<AxiosInstance>
   config: Promise<IAppConfig>
   httpTokenService: Promise<HttpTokenService>
   assetService: Promise<AssetService>
@@ -588,8 +590,7 @@ export class App {
     const router = new Router<DefaultState, AppContext>()
 
     router.use(bodyParser())
-
-    router.get('/', autoPeeringRoutes.get)
+    router.post('/', autoPeeringRoutes.acceptPeerRequest)
 
     koa.use(router.routes())
 

packages/backend/src/auto-peering/errors.ts

@@ -0,0 +1,39 @@
+export enum AutoPeeringError {
+  InvalidIlpConfiguration = 'InvalidIlpConfiguration',
+  InvalidPeerIlpConfiguration = 'InvalidPeerIlpConfiguration',
+  UnknownAsset = 'UnknownAsset',
+  PeerUnsupportedAsset = 'PeerUnsupportedAsset',
+  InvalidPeerUrl = 'InvalidPeerUrl',
+  InvalidPeeringRequest = 'InvalidPeeringRequest',
+  DuplicatePeer = 'DuplicatePeer'
+}
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
+export const isAutoPeeringError = (o: any): o is AutoPeeringError =>
+  Object.values(AutoPeeringError).includes(o)
+
+export const errorToCode: {
+  [key in AutoPeeringError]: number
+} = {
+  [AutoPeeringError.InvalidIlpConfiguration]: 400,
+  [AutoPeeringError.InvalidPeerIlpConfiguration]: 400,
+  [AutoPeeringError.UnknownAsset]: 404,
+  [AutoPeeringError.PeerUnsupportedAsset]: 400,
+  [AutoPeeringError.InvalidPeerUrl]: 400,
+  [AutoPeeringError.InvalidPeeringRequest]: 400,
+  [AutoPeeringError.DuplicatePeer]: 409
+}
+
+export const errorToMessage: {
+  [key in AutoPeeringError]: string
+} = {
+  [AutoPeeringError.InvalidIlpConfiguration]:
+    'The ILP configuration is misconfigured',
+  [AutoPeeringError.InvalidPeerIlpConfiguration]: `Requested peer's ILP configuration is misconfigured`,
+  [AutoPeeringError.UnknownAsset]: 'Unknown asset',
+  [AutoPeeringError.PeerUnsupportedAsset]: 'Peer does not support asset',
+  [AutoPeeringError.InvalidPeerUrl]:
+    'Peer URL is invalid or peer does not support auto-peering',
+  [AutoPeeringError.InvalidPeeringRequest]: 'Invalid peering request',
+  [AutoPeeringError.DuplicatePeer]: 'Duplicate peer'
+}