feat: WM on Test wallet

README.md

@@ -91,7 +91,7 @@ The `RAPYD_ACCESS_KEY` and `RAPYD_SECRET_KEY` variables values can be found in y
 To create a new Interledger Test Wallet account, a verification email will be sent to the provided email address. If you want to send emails within the development environment, you will need to have a personal Sendgrid account and update the following environment variables: `SEND_EMAIL` to `true`, `SENDGRID_API_KEY` and `FROM_EMAIL`. If you prefer not to send emails in the development environment, simply set `SEND_EMAIL` to `false` and use the verification link found in the Docker `wallet-backend` container logs to finalize the registration process for a new user.
 
 Cross-currency transactions are supported. To enable this functionality, you will need to register at [freecurrencyapi.com/](https://freecurrencyapi.com/) and update the `RATE_API_KEY` environment variable with your own API key.
-Currencies can be added in the `admin` environment. For example `assetCode` is `EUR`, `assetScale` is `2`, and you will need to add an amount to `liquidity`.
+Currencies can be added in the `admin` environment. For example `assetCode` is `USD`, `assetScale` is `2`, and you will need to add an amount to `liquidity`.
 
 To have everything ready for `DEV` environment, we already set up some default values for Interledger Test Wallet, this way developers are ready to login without validation, and test e-commerce application without any additional setup:
 

docker/dev/docker-compose.yml

@@ -54,7 +54,7 @@ services:
       RATE_API_KEY: ${RATE_API_KEY}
       BASE_ASSET_SCALE: 2
       MAX_ASSET_SCALE: 9
-      WM_THRESHOLD: 100000000
+      RAPYD_THRESHOLD: 10000000 # 0.01
       DEBT_THRESHOLD: 5
       REDIS_URL: redis://redis:6379/0
     restart: always

docker/prod/.env.example

@@ -33,7 +33,7 @@ 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_RAPYD_THRESHOLD=
 WALLET_BACKEND_DEBT_THRESHOLD=
 
 # BOUTIQUE

docker/prod/docker-compose.yml

@@ -67,7 +67,7 @@ services:
       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}
+      RAPYD_THRESHOLD: ${WALLET_BACKEND_RAPYD_THRESHOLD}
       DEBT_THRESHOLD: ${WALLET_BACKEND_DEBT_THRESHOLD}
       REDIS_URL: ${WALLET_BACKEND_REDIS_URL}
     networks:

packages/wallet/backend/knexfile.js

@@ -20,6 +20,20 @@ module.exports = {
     }
   },
 
