@sentio/sdk 2.35.0 → 2.36.0-rc.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentio/sdk",
-  "version": "2.35.0",
+  "version": "2.36.0-rc.1",
   "license": "Apache-2.0",
   "type": "module",
   "exports": {
@@ -33,7 +33,9 @@
     "./sui/builtin": "./lib/sui/builtin/index.js",
     "./sui/builtin/0x1": "./lib/sui/builtin/0x1.js",
     "./sui/builtin/0x2": "./lib/sui/builtin/0x2.js",
-    "./sui/builtin/0x3": "./lib/sui/builtin/0x3.js"
+    "./sui/builtin/0x3": "./lib/sui/builtin/0x3.js",
+    "./fuel": "./lib/fuel/index.js",
+    "./fuel/codegen": "./lib/fuel/codegen/index.js"
   },
   "files": [
     "{lib,src}",
@@ -43,10 +45,11 @@
   "dependencies": {
     "@aptos-labs/ts-sdk": "~1.13.0",
     "@coral-xyz/borsh": "^0.29.0",
+    "@fuel-ts/abi-typegen": "^0.82.0",
     "@mysten/sui.js": "~0.51.0",
     "@project-serum/anchor": "^0.26.0",
     "@sentio/bigdecimal": "9.1.1-patch.3",
-    "@sentio/chain": "^1.0.16",
+    "@sentio/chain": "^1.0.21",
     "@sentio/ethers-v6": "^1.0.29",
     "@solana/web3.js": "1.89.1",
     "@typemove/aptos": "~1.5.6",
@@ -56,6 +59,7 @@
     "chalk": "^5.3.0",
     "csv-parse": "^5.5.3",
     "ethers": "npm:@sentio/ethers@6.7.1-patch.4",
+    "fuels": "^0.81.0",
     "js-sha3": "^0.9.3",
     "lru-cache": "^10.2.0",
     "mkdirp": "^1.0.4",
@@ -73,8 +77,8 @@
     "typedoc": "^0.25.7",
     "utility-types": "^3.11.0",
     "yaml": "^2.3.4",
-    "@sentio/protos": "2.35.0",
-    "@sentio/runtime": "^2.35.0"
+    "@sentio/protos": "2.36.0-rc.1",
+    "@sentio/runtime": "^2.36.0-rc.1"
   },
   "peerDependencies": {
     "tsup": "npm:@sentio/tsup@^6.7.2"
@@ -93,12 +97,14 @@
     "build": "pnpm gen && pnpm compile",
     "build:all": "pnpm --filter=$(node -p \"require('./package.json').name\")... build",
     "compile": "tsc && cp src/utils/*.csv lib/utils && cp src/tsup.config.ts lib",
-    "gen": "pnpm gen:eth && pnpm gen:aptos && pnpm gen:sui && pnpm gen:solana",
+    "gen": "pnpm gen:eth && pnpm gen:aptos && pnpm gen:sui && pnpm gen:solana && pnpm gen:fuel",
     "gen:aptos": "node --loader ts-node/esm  src/aptos/codegen/run.ts src/aptos/abis src/aptos/builtin && pnpm gen:aptos_test",
     "gen:aptos_test": "node --loader ts-node/esm  src/aptos/codegen/run.ts src/aptos/tests/abis src/aptos/tests/types",
     "gen:docs": "typedoc --options typedoc.json",
     "gen:eth": "node --loader ts-node/esm src/eth/codegen/run.ts src/eth/abis src/eth/builtin && pnpm gen:eth_test",
     "gen:eth_test": "node --loader ts-node/esm src/eth/codegen/run.ts src/eth/tests/abis/eth ./src/eth/tests/types",
+    "gen:fuel": "node --loader ts-node/esm  src/fuel/codegen/run.ts src/fuel/abis src/sui/builtin && pnpm gen:fuel_test",
+    "gen:fuel_test": "node --loader ts-node/esm  src/fuel/codegen/run.ts src/fuel/tests/abis src/fuel/tests/types",
     "gen:solana": "node --loader ts-node/esm src/solana/codegen/run.ts src/solana/tests/abis src/solana/tests/types",
     "gen:sui": "node --loader ts-node/esm  src/sui/codegen/run.ts src/sui/abis src/sui/builtin && pnpm gen:sui_test",
     "gen:sui_test": "node --loader ts-node/esm  src/sui/codegen/run.ts src/sui/tests/abis src/sui/tests/types",

package/src/aptos/aptos-plugin.ts

@@ -1,4 +1,4 @@
-import { errorString, mergeProcessResults, Plugin, PluginManager, USER_PROCESSOR } from '@sentio/runtime'
+import { errorString, GLOBAL_CONFIG, mergeProcessResults, Plugin, PluginManager, USER_PROCESSOR } from '@sentio/runtime'
 import {
   AccountConfig,
   ContractConfig,
@@ -12,7 +12,7 @@ import {
   MoveOwnerType,
   ProcessConfigResponse,
   ProcessResult,
-  StartRequest,
+  StartRequest
 } from '@sentio/protos'
 
 import { ServerError, Status } from 'nice-grpc'
@@ -24,7 +24,7 @@ import { AptosChainId } from '@sentio/chain'
 import { AptosResourcesContext } from './context.js'
 import {
   AptosResourceProcessorTemplate,
-  AptosResourceProcessorTemplateState,
+  AptosResourceProcessorTemplateState
 } from './aptos-resource-processor-template.js'
 import { AptosNetwork } from './network.js'
 
@@ -38,7 +38,7 @@ export class AptosPlugin extends Plugin {
   handlers: Handlers = {
     aptosEventHandlers: [],
     aptosCallHandlers: [],
-    aptosResourceHandlers: [],
+    aptosResourceHandlers: []
   }
 
   async start(request: StartRequest) {
@@ -57,7 +57,7 @@ export class AptosPlugin extends Plugin {
         {
           address: instance.contract?.address || '',
           network: <AptosNetwork>instance.contract?.chainId || AptosNetwork.MAIN_NET,
-          startVersion: instance.startBlock || 0n,
+          startVersion: instance.startBlock || 0n
         },
         NoopContext
       )
@@ -68,7 +68,7 @@ export class AptosPlugin extends Plugin {
     const handlers: Handlers = {
       aptosEventHandlers: [],
       aptosCallHandlers: [],
-      aptosResourceHandlers: [],
+      aptosResourceHandlers: []
     }
     for (const aptosProcessor of AptosProcessorState.INSTANCE.getValues()) {
       const contractConfig = ContractConfig.fromPartial({
@@ -77,9 +77,9 @@ export class AptosPlugin extends Plugin {
           name: aptosProcessor.moduleName,
           chainId: aptosProcessor.getChainId(),
           address: aptosProcessor.config.address,
-          abi: '',
+          abi: ''
         },
-        startBlock: aptosProcessor.config.startVersion,
+        startBlock: aptosProcessor.config.startVersion
       })
       // 1. Prepare event handlers
       for (const handler of aptosProcessor.eventHandlers) {
@@ -88,11 +88,11 @@ export class AptosPlugin extends Plugin {
           filters: handler.filters.map((f) => {
             return {
               type: f.type,
-              account: f.account || '',
+              account: f.account || ''
             }
           }),
           fetchConfig: handler.fetchConfig,
-          handlerId,
+          handlerId
         }
         contractConfig.moveEventConfigs.push(eventHandlerConfig)
       }
@@ -107,11 +107,11 @@ export class AptosPlugin extends Plugin {
               typeArguments: filter.typeArguments || [],
               withTypeArguments: !!filter.typeArguments,
               includeFailed: filter.includeFailed || false,
-              publicKeyPrefix: filter.publicKeyPrefix || '',
+              publicKeyPrefix: filter.publicKeyPrefix || ''
             }
           }),
           fetchConfig: handler.fetchConfig,
-          handlerId,
+          handlerId
         }
         contractConfig.moveCallConfigs.push(functionHandlerConfig)
       }
@@ -122,7 +122,7 @@ export class AptosPlugin extends Plugin {
       const accountConfig = AccountConfig.fromPartial({
         address: aptosProcessor.config.address,
         chainId: aptosProcessor.getChainId(),
-        startBlock: aptosProcessor.config.startVersion,
+        startBlock: aptosProcessor.config.startVersion
       })
       for (const handler of aptosProcessor.resourcesHandlers) {
         const handlerId = handlers.aptosResourceHandlers.push(handler.handler) - 1
@@ -133,11 +133,11 @@ export class AptosPlugin extends Plugin {
             minutesInterval: handler.timeIntervalInMinutes,
             slot: 0,
             slotInterval: handler.versionInterval,
-            fetchConfig: undefined,
+            fetchConfig: undefined
           },
           type: handler.type || '',
           ownerType: MoveOwnerType.ADDRESS,
-          fetchConfig: undefined,
+          fetchConfig: undefined
         })
       }
       config.accountConfigs.push(accountConfig)
@@ -168,15 +168,16 @@ export class AptosPlugin extends Plugin {
     const event = binding.data.aptEvent
 
     for (const handlerId of binding.handlerIds) {
-      // only support aptos event for now
-      promises.push(
-        this.handlers.aptosEventHandlers[handlerId](event).catch((e) => {
-          throw new ServerError(
-            Status.INTERNAL,
-            'error processing event: ' + JSON.stringify(event) + '\n' + errorString(e)
-          )
-        })
-      )
+      const promise = this.handlers.aptosEventHandlers[handlerId](event).catch((e) => {
+        throw new ServerError(
+          Status.INTERNAL,
+          'error processing event: ' + JSON.stringify(event) + '\n' + errorString(e)
+        )
+      })
+      if (GLOBAL_CONFIG.execution.sequential) {
+        await promise
+      }
+      promises.push(promise)
     }
     return mergeProcessResults(await Promise.all(promises))
   }
@@ -189,14 +190,16 @@ export class AptosPlugin extends Plugin {
 
     const promises: Promise<ProcessResult>[] = []
     for (const handlerId of binding.handlerIds) {
-      promises.push(
-        this.handlers.aptosResourceHandlers[handlerId](resource).catch((e) => {
-          throw new ServerError(
-            Status.INTERNAL,
-            'error processing resource: ' + JSON.stringify(resource) + '\n' + errorString(e)
-          )
-        })
-      )
+      const promise = this.handlers.aptosResourceHandlers[handlerId](resource).catch((e) => {
+        throw new ServerError(
+          Status.INTERNAL,
+          'error processing resource: ' + JSON.stringify(resource) + '\n' + errorString(e)
+        )
+      })
+      if (GLOBAL_CONFIG.execution.sequential) {
+        await promise
+      }
+      promises.push(promise)
     }
     return mergeProcessResults(await Promise.all(promises))
   }
@@ -213,6 +216,9 @@ export class AptosPlugin extends Plugin {
       const promise = this.handlers.aptosCallHandlers[handlerId](call).catch((e) => {
         throw new ServerError(Status.INTERNAL, 'error processing call: ' + JSON.stringify(call) + '\n' + errorString(e))
       })
+      if (GLOBAL_CONFIG.execution.sequential) {
+        await promise
+      }
       promises.push(promise)
     }
     return mergeProcessResults(await Promise.all(promises))

package/src/eth/binds.ts

@@ -6,8 +6,8 @@ import { BaseContract } from 'ethers'
 import { MapStateStorage } from '@sentio/runtime'
 import { EthChainId } from '@sentio/chain'
 
-export class ProcessorState extends MapStateStorage<BaseProcessor<any, any>> {
-  static INSTANCE = new ProcessorState()
+export class EthProcessorState extends MapStateStorage<BaseProcessor<any, any>> {
+  static INSTANCE = new EthProcessorState()
 }
 
 // from abiName_address_chainId => contract wrapper
@@ -20,13 +20,13 @@ function getKey(abiName: string, address: string, network: EthChainId) {
 // Dedup processor that bind multiple times
 export function getProcessor(opts: BindOptions) {
   const sig = getOptionsSignature(opts)
-  return ProcessorState.INSTANCE.getValue(sig)
+  return EthProcessorState.INSTANCE.getValue(sig)
 }
 
 export function addProcessor(opts: BindOptions, processor: BaseProcessor<any, any>) {
   const sig = getOptionsSignature(opts)
 
-  ProcessorState.INSTANCE.getOrSetValue(sig, processor)
+  EthProcessorState.INSTANCE.getOrSetValue(sig, processor)
 }
 
 export function getContractByABI(abiName: string, address: string, network: EthChainId) {

package/src/eth/codegen/codegen.ts

@@ -67,9 +67,11 @@ async function codegenInternal(
 
   const fileDescriptions = loadFileDescriptions(services, config.filesToProcess)
 
+  // @ts-ignore - no types
   filesGenerated += processOutput(services, config, await target.beforeRun())
 
   for (const fd of fileDescriptions) {
+    // @ts-ignore - no types
     filesGenerated += processOutput(services, config, await target.transformFile(fd))
   }
 

package/src/eth/codegen/ethers-sentio.ts

@@ -1,3 +1,6 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
+
 import Ethers from '@sentio/ethers-v6'
 import {
   Config,
@@ -65,7 +68,7 @@ export default class EthersSentio extends Ethers.default {
     }
   }
 
-  override afterRun() {
+  override afterRun(): FileDescription[] {
     const commonPath = join('internal', 'common.ts')
     const files = super.afterRun()
     for (const [idx, file] of files.entries()) {

package/src/eth/eth-plugin.ts

@@ -16,7 +16,7 @@ import {
 } from '@sentio/protos'
 
 import { ServerError, Status } from 'nice-grpc'
-import { ProcessorState } from './binds.js'
+import { EthProcessorState } from './binds.js'
 import { AccountProcessorState } from './account-processor-state.js'
 import { ProcessorTemplateProcessorState } from './base-processor-template.js'
 import { GlobalProcessorState } from './base-processor.js'
@@ -49,7 +49,7 @@ export class EthPlugin extends Plugin {
       transactionHandlers: []
     }
 
-    for (const processor of ProcessorState.INSTANCE.getValues()) {
+    for (const processor of EthProcessorState.INSTANCE.getValues()) {
       // If server favor incremental update this need to change
       // Start basic config for contract
       const chainId = processor.getChainId()

package/src/fuel/base-processor.ts

@@ -0,0 +1,38 @@
+import { FuelProcessor, FuelProcessorConfig, FuelProcessorState } from './fuel-processor.js'
+import { JsonAbi } from 'fuels'
+import { FuelCall, FuelContext } from './context.js'
+import { FuelFetchConfig } from './transaction.js'
+import { FuelChainId } from '@sentio/chain'
+
+
+export abstract class FuelAbstractProcessor extends FuelProcessor {
+
+  protected constructor(abi: JsonAbi, config?: FuelProcessorConfig) {
+    if (!config) {
+      config = {
+        chainId: FuelChainId.FUEL_MAINNET,
+        address: ''
+      }
+    }
+    config.abi = abi
+    super(config)
+    FuelProcessorState.INSTANCE.addValue(this)
+  }
+
+  protected onCallMethod<T extends Array<any>, R>(method: string, fn: (call: TypedCall<T, R>, ctx: FuelContext) => (void | Promise<void>), config: FuelFetchConfig): this {
+    const nameFilter = method
+    const handler =async (call: FuelCall, ctx: FuelContext) => {
+      await fn({
+        args: call.functionScopes[0].getCallConfig().args as T,
+        returnValue: call.value as R
+      }, ctx)
+    }
+    return super.onCall(nameFilter, handler, config)
+  }
+
+}
+
+export type TypedCall<T extends Array<any>, R> = {
+  args: T
+  returnValue: R
+}

package/src/fuel/codegen/codegen.ts

@@ -0,0 +1,149 @@
+import fs, { readFileSync, writeFileSync } from 'fs'
+import chalk from 'chalk'
+import { AbiTypeGen, IFile, IFunction, ProgramTypeEnum } from '@fuel-ts/abi-typegen'
+import mkdirp from 'mkdirp'
+import path from 'path'
+import { upperFirst } from './utils.js'
+
+export async function codegen(abisDir: string, outDir: string) {
+  if (!fs.existsSync(abisDir)) {
+    return
+  }
+
+  const numFiles = await codegenInternal(abisDir, outDir)
+  console.log(chalk.green(`Generated ${numFiles} files for Fuel`))
+}
+
+function patchImport(contents: string) {
+  return contents.replace(/from\s+['"](\..+)['"]/g, `from '\$1.js'`)
+}
+
+function patchEnumType(contents: string) {
+  const matches = contents.matchAll(/export type (.+) = Enum<{ Ok: T, Err: E }>;/g)
+
+  for (const m of matches) {
+    const vname = m[1]
+    contents = contents.replace(m[0], `export type ${vname}<T,E> = Enum<{ Ok: T, Err: E }>;`)
+
+    const reg = new RegExp(`export type (.+) = ${vname}`, 'g')
+    contents = contents.replace(reg, `export type \$1<T,E> = ${vname}<T,E>`)
+  }
+  return contents
+}
+
+async function codegenInternal(abisDir: string, outDir: string): Promise<number> {
+  const allFiles = fs.readdirSync(abisDir)
+  if (allFiles.length === 0) {
+    return 0
+  }
+
+  const allABIFiles = []
+  for (const f of allFiles) {
+    if (f.toLowerCase().endsWith('-abi.json')) {
+      allABIFiles.push(path.join(abisDir, f))
+    }
+  }
+  if (allABIFiles.length === 0) {
+    return 0
+  }
+  const abiFiles = allABIFiles.map((filepath) => {
+    const abi: IFile = {
+      path: filepath,
+      contents: readFileSync(filepath, 'utf-8')
+    }
+    return abi
+  })
+
+  // fuels type gen
+  const abiTypeGen = new AbiTypeGen({
+    abiFiles,
+    binFiles: [],
+    storageSlotsFiles: [],
+    outputDir: outDir,
+    programType: ProgramTypeEnum.CONTRACT
+  })
+
+  mkdirp.sync(outDir)
+  mkdirp.sync(path.join(outDir, 'factories'))
+
+  abiTypeGen.files.forEach((file) => {
+    if (!file.path.endsWith('.hex.ts')) {
+      let content = patchImport(file.contents)
+      content = patchEnumType(content)
+      writeFileSync(file.path, content)
+    }
+  })
+
+  for (const abi of abiTypeGen.abis) {
+    const name = abi.name.endsWith('Abi') ? abi.name.slice(0, -3) : abi.name
+    const filePath = path.join(outDir, `${name}Processor.ts`)
+    const importedTypes = collectImportedTypes(abi.types)
+
+    const content = `/* Autogenerated file. Do not edit manually. */
+
+/* tslint:disable */
+/* eslint-disable */
+    
+import { FuelAbstractProcessor, FuelContext, FuelProcessorConfig, TypedCall, FuelFetchConfig} from '@sentio/sdk/fuel'
+import {${abi.name}__factory } from './factories/${abi.name}__factory.js'
+import {${abi.commonTypesInUse.join(',')}} from './common.js'
+import {${importedTypes.join(',')}} from './${abi.name}.js'
+
+import type {
+  BigNumberish,
+  BN,
+  BytesLike,
+} from 'fuels';
+
+
+namespace ${name} {
+${abi.functions.map(genCallType).join('\n')}
+}
+
+export class ${name}Processor extends FuelAbstractProcessor {
+  constructor(config?: FuelProcessorConfig) {
+    super(${abi.name}__factory.abi, config)
+  }
+  
+  static bind(config?: FuelProcessorConfig) {
+    return new ${name}Processor(config)
+  }
+
+${abi.functions.map((f) => genOnCallFunction(name, f)).join('\n')}   
+}
+`
+    writeFileSync(filePath, content)
+  }
+
+  return allABIFiles.length
+}
+
+function genCallType(f: IFunction) {
+  const name = upperFirst(f.name)
+  return `
+  export interface ${name}Call extends TypedCall<[${f.attributes.inputs}], ${f.attributes.output}> {
+      args: [${f.attributes.inputs}]
+      returnValue: ${f.attributes.output}
+  }
+`
+}
+
+function genOnCallFunction(contractName: string, f: IFunction) {
+  const name = upperFirst(f.name)
+  return `
+  onCall${name}(handler: (call: ${contractName}.${name}Call, ctx: FuelContext) => void | Promise<void>, config: FuelFetchConfig) {
+      super.onCallMethod('${f.name}', handler, config)
+  }`
+}
+
+function collectImportedTypes(types: any[]): string[] {
+  const ret = new Set<string>()
+  for (const type of types) {
+    if ((type && type.name == 'struct') || type.name == 'enum') {
+      ret.add(type.attributes.inputLabel)
+      ret.add(type.attributes.outputLabel)
+    }
+  }
+
+  return Array.from(ret)
+}

package/src/fuel/codegen/index.ts

@@ -0,0 +1 @@
+export * from './codegen.js'

package/src/fuel/codegen/run.ts

@@ -0,0 +1,10 @@
+import { codegen } from './index.js'
+
+if (process.argv.length > 3) {
+  const abisDir = process.argv[2]
+  const targetDir = process.argv[3]
+  await codegen(abisDir, targetDir)
+} else {
+  console.error('Not enough argument')
+  process.exit(1)
+}

package/src/fuel/codegen/utils.ts

@@ -0,0 +1,6 @@
+
+
+
+export function upperFirst(str: string): string {
+  return str.charAt(0).toUpperCase() + str.slice(1);
+}

package/src/fuel/context.ts

@@ -0,0 +1,34 @@
+import { BaseContext, Labels, normalizeLabels } from '../core/index.js'
+import { ChainId } from '@sentio/chain'
+import { RecordMetaData } from '@sentio/protos'
+import { InvocationCallResult } from 'fuels'
+import { FuelTransaction } from './transaction.js'
+
+export type FuelCall = InvocationCallResult
+
+export class FuelContext extends BaseContext {
+  constructor(
+    readonly transaction: FuelTransaction | null,
+    readonly chainId: ChainId
+  ) {
+    super({})
+  }
+
+  getChainId(): ChainId {
+    return this.chainId
+  }
+
+  protected getMetaDataInternal(name: string, labels: Labels): RecordMetaData {
+    return {
+      address: this.transaction?.id || '',
+      contractName: this.transaction?.id || '', // TODO
+      blockNumber: 0n,
+      transactionIndex: 0,
+      transactionHash: this.transaction?.id || '', // TODO
+      chainId: this.getChainId(),
+      name: name,
+      logIndex: 0,
+      labels: normalizeLabels(labels)
+    }
+  }
+}