Feat/transaction split

.env

@@ -0,0 +1,23 @@
+
+
+# Database
+DATABASE_HOST = 127.0.0.1
+DATABASE_PORT = 5432
+DATABASE_USERNAME = postgres
+DATABASE_PASSWORD = postgres
+DATABASE_NAME = postgres
+
+
+DATABASE_PORT_TEST = 5432
+# APP
+API_PORT=3333
+APP_NAME=bsafe-api
+# ADMIN USER
+APP_ADMIN_EMAIL=admin_user_email
+APP_ADMIN_PASSWORD=admin_user_password
+# TOKENS
+ACCESS_TOKEN_SECRET=access_token_secret
+REFRESH_TOKEN_SECRET=refresh_token_secret
+# AWS
+UI_URL=https://app.bsafe.pro
+

.env.example

@@ -6,7 +6,7 @@ DATABASE_PASSWORD = database_password
 DATABASE_NAME = database_name
 
 # App
-API_PORT = 80
+API_PORT = 3333
 
 # Admin user
 APP_ADMIN_EMAIL = admin_user_email

docker/database/.env.dev

@@ -1,6 +1,21 @@
-DATABASE_HOST=127.0.0.1
-DATABASE_PORT=5432
-DATABASE_USERNAME=postgres
-DATABASE_PASSWORD=postgres
-DATABASE_NAME=postgres
-NODE_ENV=development
+# Database
+DATABASE_HOST = 127.0.0.1
+DATABASE_PORT = 5432
+DATABASE_USERNAME = postgres
+DATABASE_PASSWORD = postgres
+DATABASE_NAME = postgres
+
+# App
+API_PORT = 3333
+
+# Admin user
+APP_ADMIN_EMAIL = [email protected]
+APP_ADMIN_PASSWORD = admin_user_password
+
+# Tokens
+ACCESS_TOKEN_SECRET = access_token_secret
+REFRESH_TOKEN_SECRET = refresh_token_secret
+# Time should be in minutes
+TOKEN_EXPIRATION_TIME = 15
+UI_URL=http://localhost:5173
+# UI_URL=https://app.bsafe.pro

docker/database/.env.test

@@ -3,4 +3,5 @@ DATABASE_PORT=5432
 DATABASE_USERNAME=postgres
 DATABASE_PASSWORD=postgres
 DATABASE_NAME=postgres
-NODE_ENV=test
+NODE_ENV=test
+UI_URL=https://app.bsafe.pro

package.json

