@sentio/sdk 1.20.2 → 1.21.0

package/src/builtin/internal/eacaggregatorproxy_processor.ts

@@ -14,10 +14,9 @@ import {
   BaseProcessor,
   BaseProcessorTemplate,
   BoundContractView,
-  Context,
+  ContractContext,
   ContractView,
   DummyProvider,
-  getContractName,
   TypedCallTrace,
 } from "@sentio/sdk";
 import { PromiseOrValue } from "./common";
@@ -827,7 +826,7 @@ export class EACAggregatorProxyBoundContractView extends BoundContractView<
   }
 }
 
-export type EACAggregatorProxyContext = Context<
+export type EACAggregatorProxyContext = ContractContext<
   EACAggregatorProxy,
   EACAggregatorProxyBoundContractView
 >;
@@ -837,20 +836,13 @@ export class EACAggregatorProxyProcessorTemplate extends BaseProcessorTemplate<
   EACAggregatorProxyBoundContractView
 > {
   bindInternal(options: BindOptions) {
-    let processor = getProcessor(
-      "EACAggregatorProxy",
-      options
-    ) as EACAggregatorProxyProcessor;
+    if (!options.name) {
+      options.name = "EACAggregatorProxy";
+    }
+    let processor = getProcessor(options) as EACAggregatorProxyProcessor;
     if (!processor) {
-      const finalOptions = Object.assign({}, options);
-      finalOptions.name = getContractName(
-        "EACAggregatorProxy",
-        options.name,
-        options.address,
-        options.network
-      );
-      processor = new EACAggregatorProxyProcessor(finalOptions);
-      addProcessor("EACAggregatorProxy", options, processor);
+      processor = new EACAggregatorProxyProcessor(options);
+      addProcessor(options, processor);
     }
     return processor;
   }
@@ -1375,22 +1367,13 @@ export class EACAggregatorProxyProcessor extends BaseProcessor<
   }
 
   public static bind(options: BindOptions): EACAggregatorProxyProcessor {
-    let processor = getProcessor(
-      "EACAggregatorProxy",
-      options
-    ) as EACAggregatorProxyProcessor;
+    if (!options.name) {
+      options.name = "EACAggregatorProxy";
+    }
+    let processor = getProcessor(options) as EACAggregatorProxyProcessor;
     if (!processor) {
-      // const wrapper = getEACAggregatorProxyContract(options.address, options.network)
-
-      const finalOptions = Object.assign({}, options);
-      finalOptions.name = getContractName(
-        "EACAggregatorProxy",
-        options.name,
-        options.address,
-        options.network
-      );
-      processor = new EACAggregatorProxyProcessor(finalOptions);
-      addProcessor("EACAggregatorProxy", options, processor);
+      processor = new EACAggregatorProxyProcessor(options);
+      addProcessor(options, processor);
     }
     return processor;
   }

package/src/builtin/internal/erc20_processor.ts

@@ -14,10 +14,9 @@ import {
   BaseProcessor,
   BaseProcessorTemplate,
   BoundContractView,
-  Context,
+  ContractContext,
   ContractView,
   DummyProvider,
-  getContractName,
   TypedCallTrace,
 } from "@sentio/sdk";
 import { PromiseOrValue } from "./common";
@@ -423,24 +422,20 @@ export class ERC20BoundContractView extends BoundContractView<
   }
 }
 
