Fix prismas

.gitignore

@@ -73,3 +73,4 @@ cypress/videos
 **/.env
 **/react-app-env.d.ts
 .secret
+**/generated

modules/router/ops/entry.sh

@@ -47,9 +47,9 @@ fi
 ########################################
 # Launch it
 
-# echo "Running database migration"
-# prisma --version
-# prisma migrate up --experimental
+echo "Running database migration"
+prisma --version
+prisma migrate up --experimental
 
 # TODO: this doesn't work with single container mode
 # echo "Starting database UI"

modules/router/ops/webpack.config.js

@@ -58,6 +58,10 @@ module.exports = {
   plugins: [
     new CopyPlugin({
       patterns: [
+        {
+          from: path.join(__dirname, "../src/generated"),
+          to: path.join(__dirname, "../dist/generated"),
+        },
         {
           from: path.join(__dirname, "../node_modules/@connext/vector-contracts/dist/pure-evm_bg.wasm"),
           to: path.join(__dirname, "../dist/pure-evm_bg.wasm"),

modules/router/package.json

@@ -4,10 +4,11 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "build": "rm -rf dist && tsc",
+    "build": "prisma generate && rm -rf dist && tsc",
     "build-bundle": "webpack --config ops/webpack.config.js",
-    "start": "node dist/index.js",
-    "test": "ts-mocha --bail --check-leaks --exit --timeout 60000 'src/**/*.spec.ts'"
+    "start": "prisma migrate up --experimental && node dist/index.js",
+    "test": "ts-mocha --bail --check-leaks --exit --timeout 60000 'src/**/*.spec.ts'",
+    "migration:generate": "prisma migrate save --experimental"
   },
   "author": "",
   "license": "ISC",

modules/router/schema.prisma

@@ -0,0 +1,19 @@
+generator client {
+  provider      = "prisma-client-js"
+  binaryTargets = ["native"]
+  output        = "./src/generated/db-client"
+}
+
+datasource db {
+  provider = ["postgresql", "sqlite"]
+  url      = env("VECTOR_DATABASE_URL")
+}
+
+model QueuedUpdate {
+  id             String @id @default(uuid())
+  type           String
+  channelAddress String
+  updateData     String
+  status         String
+  context        String?
+}

modules/router/src/services/store.ts

@@ -1,6 +1,6 @@
 import { NodeParams } from "@connext/vector-types";
-import { PrismaClient } from "@prisma/client";
 
+import { PrismaClient } from "../generated/db-client";
 import { config } from "../config";
 
 export const RouterUpdateStatus = {

modules/server-node/ops/Dockerfile

@@ -11,6 +11,4 @@ COPY ops ops
 COPY schema.prisma schema.prisma
 COPY migrations migrations
 COPY dist dist
-RUN cp -rfT dist/.prisma node_modules/.prisma
-RUN cp -rfT dist/@prisma/client node_modules/@prisma/client
 ENTRYPOINT ["bash", "ops/entry.sh"]

modules/server-node/ops/entry.sh

@@ -54,8 +54,8 @@ fi
 # Launch it
 
 echo "Running database migration"
-# prisma --version
-# prisma migrate up --experimental
+prisma --version
+prisma migrate up --experimental
 
 # TODO: this doesn't work with single container mode
 # echo "Starting database UI"

modules/server-node/ops/webpack.config.js

@@ -66,20 +66,16 @@ module.exports = {
     new CopyPlugin({
       patterns: [
         {
-          from: path.join(__dirname, "../schema.prisma"),
-          to: path.join(__dirname, "../dist/schema.prisma"),
-        },
-        {
-          from: path.join(__dirname, "../../../node_modules/@prisma/client"),
-          to: path.join(__dirname, "../dist/@prisma/client"),
+          from: path.join(__dirname, "../node_modules/@connext/vector-contracts/dist/pure-evm_bg.wasm"),
+          to: path.join(__dirname, "../dist/pure-evm_bg.wasm"),
         },
         {
-          from: path.join(__dirname, "../../../node_modules/.prisma/client"),
-          to: path.join(__dirname, "../dist/.prisma/client"),
+          from: path.join(__dirname, "../schema.prisma"),
+          to: path.join(__dirname, "../dist/schema.prisma"),
         },
         {
-          from: path.join(__dirname, "../node_modules/@connext/vector-contracts/dist/pure-evm_bg.wasm"),
-          to: path.join(__dirname, "../dist/pure-evm_bg.wasm"),
+          from: path.join(__dirname, "../src/generated"),
+          to: path.join(__dirname, "../dist/generated"),
         },
       ],
     }),

modules/server-node/schema.prisma

@@ -1,6 +1,7 @@
 generator client {
   provider      = "prisma-client-js"
   binaryTargets = ["native"]
+  output        = "./src/generated/db-client"
 }
 
 datasource db {
@@ -193,13 +194,3 @@ model NodeIndex {
 
   @@map(name: "node_index")
 }
-
-// Router Models
-model QueuedUpdate {
-  id             String @id @default(uuid())
-  type           String
-  channelAddress String
-  updateData     String
-  status         String
-  context        String?
-}

modules/server-node/src/services/store.ts

@@ -17,6 +17,10 @@ import {
   TransferDispute,
 } from "@connext/vector-types";
 import { getRandomBytes32, getSignerAddressFromPublicIdentifier } from "@connext/vector-utils";
+import { BigNumber } from "@ethersproject/bignumber";
+import { TransactionResponse, TransactionReceipt } from "@ethersproject/providers";
+
+import { config } from "../config";
 import {
   Prisma,
   Channel,
@@ -25,11 +29,7 @@ import {
   Balance as BalanceEntity,
   Transfer,
   OnchainTransaction,
-} from "@prisma/client";
-import { BigNumber } from "@ethersproject/bignumber";
-import { TransactionResponse, TransactionReceipt } from "@ethersproject/providers";
-
-import { config } from "../config";
+} from "../generated/db-client";
 
 export interface IServerNodeStore extends IEngineStore {
   registerSubscription<T extends EngineEvent>(publicIdentifier: string, event: T, url: string): Promise<void>;