@sentio/sdk 2.13.0-rc.8 → 2.13.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sentio/sdk",
   "license": "Apache-2.0",
-  "version": "2.13.0-rc.8",
+  "version": "2.13.0",
   "type": "module",
   "scripts": {
     "compile": "tsc && cp src/utils/*.csv lib/utils && cp src/tsup.config.ts lib",
@@ -23,8 +23,8 @@
     "@project-serum/anchor": "^0.26.0",
     "@sentio/bigdecimal": "^9.1.1-patch.3",
     "@sentio/ethers-v6": "^1.0.28",
-    "@sentio/protos": "^2.13.0-rc.8",
-    "@sentio/runtime": "^2.13.0-rc.8",
+    "@sentio/protos": "^2.13.0",
+    "@sentio/runtime": "^2.13.0",
     "@solana/web3.js": "^1.74.0",
     "@types/prettier": "^2.7.2",
     "aptos-sdk": "npm:aptos@^1.8.3",
@@ -88,5 +88,5 @@
   "engines": {
     "node": ">=16"
   },
-  "gitHead": "5d6eeb8de67db465909669b26fa97bdd3f68a336"
+  "gitHead": "73d75748a375e4c2bea7badc9db1c973db91d175"
 }

package/src/aptos/aptos-plugin.ts

@@ -20,6 +20,7 @@ import { ServerError, Status } from 'nice-grpc'
 import { AptosAccountProcessorState, AptosProcessorState } from './aptos-processor.js'
 
 import { initCoinList } from './ext/coin.js'
