@sentio/sdk 3.9.0-rc.9 → 4.0.0-rc.1

package/src/solana/codegen/codegen.ts

@@ -12,12 +12,12 @@ import {
 } from '@anchor-lang/core'
 import { recursiveCodegen } from '../../core/codegen.js'
 
-export function codegen(abisDir: string, targetPath = path.join('src', 'types', 'solana'), genExample = false) {
+export async function codegen(abisDir: string, targetPath = path.join('src', 'types', 'solana'), genExample = false) {
   if (!fs.existsSync(abisDir)) {
     return
   }
 
-  const numFiles = recursiveCodegen(abisDir, targetPath, codegenInternal)
+  const numFiles = await recursiveCodegen(abisDir, targetPath, codegenInternal)
 
   console.log(chalk.green(`Generated ${numFiles} for Solana`))
 }

package/src/solana/solana-processor.ts

@@ -18,7 +18,11 @@ export interface InstructionCoder {
   decode(ix: Buffer | string, encoding?: 'hex' | 'base58'): Instruction | null
 }
 
-export type SolanaInstructionHandler = (instruction: Instruction, ctx: SolanaContext, accounts?: string[]) => void
+export type SolanaInstructionHandler<T extends Instruction = Instruction> = (
+  instruction: T,
+  ctx: SolanaContext,
+  accounts: string[]
+) => void
 
 export interface InstructionHandlerEntry {
   handler: SolanaInstructionHandler
@@ -79,12 +83,12 @@ export class SolanaBaseProcessor {
     SolanaProcessorState.INSTANCE.addValue(this)
   }
 
-  public onInstruction(
+  public onInstruction<T extends Instruction = Instruction>(
     instructionName: string,
-    handler: SolanaInstructionHandler,
-    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+    handler: SolanaInstructionHandler<T>,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, T>
   ) {
-    this.instructionHandlerMap.set(instructionName, { handler, handlerOptions })
+    this.instructionHandlerMap.set(instructionName, { handler, handlerOptions } as InstructionHandlerEntry)
     return this
   }
 

package/src/store/codegen.ts

@@ -210,7 +210,7 @@ async function codegenInternal(schema: GraphQLSchema, source: string, target: st
               })
               fields.push({
                 name: f.name + 'ID' + (isMany ? 's' : ''),
-                type: isMany ? `Array<ID | undefined>` : `ID`,
+                type: isMany ? `Array<ID>` : `ID`,
                 annotations: []
               })
               if (isMany) {
@@ -317,7 +317,7 @@ export class ${c.name} ${c.parent ? `extends ${c.parent}` : ''} ${c.interfaces.l
 ${c.fields
   .map((f) => `${f.annotations.map((a) => `\n\t${a}`).join('')}\n\t${f.name}${f.optional ? '?' : ''}: ${f.type}`)
   .join('\n')}
-  ${isEntity ? `constructor(data: ${c.name}ConstructorInput) {super()}` : ''}
+  ${isEntity ? `constructor(data: Partial<${c.name}ConstructorInput>) {super()}` : ''}
   ${(c.methods ?? []).map(genMethod).join('\n')}
   
   ${

package/src/store/store.ts

@@ -96,7 +96,7 @@ export class Store {
       entity: [] as string[],
       id: [] as string[]
     }
-    const entityName = getEntityName(entity)
+    const entityName = getEntityName(entity as EntityClass<T> | T)
     if (id) {
       if (Array.isArray(id)) {
         for (const i of id) {

package/src/sui/sui-processor.ts

@@ -76,10 +76,10 @@ export class SuiBaseProcessor {
     return this.config.network
   }
 
-  protected onMoveEvent(
-    handler: (event: SuiEventInput, ctx: SuiContext) => PromiseOrVoid,
+  protected onMoveEvent<T extends SuiEventInput = SuiEventInput>(
+    handler: (event: T, ctx: SuiContext) => PromiseOrVoid,
     filter: EventFilter | EventFilter[],
-    handlerOptions?: HandlerOptions<MoveFetchConfig, SuiEventInput>
+    handlerOptions?: HandlerOptions<MoveFetchConfig, T>
   ): SuiBaseProcessor {
     let _filters: EventFilter[] = []
     const _fetchConfig = MoveFetchConfig.fromPartial({ ...DEFAULT_FETCH_CONFIG, ...handlerOptions })
@@ -118,8 +118,8 @@ export class SuiBaseProcessor {
           processor.config.baseLabels
         )
 
-        const decoded = await processor.coder.decodeEvent<any>(evt)
-        await handler(decoded || evt, ctx)
+        const decoded = await processor.coder.decodeEvent<T>(evt)
+        await handler((decoded || evt) as T, ctx)
 
         return ctx.stopAndGetResult()
       },
@@ -131,7 +131,7 @@ export class SuiBaseProcessor {
         if (typeof p === 'function') {
           const evt = JSON.parse(data.rawEvent) as SuiEventInput
           const decoded = await processor.coder.decodeEvent<any>(evt)
-          return p(decoded || evt)
+          return p((decoded || evt) as T)
         }
         return p
       }
@@ -139,10 +139,10 @@ export class SuiBaseProcessor {
     return this
   }
 
-  protected onEntryFunctionCall(
-    handler: (call: GrpcTypes.MoveCall, ctx: SuiContext) => PromiseOrVoid,
+  protected onEntryFunctionCall<T extends GrpcTypes.MoveCall = GrpcTypes.MoveCall>(
+    handler: (call: T, ctx: SuiContext) => PromiseOrVoid,
     filter: FunctionNameAndCallFilter | FunctionNameAndCallFilter[],
-    handlerOptions?: HandlerOptions<MoveFetchConfig, GrpcTypes.MoveCall>
+    handlerOptions?: HandlerOptions<MoveFetchConfig, T>
   ): SuiBaseProcessor {
     let _filters: FunctionNameAndCallFilter[] = []
     const _fetchConfig = MoveFetchConfig.fromPartial({ ...DEFAULT_FETCH_CONFIG, ...handlerOptions })
@@ -205,7 +205,7 @@ export class SuiBaseProcessor {
           const calls = getMoveCalls(tx)
           // For simplicity, use the first call for partitioning
           if (calls.length > 0) {
-            return p(calls[0])
+            return p(calls[0] as T)
           }
           return undefined
         }

package/src/testing/memory-database.ts

@@ -43,7 +43,10 @@ export class MemoryDatabase {
   }
 
   start() {
-    this.dbContext.subject.subscribe(this.processRequest.bind(this))
+    // The subject is typed `DeepPartial<ProcessStreamResponse>`, but at runtime it always carries a
+    // full response. Match the subscriber's parameter type and narrow inside (a bound method with the
+    // narrower `ProcessStreamResponse` parameter is rejected under `strictFunctionTypes`).
+    this.dbContext.subject.subscribe((request) => this.processRequest(request as ProcessStreamResponse))
   }
 
   stop() {