@sentio/sdk 3.8.0-rc.2 → 3.9.0-rc.10

package/src/iota/iota-processor.ts

@@ -79,10 +79,10 @@ export class IotaBaseProcessor {
     return this.config.network
   }
 
-  protected onMoveEvent(
-    handler: (event: IotaEvent, ctx: IotaContext) => PromiseOrVoid,
+  protected onMoveEvent<T extends IotaEvent = IotaEvent>(
+    handler: (event: T, ctx: IotaContext) => PromiseOrVoid,
     filter: EventFilter | EventFilter[],
-    handlerOptions?: HandlerOptions<MoveFetchConfig, IotaEvent>
+    handlerOptions?: HandlerOptions<MoveFetchConfig, T>
   ): IotaBaseProcessor {
     let _filters: EventFilter[] = []
     const _fetchConfig = MoveFetchConfig.fromPartial({ ...DEFAULT_FETCH_CONFIG, ...handlerOptions })
@@ -124,7 +124,7 @@ export class IotaBaseProcessor {
         )
 
         const decoded = await processor.coder.decodeEvent<any>(evt)
-        await handler(decoded || evt, ctx)
+        await handler((decoded || evt) as T, ctx)
 
         return ctx.stopAndGetResult()
       },
@@ -136,7 +136,7 @@ export class IotaBaseProcessor {
         if (typeof p === 'function') {
           const evt = JSON.parse(data.rawEvent) as IotaEvent
           const decoded = await processor.coder.decodeEvent<any>(evt)
-          return p(decoded || evt)
+          return p((decoded || evt) as T)
         }
         return p
       }
@@ -144,10 +144,10 @@ export class IotaBaseProcessor {
     return this
   }
 
-  protected onEntryFunctionCall(
-    handler: (call: MoveCallIotaTransaction, ctx: IotaContext) => PromiseOrVoid,
+  protected onEntryFunctionCall<T extends MoveCallIotaTransaction = MoveCallIotaTransaction>(
+    handler: (call: T, ctx: IotaContext) => PromiseOrVoid,
     filter: FunctionNameAndCallFilter | FunctionNameAndCallFilter[],
-    handlerOptions?: HandlerOptions<MoveFetchConfig, MoveCallIotaTransaction>
+    handlerOptions?: HandlerOptions<MoveFetchConfig, T>
   ): IotaBaseProcessor {
     let _filters: FunctionNameAndCallFilter[] = []
     const _fetchConfig = MoveFetchConfig.fromPartial({ ...DEFAULT_FETCH_CONFIG, ...handlerOptions })
@@ -198,7 +198,7 @@ export class IotaBaseProcessor {
 
             // TODO maybe do in parallel
             const decoded = await processor.coder.decodeFunctionPayload(call, programmableTx?.inputs || [])
-            await handler(decoded, ctx)
+            await handler(decoded as T, ctx)
           }
         }
         return ctx.stopAndGetResult()
@@ -213,7 +213,7 @@ export class IotaBaseProcessor {
           const calls: MoveCallIotaTransaction[] = 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/solana/builtin/index.ts

@@ -1 +1,2 @@
-export * from './spl-token-processor.js'
+export * from './spl-token-processor.js'
+export * from './spl-token-2022-processor.js'

package/src/solana/builtin/spl-token-2022-processor.ts

@@ -0,0 +1,324 @@
+import { SPLTokenProcessor } from './spl-token-processor.js'
+import { SolanaBindOptions, SolanaContext, SolanaFetchConfig } from '../index.js'
+import { Instruction } from '@anchor-lang/core'
+import {
+  ApplyPendingConfidentialTransferBalance,
+  ApproveConfidentialTransferAccount,
+  ConfidentialTransfer,
+  ConfidentialTransferCreditsToggle,
+  ConfidentialTransferWithFee,
+  ConfigureConfidentialAccountWithRegistry,
+  ConfigureConfidentialTransferAccount,
+  DepositConfidentialTransfer,
+  EmitTokenMetadataInfo,
+  EmptyConfidentialTransferAccount,
+  InitializeConfidentialTransferMint,
+  InitializeGroupMemberPointerInfo,
+  InitializeGroupPointerInfo,
+  InitializeMetadataPointerInfo,
+  InitializeMint2,
+  InitializeNonTransferableMint,
+  InitializePermanentDelegate,
+  InitializeTokenGroupInfo,
+  InitializeTokenGroupMemberInfo,
+  InitializeTokenMetadataInfo,
+  RemoveTokenMetadataKeyInfo,
+  UpdateConfidentialTransferMint,
+  UpdateGroupMemberPointerInfo,
+  UpdateGroupPointerInfo,
+  UpdateMetadataPointerInfo,
+  UpdateTokenGroupMaxSizeInfo,
+  UpdateTokenGroupUpdateAuthorityInfo,
+  UpdateTokenMetadataAuthorityInfo,
+  UpdateTokenMetadataFieldInfo,
+  UpdateTokenMetadataUpdateAuthorityInfo,
+  WithdrawConfidentialTransfer,
+  WithdrawExcessLamports,
+} from './types.js'
+import { HandlerOptions } from '../../core/handler-options.js'
+
+export const SPL_TOKEN_2022_PROGRAM_ID = 'TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb'
+
+// Mirrors SPL Token RPC `jsonParsed` decoding of the Token-2022 program. Inherits all
+// instructions shared with the legacy SPL Token program (transfer, mintTo, burn, etc.)
+// from SPLTokenProcessor; this subclass adds handlers for Token-2022-only instructions.
+export class SPLToken2022Processor extends SPLTokenProcessor {
+  static bind(options: SolanaBindOptions): SPLToken2022Processor {
+    if (options && !options.name) {
+      options.name = 'SPL Token 2022 Program'
+    }
+    return new SPLToken2022Processor(options)
+  }
+
+  private addHandler<T>(
+    instructionName: string,
+    handler: (data: T, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ): this {
+    this.onInstruction(
+      instructionName,
+      (ins, ctx) => {
+        if (ins) {
+          handler(ins.data as T, ctx)
+        }
+      },
+      handlerOptions
+    )
+    return this
+  }
+
+  public onInitializeMint2(
+    handler: (data: InitializeMint2, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ) {
+    return this.addHandler('initializeMint2', handler, handlerOptions)
+  }
+
+  public onInitializeNonTransferableMint(
+    handler: (data: InitializeNonTransferableMint, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ) {
+    return this.addHandler('initializeNonTransferableMint', handler, handlerOptions)
+  }
+
+  public onInitializePermanentDelegate(
+    handler: (data: InitializePermanentDelegate, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ) {
+    return this.addHandler('initializePermanentDelegate', handler, handlerOptions)
+  }
+
+  public onWithdrawExcessLamports(
+    handler: (data: WithdrawExcessLamports, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ) {
+    return this.addHandler('withdrawExcessLamports', handler, handlerOptions)
+  }
+
+  // Metadata Pointer
+
+  public onInitializeMetadataPointer(
+    handler: (data: InitializeMetadataPointerInfo, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ) {
+    return this.addHandler('initializeMetadataPointer', handler, handlerOptions)
+  }
+
+  public onUpdateMetadataPointer(
+    handler: (data: UpdateMetadataPointerInfo, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ) {
+    return this.addHandler('updateMetadataPointer', handler, handlerOptions)
+  }
+
+  // Group Pointer
+
+  public onInitializeGroupPointer(
+    handler: (data: InitializeGroupPointerInfo, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ) {
+    return this.addHandler('initializeGroupPointer', handler, handlerOptions)
+  }
+
+  public onUpdateGroupPointer(
+    handler: (data: UpdateGroupPointerInfo, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ) {
+    return this.addHandler('updateGroupPointer', handler, handlerOptions)
+  }
+
+  public onInitializeGroupMemberPointer(
+    handler: (data: InitializeGroupMemberPointerInfo, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ) {
+    return this.addHandler('initializeGroupMemberPointer', handler, handlerOptions)
+  }
+
+  public onUpdateGroupMemberPointer(
+    handler: (data: UpdateGroupMemberPointerInfo, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ) {
+    return this.addHandler('updateGroupMemberPointer', handler, handlerOptions)
+  }
+
+  // Token Group
+
+  public onInitializeTokenGroup(
+    handler: (data: InitializeTokenGroupInfo, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ) {
+    return this.addHandler('initializeTokenGroup', handler, handlerOptions)
+  }
+
+  public onUpdateTokenGroupMaxSize(
+    handler: (data: UpdateTokenGroupMaxSizeInfo, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ) {
+    return this.addHandler('updateTokenGroupMaxSize', handler, handlerOptions)
+  }
+
+  public onUpdateTokenGroupUpdateAuthority(
+    handler: (data: UpdateTokenGroupUpdateAuthorityInfo, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ) {
+    return this.addHandler('updateTokenGroupUpdateAuthority', handler, handlerOptions)
+  }
+
+  public onInitializeTokenGroupMember(
+    handler: (data: InitializeTokenGroupMemberInfo, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ) {
+    return this.addHandler('initializeTokenGroupMember', handler, handlerOptions)
+  }
+
+  // Token Metadata
+
+  public onInitializeTokenMetadata(
+    handler: (data: InitializeTokenMetadataInfo, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ) {
+    return this.addHandler('initializeTokenMetadata', handler, handlerOptions)
+  }
+
+  public onUpdateTokenMetadataField(
+    handler: (data: UpdateTokenMetadataFieldInfo, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ) {
+    return this.addHandler('updateTokenMetadataField', handler, handlerOptions)
+  }
+
+  public onRemoveTokenMetadataKey(
+    handler: (data: RemoveTokenMetadataKeyInfo, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ) {
+    return this.addHandler('removeTokenMetadataKey', handler, handlerOptions)
+  }
+
+  public onUpdateTokenMetadataAuthority(
+    handler: (data: UpdateTokenMetadataAuthorityInfo, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ) {
+    return this.addHandler('updateTokenMetadataAuthority', handler, handlerOptions)
+  }
+
+  public onUpdateTokenMetadataUpdateAuthority(
+    handler: (data: UpdateTokenMetadataUpdateAuthorityInfo, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ) {
+    return this.addHandler('updateTokenMetadataUpdateAuthority', handler, handlerOptions)
+  }
+
+  public onEmitTokenMetadata(
+    handler: (data: EmitTokenMetadataInfo, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ) {
+    return this.addHandler('emitTokenMetadata', handler, handlerOptions)
+  }
+
+  // Confidential Transfer
+
+  public onInitializeConfidentialTransferMint(
+    handler: (data: InitializeConfidentialTransferMint, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ) {
+    return this.addHandler('initializeConfidentialTransferMint', handler, handlerOptions)
+  }
+
+  public onUpdateConfidentialTransferMint(
+    handler: (data: UpdateConfidentialTransferMint, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ) {
+    return this.addHandler('updateConfidentialTransferMint', handler, handlerOptions)
+  }
+
+  public onConfigureConfidentialTransferAccount(
+    handler: (data: ConfigureConfidentialTransferAccount, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ) {
+    return this.addHandler('configureConfidentialTransferAccount', handler, handlerOptions)
+  }
+
+  public onApproveConfidentialTransferAccount(
+    handler: (data: ApproveConfidentialTransferAccount, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ) {
+    return this.addHandler('approveConfidentialTransferAccount', handler, handlerOptions)
+  }
+
+  public onEmptyConfidentialTransferAccount(
+    handler: (data: EmptyConfidentialTransferAccount, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ) {
+    return this.addHandler('emptyConfidentialTransferAccount', handler, handlerOptions)
+  }
+
+  public onDepositConfidentialTransfer(
+    handler: (data: DepositConfidentialTransfer, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ) {
+    return this.addHandler('depositConfidentialTransfer', handler, handlerOptions)
+  }
+
+  public onWithdrawConfidentialTransfer(
+    handler: (data: WithdrawConfidentialTransfer, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ) {
+    return this.addHandler('withdrawConfidentialTransfer', handler, handlerOptions)
+  }
+
+  public onConfidentialTransfer(
+    handler: (data: ConfidentialTransfer, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ) {
+    return this.addHandler('confidentialTransfer', handler, handlerOptions)
+  }
+
+  public onConfidentialTransferWithFee(
+    handler: (data: ConfidentialTransferWithFee, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ) {
+    return this.addHandler('confidentialTransferWithFee', handler, handlerOptions)
+  }
+
+  public onApplyPendingConfidentialTransferBalance(
+    handler: (data: ApplyPendingConfidentialTransferBalance, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ) {
+    return this.addHandler('applyPendingConfidentialTransferBalance', handler, handlerOptions)
+  }
+
+  public onEnableConfidentialTransferConfidentialCredits(
+    handler: (data: ConfidentialTransferCreditsToggle, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ) {
+    return this.addHandler('enableConfidentialTransferConfidentialCredits', handler, handlerOptions)
+  }
+
+  public onDisableConfidentialTransferConfidentialCredits(
+    handler: (data: ConfidentialTransferCreditsToggle, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ) {
+    return this.addHandler('disableConfidentialTransferConfidentialCredits', handler, handlerOptions)
+  }
+
+  public onEnableConfidentialTransferNonConfidentialCredits(
+    handler: (data: ConfidentialTransferCreditsToggle, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ) {
+    return this.addHandler('enableConfidentialTransferNonConfidentialCredits', handler, handlerOptions)
+  }
+
+  public onDisableConfidentialTransferNonConfidentialCredits(
+    handler: (data: ConfidentialTransferCreditsToggle, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ) {
+    return this.addHandler('disableConfidentialTransferNonConfidentialCredits', handler, handlerOptions)
+  }
+
+  public onConfigureConfidentialAccountWithRegistry(
+    handler: (data: ConfigureConfidentialAccountWithRegistry, ctx: SolanaContext) => void,
+    handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
+  ) {
+    return this.addHandler('configureConfidentialAccountWithRegistry', handler, handlerOptions)
+  }
+}

package/src/solana/builtin/spl-token-processor.ts

@@ -1,5 +1,5 @@
 import { SolanaBaseProcessor, SolanaContext, SolanaBindOptions, SolanaFetchConfig } from "../index.js"
-import { Instruction } from '@coral-xyz/anchor'
+import { Instruction } from '@anchor-lang/core'
 import { AmountToUiAmount, Approve, ApproveChecked, Burn, BurnChecked, CloseAccount, CreateNativeMint, DefaultAccountStateExtension, FreezeAccount, GetAccountDataSize, InitializeAccount, InitializeAccount2, InitializeAccount3, InitializeImmutableOwner, InitializeMint, InitializeMintCloseAuthority, InitializeMultisig, MemoTransferExtension, MintTo, MintToChecked, Reallocate, Revoke, SyncNative, ThawAccount, Transfer, TransferChecked, TransferFeeExtension, UiAmountToAmount } from './types.js';
 import { HandlerOptions } from '../../core/handler-options.js'
 
@@ -27,7 +27,7 @@ export class SPLTokenProcessor extends SolanaBaseProcessor {
   public onInitializeMint(
     handler: (data: InitializeMint, ctx: SolanaContext) => void,
     handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
-  ): SPLTokenProcessor {
+  ): this {
     this.onInstruction('initializeMint', (ins: Instruction, ctx) => {
       if (ins) {
         handler(ins.data as InitializeMint, ctx)
@@ -39,7 +39,7 @@ export class SPLTokenProcessor extends SolanaBaseProcessor {
   public onInitializeAccount(
     handler: (data: InitializeAccount, ctx: SolanaContext) => void,
     handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
-  ): SPLTokenProcessor {
+  ): this {
     this.onInstruction('initializeAccount', (ins: Instruction, ctx) => {
       if (ins) {
         handler(ins.data as InitializeAccount, ctx)
@@ -51,7 +51,7 @@ export class SPLTokenProcessor extends SolanaBaseProcessor {
   public onInitializeAccount2(
     handler: (data: InitializeAccount2, ctx: SolanaContext) => void,
     handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
-  ): SPLTokenProcessor {
+  ): this {
     this.onInstruction('initializeAccount2', (ins: Instruction, ctx) => {
       if (ins) {
         handler(ins.data as InitializeAccount2, ctx)
@@ -63,7 +63,7 @@ export class SPLTokenProcessor extends SolanaBaseProcessor {
   public onInitializeAccount3(
     handler: (data: InitializeAccount3, ctx: SolanaContext) => void,
     handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
-  ): SPLTokenProcessor {
+  ): this {
     this.onInstruction('initializeAccount3', (ins: Instruction, ctx) => {
       if (ins) {
         handler(ins.data as InitializeAccount3, ctx)
@@ -75,7 +75,7 @@ export class SPLTokenProcessor extends SolanaBaseProcessor {
   public onInitializeMultisig(
     handler: (data: InitializeMultisig, ctx: SolanaContext) => void,
     handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
-  ): SPLTokenProcessor {
+  ): this {
     this.onInstruction('initializeMultisig', (ins: Instruction, ctx) => {
       if (ins) {
         handler(ins.data as InitializeMultisig, ctx)
@@ -87,7 +87,7 @@ export class SPLTokenProcessor extends SolanaBaseProcessor {
   public onTransfer(
     handler: (data: Transfer, ctx: SolanaContext) => void,
     handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
-  ): SPLTokenProcessor {
+  ): this {
     this.onInstruction('transfer', (ins: Instruction, ctx) => {
       if (ins) {
         handler(ins.data as Transfer, ctx)
@@ -99,7 +99,7 @@ export class SPLTokenProcessor extends SolanaBaseProcessor {
   public onApprove(
     handler: (data: Approve, ctx: SolanaContext) => void,
     handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
-  ): SPLTokenProcessor {
+  ): this {
     this.onInstruction('approve', (ins: Instruction, ctx) => {
       if (ins) {
         handler(ins.data as Approve, ctx)
@@ -111,7 +111,7 @@ export class SPLTokenProcessor extends SolanaBaseProcessor {
   public onRevoke(
     handler: (data: Revoke, ctx: SolanaContext) => void,
     handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
-  ): SPLTokenProcessor {
+  ): this {
     this.onInstruction('revoke', (ins: Instruction, ctx) => {
       if (ins) {
         handler(ins.data as Revoke, ctx)
@@ -123,7 +123,7 @@ export class SPLTokenProcessor extends SolanaBaseProcessor {
   public onSetAuthority(
     handler: (data: any, ctx: SolanaContext) => void,
     handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
-  ): SPLTokenProcessor {
+  ): this {
     this.onInstruction('setAuthority', (ins: Instruction, ctx) => {
       if (ins) {
         handler(ins.data as any, ctx)
@@ -135,7 +135,7 @@ export class SPLTokenProcessor extends SolanaBaseProcessor {
   public onMintTo(
     handler: (data: MintTo, ctx: SolanaContext) => void,
     handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
-  ): SPLTokenProcessor {
+  ): this {
     this.onInstruction('mintTo', (ins: Instruction, ctx) => {
       if (ins) {
         handler(ins.data as MintTo, ctx)
@@ -147,7 +147,7 @@ export class SPLTokenProcessor extends SolanaBaseProcessor {
   public onBurn(
     handler: (data: Burn, ctx: SolanaContext) => void,
     handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
-  ): SPLTokenProcessor {
+  ): this {
     this.onInstruction('burn', (ins: Instruction, ctx) => {
       if (ins) {
         handler(ins.data as Burn, ctx)
@@ -159,7 +159,7 @@ export class SPLTokenProcessor extends SolanaBaseProcessor {
   public onCloseAccount(
     handler: (data: CloseAccount, ctx: SolanaContext) => void,
     handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
-  ): SPLTokenProcessor {
+  ): this {
     this.onInstruction('closeAccount', (ins: Instruction, ctx) => {
       if (ins) {
         handler(ins.data as CloseAccount, ctx)
@@ -171,7 +171,7 @@ export class SPLTokenProcessor extends SolanaBaseProcessor {
   public onFreezeAccount(
     handler: (data: FreezeAccount, ctx: SolanaContext) => void,
     handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
-  ): SPLTokenProcessor {
+  ): this {
     this.onInstruction('freezeAccount', (ins: Instruction, ctx) => {
       if (ins) {
         handler(ins.data as FreezeAccount, ctx)
@@ -183,7 +183,7 @@ export class SPLTokenProcessor extends SolanaBaseProcessor {
   public onThawAccount(
     handler: (data: ThawAccount, ctx: SolanaContext) => void,
     handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
-  ): SPLTokenProcessor {
+  ): this {
     this.onInstruction('thawAccount', (ins: Instruction, ctx) => {
       if (ins) {
         handler(ins.data as ThawAccount, ctx)
@@ -195,7 +195,7 @@ export class SPLTokenProcessor extends SolanaBaseProcessor {
   public onTransferChecked(
     handler: (data: TransferChecked, ctx: SolanaContext) => void,
     handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
-  ): SPLTokenProcessor {
+  ): this {
     this.onInstruction('transferChecked', (ins: Instruction, ctx) => {
       if (ins) {
         handler(ins.data as TransferChecked, ctx)
@@ -207,7 +207,7 @@ export class SPLTokenProcessor extends SolanaBaseProcessor {
   public onApproveChecked(
     handler: (data: ApproveChecked, ctx: SolanaContext) => void,
     handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
-  ): SPLTokenProcessor {
+  ): this {
     this.onInstruction('approveChecked', (ins: Instruction, ctx) => {
       if (ins) {
         handler(ins.data as ApproveChecked, ctx)
@@ -219,7 +219,7 @@ export class SPLTokenProcessor extends SolanaBaseProcessor {
   public onMintToChecked(
     handler: (data: MintToChecked, ctx: SolanaContext) => void,
     handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
-  ): SPLTokenProcessor {
+  ): this {
     this.onInstruction('mintToChecked', (ins: Instruction, ctx) => {
       if (ins) {
         handler(ins.data as MintToChecked, ctx)
@@ -231,7 +231,7 @@ export class SPLTokenProcessor extends SolanaBaseProcessor {
   public onBurnChecked(
     handler: (data: BurnChecked, ctx: SolanaContext) => void,
     handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
-  ): SPLTokenProcessor {
+  ): this {
     this.onInstruction('burnChecked', (ins: Instruction, ctx) => {
       if (ins) {
         handler(ins.data as BurnChecked, ctx)
@@ -243,7 +243,7 @@ export class SPLTokenProcessor extends SolanaBaseProcessor {
   public onSyncNative(
     handler: (data: SyncNative, ctx: SolanaContext) => void,
     handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
-  ): SPLTokenProcessor {
+  ): this {
     this.onInstruction('syncNative', (ins: Instruction, ctx) => {
       if (ins) {
         handler(ins.data as SyncNative, ctx)
@@ -255,7 +255,7 @@ export class SPLTokenProcessor extends SolanaBaseProcessor {
   public onGetAccountDataSize(
     handler: (data: GetAccountDataSize, ctx: SolanaContext) => void,
     handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
-  ): SPLTokenProcessor {
+  ): this {
     this.onInstruction('getAccountDataSize', (ins: Instruction, ctx) => {
       if (ins) {
         handler(ins.data as GetAccountDataSize, ctx)
@@ -267,7 +267,7 @@ export class SPLTokenProcessor extends SolanaBaseProcessor {
   public onInitializeImmutableOwner(
     handler: (data: InitializeImmutableOwner, ctx: SolanaContext) => void,
     handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
-  ): SPLTokenProcessor {
+  ): this {
     this.onInstruction('initializeImmutableOwner', (ins: Instruction, ctx) => {
       if (ins) {
         handler(ins.data as InitializeImmutableOwner, ctx)
@@ -279,7 +279,7 @@ export class SPLTokenProcessor extends SolanaBaseProcessor {
   public onAmountToUiAmount(
     handler: (data: AmountToUiAmount, ctx: SolanaContext) => void,
     handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
-  ): SPLTokenProcessor {
+  ): this {
     this.onInstruction('amountToUiAmount', (ins: Instruction, ctx) => {
       if (ins) {
         handler(ins.data as AmountToUiAmount, ctx)
@@ -291,7 +291,7 @@ export class SPLTokenProcessor extends SolanaBaseProcessor {
   public onUiAmountToAmount(
     handler: (data: UiAmountToAmount, ctx: SolanaContext) => void,
     handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
-  ): SPLTokenProcessor {
+  ): this {
     this.onInstruction('uiAmountToAmount', (ins: Instruction, ctx) => {
       if (ins) {
         handler(ins.data as UiAmountToAmount, ctx)
@@ -303,7 +303,7 @@ export class SPLTokenProcessor extends SolanaBaseProcessor {
   public onInitializeMintCloseAuthority(
     handler: (data: InitializeMintCloseAuthority, ctx: SolanaContext) => void,
     handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
-  ): SPLTokenProcessor {
+  ): this {
     this.onInstruction('initializeMintCloseAuthority', (ins: Instruction, ctx) => {
       if (ins) {
         handler(ins.data as InitializeMintCloseAuthority, ctx)
@@ -315,7 +315,7 @@ export class SPLTokenProcessor extends SolanaBaseProcessor {
   public onTransferFeeExtension(
     handler: (data: TransferFeeExtension, ctx: SolanaContext) => void,
     handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
-  ): SPLTokenProcessor {
+  ): this {
     this.onInstruction('transferFeeExtension', (ins: Instruction, ctx) => {
       if (ins) {
         handler(ins.data as TransferFeeExtension, ctx)
@@ -327,7 +327,7 @@ export class SPLTokenProcessor extends SolanaBaseProcessor {
   public onDefaultAccountStateExtension(
     handler: (data: DefaultAccountStateExtension, ctx: SolanaContext) => void,
     handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
-  ): SPLTokenProcessor {
+  ): this {
     this.onInstruction('defaultAccountStateExtension', (ins: Instruction, ctx) => {
       if (ins) {
         handler(ins.data as DefaultAccountStateExtension, ctx)
@@ -339,7 +339,7 @@ export class SPLTokenProcessor extends SolanaBaseProcessor {
   public onReallocate(
     handler: (data: Reallocate, ctx: SolanaContext) => void,
     handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
-  ): SPLTokenProcessor {
+  ): this {
     this.onInstruction('reallocate', (ins: Instruction, ctx) => {
       if (ins) {
         handler(ins.data as Reallocate, ctx)
@@ -351,7 +351,7 @@ export class SPLTokenProcessor extends SolanaBaseProcessor {
   public onMemoTransferExtension(
     handler: (data: MemoTransferExtension, ctx: SolanaContext) => void,
     handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
-  ): SPLTokenProcessor {
+  ): this {
     this.onInstruction('memoTransferExtension', (ins: Instruction, ctx) => {
       if (ins) {
         handler(ins.data as MemoTransferExtension, ctx)
@@ -363,7 +363,7 @@ export class SPLTokenProcessor extends SolanaBaseProcessor {
   public onCreateNativeMint(
     handler: (data: CreateNativeMint, ctx: SolanaContext) => void,
     handlerOptions?: HandlerOptions<SolanaFetchConfig, Instruction>
-  ): SPLTokenProcessor {
+  ): this {
     this.onInstruction('createNativeMint', (ins: Instruction, ctx) => {
       if (ins) {
         handler(ins.data as CreateNativeMint, ctx)