-export type ERC20Context = Context<ERC20, ERC20BoundContractView>;
+export type ERC20Context = ContractContext<ERC20, ERC20BoundContractView>;
 
 export class ERC20ProcessorTemplate extends BaseProcessorTemplate<
   ERC20,
   ERC20BoundContractView
 > {
   bindInternal(options: BindOptions) {
-    let processor = getProcessor("ERC20", options) as ERC20Processor;
+    if (!options.name) {
+      options.name = "ERC20";
+    }
+    let processor = getProcessor(options) as ERC20Processor;
     if (!processor) {
-      const finalOptions = Object.assign({}, options);
-      finalOptions.name = getContractName(
-        "ERC20",
-        options.name,
-        options.address,
-        options.network
-      );
-      processor = new ERC20Processor(finalOptions);
-      addProcessor("ERC20", options, processor);
+      processor = new ERC20Processor(options);
+      addProcessor(options, processor);
     }
     return processor;
   }
@@ -738,19 +733,13 @@ export class ERC20Processor extends BaseProcessor<
   }
 
   public static bind(options: BindOptions): ERC20Processor {
-    let processor = getProcessor("ERC20", options) as ERC20Processor;
+    if (!options.name) {
+      options.name = "ERC20";
+    }
+    let processor = getProcessor(options) as ERC20Processor;
     if (!processor) {
-      // const wrapper = getERC20Contract(options.address, options.network)
-
-      const finalOptions = Object.assign({}, options);
-      finalOptions.name = getContractName(
-        "ERC20",
-        options.name,
-        options.address,
-        options.network
-      );
-      processor = new ERC20Processor(finalOptions);
-      addProcessor("ERC20", options, processor);
+      processor = new ERC20Processor(options);
+      addProcessor(options, processor);
     }
     return processor;
   }

package/src/builtin/internal/erc20bytes_processor.ts

@@ -14,10 +14,9 @@ import {
   BaseProcessor,
   BaseProcessorTemplate,
   BoundContractView,
-  Context,
+  ContractContext,
   ContractView,
   DummyProvider,
-  getContractName,
   TypedCallTrace,
 } from "@sentio/sdk";
 import { PromiseOrValue } from "./common";
@@ -297,7 +296,7 @@ export class ERC20BytesBoundContractView extends BoundContractView<
   }
 }
 
-export type ERC20BytesContext = Context<
+export type ERC20BytesContext = ContractContext<
   ERC20Bytes,
   ERC20BytesBoundContractView
 >;
@@ -307,17 +306,13 @@ export class ERC20BytesProcessorTemplate extends BaseProcessorTemplate<
   ERC20BytesBoundContractView
 > {
   bindInternal(options: BindOptions) {
-    let processor = getProcessor("ERC20Bytes", options) as ERC20BytesProcessor;
+    if (!options.name) {
+      options.name = "ERC20Bytes";
+    }
+    let processor = getProcessor(options) as ERC20BytesProcessor;
     if (!processor) {
-      const finalOptions = Object.assign({}, options);
-      finalOptions.name = getContractName(
-        "ERC20Bytes",
-        options.name,
-        options.address,
-        options.network
-      );
-      processor = new ERC20BytesProcessor(finalOptions);
-      addProcessor("ERC20Bytes", options, processor);
+      processor = new ERC20BytesProcessor(options);
+      addProcessor(options, processor);
     }
     return processor;
   }
@@ -502,19 +497,13 @@ export class ERC20BytesProcessor extends BaseProcessor<
   }
 
   public static bind(options: BindOptions): ERC20BytesProcessor {
-    let processor = getProcessor("ERC20Bytes", options) as ERC20BytesProcessor;
+    if (!options.name) {
+      options.name = "ERC20Bytes";
+    }
+    let processor = getProcessor(options) as ERC20BytesProcessor;
     if (!processor) {
-      // const wrapper = getERC20BytesContract(options.address, options.network)
-
-      const finalOptions = Object.assign({}, options);
-      finalOptions.name = getContractName(
-        "ERC20Bytes",
-        options.name,
-        options.address,
-        options.network
-      );
-      processor = new ERC20BytesProcessor(finalOptions);
-      addProcessor("ERC20Bytes", options, processor);
+      processor = new ERC20BytesProcessor(options);
+      addProcessor(options, processor);
     }
     return processor;
   }

package/src/builtin/internal/weth9_processor.ts