@@ -4,7 +4,7 @@
   "main": "src/index.ts",
   "license": "MIT",
   "scripts": {
-    "dev": "ts-node-dev --respawn --transpile-only -r tsconfig-paths/register -r dotenv/config src/server/index.ts",
+    "dev": "NODE_ENV=development ts-node-dev --respawn --transpile-only -r tsconfig-paths/register -r dotenv/config src/server/index.ts",
     "test": "chmod +x ./scripts/init_test.sh && ./scripts/init_test.sh",
     "start": "ts-node -r dotenv/config ./build/index.js",
     "build": "tsc --project . && tscpaths -p tsconfig.json -s ./src -o ./build",
@@ -22,20 +22,21 @@
     "axios": "1.5.1",
     "bcrypt": "5.1.0",
     "body-parser": "1.20.2",
+    "bsafe": "../bsafe/",
     "class-validator": "0.14.0",
     "cookie-parser": "1.4.6",
     "cors": "2.8.5",
     "date-fns": "2.30.0",
     "dotenv": "8.2.0",
     "express": "4.17.1",
     "express-joi-validation": "5.0.0",
-    "fuels": "0.55.0",
     "joi": "17.4.0",
     "jsonwebtoken": "9.0.1",
     "morgan": "1.10.0",
     "patch-package": "8.0.0",
     "pg": "8.5.1",
     "reflect-metadata": "0.1.13",
+    "socket.io": "4.7.2",
     "ts-node": "^10.9.1",
     "tsconfig-paths": "^3.9.0",
     "typeorm": "^0.2.29",

scripts/init_test.sh

@@ -2,8 +2,7 @@
 yarn database:test
 
 #give a timeout and run migrations
-sleep 5 && yarn migration:run
+sleep 5
 
 #run jest tests
-node --experimental-vm-modules ./node_modules/jest/bin/jest.js
-
+NODE_ENV=test node  --experimental-vm-modules ./node_modules/jest/bin/jest.js

src/config/database.ts

@@ -12,20 +12,11 @@ const {
   DATABASE_NAME,
   DATABASE_PORT,
   NODE_ENV,
+  DATABASE_PORT_TEST,
 } = process.env;
 
-console.log({
-  DATABASE_PASSWORD,
-  DATABASE_HOST,
-  DATABASE_URL,
-  DATABASE_USERNAME,
-  DATABASE_NAME,
-  DATABASE_PORT,
-  NODE_ENV,
-});
-
 const [host, port] = String(DATABASE_URL).split(':');
-const environment = NODE_ENV;
+const environment: string = NODE_ENV;
 const entitiesDir = path.resolve(__dirname, '..', 'models', '**', '*{.ts,.js}');
 export const migrationsDir = path.resolve(
   __dirname,
@@ -59,13 +50,13 @@ const development: ConnectionOptions = {
     migrationsDir: './src/database/migrations/',
   },
   synchronize: false,
-  migrationsRun: false,
+  migrationsRun: true,
 };
 
 const test: ConnectionOptions = {
   type: 'postgres',
   host: DATABASE_HOST,
-  port: Number(port),
+  port: Number(process.env.DATABASE_PORT_TEST),
   username: DATABASE_USERNAME,
   password: DATABASE_PASSWORD,
   database: DATABASE_NAME,

src/database/migrations/1694193586666-create-table-predicates.ts

@@ -25,6 +25,7 @@ export class createTablePredicates1694193586666 implements MigrationInterface {
           {
             name: 'description',
             type: 'varchar',
+            isNullable: true,
           },
           {
             name: 'minSigners',

src/database/migrations/1694536141266-create-table-transactions.ts

@@ -16,7 +16,7 @@ export class createTableTransactions1694536141266 implements MigrationInterface
             default: `uuid_generate_v4()`,
           },
           {
-            name: 'predicateAdress',
+            name: 'predicate_address',
             type: 'varchar',
           },
           {
@@ -28,12 +28,12 @@ export class createTableTransactions1694536141266 implements MigrationInterface
             type: 'varchar',
           },
           {
-            name: 'txData',
+            name: 'hash',
             type: 'varchar',
           },
           {
-            name: 'hash',
-            type: 'varchar',
+            name: 'tx_data',
+            type: 'jsonb',
           },
           {
             name: 'status',

src/database/migrations/1694543036941-create-table-witnesses.ts

@@ -2,17 +2,18 @@ import { MigrationInterface, QueryRunner, Table } from 'typeorm';
 
 export class createTableWitnesses1694543036941 implements MigrationInterface {
   public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`CREATE EXTENSION IF NOT EXISTS "uuid-ossp"`);
     await queryRunner.createTable(
       new Table({
         name: 'witnesses',
         columns: [
           {
             name: 'id',
-            type: 'integer',
-            unsigned: true,
+            type: 'uuid',
             isPrimary: true,
-            isGenerated: true,
-            generationStrategy: 'increment',
+            isUnique: true,
+            generationStrategy: 'uuid',
+            default: `uuid_generate_v4()`,
           },
           {
             name: 'signature',

src/database/migrations/1694545394302-create-table-assets.ts

@@ -2,20 +2,21 @@ import { MigrationInterface, QueryRunner, Table } from 'typeorm';
 
 export class createTableAssets1694545394302 implements MigrationInterface {
   public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`CREATE EXTENSION IF NOT EXISTS "uuid-ossp"`);
     await queryRunner.createTable(
       new Table({
         name: 'assets',
         columns: [
           {
             name: 'id',
-            type: 'integer',
-            unsigned: true,
+            type: 'uuid',
             isPrimary: true,
-            isGenerated: true,
-            generationStrategy: 'increment',
+            isUnique: true,
+            generationStrategy: 'uuid',
+            default: `uuid_generate_v4()`,
           },
           {
-            name: 'assetID',
+            name: 'assetId',
             type: 'varchar',
           },
           {
@@ -30,6 +31,10 @@ export class createTableAssets1694545394302 implements MigrationInterface {
             name: 'amount',
             type: 'varchar',
           },
+          {
+            name: 'utxo',
+            type: 'varchar',
+          },
           {
             name: 'created_at',
             type: 'timestamp',

src/database/migrations/1699272433660-add-column-dapps.ts

@@ -0,0 +1,65 @@
+import { MigrationInterface, QueryRunner, Table } from 'typeorm';
+
+export class addColumnDapps1699272433660 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.createTable(
+      new Table({
+        name: 'dapp',
+        columns: [
+          {
+            name: 'id',
+            type: 'uuid',
+            isPrimary: true,
+            isUnique: true,
+            generationStrategy: 'uuid',
+            default: `uuid_generate_v4()`,
+          },
+          {
+            name: 'session_id',
+            type: 'varchar',
+          },
+          {
+            name: 'origin',
+            type: 'varchar',
+          },
+          {
+            name: 'current',
+            type: 'uuid',
+          },
+          {
+            name: 'name',
+            type: 'varchar',
+            isNullable: true,
+          },
+          {
+            name: 'created_at',
+            type: 'timestamp',
+          },
+          {
+            name: 'updated_at',
+            type: 'timestamp',
+            isNullable: true,
+          },
+          {
+            name: 'deleted_at',
+            type: 'timestamp',
+            isNullable: true,
+          },
+        ],
+        foreignKeys: [
+          {
+            name: 'FK-transaction-witnesses',
+            columnNames: ['current'],
+            referencedColumnNames: ['id'],
+            referencedTableName: 'predicates',
+            onDelete: 'CASCADE',
+          },
+        ],
+      }),
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.dropTable('dapps');
+  }
+}