Merging of the terraform

.github/workflows/deploy.yaml

@@ -0,0 +1,61 @@
+name: Build/Deploy
+
+on:
+  push:
+    branches:
+      - main
+      - test
+      - '*'
+  pull_request:
+    branches:
+      - main
+      - test
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+
+    if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/test')
+    environment: ${{ github.event_name == 'pull_request' && github.base_ref || github.ref_name }}
+
+    env:
+      DESTINATION_BRANCH: ${{ github.event_name == 'pull_request' && github.base_ref || github.ref_name }}
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set up Terraform
+        uses: hashicorp/setup-terraform@v1
+        with:
+          terraform_wrapper: false
+
+      - name: Terraform Init
+        run: terraform init -backend-config="environments/${{ env.DESTINATION_BRANCH }}.backend.tfvars"
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        working-directory: ./terraform
+
+      - name: Set Version
+        if: github.ref == 'refs/heads/main'
+        run: echo "PROJECT_VERSION=$(git describe --tags `git rev-list --tags --max-count=1`)" >> $GITHUB_ENV
+
+      - name: Terraform Deploy
+        run: |
+          terraform apply -auto-approve \
+            -var-file="environments/${{ env.DESTINATION_BRANCH }}.tfvars" \
+            -var="account_id=${{ vars.AWS_ACCOUNT_ID }}" \
+            -var="region=${{ vars.AWS_REGION }}" \
+            -var="project_version=${{ env.PROJECT_VERSION }}" \
+            -var="tesnet_provider_url=${{ secrets.TESTNET_PROVIDER_URL }}" \
+            -var="mainnet_provider_key=${{ secrets.MAINNET_PROVIDER_KEY }}"
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          PROJECT_VERSION: ${{ env.PROJECT_VERSION }}
+        working-directory: ./terraform

database/schema.ts

@@ -2,7 +2,7 @@ import { env } from "../env";
 
 import { integer, text, boolean, pgSchema } from "drizzle-orm/pg-core";
 