@@ -14,10 +14,9 @@ import {
   BaseProcessor,
   BaseProcessorTemplate,
   BoundContractView,
-  Context,
+  ContractContext,
   ContractView,
   DummyProvider,
-  getContractName,
   TypedCallTrace,
 } from "@sentio/sdk";
 import { PromiseOrValue } from "./common";
@@ -306,24 +305,20 @@ export class WETH9BoundContractView extends BoundContractView<
   }
 }
 
-export type WETH9Context = Context<WETH9, WETH9BoundContractView>;
+export type WETH9Context = ContractContext<WETH9, WETH9BoundContractView>;
 
 export class WETH9ProcessorTemplate extends BaseProcessorTemplate<
   WETH9,
   WETH9BoundContractView
 > {
   bindInternal(options: BindOptions) {
-    let processor = getProcessor("WETH9", options) as WETH9Processor;
+    if (!options.name) {
+      options.name = "WETH9";
+    }
+    let processor = getProcessor(options) as WETH9Processor;
     if (!processor) {
-      const finalOptions = Object.assign({}, options);
-      finalOptions.name = getContractName(
-        "WETH9",
-        options.name,
-        options.address,
-        options.network
-      );
-      processor = new WETH9Processor(finalOptions);
-      addProcessor("WETH9", options, processor);
+      processor = new WETH9Processor(options);
+      addProcessor(options, processor);
     }
     return processor;
   }
@@ -567,19 +562,13 @@ export class WETH9Processor extends BaseProcessor<
   }
 
   public static bind(options: BindOptions): WETH9Processor {
-    let processor = getProcessor("WETH9", options) as WETH9Processor;
+    if (!options.name) {
+      options.name = "WETH9";
+    }
+    let processor = getProcessor(options) as WETH9Processor;
     if (!processor) {
-      // const wrapper = getWETH9Contract(options.address, options.network)
-
-      const finalOptions = Object.assign({}, options);
-      finalOptions.name = getContractName(
-        "WETH9",
-        options.name,
-        options.address,
-        options.network
-      );
-      processor = new WETH9Processor(finalOptions);
-      addProcessor("WETH9", options, processor);
+      processor = new WETH9Processor(options);
+      addProcessor(options, processor);
     }
     return processor;
   }

package/src/builtin/solana/wormhole-processor.ts

@@ -46,6 +46,9 @@ export class TokenBridgeProcessor extends SolanaBaseProcessor {
   ]
 
   static bind(options: SolanaBindOptions): TokenBridgeProcessor {
+    if (options && !options.name) {
+      options.name = 'WormholeTokenBridge'
+    }
     return new TokenBridgeProcessor(options)
   }
 
@@ -118,56 +121,56 @@ export class TokenBridgeProcessor extends SolanaBaseProcessor {
     }
   }
 
