@sentio/sdk 1.26.3 → 1.27.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sentio/sdk",
   "license": "Apache-2.0",
-  "version": "1.26.3",
+  "version": "1.27.0",
   "scripts": {
     "compile_target": "yarn tsc -b src/target-ethers-sentio/tsconfig.json",
     "compile": "tsc -p . && cp src/cli/webpack.config.js lib/cli && cp src/utils/*.csv lib/utils",
@@ -25,6 +25,7 @@
     "@solana/web3.js": "^1.47.3",
     "@typechain/ethers-v5": "^10.0.0",
     "@types/bn.js": "^5.1.0",
+    "@types/express": "^4.17.14",
     "@types/node-fetch": "^2.6.2",
     "aptos-sdk": "npm:aptos@^1.3.16",
     "bignumber.js": "^9.1.0",
@@ -34,6 +35,7 @@
     "command-line-usage": "^6.1.3",
     "csv-parse": "^5.3.0",
     "ethers": "~5.7.1",
+    "express": "^4.18.2",
     "form-data": "^4.0.0",
     "fs-extra": "^10.1.0",
     "google-protobuf": "^3.15.8",
@@ -78,5 +80,8 @@
     "lib/**/*",
     "src/**/*",
     "templates/**/*"
-  ]
+  ],
+  "engines": {
+    "node": ">=16"
+  }
 }

package/src/aptos/aptos-processor.ts

