@sentio/sdk 2.58.7 → 2.59.0-rc.10

package/src/aptos/codegen/codegen.ts

@@ -26,9 +26,9 @@ class AptosNetworkCodegen extends BaseAptosCodegen {
   moduleGenerator: SharedNetworkCodegen<AptosNetwork, MoveModuleBytecode, Event | MoveResource>
   SYSTEM_PACKAGE = '@sentio/sdk/aptos'
 
-  constructor(network: AptosNetwork) {
+  constructor(network: AptosNetwork, useViewJson = false) {
     const endpoint = getRpcEndpoint(network)
-    super(endpoint)
+    super(endpoint, useViewJson)
     const generator = this
 
     this.moduleGenerator = new (class extends SharedNetworkCodegen<
@@ -54,6 +54,7 @@ class AptosNetworkCodegen extends BaseAptosCodegen {
   protected getGetDefaultCoder() {
     return `defaultMoveCoderForClient(client)`
   }
+
   generateModule(module: InternalMoveModule, allEventStructs: Map<string, InternalMoveStruct>) {
     return this.moduleGenerator.generateModule(module, allEventStructs)
   }
@@ -67,18 +68,44 @@ class AptosNetworkCodegen extends BaseAptosCodegen {
         MoveCoder, TypedEventInstance } from "@typemove/${this.PREFIX.toLowerCase()}"
 
       import { defaultMoveCoder, defaultMoveCoderForClient } from "${this.defaultCoderPackage()}"
-      import { Aptos, Account as AptosAccount, MoveAddressType, PendingTransactionResponse, InputGenerateTransactionOptions, MoveStructId, InputViewFunctionData } from '@aptos-labs/ts-sdk'`
+      import { Aptos, Account as AptosAccount, MoveAddressType, PendingTransactionResponse, InputGenerateTransactionOptions, MoveStructId, InputViewFunctionData, InputViewFunctionJsonData } from '@aptos-labs/ts-sdk'`
     )
   }
+
   generateLoadAll(isSystem: boolean): string {
     return this.moduleGenerator.generateLoadAll(isSystem)
   }
 }
 
+const ADDRESS_LENGTH = 64
+
+class InitiaAptosNetworkCodegen extends AptosNetworkCodegen {
+  constructor(network: AptosNetwork) {
+    super(network, true)
+
+    const oldFetchModules = this.chainAdapter.fetchModules.bind(this.chainAdapter)
+    this.chainAdapter.fetchModules = async (address: string) => {
+      return oldFetchModules(this.padZero(address))
+    }
+    const oldFetchModule = this.chainAdapter.fetchModule.bind(this.chainAdapter)
+    this.chainAdapter.fetchModule = async (address: string, moduleName: string) => {
+      return oldFetchModule(this.padZero(address), moduleName)
+    }
+  }
+
+  private padZero(address: string): string {
+    if (address.startsWith('0x')) {
+      address = address.slice(2)
+    }
+    return '0x' + address.padStart(ADDRESS_LENGTH, '0')
+  }
+}
+
 const MAINNET_CODEGEN = new AptosNetworkCodegen(AptosNetwork.MAIN_NET)
 const TESTNET_CODEGEN = new AptosNetworkCodegen(AptosNetwork.TEST_NET)
 const MOVEMENT_MAINNET_CODEGEN = new AptosNetworkCodegen(AptosNetwork.MOVEMENT_MAIN_NET)
 const MOVEMENT_TESTNET_CODEGEN = new AptosNetworkCodegen(AptosNetwork.MOVEMENT_TEST_NET)
+const ECHELON_CODEGEN = new InitiaAptosNetworkCodegen(AptosNetwork.INITIA_ECHELON)
 
 class AptosCodegen {
   async generate(srcDir: string, outputDir: string, builtin = false): Promise<number> {
@@ -87,11 +114,12 @@ class AptosCodegen {
       ['', MAINNET_CODEGEN],
       ['testnet', TESTNET_CODEGEN],
       ['movement-mainnet', MOVEMENT_MAINNET_CODEGEN],
-      ['movement-testnet', MOVEMENT_TESTNET_CODEGEN]
+      ['movement-testnet', MOVEMENT_TESTNET_CODEGEN],
+      ['initia-echelon', ECHELON_CODEGEN]
     ]
 
     for (const [network, gen] of generators) {
-      const exclude = network ? [] : ['testnet', 'movement-mainnet', 'movement-testnet']
+      const exclude = network ? [] : ['testnet', 'movement-mainnet', 'movement-testnet', 'initia-echelon']
       numFiles += await recursiveCodegen(
         path.join(srcDir, network),
         path.join(outputDir, network),

package/src/aptos/move-coder.ts

@@ -9,7 +9,7 @@ export function defaultMoveCoder(network: AptosNetwork = AptosNetwork.MAIN_NET):
   let coder = CODERS.get(network)
   if (!coder) {
     const client = getClient(network)
-    coder = new MoveCoder(getClient(network))
+    coder = new MoveCoder(getClient(network), network == AptosNetwork.INITIA_ECHELON)
     CODERS.set(network, coder)
     URL_CODERS.set(client.config.fullnode || '', coder)
   }

package/src/aptos/network.ts

@@ -11,7 +11,8 @@ export const AptosNetwork = <const>{
   TEST_NET: AptosChainId.APTOS_TESTNET,
 
   MOVEMENT_MAIN_NET: AptosChainId.APTOS_MOVEMENT_MAINNET,
-  MOVEMENT_TEST_NET: AptosChainId.APTOS_MOVEMENT_TESTNET
+  MOVEMENT_TEST_NET: AptosChainId.APTOS_MOVEMENT_TESTNET,
+  INITIA_ECHELON: AptosChainId.INITIA_ECHELON
 }
 
 export const MovementNetwork = <const>{
@@ -24,6 +25,7 @@ export class AptosBindOptions {
   network?: AptosNetwork = AptosNetwork.MAIN_NET
   client?: Aptos
   startVersion?: bigint | number
+  endVersion?: bigint | number
   baseLabels?: Labels
 }
 
@@ -37,6 +39,8 @@ export function getRpcEndpoint(network: AptosNetwork): string {
       return 'https://mainnet.movementnetwork.xyz/v1'
     case AptosNetwork.MOVEMENT_TEST_NET:
       return 'https://aptos.testnet.bardock.movementlabs.xyz/v1'
+    case AptosNetwork.INITIA_ECHELON:
+      return 'https://rpc.sentio.xyz/initia-aptos/v1'
   }
 }
 

package/src/eth/base-processor.ts

@@ -13,7 +13,7 @@ import {
   PreprocessResult,
   ProcessResult
 } from '@sentio/protos'
-import { BindOptions } from './bind-options.js'
+import { BindOptions, TimeOrBlock } from './bind-options.js'
 import { PromiseOrVoid } from '../core/promises.js'
 import { ServerError, Status } from 'nice-grpc'
 import {
@@ -75,8 +75,8 @@ class BindInternalOptions {
   address: string
   network: EthChainId
   name: string
-  startBlock: bigint
-  endBlock?: bigint
+  start: TimeOrBlock
+  end?: TimeOrBlock
   baseLabels?: { [key: string]: string }
 }
 
@@ -101,13 +101,20 @@ export class GlobalProcessor {
       address: ALL_ADDRESS,
       name: config.name || 'Global',
       network: config.network || EthChainId.ETHEREUM,
-      startBlock: 0n
+      start: config.start || {
+        block: 0
+      },
+      end: config.end
     }
     if (config.startBlock) {
-      this.config.startBlock = BigInt(config.startBlock)
+      this.config.start = {
+        block: config.startBlock
+      }
     }
     if (config.endBlock) {
-      this.config.endBlock = BigInt(config.endBlock)
+      this.config.end = {
+        block: config.endBlock
+      }
     }
 
     return proxyProcessor(this)
@@ -390,14 +397,21 @@ export abstract class BaseProcessor<
       address: validateAndNormalizeAddress(config.address),
       name: config.name || '',
       network: config.network || EthChainId.ETHEREUM,
-      startBlock: 0n,
+      start: config.start || {
+        block: 0
+      },
+      end: config.end,
       baseLabels: config.baseLabels
     }
     if (config.startBlock) {
-      this.config.startBlock = BigInt(config.startBlock)
+      this.config.start = {
+        block: config.startBlock
+      }
     }
     if (config.endBlock) {
-      this.config.endBlock = BigInt(config.endBlock)
+      this.config.end = {
+        block: config.endBlock
+      }
     }
 
     return proxyProcessor(this)

package/src/eth/bind-options.ts

@@ -7,11 +7,18 @@ export class BindOptions {
   network?: EthChainId = EthChainId.ETHEREUM
   // Optional, override default contract name
   name?: string
+  start?: TimeOrBlock
+  end?: TimeOrBlock
   startBlock?: bigint | number
   endBlock?: bigint | number
   baseLabels?: { [key: string]: string }
 }
 
+export interface TimeOrBlock {
+  block?: bigint | number
+  time?: Date
+}
+
 export function getOptionsSignature(opts: BindOptions): string {
   const sig = [opts.address]
   if (opts.network) {

package/src/eth/eth-plugin.ts

@@ -1,4 +1,12 @@
-import { errorString, mergeProcessResults, Plugin, PluginManager, USER_PROCESSOR, GLOBAL_CONFIG } from '@sentio/runtime'
+import {
+  errorString,
+  mergeProcessResults,
+  Plugin,
+  PluginManager,
+  USER_PROCESSOR,
+  GLOBAL_CONFIG,
+  getProvider
+} from '@sentio/runtime'
 import {
   AccountConfig,
   ContractConfig,
@@ -26,6 +34,7 @@ import { validateAndNormalizeAddress } from './eth.js'
 import { EthChainId } from '@sentio/chain'
 import { EthContext } from './context.js'
 import { TemplateInstanceState } from '../core/template.js'
+import { timeOrBlockToBlockNumber } from '@sentio/sdk/utils'
 
 interface Handlers {
   eventHandlers: ((event: Data_EthLog, preparedData?: PreparedData) => Promise<ProcessResult>)[]
@@ -79,6 +88,10 @@ export class EthPlugin extends Plugin {
       const chainId = processor.getChainId()
       // this.processorsByChainId.set(chainId, processor)
 
+      const provider = getProvider(chainId)
+      const startBlock = await timeOrBlockToBlockNumber(provider, processor.config.start)
+      const endBlock = processor.config.end ? await timeOrBlockToBlockNumber(provider, processor.config.end) : undefined
+
       const contractConfig = ContractConfig.fromPartial({
         processorType: USER_PROCESSOR,
         contract: {
@@ -87,8 +100,8 @@ export class EthPlugin extends Plugin {
           address: validateAndNormalizeAddress(processor.config.address),
           abi: ''
         },
-        startBlock: processor.config.startBlock,
-        endBlock: processor.config.endBlock
+        startBlock,
+        endBlock
       })
 
       // Step 1. Prepare all the block handlers
@@ -167,6 +180,10 @@ export class EthPlugin extends Plugin {
     for (const processor of GlobalProcessorState.INSTANCE.getValues()) {
       const chainId = processor.getChainId()
 
+      const provider = getProvider(chainId)
+      const startBlock = await timeOrBlockToBlockNumber(provider, processor.config.start)
+      const endBlock = processor.config.end ? await timeOrBlockToBlockNumber(provider, processor.config.end) : undefined
+
       const contractConfig = ContractConfig.fromPartial({
         processorType: USER_PROCESSOR,
         contract: {
@@ -175,8 +192,8 @@ export class EthPlugin extends Plugin {
           address: processor.config.address, // can only be *
           abi: ''
         },
-        startBlock: processor.config.startBlock,
-        endBlock: processor.config.endBlock
+        startBlock,
+        endBlock
       })
 
       for (const blockHandler of processor.blockHandlers) {

package/src/store/codegen.ts

@@ -48,6 +48,7 @@ interface Class {
   annotations: string[]
   parent?: string
   interfaces: string[]
+  timeseries?: boolean
 }
 
 interface Interface {
@@ -154,6 +155,18 @@ async function codegenInternal(schema: GraphQLSchema, source: string, target: st
     }
 
     if (t instanceof GraphQLObjectType) {
+      if (isTimeseries(t)) {
+        // check id is int8
+        const idField = t.getFields()['id']
+        if (!idField || !isNonNullType(idField.type) || idField.type.toString() !== 'Int8!') {
+          throw new Error(`Timeseries entity ${t.name} must have an id field of type Int8!`)
+        }
+        // check if it has a timestamp field
+        const timestampField = t.getFields()['timestamp']
+        if (!timestampField || !isNonNullType(timestampField.type) || timestampField.type.toString() !== 'Timestamp!') {
+          throw new Error(`Timeseries entity ${t.name} must have a timestamp field of type Timestamp!`)
+        }
+      }
       if (isEntity(t)) {
         const fields: Field[] = []
         const methods: Method[] = []
@@ -228,6 +241,7 @@ async function codegenInternal(schema: GraphQLSchema, source: string, target: st
         }
         classes.push({
           name: t.name,
+          timeseries: isTimeseries(t),
           fields,
           methods,
           annotations: [`@Entity("${t.name}")`],
@@ -367,6 +381,14 @@ function isEntity(t: GraphQLObjectType) {
   return t.astNode?.directives?.some((d) => d.name.value == 'entity')
 }
 
+function isTimeseries(t: GraphQLObjectType) {
+  return t.astNode?.directives?.some(
+    (d) =>
+      d.name.value == 'entity' &&
+      d.arguments?.some((a) => a.name.value == 'timeseries' && a.value.kind == 'BooleanValue' && a.value.value == true)
+  )
+}
+
 function isDerived(f: GraphQLField<any, any>) {
   return f.astNode?.directives?.some((d) => d.name.value == 'derivedFrom')
 }

package/src/store/schema.ts

@@ -6,7 +6,7 @@ const customScalars = ['BigInt', 'BigDecimal', 'Timestamp', 'JSON', 'Bytes', 'ID
 
 const baseSchema = buildASTSchema(
   parse(`
-    directive @entity(immutable: Boolean! = false, sparse: Boolean! = false) on OBJECT
+    directive @entity(immutable: Boolean! = false, sparse: Boolean! = false, timeseries: Boolean! = false) on OBJECT
     directive @query on INTERFACE
     directive @derivedFrom(field: String!) on FIELD_DEFINITION
     directive @unique on FIELD_DEFINITION
@@ -16,6 +16,8 @@ const baseSchema = buildASTSchema(
     directive @byteWeight(value: Float!) on FIELD_DEFINITION
     directive @variant on OBJECT # legacy
     directive @jsonField on OBJECT # legacy
+    directive @aggregation(intervals: [String!]! = ["hour"], source: String!) on OBJECT
+    directive @aggregate(fn: String!, arg: String, cumulative: Boolean = false) on FIELD_DEFINITION
     ${customScalars.map((name) => 'scalar ' + name).join('\n')}
 `)
 )

package/src/store/types.ts

@@ -14,7 +14,7 @@ export type Bytes = Uint8Array
 export type BigInt = bigint
 
 export abstract class AbstractEntity {
-  abstract id: ID
+  abstract id: ID | Int8
   private readonly _data: RichStruct
 
   toJSON() {

package/src/sui/abis/0x1.json

@@ -690,6 +690,14 @@
       }
     }
   },
+  "bool": {
+    "fileFormatVersion": 6,
+    "address": "0x1",
+    "name": "bool",
+    "friends": [],
+    "structs": {},
+    "exposedFunctions": {}
+  },
   "debug": {
     "fileFormatVersion": 6,
     "address": "0x1",