-export const schema = pgSchema("test" as string); //TODO: change to env.DB_SCHEMA
+export const schema = pgSchema(env.DB_SCHEMA || "test");
 
 export const fractalityTokenMigrations = schema.table(
   "fractality_token_migrations",

env.ts

@@ -18,6 +18,7 @@ const envSchema = z.object({
   DB_PORT: z.coerce.number().optional(),
   DB_USER: z.string().optional(),
   DB_PASSWORD: z.string().optional(),
+  DB_SCHEMA: z.string().optional(),
   BLOCKCHAIN_ENVIRONMENT: z.string(),
   BLOCK_START_NUMBER: z.string(),
   SAFETY_CUSHION_NUMBER_OF_BLOCKS: z.coerce.number(),

handler.ts

@@ -0,0 +1,15 @@
+import { type Context, type Handler } from 'aws-lambda'
+
+import { main } from './migrationService'
+
+export const handler: Handler<void, void> = async (
+  event: void,
+  context: Context
+): Promise<void> => {
+  try {
+    await main(false)
+  } catch (error) {
+    console.error('Error With Migration Service:', error)
+    throw error
+  }
+}

interfaces.ts

@@ -16,8 +16,7 @@ export interface HLMigration {
 }
 
 export enum MigrationStatus {
-  FOUND_ON_ARBITRUM = "FOUND_ON_ARBITRUM",
-  PREPPED_FOR_HL = "PREPPED_FOR_HL",
-  SENT_TO_HL = "SENT_TO_HL",
-  ERRORED_IN_SENDING_TO_HL = "ERRORED_IN_SENDING_TO_HL",
+  FOUND_ON_ARBITRUM = "FOUND_ON_ARBITRUM", //Just found on arbitrum, not filtered.
+  SENT_TO_HL = "SENT_TO_HL", //Sent to HL
+  ERRORED_IN_SENDING_TO_HL = "ERRORED_IN_SENDING_TO_HL", //Errored in sending to HL
 }

index.ts → migrationService.ts

@@ -20,7 +20,8 @@ import { initializeDatabaseConnection } from "./database";
 import cron from "node-cron";
 import { PreviousBlockManager } from "./libs/PreviousBlockManager";
 import { HyperliquidManager } from "./libs/HyperliquidManager";
-async function main() {
+
+export async function main(runWithCron: boolean) {
   await privateKeyManager.init();
   await initializeDatabaseConnection();
 
@@ -48,51 +49,71 @@ async function main() {
     () => blockchainConnectionProvider.getCurrentBlockNumber()
   );
 
-  console.log("starting cron job for migrations, running every 5 minutes");
-  cron.schedule("* * * * *", async () => {
-    const fromBlock = await blockManager.getFromBlockForScan();
-    const toBlock = await blockManager.setFromBlockForScanToCurrentBlock();
-    console.log(
-      `looking for migrations from block ${fromBlock} to block ${toBlock}`
+  if (runWithCron) {
+    console.log("starting cron job for migrations, running every 5 minutes");
+    cron.schedule("* * * * *", async () => {
+      await coreMigrationService(
+        blockManager,
+        blockchainConnectionProvider,
+        hlManager
+      );
+    });
+  } else {
+    await coreMigrationService(
+      blockManager,
+      blockchainConnectionProvider,
+      hlManager
     );
+  }
+}
 
-    const y2kMigrations = await blockchainConnectionProvider.scanMigrations(
-      env.Y2K_TOKEN_MIGRATION_ADDRESS as Address,
-      fromBlock,
-      toBlock
-    );
-    const frctRMigrations = await blockchainConnectionProvider.scanMigrations(
-      env.FRCT_R_MIGRATION_ADDRESS as Address,
-      fromBlock,
-      toBlock
-    );
-    await addMigrationsToDatabase([...y2kMigrations, ...frctRMigrations]);
+export async function coreMigrationService(
+  blockManager: PreviousBlockManager,
+  blockchainConnectionProvider: BlockchainConnectionProvider,
+  hlManager: HyperliquidManager
+) {
+  const fromBlock = await blockManager.getFromBlockForScan();
+  const toBlock = await blockManager.setFromBlockForScanToCurrentBlock();
+  console.log(
+    `looking for migrations from block ${fromBlock} to block ${toBlock}`
+  );
+
+  const y2kMigrations = await blockchainConnectionProvider.scanMigrations(
+    env.Y2K_TOKEN_MIGRATION_ADDRESS as Address,
+    fromBlock,
+    toBlock
+  );
+  const frctRMigrations = await blockchainConnectionProvider.scanMigrations(
+    env.FRCT_R_MIGRATION_ADDRESS as Address,
+    fromBlock,
+    toBlock
+  );
+  await addMigrationsToDatabase([...y2kMigrations, ...frctRMigrations]);
 
-    //get migrations that still have not been sent to hyperliquid
-    const unmigratedMigrations: TokenMigration[] =
-      await getUnmigratedFractalityTokenMigrations();
+  //get migrations that still have not been sent to hyperliquid
+  const unmigratedMigrations: TokenMigration[] =
+    await getUnmigratedFractalityTokenMigrations();
 
-    //calcualate the amount of tokens to send to hyperliquid
-    const hlMigrations = await prepForHLMigration(
-      hlManager,
-      unmigratedMigrations
-    );
-    console.log("hlMigrations", hlMigrations);
+  //calcualate the amount of tokens to send to hyperliquid
+  const hlMigrations = await prepForHLMigration(
+    hlManager,
+    unmigratedMigrations
+  );
+  console.log("hlMigrations", hlMigrations);
 
-    const { successes, failures } = await hlManager.sendHLMigrations(
-      hlMigrations
-    );
-    console.log("successes", successes);
-    console.log("failures", failures);
+  const { successes, failures } = await hlManager.sendHLMigrations(
+    hlMigrations
+  );
+  console.log("successes", successes);
+  console.log("failures", failures);
 
-    try {
-      await finalizeHlMigrations(successes);
-    } catch (error) {
-      console.error("FATAL ERROR: Error finalizing HL migrations", error);
-    }
+  try {
+    await finalizeHlMigrations(successes);
+  } catch (error) {
+    console.error("FATAL ERROR: Error finalizing HL migrations", error);
+  }
 
-    console.log("done");
-  });
+  console.log("done");
 }
 
 async function prepForHLMigration(
@@ -145,5 +166,3 @@ async function addMigrationsToDatabase(migrations: MigrationRegisteredEvent[]) {
     console.error("Error adding migration to database", e);
   }
 }
-
-main();