backend redesign

backend-all/package.json

@@ -17,6 +17,13 @@
     "contracts": "yarn contracts:sync && yarn contracts:typings",
     "contracts:sync": "SCRIPT=./src/gotbit-tools/scripts/shell/import-contracts.sh yarn script",
     "contracts:typings": "node ./src/gotbit-tools/scripts/typings.js",
+    "typeorm": "typeorm-ts-node-commonjs",
+    "migration:generate": "yarn typeorm migration:generate -d src/lib/database/data-source.ts",
+    "migration:run": "yarn typeorm migration:run -d src/lib/database/data-source.ts",
+    "migration:revert": "yarn typeorm migration:revert -d src/lib/database/data-source.ts",
+    "migration:show": "yarn typeorm migration:show -d src/lib/database/data-source.ts",
+    "schema:sync": "yarn typeorm schema:sync -d src/lib/database/data-source.ts",
+    "schema:drop": "yarn typeorm schema:drop -d src/lib/database/data-source.ts",
     "\n# UTILS SCRIPTS:": "",
     "script": "chmod +x $SCRIPT && $SCRIPT",
     "dev-win": "yarn build-win && concurrently \"tsc -w\" \"cross-env DEBUG=true node-dev --respawn dist/app.js\"",
@@ -44,8 +51,12 @@
   "author": "kotsmile",
   "license": "MIT",
   "dependencies": {
+    "@coral-xyz/anchor": "^0.31.1",
+    "@solana/spl-token": "^0.4.13",
+    "@solana/web3.js": "^1.98.4",
     "axios": "^0.27.2",
     "body-parser": "^1.20.0",
+    "bs58": "^6.0.0",
     "cors": "^2.8.5",
     "dotenv": "^16.0.0",
     "ethers": "^5.6.6",
@@ -55,7 +66,11 @@
     "helmet": "^5.0.2",
     "module-alias": "^2.2.2",
     "moment": "^2.29.3",
-    "morgan": "^1.10.0"
+    "morgan": "^1.10.0",
+    "pg": "^8.8.0",
+    "reflect-metadata": "^0.1.13",
+    "typeorm": "^0.3.12",
+    "winston": "^3.17.0"
   },
   "devDependencies": {
     "@types/chai": "^4.3.3",
@@ -65,6 +80,7 @@
     "@types/mocha": "^9.1.1",
     "@types/morgan": "^1.9.3",
     "@types/node": "^17.0.31",
+    "@types/pg": "^8.6.6",
     "@types/supertest": "^2.0.12",
     "c8": "^7.11.3",
     "chai": "^4.3.6",
@@ -74,6 +90,6 @@
     "node-dev": "^7.4.3",
     "supertest": "^6.2.4",
     "ts-jest": "^29.0.0",
-    "typescript": "^4.6.4"
+    "typescript": "^5.0.0"
   }
 }

backend-all/src/app.ts

@@ -1,3 +1,4 @@
+import 'reflect-metadata'
 import express from 'express'
 import path from 'path'
 
@@ -10,7 +11,9 @@ import 'module-alias/register'
 import * as dotenv from 'dotenv'
 dotenv.config()
 
-import config from '@/config'
+import { config } from '@/config'
+import { dbConnection } from '@/lib/database'
+import { isPublicRelayer } from './utils/env-var'
 
 const app = express()
 
@@ -20,10 +23,47 @@ autoroutes(app, {
   dir: path.join(__dirname, 'routes'),
 })
 
-if (!process.env.TEST)
-  app.listen(config.port, () => {
-    console.log(`Server started on port ${config.port}`)
-    console.log(`DEBUG=${process.env.DEBUG}`)
-  })
+// Initialize database connection and start server
+const startServer = async () => {
+  try {
+    // Connect to database
+
+    if (isPublicRelayer) {
+      await dbConnection.connect()
+
+      // Run migrations on startup (optional - you might want to run them manually)
+      await dbConnection.runMigrations()
+    }
+
+    if (!process.env.TEST) {
+      app.listen(config.port, () => {
+        console.log(`Server started on port ${config.port}`)
+        console.log(`DEBUG=${process.env.DEBUG}`)
+        console.log('Database connected successfully')
+      })
+    }
+  } catch (error) {
+    console.error('Failed to start server:', error)
+    process.exit(1)
+  }
+}
+
+// Graceful shutdown
+process.on('SIGINT', async () => {
+  console.log('Shutting down gracefully...')
+
+
+  await dbConnection.disconnect()
+  process.exit(0)
+})
+
+process.on('SIGTERM', async () => {
+  console.log('Shutting down gracefully...')
+
+  await dbConnection.disconnect()
+  process.exit(0)
+})
+
+startServer()
 
 export default app