-  onInitialize(handler: (args: any, ctx: SolanaContext) => void): TokenBridgeProcessor {
-    this.onInstruction('Initialize', (ins: Instruction, ctx) => {
+  onInitialize(handler: (args: any, accounts: string[], ctx: SolanaContext) => void): TokenBridgeProcessor {
+    this.onInstruction('Initialize', (ins: Instruction, ctx, accounts: string[]) => {
       if (ins) {
-        handler(ins.data, ctx)
+        handler(ins.data, accounts, ctx)
       }
     })
     return this
   }
 
-  onAttestToken(handler: (args: any, ctx: SolanaContext) => void): TokenBridgeProcessor {
-    this.onInstruction('AttestToken', (ins: Instruction, ctx) => {
+  onAttestToken(handler: (args: any, accounts: string[], ctx: SolanaContext) => void): TokenBridgeProcessor {
+    this.onInstruction('AttestToken', (ins: Instruction, ctx, accounts: string[]) => {
       if (ins) {
-        handler(ins.data, ctx)
+        handler(ins.data, accounts, ctx)
       }
     })
     return this
   }
 
 
-  onTransferWrapped(handler: (args: any, ctx: SolanaContext) => void): TokenBridgeProcessor {
-    this.onInstruction('TransferWrapped', (ins: Instruction, ctx) => {
+  onTransferWrapped(handler: (args: any, accounts: string[], ctx: SolanaContext) => void): TokenBridgeProcessor {
+    this.onInstruction('TransferWrapped', (ins: Instruction, ctx, accounts: string[]) => {
       if (ins) {
-        handler(ins.data, ctx)
+        handler(ins.data, accounts, ctx)
       }
     })
     return this
   }
 
-  onTransferNativeWithPayload(handler: (args: any, ctx: SolanaContext) => void): TokenBridgeProcessor {
-    this.onInstruction('TransferNativeWithPayload', (ins: Instruction, ctx) => {
+  onTransferNativeWithPayload(handler: (args: any, accounts: string[], ctx: SolanaContext) => void): TokenBridgeProcessor {
+    this.onInstruction('TransferNativeWithPayload', (ins: Instruction, ctx, accounts: string[]) => {
       if (ins) {
-        handler(ins.data, ctx)
+        handler(ins.data,  accounts, ctx)
       }
     })
     return this
   }
 
-  onTransferWrappedWithPaylod(handler: (args: any, ctx: SolanaContext) => void): TokenBridgeProcessor {
-    this.onInstruction('TransferWrappedWithPaylod', (ins: Instruction, ctx) => {
+  onTransferWrappedWithPaylod(handler: (args: any, accounts: string[], ctx: SolanaContext) => void): TokenBridgeProcessor {
+    this.onInstruction('TransferWrappedWithPaylod', (ins: Instruction, ctx, accounts: string[]) => {
       if (ins) {
-        handler(ins.data, ctx)
+        handler(ins.data, accounts, ctx)
       }
     })
     return this
   }
 
-  onTransferNative(handler: (args: any, ctx: SolanaContext) => void): TokenBridgeProcessor {
-    this.onInstruction('TransferNative', (ins: Instruction, ctx) => {
+  onTransferNative(handler: (args: any, accounts: string[], ctx: SolanaContext) => void): TokenBridgeProcessor {
+    this.onInstruction('TransferNative', (ins: Instruction, ctx, accounts: string[]) => {
       if (ins) {
-        handler(ins.data, ctx)
+        handler(ins.data, accounts, ctx)
       }
     })
     return this

package/src/cli/build.ts

@@ -2,7 +2,7 @@ import chalk from 'chalk'
 import path from 'path'
 import fs from 'fs'
 import { exec } from 'child_process'
-import { AptosCodegen } from '../aptos-codegen/codegen'
+import { generate } from '../aptos-codegen/codegen'
 // import { EVM, SOLANA, Target } from './config'
 
 export async function buildProcessor(onlyGen: boolean) {
@@ -41,21 +41,23 @@ export function codeGenAptosProcessor(abisDir: string, outDir = 'src/types/aptos
     return
   }
 
-  const files = fs.readdirSync(abisDir)
+  // const files = fs.readdirSync(abisDir)
 
   console.log(chalk.green('Generated Types for Aptos'))
-  for (const file of files) {
-    if (path.extname(file) === '.json') {
-      if (!fs.existsSync(outDir)) {
-        fs.mkdirSync(outDir, { recursive: true })
-      }
-    }
-    const codegen = new AptosCodegen({
-      srcFile: path.join(abisDir, file),
-      outputDir: outDir,
-    })
-    codegen.generate()
-  }
+
+  generate(abisDir, outDir)
+  // for (const file of files) {
+  //   if (path.extname(file) === '.json') {
+  //     if (!fs.existsSync(outDir)) {
+  //       fs.mkdirSync(outDir, { recursive: true })
+  //     }
+  //   }
+  //   const codegen = new AptosAccountCodegen({
+  //     srcFile: path.join(abisDir, file),
+  //     outputDir: outDir,
+  //   })
+  //   codegen.generate()
+  // }
 }
 
 export async function codeGenEthersProcessor(
@@ -149,10 +151,10 @@ function codeGenSolanaInstruction(idlName: string, ins: any): string {
   return `
   on${
     instructionName.charAt(0).toUpperCase() + instructionName.slice(1)
-  }(handler: (args: ${argsTypeString}, ctx: SolanaContext) => void): ${idlName}Processor {
-    this.onInstruction('${instructionName}', (ins: Instruction, ctx) => {
+  }(handler: (args: ${argsTypeString}, accounts: string[], ctx: SolanaContext) => void): ${idlName}Processor {
+    this.onInstruction('${instructionName}', (ins: Instruction, ctx, accounts: string[]) => {
       if (ins) {
-        handler(ins.data as ${argsTypeString}, ctx)
+        handler(ins.data as ${argsTypeString}, accounts, ctx)
       }
     })
     return this

package/src/core/base-processor-template.ts

@@ -1,4 +1,4 @@
-import { BoundContractView, Context, ContractView } from './context'
+import { BoundContractView, ContractContext, ContractView } from './context'
 import { Block } from '@ethersproject/abstract-provider'
 import { BaseContract, EventFilter } from 'ethers'
 import { Event } from '@ethersproject/contracts'
@@ -16,13 +16,13 @@ export abstract class BaseProcessorTemplate<
 > {
   id: number
   binds = new Set<string>()
-  blockHandlers: ((block: Block, ctx: Context<TContract, TBoundContractView>) => PromiseOrVoid)[] = []
+  blockHandlers: ((block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid)[] = []
   traceHandlers: {
     signature: string
-    handler: (trace: Trace, ctx: Context<TContract, TBoundContractView>) => PromiseOrVoid
+    handler: (trace: Trace, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid
   }[] = []
   eventHandlers: {
-    handler: (event: Event, ctx: Context<TContract, TBoundContractView>) => PromiseOrVoid
+    handler: (event: Event, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid
     filter: EventFilter | EventFilter[]
   }[] = []
 
@@ -78,7 +78,7 @@ export abstract class BaseProcessorTemplate<
   }
 
   public onEvent(
-    handler: (event: Event, ctx: Context<TContract, TBoundContractView>) => PromiseOrVoid,
+    handler: (event: Event, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,
     filter: EventFilter | EventFilter[]
   ) {
     this.eventHandlers.push({
@@ -88,14 +88,14 @@ export abstract class BaseProcessorTemplate<
     return this
   }
 
-  public onBlock(handler: (block: Block, ctx: Context<TContract, TBoundContractView>) => PromiseOrVoid) {
+  public onBlock(handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid) {
     this.blockHandlers.push(handler)
     return this
   }
 
   public onTrace(
     signature: string,
-    handler: (trace: Trace, ctx: Context<TContract, TBoundContractView>) => PromiseOrVoid
+    handler: (trace: Trace, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid
   ) {
     this.traceHandlers.push({ signature, handler })
     return this

package/src/core/base-processor.ts

@@ -4,7 +4,7 @@ import { Block, Log, getNetwork } from '@ethersproject/providers'
 import { BaseContract, EventFilter } from '@ethersproject/contracts'
 import Long from 'long'
 
-import { BoundContractView, Context, ContractView } from './context'
+import { BoundContractView, ContractContext, ContractView } from './context'
 import { ProcessResult } from '../gen'
 import { BindInternalOptions, BindOptions } from './bind-options'
 import { PromiseOrVoid } from '../promise-or-void'
@@ -28,7 +28,6 @@ export abstract class BaseProcessor<
   eventHandlers: EventsHandler[] = []
   traceHandlers: TraceHandler[] = []
 
-  name: string
   config: BindInternalOptions
 
   constructor(config: BindOptions) {
@@ -61,7 +60,7 @@ export abstract class BaseProcessor<
   }
 
   public onEvent(
-    handler: (event: Event, ctx: Context<TContract, TBoundContractView>) => PromiseOrVoid,
+    handler: (event: Event, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,
     filter: EventFilter | EventFilter[]
   ) {
     const chainId = this.getChainId()
@@ -75,10 +74,17 @@ export abstract class BaseProcessor<
     }
 
     const contractView = this.CreateBoundContractView()
+    const contractName = this.config.name
     this.eventHandlers.push({
       filters: _filters,
       handler: async function (log) {
-        const ctx = new Context<TContract, TBoundContractView>(contractView, chainId, undefined, log)
+        const ctx = new ContractContext<TContract, TBoundContractView>(
+          contractName,
+          contractView,
+          chainId,
+          undefined,
+          log
+        )
         // let event: Event = <Event>deepCopy(log);
         const event: Event = <Event>log
         const parsed = contractView.rawContract.interface.parseLog(log)
@@ -108,12 +114,19 @@ export abstract class BaseProcessor<
     return this
   }
 
-  public onBlock(handler: (block: Block, ctx: Context<TContract, TBoundContractView>) => PromiseOrVoid) {
+  public onBlock(handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid) {
     const chainId = this.getChainId()
     const contractView = this.CreateBoundContractView()
+    const contractName = this.config.name
 
     this.blockHandlers.push(async function (block: Block) {
-      const ctx = new Context<TContract, TBoundContractView>(contractView, chainId, block, undefined)
+      const ctx = new ContractContext<TContract, TBoundContractView>(
+        contractName,
+        contractView,
+        chainId,
+        block,
+        undefined
+      )
       await handler(block, ctx)
       return {
         gauges: ctx.gauges,
@@ -124,7 +137,7 @@ export abstract class BaseProcessor<
     return this
   }
 
-  public onAllEvents(handler: (event: Log, ctx: Context<TContract, TBoundContractView>) => PromiseOrVoid) {
+  public onAllEvents(handler: (event: Log, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid) {
     const _filters: EventFilter[] = []
     const tmpContract = this.CreateBoundContractView()
 
@@ -138,10 +151,11 @@ export abstract class BaseProcessor<
 
   protected onTrace(
     signature: string,
-    handler: (trace: Trace, ctx: Context<TContract, TBoundContractView>) => PromiseOrVoid
+    handler: (trace: Trace, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid
   ) {
     const chainId = this.getChainId()
     const contractView = this.CreateBoundContractView()
+    const contractName = this.config.name
 
     this.traceHandlers.push({
       signature,
@@ -158,7 +172,14 @@ export abstract class BaseProcessor<
         const traceData = '0x' + trace.action.input.slice(10)
         trace.args = contractInterface._abiCoder.decode(fragment.inputs, traceData)
 
-        const ctx = new Context<TContract, TBoundContractView>(contractView, chainId, undefined, undefined, trace)
+        const ctx = new ContractContext<TContract, TBoundContractView>(
+          contractName,
+          contractView,
+          chainId,
+          undefined,
+          undefined,
+          trace
+        )
         await handler(trace, ctx)
         return {
           gauges: ctx.gauges,

package/src/core/big-decimal.ts

@@ -0,0 +1 @@
+export { BigNumber as BigDecimal } from 'bignumber.js'

package/src/core/bind-options.ts

@@ -3,8 +3,11 @@ import Long from 'long'
 import { getNetwork } from '@ethersproject/providers'
 
 export class BindOptions {
+  // Contract address
   address: string
+  // Optional, if not set, then use eth mainnet
   network?: Networkish = 1
+  // Optional, override default contract name
   name?: string
   startBlock?: Long | number
   endBlock?: Long | number
@@ -39,5 +42,3 @@ export class SolanaBindOptions extends BindOptions {
   declare network?: string
   processInnerInstruction?: boolean
 }
-
-export class SuiBindOptions extends BindOptions {}