@@ -251,9 +251,9 @@ export class AptosAccountProcessor {
   public onTimeInterval(
     handler: (resources: MoveResource[], ctx: AptosResourceContext) => void,
     timeIntervalInMinutes = 60,
-    typpe?: string
+    type?: string
   ) {
-    return this.onInterval(handler, timeIntervalInMinutes, undefined, typpe)
+    return this.onInterval(handler, timeIntervalInMinutes, undefined, type)
   }
 
   public onVersionInterval(

package/src/aptos/index.ts

@@ -3,5 +3,5 @@ export type { EventInstance, TypedEventInstance, TypedEntryFunctionPayload } fro
 export { TYPE_REGISTRY, TypeRegistry } from './types'
 export type { FunctionNameAndCallFilter, EventFilter, CallFilter, ArgumentsFilter } from './aptos-processor'
 export { AptosBaseProcessor, AptosAccountProcessor } from './aptos-processor'
-export { AptosContext } from './context'
+export { AptosContext, AptosResourceContext } from './context'
 export { AptosBindOptions, AptosNetwork, getRpcClient } from './network'

package/src/aptos-codegen/codegen.ts

@@ -2,8 +2,8 @@ import fs from 'fs'
 import path from 'path'
 import prettier from 'prettier'
 import { MoveFunction, MoveModule, MoveModuleBytecode, MoveStruct } from 'aptos-sdk/src/generated'
-import { AccountModulesImportInfo, AccountRegister, generateType } from './typegen'
-import { isFrameworkAccount } from '../aptos/utils'
+import { AccountModulesImportInfo, AccountRegister, generateType, parseMoveType } from './typegen'
+import { isFrameworkAccount, moduleQname, SPLITTER } from '../aptos/utils'
 import chalk from 'chalk'
 import { AptosNetwork, getChainName, getRpcClient } from '../aptos/network'
 
@@ -56,7 +56,7 @@ export async function generateForNetwork(srcDir: string, outputDir: string, netw
 
   while (loader.pendingAccounts.size > 0) {
     for (const account of loader.pendingAccounts) {
-      console.log(`download depended module for account ${account} at ${getChainName(network)}`)
+      console.log(`download dependent module for account ${account} at ${getChainName(network)}`)
 
       try {
         const modules = await client.getAccountModules(account)
@@ -176,12 +176,12 @@ export class AccountCodegen {
     
     ${this.modules.map((m) => generateModule(m, this.config.network)).join('\n')}
     
-    function loadAllTypes(registry: aptos.TypeRegistry) {
-      ${dependedAccounts.map((m) => `${m}.loadTypes(registry)`).join('\n')}
+    function loadAllTypes(_r: aptos.TypeRegistry) {
+      ${dependedAccounts.map((m) => `${m}.loadTypes(_r)`).join('\n')}
 
       ${this.modules
         .map((m) => {
-          return `registry.load(${m.abi?.name}.ABI)`
+          return `_r.load(${m.abi?.name}.ABI)`
         })
         .join('\n')}
     }
@@ -211,8 +211,13 @@ function generateModule(moduleByteCode: MoveModuleBytecode, network: AptosNetwor
   const module = moduleByteCode.abi
 
   const functions = module.exposed_functions.map((f) => generateOnEntryFunctions(module, f)).filter((s) => s !== '')
-  const events = module.structs.map((e) => generateOnEvents(module, e)).filter((s) => s !== '')
-  const structs = module.structs.map((s) => generateStructs(module, s))
+
+  const eventStructs = getEventStructs(module)
+  const eventTypes = new Set(eventStructs.keys())
+  const events = Array.from(eventStructs.values())
+    .map((e) => generateOnEvents(module, e))
+    .filter((s) => s !== '')
+  const structs = module.structs.map((s) => generateStructs(module, s, eventTypes))
   const callArgs = module.exposed_functions.map((f) => generateCallArgsStructs(module, f))
 
   let processor = ''
@@ -250,15 +255,15 @@ function generateModule(moduleByteCode: MoveModuleBytecode, network: AptosNetwor
     
     ${callArgs.join('\n')}
        
-    export function loadTypes(registry: aptos.TypeRegistry) {
-      loadAllTypes(registry)
+    export function loadTypes(_r: aptos.TypeRegistry) {
+      loadAllTypes(_r)
     }
     export const ABI: MoveModule = JSON.parse('${JSON.stringify(module)}')
  }
   `
 }
 
-function generateStructs(module: MoveModule, struct: MoveStruct) {
+function generateStructs(module: MoveModule, struct: MoveStruct, events: Set<string>) {
   const genericString = generateStructTypeParameters(struct)
   const genericStringAny = generateStructTypeParameters(struct, true)
 
@@ -267,7 +272,7 @@ function generateStructs(module: MoveModule, struct: MoveStruct) {
   })
 
   let eventPayload = ''
-  if (isEvent(struct)) {
+  if (events.has(moduleQname(module) + SPLITTER + struct.name)) {
     eventPayload = `
     export interface ${struct.name}Instance extends 
         aptos.TypedEventInstance<${struct.name}${genericStringAny}> {
@@ -357,15 +362,36 @@ function generateOnEntryFunctions(module: MoveModule, func: MoveFunction) {
   return source
 }
 
-function isEvent(struct: MoveStruct) {
-  return struct.abilities.includes('drop') && struct.abilities.includes('store') && struct.name.endsWith('Event')
+function getEventStructs(module: MoveModule) {
+  const qname = moduleQname(module)
+  const structMap = new Map<string, MoveStruct>()
+  const eventMap = new Map<string, MoveStruct>()
+
+  for (const struct of module.structs) {
+    structMap.set(qname + SPLITTER + struct.name, struct)
+  }
+
+  for (const struct of module.structs) {
+    for (const field of struct.fields) {
+      const t = parseMoveType(field.type)
+      if (t.qname === '0x1::event::EventHandle') {
+        const event = t.typeArgs[0].qname
+        const eventStruct = structMap.get(event)
+        if (eventStruct) {
+          eventMap.set(event, eventStruct)
+        }
+      }
+    }
+  }
+
+  return eventMap
 }
 
 function generateOnEvents(module: MoveModule, struct: MoveStruct): string {
   // for struct that has drop + store
-  if (!isEvent(struct)) {
-    return ''
-  }
+  // if (!isEvent(struct, module)) {
+  //   return ''
+  // }
 
   // const genericString = generateStructTypeParameters(struct)