Merge pull request #8 from baker-fi/develop

Merge on Master

Author: chefkenji

prisma/migrations/20250416154552_contract_cast_status/migration.sql

@@ -0,0 +1,5 @@
+-- CreateEnum
+CREATE TYPE "ContractCastStatus" AS ENUM ('IDLE', 'RECOVERING', 'LISTENING', 'TERMINATED');
+
+-- AlterTable
+ALTER TABLE "ContractCast" ADD COLUMN     "status" "ContractCastStatus" NOT NULL DEFAULT 'IDLE';

prisma/schema.prisma

@@ -20,10 +20,18 @@ enum ContractCastType {
   ERC1155
 }
 
+enum ContractCastStatus {
+  IDLE
+  RECOVERING
+  LISTENING
+  TERMINATED
+}
+
 model ContractCast {
    id                     String  @id @default(cuid()) @db.VarChar(30)
    name                   String? @unique
    type                   ContractCastType
+   status                 ContractCastStatus @default(IDLE)
    abi                    String
    address                String
    chainId                Int

src/graphql/resolvers/contract-cast/contract-cast.ts

@@ -34,6 +34,7 @@ export const contractCast: Resolver<ContractCast, ContractCastArgType> = async (
       name: true,
       address: true,
       blockNumber: true,
+      status: true,
       transactionIndex: true,
       abi: true,
       chainId: true,

src/graphql/resolvers/contract-cast/contract-casts.ts

@@ -54,6 +54,7 @@ export const contractCasts: Resolver<ContractCast[], ContractCastsArgType> = asy
       name: true,
       address: true,
       blockNumber: true,
+      status: true,
       transactionIndex: true,
       abi: true,
       chainId: true,

src/graphql/resolvers/contract-cast/create.ts

@@ -86,6 +86,7 @@ const createContractCast: Resolver<ContractCast, CreateContractCastArgType> = as
       name: true,
       abi: true,
       program: true,
+      status: true,
       blockNumber: true,
       transactionIndex: true,
       chainId: true,

src/graphql/resolvers/contract-cast/delete.ts

@@ -33,6 +33,7 @@ export const deleteContractCast: Resolver<ContractCast, DeleteContractCastArgTyp
       name: true,
       blockNumber: true,
       chainId: true,
+      status: true,
       createdAt: true,
       program: true,
       type: true,

src/graphql/resolvers/contract-cast/update.ts

@@ -45,6 +45,7 @@ const updateContractCast: Resolver<ContractCast, UpdateContractCastArgType> = as
       program: true,
       blockNumber: true,
       transactionIndex: true,
+      status: true,
       abi: true,
       chainId: true,
       createdAt: true,

src/graphql/types/contract-cast.ts

@@ -1,10 +1,14 @@
 import { builder } from '../builder';
-import { ContractCastType } from '@prisma/client';
+import { ContractCastType, ContractCastStatus } from '@prisma/client';
 
 export const ContractCastTypeEnum = builder.enumType('ContractCastType', {
   values: Object.values(ContractCastType),
 });
 
+export const ContractCastStatusEnum = builder.enumType('ContractCastStatusEnum', {
+  values: Object.values(ContractCastStatus),
+});
+
 builder.prismaObject('ContractCast', {
   fields: (t) => ({
     id: t.exposeID('id'),
@@ -13,11 +17,14 @@ builder.prismaObject('ContractCast', {
     }),
     address: t.exposeString('address'),
     chainId: t.exposeInt('chainId'),
-    blockNumber: t.exposeInt('chainId'),
+    blockNumber: t.exposeInt('blockNumber'),
     transactionIndex: t.exposeInt('transactionIndex'),
     type: t.expose('type', {
       type: ContractCastTypeEnum,
     }),
+    status: t.expose('status', {
+      type: ContractCastStatusEnum,
+    }),
     program: t.exposeString('program'),
     createdAt: t.expose('createdAt', {
       type: 'Date',

src/lib/contract-cast.ts

@@ -7,10 +7,10 @@
 import { Web3Connection } from '@taikai/dappkit';
 import { ContractEventListener, EventListenerHandler, Web3Event } from '@/types/events';
 import log from '@/services/log';
-import { ContractCastType } from '@prisma/client';
+import { ContractCastType, ContractCastStatus } from '@prisma/client';
 import { chainsSupported } from '@/constants/chains';
 import { InstructionMap, Program, VirtualMachine } from '@/types/vm';
-import { CastInfo, ContractCast, ContractCastStatusEnum, SecretManager, SecretMap } from '../types';
+import { CastInfo, ContractCast, SecretManager, SecretMap } from '../types';
 import db from '@/services/prisma';
 import { ContractListenerFactory } from './contract-listener-factory';
 import EVMContractListener from './contract-listener';
@@ -57,7 +57,7 @@ export class EVMContractCast<VM extends VirtualMachine, T extends SecretManager>
   /** Web3 connection to interact with the blockchain */
   private _web3Con: Web3Connection;
   /** Current status of the contract cast */
-  private _status: ContractCastStatusEnum = ContractCastStatusEnum.IDLE;
+  private _status: ContractCastStatus = ContractCastStatus.IDLE;
   /** Manager for handling secrets needed by the contract cast */
   private _secretManager: T;
 
@@ -142,7 +142,7 @@ export class EVMContractCast<VM extends VirtualMachine, T extends SecretManager>
    *
    * @returns The current status enum value
    */
-  getStatus(): ContractCastStatusEnum {
+  getStatus(): ContractCastStatus {
     return this._status;
   }
 
@@ -209,6 +209,20 @@ export class EVMContractCast<VM extends VirtualMachine, T extends SecretManager>
     this._vm.loadProgram(program);
   }
 
+  async setStatus(status: ContractCastStatus) {
+    this._status = status;
+    await db.contractCast.update({
+      where: {
+        id: this._id,
+      },
+      data: {
+        status: status,
+      },
+    });
+  }
+
+
+
   /**
    * Starts the Contract Cast by recovering past events and setting up event listening.
    *
@@ -221,14 +235,14 @@ export class EVMContractCast<VM extends VirtualMachine, T extends SecretManager>
   async start() {
     log.d(`Starting the Contract Cast=[${this.getName()}]`);
     try {
-      this._status = ContractCastStatusEnum.RECOVERING;
+      await this.setStatus(ContractCastStatus.RECOVERING);
       log.d(`Starting Recovering Cast=[${this.getName()}]`);
 
       await this._recoverEvents();
       log.d(`Stopping Recovering Cast=[${this.getName()}]`);
-      if ((this.getStatus() as number) !== ContractCastStatusEnum.TERMINATED) {
+      if ((this.getStatus()) !== ContractCastStatus.TERMINATED) {
         await this._startContractListening();
-        this._status = ContractCastStatusEnum.LISTENING;
+        await this.setStatus(ContractCastStatus.LISTENING);
       }
     } catch (e: Error | any) {
       log.e(`Failed to start Contract Cast=[${this.getName()}] ${e.message}  ${e.stack}`);
@@ -253,7 +267,7 @@ export class EVMContractCast<VM extends VirtualMachine, T extends SecretManager>
          * If the Cast is in recovery state the recover process will save the
          * latest block position and transaction Index;
          * */
-        if (this.getStatus() !== ContractCastStatusEnum.RECOVERING) {
+        if (this.getStatus() !== ContractCastStatus.RECOVERING) {
           const currentBlock = await this._web3Con.eth.getBlockNumber();
           const txCount = await this._web3Con.eth.getBlockTransactionCount(currentBlock);
           if (
@@ -271,7 +285,7 @@ export class EVMContractCast<VM extends VirtualMachine, T extends SecretManager>
         log.e(`Failed to stop Contract Cast=[${this.getName()}]${e.message}  ${e.stack}`);
       }
     } else {
-      this._status = ContractCastStatusEnum.TERMINATED;
+      await this.setStatus(ContractCastStatus.TERMINATED);
     }
   }
 
@@ -316,7 +330,7 @@ export class EVMContractCast<VM extends VirtualMachine, T extends SecretManager>
    * @returns True if the status is TERMINATED, false otherwise
    */
   shouldStop(): boolean {
-    return this.getStatus() === ContractCastStatusEnum.TERMINATED;
+    return this.getStatus() === ContractCastStatus.TERMINATED;
   }
 
   /**

src/types/index.ts

@@ -1,5 +1,5 @@
 import { ChainCastManager } from '@/services/chaincast-manager';
-import { ContractCastType, PrismaClient } from '@prisma/client';
+import { ContractCastType, ContractCastStatus, PrismaClient } from '@prisma/client';
 import LogService, { LogLevel } from '@taikai/scribal';
 import { InstructionMap, Program, VirtualMachine } from './vm';
 import { EventListenerHandler, Web3Event } from './events';
@@ -103,14 +103,14 @@ export type CastInfo = {
 };
 
 export enum ContractCastStatusEnum {
-  IDLE,
-  RECOVERING,
-  LISTENING,
-  TERMINATED,
+  IDLE = 'IDLE',
+  RECOVERING = 'RECOVERING',
+  LISTENING = 'LISTENING',
+  TERMINATED = 'TERMINATED',
 }
 
 export type ContractCast = {
-  getStatus(): ContractCastStatusEnum;
+  getStatus(): ContractCastStatus;
   loadProgram(program: Program): Promise<void>;
   loadSecrets(secrets: SecretMap): Promise<void>;
   getSecretsManager(): SecretManager;