backend-all/src/config.ts

@@ -1,5 +1,15 @@
-export default {
+console.log(process.env.DATABASE_USERNAME)
+export const config = {
   morganLogger:
     ':date[web] :method :url :status :res[content-length] - :response-time ms',
   port: process.env.PORT,
-}
+  database: {
+    host: process.env.DATABASE_HOST || 'localhost',
+    port: parseInt(process.env.DATABASE_PORT || '5432'),
+    username: process.env.DATABASE_USERNAME || 'postgres',
+    password: process.env.DATABASE_PASSWORD || 'password',
+    database: process.env.DATABASE_NAME || 'assetchain_bridge',
+    logging: process.env.DB_LOGGING === 'true',
+    ssl: process.env.DB_SSL === 'true',
+  },
+};

backend-all/src/confirmations.json

@@ -1,22 +1,25 @@
 {
-  "1": 7,
-  "97": 42,
-  "56": 42,
-  "137": 42,
-  "369": 42,
-  "5000": 42,
-  "31337": 42,
-  "42161": 42,
-  "5001": 42,
-  "43113": 42,
-  "80001": 42,
-  "421614": 42,
-  "8453": 42,
-  "42421": 42,
-  "80002": 42,
-  "84532": 42,
-  "11155111": 42,
-  "200810": 42,
-  "200901": 42,
-  "42420": 42
+  "1": 10,
+  "97": 10,
+  "56": 10,
+  "137": 10,
+  "369": 10,
+  "5000": 10,
+  "31337": 10,
+  "42161": 10,
+  "5001": 10,
+  "43113": 10,
+  "80001": 10,
+  "421614": 10,
+  "8453": 10,
+  "42421": 5,
+  "80002": 10,
+  "84532": 10,
+  "11155111": 10,
+  "200810": 10,
+  "200901": 10,
+  "42420": 5,
+  "solana": 10,
+  "sol.devnet": 10,
+  "sol.mainnet": 10
 }

backend-all/src/lib/database/connection.ts

@@ -0,0 +1,88 @@
+import "reflect-metadata";
+import { DataSource } from "typeorm";
+import { AppDataSource } from "./data-source";
+import EventLogger from "../logger/index.logger";
+
+class DatabaseConnection {
+  private static instance: DatabaseConnection;
+  private dataSource: DataSource | null = null;
+
+  private constructor() {}
+
+  public static getInstance(): DatabaseConnection {
+    if (!DatabaseConnection.instance) {
+      DatabaseConnection.instance = new DatabaseConnection();
+    }
+    return DatabaseConnection.instance;
+  }
+
+  public async connect() {
+    try {
+      if (!this.dataSource) {
+        this.dataSource = AppDataSource;
+        await this.dataSource.initialize();
+        EventLogger.info("Database connection established successfully");
+      }
+      return this.dataSource;
+    } catch (error: any) {
+      EventLogger.error(`Error connecting to database ${error.message}`);
+      throw error;
+    }
+  }
+
+  public async disconnect() {
+    try {
+      if (this.dataSource && this.dataSource.isInitialized) {
+        await this.dataSource.destroy();
+        this.dataSource = null;
+        EventLogger.info("Database connection closed");
+      }
+    } catch (error:any) {
+      EventLogger.error("Error disconnecting from database:" + error.message);
+      throw error;
+    }
+  }
+
+  public getDataSource() {
+    return this.dataSource;
+  }
+
+  public async runMigrations() {
+    try {
+      if (!this.dataSource) {
+        await this.connect();
+      }
+
+      if (this.dataSource && this.dataSource.isInitialized) {
+        await this.dataSource.runMigrations();
+        EventLogger.info("Migrations completed successfully");
+      }
+    } catch (error:any) {
+      EventLogger.error("Error running migrations:" + error.message);
+      throw error;
+    }
+  }
+
+  public async undoLastMigration() {
+    try {
+      if (!this.dataSource) {
+        await this.connect();
+      }
+
+      if (this.dataSource && this.dataSource.isInitialized) {
+        await this.dataSource.undoLastMigration();
+        EventLogger.info("Last migration reverted successfully");
+      }
+    } catch (error:any) {
+      EventLogger.error("Error reverting migration:" + error.message);
+      throw error;
+    }
+  }
+
+  public isConnected() {
+    return this.dataSource ? this.dataSource.isInitialized : false;
+  }
+}
+
+export const dbConnection = DatabaseConnection.getInstance();
+export default dbConnection;

