Cleanup unused env variables (#137)

Author: adam-maj

.env.example

@@ -1,14 +1,11 @@
-# WALLET [Required]
-# ------
-# Either a private key
-WALLET_PRIVATE_KEY=<your_admin_wallet_private_key>
-# Or from AWS KMS
+# WALLET [Optional]
+# If you want, you can configure AWS KMS
 AWS_KMS_KEY_ID=<your_aws_kms_key_id>
 AWS_ACCESS_KEY_ID=<your_aws_access_key_id>
 AWS_SECRET_ACCESS_KEY=<your_aws_secret_access_key>
 AWS_REGION=<your_aws_region>
 
-# Or from GOOGLE KMS
+# Or GOOGLE KMS
 # Required for Google Auth
 GOOGLE_APPLICATION_CREDENTIAL_EMAIL=<client_email_from_download_service_account_json>
 GOOGLE_APPLICATION_CREDENTIAL_PRIVATE_KEY=<private_key_from_download_service_account_json>

Makefile

@@ -9,7 +9,6 @@ export POSTGRES_USER=postgres
 export POSTGRES_PASSWORD=postgres
 export POSTGRES_PORT=5432
 export POSTGRES_USE_SSL=false
-export WALLET_PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
 # export THIRDWEB_API_SECRET_KEY=klRsqmatrdlEpik_pHKgYy_q2YzGe3bTewO1VC26eY_H184Kc7xOVqKVj0mHwOOW2AOx2N-a3GqLCQ7Z9s9-sw
 
 test-evm: FORCE

core/database/dbConnect.ts

@@ -2,14 +2,13 @@ import pg, { Knex } from "knex";
 import { env } from "../env";
 
 // Defaults to postgres
-const dbClient = env.DATABASE_CLIENT;
 const connectionString = env.POSTGRES_CONNECTION_URL;
 
 export const connectToDatabase = async (
   databaseURL?: string,
 ): Promise<Knex> => {
   let knexConfig: Knex.Config = {
-    client: dbClient,
+    client: "pg",
     connection: {
       connectionString: databaseURL || connectionString,
       ssl: {
@@ -19,18 +18,8 @@ export const connectToDatabase = async (
     acquireConnectionTimeout: 10000,
   };
 
-  // Set the appropriate databse client package
-  let dbClientPackage: typeof pg;
-  switch (dbClient) {
-    case "pg":
-      dbClientPackage = pg;
-      break;
-    default:
-      throw new Error(`Unsupported database client: ${dbClient}`);
-  }
-
   // instantiate connection with new config
-  const knex = dbClientPackage(knexConfig);
+  const knex = pg(knexConfig);
 
   return knex;
 };

core/database/dbPrereqs.ts

@@ -23,25 +23,18 @@ export const env = createEnv({
     NODE_ENV: z
       .enum(["production", "development", "testing", "local"])
       .default("development"),
-    WALLET_PRIVATE_KEY: z.string().min(1).optional(),
     AWS_KMS_KEY_ID: z.string().min(1).optional(),
     GOOGLE_KMS_KEY_ID: z.string().min(1).optional(),
     AWS_ACCESS_KEY_ID: z.string().min(1).optional(),
     AWS_SECRET_ACCESS_KEY: z.string().min(1).optional(),
     AWS_REGION: z.string().min(1).optional(),
     THIRDWEB_API_SECRET_KEY: z.string().min(1),
-    THIRDWEB_API_ORIGIN: z.string().default("http://api.thirdweb.com"),
-    DATABASE_CLIENT: z.string().default("pg"),
     POSTGRES_CONNECTION_URL: z
       .string()
       .default(
         "postgresql://postgres:postgres@localhost:5432/postgres?sslmode=disable",
       ),
     OPENAPI_BASE_ORIGIN: z.string().default("http://localhost:3005"),
-    DB_TABLES_LIST: z.string().default("wallets,transactions"),
-    DB_TRIGGERS_LIST: z
-      .string()
-      .default("trigger_notification,trigger_tx_table"),
     PORT: z.coerce.number().default(3005),
     HOST: z.string().default("0.0.0.0"),
     MIN_TRANSACTION_TO_PROCESS: z.coerce.number().default(1),
@@ -69,18 +62,13 @@ export const env = createEnv({
   isServer: true,
   runtimeEnvStrict: {
     NODE_ENV: process.env.NODE_ENV,
-    WALLET_PRIVATE_KEY: process.env.WALLET_PRIVATE_KEY,
     AWS_KMS_KEY_ID: process.env.AWS_KMS_KEY_ID,
     GOOGLE_KMS_KEY_ID: process.env.GOOGLE_KMS_KEY_ID,
     AWS_ACCESS_KEY_ID: process.env.AWS_ACCESS_KEY_ID,
     AWS_SECRET_ACCESS_KEY: process.env.AWS_SECRET_ACCESS_KEY,
     AWS_REGION: process.env.AWS_REGION,
     THIRDWEB_API_SECRET_KEY: process.env.THIRDWEB_API_SECRET_KEY,
-    THIRDWEB_API_ORIGIN: process.env.THIRDWEB_API_ORIGIN,
-    DATABASE_CLIENT: process.env.DATABASE_CLIENT,
     POSTGRES_CONNECTION_URL: process.env.POSTGRES_CONNECTION_URL,
-    DB_TABLES_LIST: process.env.DB_TABLES_LIST,
-    DB_TRIGGERS_LIST: process.env.DB_TRIGGERS_LIST,
     PORT: process.env.PORT,
     HOST: process.env.HOST,
     OPENAPI_BASE_ORIGIN: process.env.OPENAPI_BASE_ORIGIN,

core/env.ts

@@ -1,11 +1,3 @@
-import { env } from "../env";
-
-const AWS_ACCESS_KEY_ID = env.AWS_ACCESS_KEY_ID;
-const AWS_SECRET_ACCESS_KEY = env.AWS_SECRET_ACCESS_KEY;
-const AWS_REGION = env.AWS_REGION;
-
-const WALLET_PRIVATE_KEY = env.WALLET_PRIVATE_KEY;
-
 export const isValidHttpUrl = (urlString: string): boolean => {
   let url;
 

core/helpers/index.ts

@@ -20,7 +20,6 @@ const main = async () => {
 
   try {
     // Check for the Tables Existence post startup
-    // await implementTriggerOnStartUp(server);
     await startTxUpdatesNotificationListener(server);
     //check walletType and make sure i got all the access i need
   } catch (err) {

server/index.ts

@@ -2,6 +2,4 @@ import createServer from "../../server/helpers/server";
 
 const server = await createServer("Test-Suite");
 server.log.info("Setting up required Tables, Triggers and Functions");
-
-// await implementTriggerOnStartUp(server);
 server.log.info("Server setup done");