+import { validateAndNormalizeAddress } from './utils.js'
 
 export class AptosPlugin extends Plugin {
   name: string = 'AptosPlugin'
@@ -39,7 +40,7 @@ export class AptosPlugin extends Plugin {
         contract: {
           name: aptosProcessor.moduleName,
           chainId: aptosProcessor.getChainId(),
-          address: aptosProcessor.config.address,
+          address: validateAndNormalizeAddress(aptosProcessor.config.address),
           abi: '',
         },
         startBlock: aptosProcessor.config.startVersion,
@@ -82,7 +83,7 @@ export class AptosPlugin extends Plugin {
 
     for (const aptosProcessor of AptosAccountProcessorState.INSTANCE.getValues()) {
       const accountConfig = AccountConfig.fromPartial({
-        address: aptosProcessor.config.address,
+        address: validateAndNormalizeAddress(aptosProcessor.config.address),
         chainId: aptosProcessor.getChainId(),
         startBlock: aptosProcessor.config.startVersion,
       })
@@ -96,6 +97,7 @@ export class AptosPlugin extends Plugin {
             minutesInterval: handler.timeIntervalInMinutes,
             slot: 0,
             slotInterval: handler.versionInterval,
+            fetchConfig: undefined,
           },
           type: handler.type || '',
         })
@@ -107,6 +109,7 @@ export class AptosPlugin extends Plugin {
             minutesInterval: handler.timeIntervalInMinutes,
             slot: 0,
             slotInterval: handler.versionInterval,
+            fetchConfig: undefined,
           },
           type: handler.type || '',
           ownerType: MoveOnIntervalConfig_OwnerType.ADDRESS,

package/src/aptos/ext/aptos-dex.ts

@@ -2,12 +2,13 @@ import { Gauge } from '@sentio/sdk'
 import { BigDecimal } from '@sentio/bigdecimal'
 import { calculateValueInUsd, getCoinInfo, whitelistCoins, whiteListed } from './coin.js'
 import { AptosResourcesContext, TypedMoveResource, MoveResource, AptosContext } from '@sentio/sdk/aptos'
+import { TypeDescriptor } from '../../move/index.js'
 
 export interface PoolAdaptor<T> {
   getXReserve(pool: T): bigint
   getYReserve(pool: T): bigint
   getExtraPoolTags(pool: TypedMoveResource<T>): any
-  poolTypeName: string
+  poolType: TypeDescriptor<T>
 }
 
 export class AptosDex<T> {
@@ -98,10 +99,7 @@ export class AptosDex<T> {
     ctx: AptosResourcesContext,
     poolsHandler?: (pools: TypedMoveResource<T>[]) => Promise<void> | void
   ) {
-    const pools: TypedMoveResource<T>[] = await ctx.coder.filterAndDecodeResources(
-      this.poolAdaptor.poolTypeName,
-      resources
-    )
+    const pools = await ctx.coder.filterAndDecodeResources(this.poolAdaptor.poolType, resources)
 
     const volumeByCoin = new Map<string, BigDecimal>()
     const timestamp = ctx.timestampInMicros

package/src/aptos/index.ts

@@ -10,3 +10,5 @@ export { ModuleClient } from './module-client.js'
 export { AptosPlugin } from './aptos-plugin.js'
 
 export { BUILTIN_TYPES } from '../move/types.js'
+
+export * from './utils.js'

package/src/aptos/utils.ts

@@ -0,0 +1,14 @@
+import { HexString, TxnBuilderTypes } from 'aptos-sdk'
+import { isFrameworkAccount } from '../move/index.js'
+
+export function isValidAptosAddress(value: string): boolean {
+  return TxnBuilderTypes.AccountAddress.isValid(value)
+}
+
+export function validateAndNormalizeAddress(address: string): string {
+  const hex = TxnBuilderTypes.AccountAddress.fromHex(address).toHexString()
+  if (isFrameworkAccount(address)) {
+    return HexString.ensure(hex).toShortString()
+  }
+  return hex.toString()
+}

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

@@ -30,6 +30,7 @@ export abstract class BaseProcessorTemplate<
     handler: (block: BlockParams, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid
     blockInterval?: HandleInterval
     timeIntervalInMinutes?: HandleInterval
+    fetchConfig?: EthFetchConfig
   }[] = []
   traceHandlers: {
     signature: string
@@ -64,7 +65,7 @@ export abstract class BaseProcessorTemplate<
       processor.onTrace(th.signature, th.handler, th.fetchConfig)
     }
     for (const bh of this.blockHandlers) {
-      processor.onInterval(bh.handler, bh.timeIntervalInMinutes, bh.blockInterval)
+      processor.onInterval(bh.handler, bh.timeIntervalInMinutes, bh.blockInterval, bh.fetchConfig)
     }
 
     const instance: TemplateInstance = {
@@ -103,32 +104,41 @@ export abstract class BaseProcessorTemplate<
   public onBlockInterval(
     handler: (block: BlockParams, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,
     blockInterval = 1000,
-    backfillBlockInterval = 4000
+    backfillBlockInterval = 4000,
+    fetchConfig?: EthFetchConfig
   ) {
-    return this.onInterval(handler, undefined, {
-      recentInterval: blockInterval,
-      backfillInterval: backfillBlockInterval,
-    })
+    return this.onInterval(
+      handler,
+      undefined,
+      {
+        recentInterval: blockInterval,
+        backfillInterval: backfillBlockInterval,
+      },
+      fetchConfig
+    )
   }
 
   public onTimeInterval(
     handler: (block: BlockParams, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,
     timeIntervalInMinutes = 60,
-    backfillBlockInterval = 240
+    backfillBlockInterval = 240,
+    fetchConfig?: EthFetchConfig
   ) {
     return this.onInterval(
       handler,
       { recentInterval: timeIntervalInMinutes, backfillInterval: backfillBlockInterval },
-      undefined
+      undefined,
+      fetchConfig
     )
   }
 
   public onInterval(
     handler: (block: BlockParams, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,
     timeInterval: HandleInterval | undefined,
-    blockInterval: HandleInterval | undefined
+    blockInterval: HandleInterval | undefined,
+    fetchConfig: EthFetchConfig | undefined
   ) {
-    this.blockHandlers.push({ handler, timeIntervalInMinutes: timeInterval, blockInterval: blockInterval })
+    this.blockHandlers.push({ handler, timeIntervalInMinutes: timeInterval, blockInterval, fetchConfig })
     return this
   }
 

package/src/eth/base-processor.ts

@@ -41,6 +41,7 @@ export class BlockHandler {
   blockInterval?: HandleInterval
   timeIntervalInMinutes?: HandleInterval
   handler: (block: Data_EthBlock) => Promise<ProcessResult>
+  fetchConfig: EthFetchConfig
 }
 
 export class TransactionHandler {
@@ -89,23 +90,31 @@ export class GlobalProcessor {
   public onBlockInterval(
     handler: (block: RichBlock, ctx: GlobalContext) => PromiseOrVoid,
     blockInterval = 250,
-    backfillBlockInterval = 1000
+    backfillBlockInterval = 1000,
+    fetchConfig?: Partial<EthFetchConfig>
   ): this {
-    return this.onInterval(handler, undefined, {
-      recentInterval: blockInterval,
-      backfillInterval: backfillBlockInterval,
-    })
+    return this.onInterval(
+      handler,
+      undefined,
+      {
+        recentInterval: blockInterval,
+        backfillInterval: backfillBlockInterval,
+      },
+      fetchConfig
+    )
   }
 
   public onTimeInterval(
     handler: (block: RichBlock, ctx: GlobalContext) => PromiseOrVoid,
     timeIntervalInMinutes = 60,
-    backfillTimeIntervalInMinutes = 240
+    backfillTimeIntervalInMinutes = 240,
+    fetchConfig?: Partial<EthFetchConfig>
   ): this {
     return this.onInterval(
       handler,
       { recentInterval: timeIntervalInMinutes, backfillInterval: backfillTimeIntervalInMinutes },
-      undefined
+      undefined,
+      fetchConfig
     )
   }
 
@@ -116,7 +125,8 @@ export class GlobalProcessor {
   public onInterval(
     handler: (block: RichBlock, ctx: GlobalContext) => PromiseOrVoid,
     timeInterval: HandleInterval | undefined,
-    blockInterval: HandleInterval | undefined
+    blockInterval: HandleInterval | undefined,
+    fetchConfig: Partial<EthFetchConfig> | undefined
   ): this {
     const chainId = this.getChainId()
 
@@ -134,6 +144,7 @@ export class GlobalProcessor {
       },
       timeIntervalInMinutes: timeInterval,
       blockInterval: blockInterval,
+      fetchConfig: EthFetchConfig.fromPartial(fetchConfig || {}),
     })
     return this
   }
@@ -246,30 +257,39 @@ export abstract class BaseProcessor<
   public onBlockInterval(
     handler: (block: RichBlock, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,
     blockInterval = 250,
-    backfillBlockInterval = 1000
+    backfillBlockInterval = 1000,
+    fetchConfig?: Partial<EthFetchConfig>
   ): this {
-    return this.onInterval(handler, undefined, {
-      recentInterval: blockInterval,
-      backfillInterval: backfillBlockInterval,
-    })
+    return this.onInterval(
+      handler,
+      undefined,
+      {
+        recentInterval: blockInterval,
+        backfillInterval: backfillBlockInterval,
+      },
+      fetchConfig
+    )
   }
 
   public onTimeInterval(
     handler: (block: RichBlock, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,
     timeIntervalInMinutes = 60,
-    backfillTimeIntervalInMinutes = 240
+    backfillTimeIntervalInMinutes = 240,
+    fetchConfig?: Partial<EthFetchConfig>
   ): this {
     return this.onInterval(
       handler,
       { recentInterval: timeIntervalInMinutes, backfillInterval: backfillTimeIntervalInMinutes },
-      undefined
+      undefined,
+      fetchConfig
     )
   }
 
   public onInterval(
     handler: (block: RichBlock, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,
     timeInterval: HandleInterval | undefined,
-    blockInterval: HandleInterval | undefined
+    blockInterval: HandleInterval | undefined,
+    fetchConfig: Partial<EthFetchConfig> | undefined
   ): this {
     const chainId = this.getChainId()
     const processor = this
@@ -299,6 +319,7 @@ export abstract class BaseProcessor<
       },
       timeIntervalInMinutes: timeInterval,
       blockInterval: blockInterval,
+      fetchConfig: EthFetchConfig.fromPartial(fetchConfig || {}),
     })
     return this
   }

package/src/eth/eth-plugin.ts

@@ -20,6 +20,7 @@ import { ProcessorState } from './binds.js'
 import { AccountProcessorState } from './account-processor-state.js'
 import { ProcessorTemplateProcessorState, TemplateInstanceState } from './base-processor-template.js'
 import { GlobalProcessorState } from './base-processor.js'
+import { validateAndNormalizeAddress } from './eth.js'
 
 export class EthPlugin extends Plugin {
   name: string = 'EthPlugin'
@@ -44,7 +45,7 @@ export class EthPlugin extends Plugin {
         contract: {
           name: processor.config.name,
           chainId: chainId.toString(),
-          address: processor.config.address,
+          address: validateAndNormalizeAddress(processor.config.address),
           abi: '',
         },
         startBlock: processor.config.startBlock,
@@ -62,6 +63,7 @@ export class EthPlugin extends Plugin {
           minutes: 0,
           minutesInterval: blockHandler.timeIntervalInMinutes,
           handlerId: handlerId,
+          fetchConfig: blockHandler.fetchConfig,
         })
       }
 
@@ -95,7 +97,7 @@ export class EthPlugin extends Plugin {
           // }
           const logFilter: LogFilter = {
             addressType: undefined,
-            address: contractConfig.contract?.address,
+            address: contractConfig.contract?.address && validateAndNormalizeAddress(contractConfig.contract.address),
             topics: [],
           }
 
@@ -125,7 +127,7 @@ export class EthPlugin extends Plugin {
         contract: {
           name: processor.config.name,
           chainId: chainId.toString(),
-          address: processor.config.address,
+          address: processor.config.address, // can only be *
           abi: '',
         },
         startBlock: processor.config.startBlock,
@@ -140,6 +142,7 @@ export class EthPlugin extends Plugin {
           minutes: 0,
           minutesInterval: blockHandler.timeIntervalInMinutes,
           handlerId: handlerId,
+          fetchConfig: blockHandler.fetchConfig,
         })
       }
 
@@ -156,7 +159,7 @@ export class EthPlugin extends Plugin {
     // part 1.b prepare EVM account processors
     for (const processor of AccountProcessorState.INSTANCE.getValues()) {
       const accountConfig = AccountConfig.fromPartial({
-        address: processor.config.address,
+        address: validateAndNormalizeAddress(processor.config.address),
         chainId: processor.getChainId().toString(),
         startBlock: processor.config.startBlock ? BigInt(processor.config.startBlock) : 0n,
       })
@@ -181,7 +184,7 @@ export class EthPlugin extends Plugin {
           }
           const logFilter: LogFilter = {
             addressType: filter.addressType,
-            address,
+            address: address && validateAndNormalizeAddress(address),
             topics: [],
           }
 
@@ -232,7 +235,7 @@ export class EthPlugin extends Plugin {
       }
       template.bind({
         name: instance.contract.name,
-        address: instance.contract.address,
+        address: validateAndNormalizeAddress(instance.contract.address),
         network: Number(instance.contract.chainId),
         startBlock: instance.startBlock,
         endBlock: instance.endBlock,

package/src/eth/eth.ts

@@ -241,3 +241,19 @@ export interface TraceResult {
 //       "transactionPosition": 22,
 //       "type": "create"
 //     }
+
+export function isNullAddress(address: string) {
+  try {
+    // Normalize the input address
+    const normalizedAddress = getAddress(address)
+    // Check if the normalized address is equal to the null address (all zeros)
+    return normalizedAddress === '0x0000000000000000000000000000000000000000'
+  } catch (error) {
+    return false
+  }
+}
+
+export function validateAndNormalizeAddress(address: string): string {
+  const normalizedAddress = getAddress(address)
+  return normalizedAddress.toLowerCase()
+}

package/src/move/types.ts

@@ -178,10 +178,17 @@ function adjustType(type: TypeDescriptor) {
 
 export const ANY_TYPE = new TypeDescriptor<any>('any')
 
+export function vectorType<T>(t: TypeDescriptor<T> = ANY_TYPE): TypeDescriptor<T[]> {
+  return BUILTIN_TYPES.VECTOR_TYPE_ANY.apply(t)
+}
+
 export const BUILTIN_TYPES = {
   ADDRESS_TYPE: new TypeDescriptor<string>('address'),
   // export const Address = new TypeDescriptor<string>("Address")
 
+  VECTOR_TYPE_ANY: new TypeDescriptor<any[]>('vector'),
+  VECTOR_TYPE: vectorType,
+
   BOOL_TYPE: new TypeDescriptor<number>('bool'),
 
   U8_TYPE: new TypeDescriptor<number>('u8'),
@@ -198,7 +205,14 @@ export const BUILTIN_TYPES = {
   // export const U256 = new TypeDescriptor<number>("U256")
 }
 
-const BUILTIN_TYPES_SET = new Set(Object.values(BUILTIN_TYPES).map((t) => t.qname.toLowerCase()))
+const BUILTIN_TYPES_SET = new Set(
+  Object.values(BUILTIN_TYPES).flatMap((t) => {
+    if (typeof t === 'object') {
+      return [t.qname.toLowerCase()]
+    }
+    return []
+  })
+)
 
 /**
  *

package/src/move/utils.ts

@@ -1,11 +1,16 @@
 import { InternalMoveModule, InternalMoveStruct } from './internal-models.js'
+import { parseInt } from 'lodash-es'
 
 export const SPLITTER = '::'
 
 export const VECTOR_STR = 'vector'
 
 export function isFrameworkAccount(account: string) {
-  return account === '0x1' || account === '0x2' || account === '0x3'
+  const n = parseInt(account, 16)
+  if (Number.isNaN(n)) {
+    return false
+  }
+  return n >= 0 && n < 16
 }
 
 const KEYWORDS = new Set(['package', 'namespace', 'volatile', 'object', 'string', 'number', 'bigint', 'any'])

package/src/sui/sui-plugin.ts

@@ -17,6 +17,7 @@ import { ServerError, Status } from 'nice-grpc'
 
 import { SuiAccountProcessorState, SuiProcessorState } from './sui-processor.js'
 import { getChainId } from './network.js'
+import { validateAndNormalizeAddress } from './utils.js'
 
 export class SuiPlugin extends Plugin {
   name: string = 'SuiPlugin'
@@ -33,7 +34,7 @@ export class SuiPlugin extends Plugin {
         contract: {
           name: suiProcessor.moduleName,
           chainId: getChainId(suiProcessor.config.network),
-          address: suiProcessor.config.address,
+          address: validateAndNormalizeAddress(suiProcessor.config.address),
           abi: '',
         },
         startBlock: BigInt(suiProcessor.config.startTimestamp),
@@ -73,7 +74,7 @@ export class SuiPlugin extends Plugin {
 
     for (const processor of SuiAccountProcessorState.INSTANCE.getValues()) {
       const accountConfig = AccountConfig.fromPartial({
-        address: processor.config.address,
+        address: validateAndNormalizeAddress(processor.config.address),
         chainId: processor.getChainId(),
         startBlock: BigInt(processor.config.startTimestamp), // TODO maybe use another field
       })
@@ -86,6 +87,7 @@ export class SuiPlugin extends Plugin {
             minutesInterval: handler.timeIntervalInMinutes,
             slot: 0,
             slotInterval: handler.versionInterval,
+            fetchConfig: undefined,
           },
           type: handler.type || '',
           ownerType: processor.ownerType,

package/src/sui/utils.ts

@@ -5,7 +5,12 @@ import {
   getProgrammableTransaction,
   ProgrammableTransaction,
   SuiTransaction,
+  normalizeSuiAddress,
+  SUI_ADDRESS_LENGTH,
+  SuiAddress,
 } from '@mysten/sui.js'
+import { isFrameworkAccount } from '../move/index.js'
+import { parseInt } from 'lodash-es'
 
 export function getMoveCalls(txBlock: SuiTransactionBlockResponse) {
   const txKind = getTransactionKind(txBlock)
@@ -32,3 +37,26 @@ export function getMoveCalls(txBlock: SuiTransactionBlockResponse) {
     return []
   })
 }
+
+function isHex(value: string): boolean {
+  return /^(0x|0X)?[a-fA-F0-9]+$/.test(value)
+}
+
+function getHexByteLength(value: string): number {
+  return /^(0x|0X)/.test(value) ? (value.length - 2) / 2 : value.length / 2
+}
+
+export function isValidSuiAddress(value: string): value is SuiAddress {
+  return isHex(value) && getHexByteLength(value) <= SUI_ADDRESS_LENGTH
+}
+
+export function validateAndNormalizeAddress(address: string): string {
+  if (isFrameworkAccount(address)) {
+    const n = parseInt(address, 16)
+    return `0x${n.toString(16)}`
+  }
+  if (!isValidSuiAddress(address)) {
+    throw Error('Not valid Address')
+  }
+  return normalizeSuiAddress(address, true)
+}