fix: remove WM accounting (#1526)

* Remove WM accounting * Lint fix * Fix frontend errors * PR review fixes * Delete 20240903125600_update_wallet_addresses.js * remove Max asset scale env variable * fix: remove unecessary migrations and fields * fix: remove debt column * fix: remove base asset scale env var * test: remove WA asset scale/code --------- Co-authored-by: Tymmmy <[email protected]> Co-authored-by: dragosp1011 <[email protected]>
interledger · Sep 6, 2024 · f80db89 · f80db89
1 parent 60eb193
commit f80db89
Show file tree

Hide file tree

Showing 36 changed files with 189 additions and 878 deletions.
diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml
@@ -52,10 +52,6 @@ services:
       FROM_EMAIL: ${FROM_EMAIL}
       SEND_EMAIL: ${SEND_EMAIL:-false}
       RATE_API_KEY: ${RATE_API_KEY}
-      BASE_ASSET_SCALE: 2
-      MAX_ASSET_SCALE: 9
-      WM_THRESHOLD: 100000000
-      DEBT_THRESHOLD: 5
       REDIS_URL: redis://redis:6379/0
       KRATOS_ADMIN_URL: 'http://kratos:4434/admin'
     restart: always

diff --git a/docker/prod/.env.example b/docker/prod/.env.example
@@ -31,10 +31,6 @@ WALLET_BACKEND_FROM_EMAIL=
 WALLET_BACKEND_SEND_EMAIL=
 WALLET_BACKEND_AUTH_DOMAIN=
 WALLET_BACKEND_RATE_API_KEY=
-WALLET_BACKEND_BASE_ASSET_SCALE=
-WALLET_BACKEND_MAX_ASSET_SCALE=
-WALLET_BACKEND_WM_THRESHOLD=
-WALLET_BACKEND_DEBT_THRESHOLD=
 
 # BOUTIQUE
 BOUTIQUE_BACKEND_PORT=

diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml
@@ -65,10 +65,6 @@ services:
       AUTH_IDENTITY_SERVER_SECRET: ${RAFIKI_AUTH_IDENTITY_SERVER_SECRET}
       AUTH_DOMAIN: ${WALLET_BACKEND_AUTH_DOMAIN}
       RATE_API_KEY: ${WALLET_BACKEND_RATE_API_KEY}
-      BASE_ASSET_SCALE: ${WALLET_BACKEND_BASE_ASSET_SCALE}
-      MAX_ASSET_SCALE: ${WALLET_BACKEND_MAX_ASSET_SCALE}
-      WM_THRESHOLD: ${WALLET_BACKEND_WM_THRESHOLD}
-      DEBT_THRESHOLD: ${WALLET_BACKEND_DEBT_THRESHOLD}
       REDIS_URL: ${WALLET_BACKEND_REDIS_URL}
     networks:
       - testnet

diff --git a/packages/wallet/backend/migrations/20231013114620_add_wm_transactions_table.js b/packages/wallet/backend/migrations/20231013114620_add_wm_transactions_table.js
diff --git a/packages/wallet/backend/migrations/20231016055803_add_debt_column.js b/packages/wallet/backend/migrations/20231016055803_add_debt_column.js
diff --git a/packages/wallet/backend/migrations/20231018084125_update_payment_pointers_table.js b/packages/wallet/backend/migrations/20231018084125_update_payment_pointers_table.js
diff --git a/packages/wallet/backend/migrations/20231026113102_rename_payment_pointer_tables.js b/packages/wallet/backend/migrations/20231026113102_rename_payment_pointer_tables.js
@@ -12,11 +12,6 @@ exports.up = async function (knex) {
       table.dropForeign(['paymentPointerId'])
       table.renameColumn('paymentPointerId', 'walletAddressId')
       table.foreign('walletAddressId').references('walletAddresses.id')
-    }),
-    knex.schema.alterTable('wmTransactions', function (table) {
-      table.dropForeign(['paymentPointerId'])
-      table.renameColumn('paymentPointerId', 'walletAddressId')
-      table.foreign('walletAddressId').references('walletAddresses.id')
     })
   ])
 }
@@ -35,11 +30,6 @@ exports.down = async function (knex) {
       table.dropForeign(['walletAddressId'])
       table.renameColumn('walletAddressId', 'paymentPointerId')
       table.foreign('paymentPointerId').references('paymentPointers.id')
-    }),
-    knex.schema.alterTable('wmTransactions', function (table) {
-      table.dropForeign(['walletAddressId'])
-      table.renameColumn('walletAddressId', 'paymentPointerId')
-      table.foreign('paymentPointerId').references('paymentPointers.id')
     })
   ])
 }
