@sentio/sdk 1.21.0 → 1.21.2

package/src/aptos/aptos-processor.ts

@@ -22,15 +22,18 @@ type IndexConfigure = {
   // endSeqNumber?: Long
 }
 
-export interface EventFilter extends ArgumentsFilter {
+// TODO extends ArgumentsFilter
+export interface EventFilter {
   type: string
 }
 
-export interface CallFilter extends CallArgumentsFilter {
+export interface FunctionNameAndCallFilter extends CallFilter {
   function: string
 }
 
-export interface CallArgumentsFilter extends ArgumentsFilter {
+// TODO extends ArgumentsFilter
+export interface CallFilter {
+  includeFailed?: boolean
   typeArguments?: string[]
 }
 
@@ -44,7 +47,7 @@ class EventHandler {
 }
 
 class CallHandler {
-  filters: CallFilter[]
+  filters: FunctionNameAndCallFilter[]
   handler: (call: Transaction_UserTransaction) => Promise<ProcessResult>
 }
 
@@ -124,9 +127,9 @@ export class AptosBaseProcessor {
 
   public onEntryFunctionCall(
     handler: (call: TransactionPayload_EntryFunctionPayload, ctx: AptosContext) => void,
-    filter: CallFilter | CallFilter[]
+    filter: FunctionNameAndCallFilter | FunctionNameAndCallFilter[]
   ): AptosBaseProcessor {
-    let _filters: CallFilter[] = []
+    let _filters: FunctionNameAndCallFilter[] = []
 
     if (Array.isArray(filter)) {
       _filters = filter

package/src/aptos/index.ts

@@ -1,6 +1,6 @@
 export type { Transaction_UserTransaction, TransactionPayload_EntryFunctionPayload } from 'aptos/src/generated'
 export type { EventInstance, TypedEventInstance, TypeRegistry, TypedEntryFunctionPayload } from './types'
-export type { CallFilter, EventFilter } from './aptos-processor'
+export type { FunctionNameAndCallFilter, EventFilter, CallFilter, ArgumentsFilter } from './aptos-processor'
 export { AptosBaseProcessor } from './aptos-processor'
 export { AptosContext } from './context'
 export { AptosBindOptions, AptosNetwork } from './bind-options'

package/src/aptos-codegen/codegen.ts

@@ -285,8 +285,9 @@ function generateOnEntryFunctions(module: MoveModule, func: MoveFunction) {
 
   const camelFuncName = capitalizeFirstChar(camelize(func.name))
   const source = `
-  onEntry${camelFuncName}${genericString}(func: (call: ${module.name}.${camelFuncName}Payload${genericString}, ctx: aptos.AptosContext) => void): ${module.name} {
+  onEntry${camelFuncName}${genericString}(func: (call: ${module.name}.${camelFuncName}Payload${genericString}, ctx: aptos.AptosContext) => void, filter?: aptos.CallFilter): ${module.name} {
     this.onEntryFunctionCall(func, {
+      ...filter,
       function: '${module.name}::${func.name}'
     })
     return this
@@ -304,8 +305,11 @@ function generateOnEvents(module: MoveModule, struct: MoveStruct): string {
   if (!isEvent(struct)) {
     return ''
   }
+
+  const genericString = generateStructTypeParameters(struct)
+
   const source = `
-  onEvent${struct.name}(func: (event: ${module.name}.${struct.name}Instance, ctx: aptos.AptosContext) => void): ${module.name} {
+  onEvent${struct.name}${genericString}(func: (event: ${module.name}.${struct.name}Instance${genericString}, ctx: aptos.AptosContext) => void): ${module.name} {
     this.onEvent(func, {
       type: '${module.name}::${struct.name}'
     })

package/src/aptos-codegen/typegen.test.ts

@@ -17,6 +17,18 @@ describe('type gen', () => {
     assert(res.typeArgs.length === 0)
   })
 
+  test('test depended types', async () => {
+    const res = parseMoveType(
+      '0x1::table_with_length::TableWithLength<T0, 0xd5f9f2b1c24faee8f07b790e570c75dfa1b7d8c1e9a60162fbd92ade03ea29e4::iterable_table::IterableValue<T0, T1>>'
+    )
+
+    const deps = res.dependedTypes()
+    assert(deps.length === 2)
+    assert(
+      deps[0] === '0xd5f9f2b1c24faee8f07b790e570c75dfa1b7d8c1e9a60162fbd92ade03ea29e4::iterable_table::IterableValue'
+    )
+    assert(deps[1] === '0x1::table_with_length::TableWithLength')
+  })
   // test('type type gen', async () => {
   //
   //   const res = parseGenericType('x<g1<a,g2<c,d>>,b,g3<a,b>,e>')

package/src/aptos-codegen/typegen.ts

@@ -63,10 +63,11 @@ function generateSimpleType(type: string): string {
 export function parseMoveType(type: string) {
   // type = type.replace('&', '')
 
-  type = type.replace('&mut ', '&')
+  type = type.replaceAll('&mut ', '&')
+  type = type.replaceAll('mut ', '')
 
   // TODO replace ' ' is not exactly safe, need to double check this
-  type = type.replace(' ', '')
+  type = type.replaceAll(' ', '')
 
   const stack: TypeDescriptor[] = [new TypeDescriptor('')]
   let buffer = []