Renamed wallet to address everywhere

Signed-off-by: Robert Gogete <gogeterobert@yahoo.com>

Author: gogeterobert

.github/workflows/build-lint-test.yml

@@ -24,6 +24,9 @@ jobs:
       - name: Install dependencies
         run: npm ci
 
+      - name: Push Prisma schema to DB
+        run: npm run db:push
+
       - name: Build (TypeScript)
         run: npm run build
 

package-lock.json

@@ -7,7 +7,8 @@
   "scripts": {
     "build": "tsc",
     "test": "jest --runInBand",
-    "lint": "eslint . --ext .ts"
+    "lint": "eslint . --ext .ts",
+    "db:push": "prisma db push"
   },
   "keywords": [],
   "author": "",
@@ -31,13 +32,15 @@
   "dependencies": {
     "@dignetwork/datalayer-driver": "^0.1.35",
     "@dignetwork/proof-of-storage-continuity": "^0.1.0",
+    "@prisma/client": "^6.11.1",
     "async-mutex": "^0.5.0",
     "better-sqlite3": "^11.10.0",
     "bip39": "^3.1.0",
     "chia-bls": "^1.0.3",
     "fs-extra": "^11.3.0",
     "nconf": "^0.13.0",
     "observable-fns": "^0.6.1",
+    "prisma": "^6.11.1",
     "threads": "^1.7.0",
     "uuid": "^11.1.0",
     "zod": "^3.25.55"

package.json

@@ -17,7 +17,7 @@ model Block {
   created_at  DateTime @default(now())
 }
 
-model Wallet {
+model Address {
   address         String  @id
   namespace       String  @default("default")
   synced_to_height Int

prisma/schema.prisma

@@ -0,0 +1,55 @@
+import { PrismaClient } from '@prisma/client';
+
+const prisma = new PrismaClient();
+
+export interface AddressRow {
+  address: string;
+  namespace: string;
+  synced_to_height: number;
+  synced_to_hash: string;
+  name?: string;
+}
+
+export interface IAddressRepository {
+  addAddress(address: string, name: string, namespace?: string): Promise<void>;
+  updateAddressSync(address: string, synced_to_height: number, synced_to_hash: string): Promise<void>;
+  removeAddress(address: string): Promise<void>;
+  removeAddressByName(name: string): Promise<void>;
+  getAddresses(): Promise<AddressRow[]>;
+}
+
+export class AddressRepository implements IAddressRepository {
+  async addAddress(address: string, name: string, namespace: string = 'default', synchedToHeight: number = 0, synchedToHash: string = '') {
+    // Prevent duplicate names
+    const exists = await prisma.address.findUnique({ where: { name } });
+    if (exists) throw new Error('Address with this name already exists');
+    await prisma.address.create({
+      data: {
+        address,
+        namespace,
+        name,
+        synced_to_height: synchedToHeight,
+        synced_to_hash: synchedToHash,
+      },
+    });
+  }
+
+  async updateAddressSync(address: string, synced_to_height: number, synced_to_hash: string) {
+    await prisma.address.update({
+      where: { address },
+      data: { synced_to_height, synced_to_hash },
+    });
+  }
+
+  async removeAddress(address: string) {
+    await prisma.address.deleteMany({ where: { address } });
+  }
+
+  async removeAddressByName(name: string) {
+    await prisma.address.deleteMany({ where: { name } });
+  }
+
+  async getAddresses(): Promise<AddressRow[]> {
+    return prisma.address.findMany();
+  }
+}

src/application/repositories/AddressRepository.ts

@@ -29,9 +29,7 @@ export class BlockRepository implements IBlockRepository {
     return toBlock(block);
   }
 
-  // Test-only helper for inserting blocks
   async addBlock(hash: Buffer, blockHeight: number) {
-    // @ts-ignore
     return await prisma.block.create({ data: { hash, blockHeight } });
   }
 }

src/application/repositories/BlockRepository.ts

@@ -5,13 +5,13 @@ import { EncryptedData } from '../types/EncryptedData';
 import { Wallet } from '../types/Wallet';
 import type { IBlockchainService } from '../../infrastructure/BlockchainServices/IBlockChainService';
 import { ChiaBlockchainService } from '../../infrastructure/BlockchainServices/ChiaBlockchainService';
-import { AddressRow, WalletRepository } from '../repositories/WalletRepository';
+import { AddressRow, AddressRepository } from '../repositories/AddressRepository';
 
 const KEYRING_FILE = 'keyring.json';
 
-export class WalletService {
+export class AddressService {
   private blockchain: IBlockchainService;
-  private static walletRepo: WalletRepository = new WalletRepository();
+  private static addressRepo: AddressRepository = new AddressRepository();
 
   constructor() {
     this.blockchain = new ChiaBlockchainService();
@@ -29,14 +29,14 @@ export class WalletService {
   }
 
   public static async createAddress(addressName: string, mnemonic?: string): Promise<Wallet> {
-    if (await this.walletExists(addressName)) {
+    if (await this.addressExists(addressName)) {
       throw new Error('Address with the same name already exists.');
     }
     const generatedMnemonic = bip39.generateMnemonic(256);
     await this.saveAddressToKeyring(addressName, mnemonic ?? generatedMnemonic);
     let wallet = await this.loadAddress(addressName);
     const address = await wallet.getOwnerPublicKey();
-    await WalletService.walletRepo.addAddress(address, addressName);
+    await AddressService.addressRepo.addAddress(address, addressName);
 
     return wallet;
   }
@@ -48,12 +48,12 @@ export class WalletService {
       deleted = await nconfService.deleteConfigValue(addressName);
     }
     // Remove from DB as well
-    await WalletService.walletRepo.removeAddressByName(addressName);
+    await AddressService.addressRepo.removeAddressByName(addressName);
     return deleted;
   }
 
   public static async getAddresses(): Promise<AddressRow[]> {
-    return WalletService.walletRepo.getAddresses();
+    return AddressService.addressRepo.getAddresses();
   }
 
   public async calculateFeeForCoinSpends(): Promise<bigint> {
@@ -77,7 +77,7 @@ export class WalletService {
     await nconfService.setConfigValue(walletName, encryptedData);
   }
 
-  private static async walletExists(addressName: string): Promise<boolean> {
+  private static async addressExists(addressName: string): Promise<boolean> {
     const nconfService = new NconfService(KEYRING_FILE);
     if (await nconfService.configExists()) {
       const existing = await nconfService.getConfigValue(addressName);