diff --git a/packages/wallet/backend/src/account/model.ts b/packages/wallet/backend/src/account/model.ts
@@ -15,7 +15,6 @@ export class Account extends BaseModel {
   public readonly userId!: string
   public user!: User
   public walletAddresses!: Array<WalletAddress>
-  public debt!: number
 
   static relationMappings = () => ({
     user: {

diff --git a/packages/wallet/backend/src/account/service.ts b/packages/wallet/backend/src/account/service.ts
@@ -6,6 +6,7 @@ import { transformBalance } from '@/utils/helpers'
 import { Transaction } from '@/transaction/model'
 import { Amount } from '@/rafiki/service'
 import { Conflict, NotFound } from '@shared/backend'
+import { DEFAULT_ASSET_SCALE } from '@/utils/consts'
 
 type CreateAccountArgs = {
   userId: string
@@ -304,7 +305,7 @@ export class AccountService implements IAccountService {
     name = 'USD Account'
   ): Promise<Account | undefined> {
     const asset = (await this.rafikiClient.listAssets({ first: 100 })).find(
-      (asset) => asset.code === 'USD' && asset.scale === 2
+      (asset) => asset.code === 'USD' && asset.scale === DEFAULT_ASSET_SCALE
     )
     if (!asset) {
       return

diff --git a/packages/wallet/backend/src/app.ts b/packages/wallet/backend/src/app.ts
@@ -38,7 +38,6 @@ import { UserController } from './user/controller'
 import type { UserService } from './user/service'
 import { SocketService } from './socket/service'
 import { GrantService } from '@/grant/service'
-import { WMTransactionService } from '@/webMonetization/transaction/service'
 import { AwilixContainer } from 'awilix'
 import { Cradle } from '@/createContainer'
 import { initErrorHandler, RedisClient } from '@shared/backend'
@@ -78,7 +77,6 @@ export interface Bindings {
   grantService: GrantService
   emailService: EmailService
   socketService: SocketService
-  wmTransactionService: WMTransactionService
 }
 
 export class App {
@@ -336,33 +334,8 @@ export class App {
       })
   }
 
-  private async processWMWalletAddresses() {
-    const logger = await this.container.resolve('logger')
-    const walletAddressService = await this.container.resolve(
-      'walletAddressService'
-    )
-
-    return walletAddressService
-      .processWMWalletAddresses()
-      .catch((e) => {
-        logger.error(e)
-        return false
-      })
-      .then((trx) => {
-        if (trx) {
-          process.nextTick(() => this.processWMWalletAddresses())
-        } else {
-          setTimeout(
-            () => this.processWMWalletAddresses(),
-            1000 * 60 * 5
-          ).unref()
-        }
-      })
-  }
-
   async processResources() {
     process.nextTick(() => this.processPendingTransactions())
-    process.nextTick(() => this.processWMWalletAddresses())
   }
 
   async createDefaultUsers() {

diff --git a/packages/wallet/backend/src/config/env.ts b/packages/wallet/backend/src/config/env.ts
@@ -34,10 +34,6 @@ const envSchema = z.object({
     .enum(['true', 'false'])
     .default('false')
     .transform((value) => value === 'true'),
-  BASE_ASSET_SCALE: z.coerce.number().nonnegative().default(2),
-  MAX_ASSET_SCALE: z.coerce.number().nonnegative().default(9),
-  WM_THRESHOLD: z.coerce.bigint().nonnegative().default(100_000_000n), // $0.1 in asset scale 9
-  DEBT_THRESHOLD: z.coerce.number().multipleOf(0.01).nonnegative().default(5.0), // $5.00
   DEFAULT_WALLET_ACCOUNT: z
     .object({
       email: z.string().default('[email protected]'),

diff --git a/packages/wallet/backend/src/createContainer.ts b/packages/wallet/backend/src/createContainer.ts
@@ -30,7 +30,6 @@ import { type Knex } from 'knex'
 import { SocketService } from './socket/service'
 import { GrantService } from './grant/service'
 import { RatesService } from './rates/service'
-import { WMTransactionService } from '@/webMonetization/transaction/service'
 import { Logger } from 'winston'
 import {
   asClass,
@@ -70,7 +69,6 @@ export interface Cradle {
   accountService: AccountService
   ratesService: RatesService
   redisClient: RedisClient
-  wmTransactionService: WMTransactionService
   walletAddressService: WalletAddressService
   walletAddressKeyService: WalletAddressKeyService
   transactionService: TransactionService
@@ -121,10 +119,6 @@ export async function createContainer(
     accountService: asClass(AccountService).singleton(),
     ratesService: asClass(RatesService).singleton(),
     redisClient: asFunction(createRedis).singleton(),
-    wmTransactionService: asClassSingletonWithLogger(
-      WMTransactionService,
-      logger
-    ),
     transactionService: asClassSingletonWithLogger(TransactionService, logger),
     walletAddressService: asClassSingletonWithLogger(
       WalletAddressService,

diff --git a/packages/wallet/backend/src/rafiki/service.ts b/packages/wallet/backend/src/rafiki/service.ts
@@ -8,9 +8,7 @@ import { UserService } from '@/user/service'
 import { SocketService } from '@/socket/service'
 import { NodeCacheInstance } from '@/utils/helpers'
 import { WalletAddressService } from '@/walletAddress/service'
-import { WMTransactionService } from '@/webMonetization/transaction/service'
 import { Account } from '@/account/model'
-import { WMTransaction } from '@/webMonetization/transaction/model'
 import MessageType from '@/socket/messageType'
 import { BadRequest } from '@shared/backend'
 
@@ -84,8 +82,7 @@ export class RafikiService implements IRafikiService {
     private logger: Logger,
     private rafikiClient: RafikiClient,
     private transactionService: TransactionService,
-    private walletAddressService: WalletAddressService,
-    private wmTransactionService: WMTransactionService
+    private walletAddressService: WalletAddressService
   ) {}
 
   public async onWebHook(wh: WebHook): Promise<void> {
@@ -167,27 +164,20 @@ export class RafikiService implements IRafikiService {
     return amount
   }
 
-  private amountToNumber(amount: Amount): number {
-    return +(Number(amount.value) * 10 ** -amount.assetScale).toFixed(
-      amount.assetScale
-    )
+  private amountToNumber(
+    amount: Amount,
+    toAssetScale: number = amount.assetScale
+  ): number {
+    const factor = 10 ** toAssetScale
+    const scaledValue = Number(amount.value) * 10 ** -amount.assetScale
+    const truncatedValue = Math.floor(scaledValue * factor) / factor
+    return truncatedValue
   }
 
   private async handleIncomingPaymentCompleted(wh: WebHook) {
     const walletAddress = await this.getWalletAddress(wh)
     const amount = this.getAmountFromWebHook(wh)
 
-    if (walletAddress.isWM) {
-      await this.rafikiClient.withdrawLiqudity(wh.id)
-
-      await this.wmTransactionService.updateTransaction(
-        { paymentId: wh.data.id },
-        { status: 'COMPLETED', value: amount.value }
-      )
-
-      return
-    }
-
     const receiverWalletId = await this.getRapydWalletId(walletAddress)
 
     if (!this.validateAmount(amount, wh.type)) {
@@ -246,12 +236,6 @@ export class RafikiService implements IRafikiService {
   private async handleIncomingPaymentCreated(wh: WebHook) {
     const walletAddress = await this.getWalletAddress(wh)
 
-    if (walletAddress.isWM) {
-      await this.wmTransactionService.createIncomingTransaction(wh.data)
-
-      return
-    }
-
     await this.transactionService.createIncomingTransaction(
       wh.data,
       walletAddress
@@ -262,12 +246,6 @@ export class RafikiService implements IRafikiService {
     const walletAddress = await this.getWalletAddress(wh)
     const amount = this.getAmountFromWebHook(wh)
 
-    if (walletAddress.isWM) {
-      await this.rafikiClient.depositLiquidity(wh.id)
-      await this.wmTransactionService.createOutgoingTransaction(wh.data)
-      return
-    }
-
     const rapydWalletId = await this.getRapydWalletId(walletAddress)
 
     if (!this.validateAmount(amount, wh.type)) {
@@ -304,17 +282,6 @@ export class RafikiService implements IRafikiService {
     const walletAddress = await this.getWalletAddress(wh)
     const debitAmount = this.getAmountFromWebHook(wh)
 
-    if (walletAddress.isWM) {
-      await this.rafikiClient.withdrawLiqudity(wh.id)
-
-      await this.wmTransactionService.updateTransaction(
-        { paymentId: wh.data.id },
-        { status: 'COMPLETED', value: debitAmount.value }
-      )
-
-      return
-    }
-
     const source_ewallet = await this.getRapydWalletId(walletAddress)
 
     if (!this.validateAmount(debitAmount, wh.type)) {
@@ -376,20 +343,6 @@ export class RafikiService implements IRafikiService {
 
     const sentAmount = this.parseAmount(wh.data.sentAmount as AmountJSON)
 
-    if (walletAddress.isWM) {
-      await this.rafikiClient.withdrawLiqudity(wh.id)
-
-      const update: Partial<WMTransaction> = sentAmount.value
-        ? { status: 'COMPLETED', value: sentAmount.value }
-        : { status: 'FAILED', value: 0n }
-      await this.wmTransactionService.updateTransaction(
-        { paymentId: wh.data.id },
-        update
-      )
-
-      return
-    }
-
     const source_ewallet = await this.getRapydWalletId(walletAddress)
 
     const releaseResult = await this.rapydClient.releaseLiquidity({

diff --git a/packages/wallet/backend/src/rapyd/controller.ts b/packages/wallet/backend/src/rapyd/controller.ts
@@ -96,8 +96,7 @@ export class RapydController implements IRapydController {
           accountId: defaultAccount.id,
           walletAddressName,
           publicName: 'Default Payment Pointer',
-          userId: id,
-          isWM: false
+          userId: id
         })
       }