backend-all/src/lib/database/data-source.ts

@@ -0,0 +1,21 @@
+import "reflect-metadata";
+import { DataSource } from "typeorm";
+import { config } from "../../config";
+
+export const AppDataSource = new DataSource({
+  type: "postgres",
+  host: config.database.host,
+  port: config.database.port,
+  username: config.database.username,
+  password: config.database.password,
+  database: config.database.database,
+  synchronize: false, // Set to false when using migrations
+  logging: config.database.logging || false,
+  entities: [__dirname + "/entities/*.{ts,js}"],
+  migrations: [__dirname + "/migrations/*.{ts,js}"],
+  subscribers: [__dirname + "/subscribers/*.{ts,js}"],
+  migrationsTableName: "migrations",
+  ssl: config.database.ssl ? { rejectUnauthorized: false } : false,
+});
+
+export default AppDataSource;

backend-all/src/lib/database/entities/BaseEntity.ts

@@ -0,0 +1,12 @@
+import { PrimaryGeneratedColumn, CreateDateColumn, UpdateDateColumn } from "typeorm";
+
+export abstract class BaseEntity {
+  @PrimaryGeneratedColumn("uuid")
+  id: string;
+
+  @CreateDateColumn()
+  createdAt: Date;
+
+  @UpdateDateColumn()
+  updatedAt: Date;
+}

backend-all/src/lib/database/entities/BlockscanInfo.ts

@@ -0,0 +1,14 @@
+import { Entity, Column } from "typeorm";
+import { BaseEntity } from "./BaseEntity";
+
+@Entity("blockscan_infos")
+export class BlockscanInfo extends BaseEntity {
+  @Column({ type: "text" })
+  lastBlockScanned: string; // Using text for very long block numbers
+
+  @Column()
+  chainId: string;
+
+  @Column()
+  contractAddress: string;
+}

backend-all/src/lib/database/entities/BridgeInfo.ts

@@ -0,0 +1,38 @@
+import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from "typeorm";
+import { BaseEntity } from "./BaseEntity";
+import { Token } from "./Token";
+import { Transaction } from "./Transaction";
+
+@Entity("bridge_infos")
+export class BridgeInfo extends BaseEntity {
+  @Column()
+  bridgeAddress: string;
+
+  @Column()
+  chainId: string;
+
+  @Column({ type: "jsonb" })
+  fees: {
+    feeFulfill: number;
+    feeSend: number;
+  };
+
+  @ManyToOne("Token", "bridgeInfos", { 
+    onDelete: "CASCADE",
+    nullable: false 
+  })
+  @JoinColumn({ name: "tokenId" })
+  token: Token;
+
+  @Column()
+  tokenId: string;
+
+  @Column({ type: "text" })
+  limitPerSend: string;
+
+  @Column()
+  tokenDecimal: number;
+
+  @OneToMany(() => Transaction, (transaction) => transaction.bridgeInfo)
+  transactions: Transaction[];
+}

backend-all/src/lib/database/entities/Token.ts

@@ -0,0 +1,24 @@
+import { Entity, Column, OneToMany } from "typeorm";
+import { BaseEntity } from "./BaseEntity";
+import { BridgeInfo } from "./BridgeInfo";
+
+@Entity("tokens")
+export class Token extends BaseEntity {
+  @Column()
+  tokenAddress: string;
+
+  @Column()
+  decimal: number;
+
+  @Column()
+  symbol: string;
+
+  @Column()
+  name: string;
+
+  @Column()
+  chainId: string;
+
+  @OneToMany("BridgeInfo", "token")
+  bridgeInfos: BridgeInfo[];
+}