+  rafiki_backend: {
+    client: 'postgresql',
+    connection: {
+      host: 'postgres',
+      user: 'postgres',
+      password: 'password',
+      database: 'rafiki_backend'
+    },
+    pool: {
+      min: 2,
+      max: 10
+    }
+  },
+
   testing: {
     client: 'postgresql',
     connection: {

packages/wallet/backend/migrations/20240801155211_update_asset_scale.js

@@ -0,0 +1,112 @@
+const Knex = require('knex')
+const knexConfig = require('../knexfile')
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.up = async function (knex) {
+  if (process.env.NODE_ENV !== 'test') {
+    const rafikiKnex = Knex(knexConfig.rafiki_backend)
+
+    try {
+      const assets = await rafikiKnex('assets').distinct('code')
+
+      for (const asset of assets) {
+        const { code } = asset
+
+        const existingAssetWithScale9 = await rafikiKnex('assets')
+          .where({ code, scale: 9 })
+          .first()
+
+        if (existingAssetWithScale9) {
+          await knex('accounts')
+            .where({ assetCode: code, assetScale: 2 })
+            .update({
+              assetId: existingAssetWithScale9.id,
+              assetScale: 9
+            })
+        } else {
+          await rafikiKnex('assets')
+            .where({ code, scale: 2 })
+            .update({ scale: 9 })
+        }
+      }
+    } finally {
+      await rafikiKnex.destroy()
+    }
+  }
+
+  const walletAddresses = await knex('walletAddresses').select(
+    'id',
+    'accountId'
+  )
+  for (const walletAddress of walletAddresses) {
+    const account = await knex('accounts')
+      .where('id', walletAddress.accountId)
+      .first()
+    if (account) {
+      await knex('walletAddresses')
+        .where('id', walletAddress.id)
+        .update({ assetCode: account.assetCode })
+    }
+  }
+
+  await knex('walletAddresses').update({ assetScale: 9 })
+  await knex('accounts').update({ assetScale: 9 })
+}
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.down = async function (knex) {
+  if (process.env.NODE_ENV !== 'test') {
+    const rafikiKnex = Knex(knexConfig.rafiki_backend)
+
+    try {
+      const assets = await rafikiKnex('assets').distinct('code')
+
+      for (const asset of assets) {
+        const { code } = asset
+
+        const existingAssetWithScale2 = await rafikiKnex('assets')
+          .where({ code, scale: 2 })
+          .first()
+
+        if (existingAssetWithScale2) {
+          await knex('accounts')
+            .where({ assetCode: code, assetScale: 9 })
+            .update({
+              assetId: existingAssetWithScale2.id,
+              assetScale: 2
+            })
+        } else {
+          await rafikiKnex('assets')
+            .where({ code, scale: 9 })
+            .update({ scale: 2 })
+        }
+      }
+    } finally {
+      await rafikiKnex.destroy()
+    }
+  }
+
+  const walletAddresses = await knex('walletAddresses').select(
+    'id',
+    'accountId'
+  )
+  for (const walletAddress of walletAddresses) {
+    const account = await knex('accounts')
+      .where('id', walletAddress.accountId)
+      .first()
+    if (account) {
+      await knex('walletAddresses')
+        .where('id', walletAddress.id)
+        .update({ assetCode: account.assetCode })
+    }
+  }
+
+  await knex('walletAddresses').update({ assetScale: 2 })
+  await knex('accounts').update({ assetScale: 2 })
+}

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 { Env } from '@/config/env'
 
 type CreateAccountArgs = {
   userId: string
@@ -38,7 +39,8 @@ interface IAccountService {
 export class AccountService implements IAccountService {
   constructor(
     private rapydClient: RapydClient,
-    private rafikiClient: RafikiClient
+    private rafikiClient: RafikiClient,
+    private env: Env
   ) {}
 
   public async createAccount(args: CreateAccountArgs): Promise<Account> {
@@ -244,7 +246,10 @@ export class AccountService implements IAccountService {
       accountId: existingAccount.id,
       paymentId: transactions[transactions.length - 1].id,
       assetCode: existingAccount.assetCode,
-      value: transformBalance(args.amount, asset.scale),
+      value: transformBalance(
+        args.amount,
+        this.env.MAX_ASSET_SCALE || asset.scale
+      ),
       type: 'INCOMING',
       status: 'COMPLETED',
       description: 'Fund account'
@@ -304,7 +309,8 @@ 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 === this.env.MAX_ASSET_SCALE
     )
     if (!asset) {
       return

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,24 +334,25 @@ export class App {
       })
   }
 
-  private async processWMWalletAddresses() {
+  private async keepBalancesSynced(lastProcessedTimestamp: Date) {
     const logger = await this.container.resolve('logger')
     const walletAddressService = await this.container.resolve(
       'walletAddressService'
     )
 
     return walletAddressService
-      .processWMWalletAddresses()
+      .keepBalancesSynced(lastProcessedTimestamp)
       .catch((e) => {
         logger.error(e)
         return false
       })
       .then((trx) => {
+        const newTimestamp = new Date()
         if (trx) {
-          process.nextTick(() => this.processWMWalletAddresses())
+          process.nextTick(() => this.keepBalancesSynced(newTimestamp))
         } else {
           setTimeout(
-            () => this.processWMWalletAddresses(),
+            () => this.keepBalancesSynced(lastProcessedTimestamp),
             1000 * 60 * 5
           ).unref()
         }
@@ -362,7 +361,7 @@ export class App {
 
   async processResources() {
     process.nextTick(() => this.processPendingTransactions())
-    process.nextTick(() => this.processWMWalletAddresses())
+    process.nextTick(() => this.keepBalancesSynced(new Date()))
   }
 
   async createDefaultUsers() {

packages/wallet/backend/src/config/env.ts

@@ -34,7 +34,7 @@ const envSchema = z.object({
     .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
+  RAPYD_THRESHOLD: z.coerce.bigint().nonnegative().default(100_000_00n), // $0.01 in asset scale 9
   DEBT_THRESHOLD: z.coerce.number().multipleOf(0.01).nonnegative().default(5.0), // $5.00
   DEFAULT_WALLET_ACCOUNT: z
     .object({

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,
@@ -69,7 +68,6 @@ export interface Cradle {
   accountService: AccountService
   ratesService: RatesService
   redisClient: RedisClient
-  wmTransactionService: WMTransactionService
   walletAddressService: WalletAddressService
   walletAddressKeyService: WalletAddressKeyService
   transactionService: TransactionService
@@ -119,10 +117,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,