Replace database queries with prisma (#125)

* Replace all server dbOperations with prisma

* Update all knex to prisma

* Fix sql

* Fix trigger

Author: adam-maj

core/database/dbOperation.ts

@@ -2,7 +2,7 @@ import { promises as fs } from "fs";
 import { dirname } from "path";
 import { fileURLToPath } from "url";
 
-import { FastifyInstance, FastifyRequest } from "fastify";
+import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
 import { env } from "../env";
 import { createCustomError } from "../error/customError";
@@ -16,53 +16,6 @@ const connectionString = env.POSTGRES_CONNECTION_URL;
 const DATABASE_NAME =
   new URL(connectionString).pathname.split("/")[1] || "postgres";
 
-export const checkTablesExistence = async (
-  server: FastifyInstance,
-): Promise<void> => {
-  try {
-    const knex = await connectToDatabase();
-    // Check if the tables Exists
-    const tablesList: string[] = env.DB_TABLES_LIST.split(",").map(function (
-      item: any,
-    ) {
-      return item.trim();
-    });
-
-    if (!tablesList) {
-      const error = createCustomError(
-        "DB_TABLES_LIST ENV variable is empty",
-        StatusCodes.NOT_FOUND,
-        "DB_TABLES_LIST_NOT_FOUND",
-      );
-      throw error;
-    }
-
-    for (const tableName of tablesList) {
-      const schemaSQL = await fs.readFile(
-        `${__dirname}/sql-schemas/${tableName}.sql`,
-        "utf-8",
-      );
-      // Create Table using schema
-      await knex.schema.raw(schemaSQL);
-
-      server.log.info(
-        `SQL for  ${tableName} processed successfully on start-up`,
-      );
-    }
-
-    // Disconnect from DB
-    await knex.destroy();
-  } catch (error: any) {
-    server.log.error(error);
-    const customError = createCustomError(
-      "Error while executing Table SQLs on startup",
-      StatusCodes.INTERNAL_SERVER_ERROR,
-      "SERVER_STARTUP_TABLES_CREATION_ERROR",
-    );
-    throw customError;
-  }
-};
-
 export const implementTriggerOnStartUp = async (
   server: FastifyInstance,
 ): Promise<void> => {
@@ -118,49 +71,3 @@ export const implementTriggerOnStartUp = async (
     throw customError;
   }
 };
-
-export const ensureDatabaseExists = async (
-  server: FastifyInstance | FastifyRequest,
-): Promise<void> => {
-  try {
-    // Creating KNEX Config
-    let modifiedConnectionString = connectionString;
-    if (DATABASE_NAME !== "postgres") {
-      // This is required if the Database mentioned in the connection string is not postgres
-      // as we need to connect to the postgres database to create the user provied database
-      // and then connect to the user provided database
-      modifiedConnectionString = connectionString.replace(
-        `/${DATABASE_NAME}`,
-        "/postgres",
-      );
-    }
-
-    let knex = await connectToDatabase(modifiedConnectionString);
-
-    // Check if Database Exists & create if it doesn't
-    let hasDatabase: any;
-    switch (dbClient) {
-      case "pg":
-        server.log.debug("checking if pg database exists");
-        hasDatabase = await knex.raw(
-          `SELECT 1 from pg_database WHERE datname = '${DATABASE_NAME}'`,
-        );
-        server.log.info(`CHECKING for Database ${DATABASE_NAME}...`);
-        if (!hasDatabase.rows.length) {
-          await knex.raw(`CREATE DATABASE ${DATABASE_NAME}`);
-        } else {
-          server.log.info(`Database ${DATABASE_NAME} already exists`);
-        }
-        break;
-      default:
-        throw new Error(
-          `Unsupported database client: ${dbClient}. Cannot create database ${DATABASE_NAME}`,
-        );
-    }
-
-    await knex.destroy();
-  } catch (error) {
-    server.log.error(error);
-    throw new Error(`Error creating database ${DATABASE_NAME}`);
-  }
-};

core/database/dbPrereqs.ts

@@ -1,5 +1,4 @@
 export * from "./database/dbConnect";
-export * from "./database/dbOperation";
 export * from "./database/dbPrereqs";
 export * from "./env";
 export * from "./error/customError";

core/index.ts

@@ -10,7 +10,7 @@ import {
   WalletConfigType,
   walletTableSchema,
 } from "../../server/schemas/wallet";
-import { getWalletDetails } from "../database/dbOperation";
+import { getWalletDetails } from "../../src/db/wallets/getWalletDetails";
 import { env } from "../env";
 import { networkResponseSchema } from "../schema";
 
@@ -95,14 +95,17 @@ const cacheSdk = (
 };
 
 const walletDataMap: Map<string, string> = new Map();
-const getCachedWallet = async (walletAddress: string, chain: string) => {
+const getCachedWallet = async (walletAddress: string, chainId: number) => {
   walletAddress = walletAddress.toLowerCase();
   let walletData;
   const cachedWallet = walletDataMap.get(walletAddress);
   if (cachedWallet) {
     walletData = JSON.parse(cachedWallet);
   } else {
-    walletData = await getWalletDetails(walletAddress, chain);
+    console.log("Checking details for address", walletAddress);
+    // TODO: This needs to be changed...
+    walletData = await getWalletDetails({ address: walletAddress, chainId });
+    console.log("Received wallet data:", walletData);
     if (walletData) {
       walletDataMap.set(walletAddress, JSON.stringify(walletData));
     }
@@ -144,6 +147,7 @@ export const getSDK = async (
 
   //SDK doesn't exist in cache, so we need to instantiate or create it
   if (!walletAddress) {
+    console.log("Creating sdk...");
     //create sdk with no wallet
     // TODO set to read only when we can
     sdk = new ThirdwebSDK(chain, {
@@ -154,13 +158,13 @@ export const getSDK = async (
     return sdk;
   }
 
-  walletData = await getCachedWallet(walletAddress, chain.name);
+  walletData = await getCachedWallet(walletAddress, chain.chainId);
 
   if (!walletData) {
     throw new Error(`Wallet not found for address: ${walletAddress}`);
   }
 
-  const walletType = walletData.walletType;
+  const walletType = walletData.type;
   const awsKmsKeyId = walletData.awsKmsKeyId;
   const gcpKmsKeyId = walletData.gcpKmsKeyId;
   const gcpKmsKeyVersionId = walletData.gcpKmsKeyVersionId;
@@ -235,7 +239,10 @@ export const getSDK = async (
     });
     cacheSdk(chain.name, sdk, walletAddress);
     return sdk;
-  } else if (walletType === WalletConfigType.ppk) {
+  } else if (
+    walletType === WalletConfigType.ppk ||
+    walletType === WalletConfigType.local
+  ) {
     //TODO get private key from encrypted file
     wallet = new LocalWallet({
       chain,

core/sdk/sdk.ts

@@ -2,13 +2,14 @@ import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
 import { getContractInstance } from "../../../../../../core";
-import { queueTransaction } from "../../../../../helpers";
+import { queueTx } from "../../../../../../src/db/transactions/queueTx";
 import {
   erc1155ContractParamSchema,
   standardResponseSchema,
   transactionWritesResponseSchema,
 } from "../../../../../helpers/sharedApiSchemas";
 import { web3APIOverridesForWriteRequest } from "../../../../../schemas/web3api-overrides";
+import { getChainIdFromChain } from "../../../../../utilities/chain";
 
 // INPUTS
 const requestSchema = erc1155ContractParamSchema;
@@ -71,14 +72,15 @@ export async function erc1155airdrop(fastify: FastifyInstance) {
     handler: async (request, reply) => {
       const { network, contract_address } = request.params;
       const { token_id, addresses, web3api_overrides } = request.body;
+      const chainId = getChainIdFromChain(network);
 
       const contract = await getContractInstance(
         network,
         contract_address,
         web3api_overrides?.from,
       );
       const tx = await contract.erc1155.airdrop.prepare(token_id, addresses);
-      const queuedId = await queueTransaction(request, tx, network, "erc1155");
+      const queuedId = await queueTx({ tx, chainId, extension: "erc1155" });
       reply.status(StatusCodes.OK).send({
         result: queuedId,
       });