@sentio/sdk 2.40.0-rc.4 → 2.40.0-rc.41

package/src/aptos/aptos-processor.ts

@@ -1,4 +1,4 @@
-import { defaultMoveCoder, MoveCoder } from '@sentio/sdk/aptos'
+import { defaultMoveCoder, MoveCoder } from './index.js'
 
 import { Event, MoveResource, UserTransactionResponse, EntryFunctionPayloadResponse } from '@aptos-labs/ts-sdk'
 

package/src/aptos/context.ts

@@ -1,6 +1,6 @@
 import { RecordMetaData } from '@sentio/protos'
-import { type Labels, normalizeLabels } from '@sentio/sdk'
-import { MoveCoder } from '@sentio/sdk/aptos'
+import { type Labels, normalizeLabels } from '../index.js'
+import { MoveCoder } from './index.js'
 import {
   Aptos,
   Event,

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

@@ -1,6 +1,6 @@
 import { BigDecimal } from '@sentio/bigdecimal'
 import { calculateValueInUsd, getCoinInfo, whitelistCoins, whiteListed } from './coin.js'
-import { AptosResourcesContext, AptosContext, AptosNetwork } from '@sentio/sdk/aptos'
+import { AptosResourcesContext, AptosContext, AptosNetwork } from '../index.js'
 import { MoveCoinList, MoveDex, moveGetPairValue, MovePoolAdaptor, SimpleCoinInfo } from '../../move/ext/index.js'
 import { MoveResource, Event, MoveModuleBytecode } from '@aptos-labs/ts-sdk'
 

package/src/aptos/ext/coin-event.ts

@@ -1,5 +1,5 @@
 import { Event, UserTransactionResponse, WriteSetChangeWriteResource } from '@aptos-labs/ts-sdk'
-import { coin } from '@sentio/sdk/aptos/builtin/0x1'
+import { coin } from '../builtin/0x1.js'
 import { parseMoveType } from '../../move/index.js'
 
 export function findNewCoinBalances(evt: Event, tx: UserTransactionResponse, coin: string): coin.Coin<any> | undefined {

package/src/aptos/ext/coin.ts

@@ -1,9 +1,9 @@
-import { getPriceByType } from '@sentio/sdk/utils'
+import { getPriceByType } from '../../utils/index.js'
 import fetch from 'node-fetch'
 import { accountTypeString, parseMoveType, SPLITTER } from '@typemove/move'
 import { SimpleCoinInfo } from '../../move/ext/move-dex.js'
 import { AptosNetwork, getClient } from '../network.js'
-import { coin } from '@sentio/sdk/aptos/builtin/0x1'
+import { coin } from '../builtin/0x1.js'
 import { MoveStructId } from '@aptos-labs/ts-sdk'
 import { AptosChainId } from '@sentio/chain'
 

package/src/aptos/move-coder.ts

@@ -1,12 +1,14 @@
 import { AptosNetwork, getClient } from './network.js'
 import { MoveCoder } from '@typemove/aptos'
 
-const MOVE_CODER = new MoveCoder(getClient(AptosNetwork.MAIN_NET))
-const TESTNET_MOVE_CODER = new MoveCoder(getClient(AptosNetwork.TEST_NET))
+const CODERS = new Map<AptosNetwork, MoveCoder>()
 
 export function defaultMoveCoder(network: AptosNetwork = AptosNetwork.MAIN_NET): MoveCoder {
-  if (network == AptosNetwork.MAIN_NET) {
-    return MOVE_CODER
+  let coder = CODERS.get(network)
+  if (!coder) {
+    coder = new MoveCoder(getClient(network))
+    CODERS.set(network, coder)
   }
-  return TESTNET_MOVE_CODER
+
+  return coder
 }

package/src/aptos/network.ts

@@ -7,7 +7,9 @@ export type AptosNetwork = AptosChainId
 export const AptosNetwork = <const>{
   MAIN_NET: AptosChainId.APTOS_MAINNET,
   TEST_NET: AptosChainId.APTOS_TESTNET,
-  DEV_NET: AptosChainId.APTOS_DEVNET
+  DEV_NET: AptosChainId.APTOS_DEVNET,
+  M1_TEST_NET: AptosChainId.M1_TESTNET,
+  M1_MAIN_NET: AptosChainId.M1_MAINNET
 }
 
 export class AptosBindOptions {
@@ -22,6 +24,10 @@ export function getRpcEndpoint(network: AptosNetwork): string {
   switch (network) {
     case AptosNetwork.TEST_NET:
       return 'https://testnet.aptoslabs.com/v1'
+    case AptosNetwork.M1_TEST_NET:
+      return 'https://testnet.m1.movementlabs.xyz/v1'
+    case AptosNetwork.M1_MAIN_NET:
+      return 'https://mainnet.m1.movementlabs.xyz/v1'
   }
   return 'https://mainnet.aptoslabs.com/v1'
 }

package/src/bundle.config.ts

@@ -0,0 +1,23 @@
+import { defineConfig } from 'tsup'
+import packageJson from '../package.json'
+import { external } from './tsup.config.js'
+
+const entry = Object.values(packageJson.exports).map((p) => p.replace('lib', 'src').replace('.js', '.ts'))
+
+export default defineConfig({
+  esbuildOptions: (options) => {
+    options.banner = {
+      js: `import { createRequire as createRequireSdkShim } from 'module'; const require = createRequireSdkShim(import.meta.url);`
+    }
+  },
+  entry,
+  outDir: 'lib',
+  minify: true,
+  sourcemap: true,
+  clean: true,
+  // https://github.com/egoist/tsup/issues/920, use `tsc --emitDeclarationOnly --declaration` as a workaround
+  // dts: true,
+  format: 'esm',
+  // keepNames: true,
+  external
+})

package/src/eth/account-processor.ts

@@ -51,7 +51,8 @@ export class AccountProcessor {
     fetchConfig?: Partial<EthFetchConfig>,
     preprocessHandler: (
       event: ERC20TransferEvent,
-      ctx: AccountContext
+      ctx: AccountContext,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult> = defaultPreprocessHandler
   ) {
     return this.onERC20(
@@ -76,7 +77,8 @@ export class AccountProcessor {
     fetchConfig?: Partial<EthFetchConfig>,
     preprocessHandler: (
       event: ERC20TransferEvent,
-      ctx: AccountContext
+      ctx: AccountContext,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult> = defaultPreprocessHandler
   ) {
     return this.onERC20(
@@ -101,7 +103,8 @@ export class AccountProcessor {
     fetchConfig?: Partial<EthFetchConfig>,
     preprocessHandler: (
       event: ERC20TransferEvent,
-      ctx: AccountContext
+      ctx: AccountContext,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult> = defaultPreprocessHandler
   ) {
     return this.onERC20(
@@ -121,7 +124,8 @@ export class AccountProcessor {
     fetchConfig?: Partial<EthFetchConfig>,
     preprocessHandler: (
       event: ERC20TransferEvent,
-      ctx: AccountContext
+      ctx: AccountContext,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult> = defaultPreprocessHandler
   ) {
     return this.onERC(handler, tokensAddresses, defaultFilter, AddressType.ERC20, fetchConfig, preprocessHandler)
@@ -140,7 +144,8 @@ export class AccountProcessor {
     fetchConfig?: Partial<EthFetchConfig>,
     preprocessHandler: (
       event: ERC721TransferEvent,
-      ctx: AccountContext
+      ctx: AccountContext,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult> = defaultPreprocessHandler
   ) {
     return this.onERC721(
@@ -165,7 +170,8 @@ export class AccountProcessor {
     fetchConfig?: Partial<EthFetchConfig>,
     preprocessHandler: (
       event: ERC721TransferEvent,
-      ctx: AccountContext
+      ctx: AccountContext,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult> = defaultPreprocessHandler
   ) {
     return this.onERC721(
@@ -190,7 +196,8 @@ export class AccountProcessor {
     fetchConfig?: Partial<EthFetchConfig>,
     preprocessHandler: (
       event: ERC721TransferEvent,
-      ctx: AccountContext
+      ctx: AccountContext,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult> = defaultPreprocessHandler
   ) {
     return this.onERC721(
@@ -210,7 +217,8 @@ export class AccountProcessor {
     fetchConfig?: Partial<EthFetchConfig>,
     preprocessHandler: (
       event: ERC721TransferEvent,
-      ctx: AccountContext
+      ctx: AccountContext,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult> = defaultPreprocessHandler
   ) {
     return this.onERC(handler, collections, defaultFilter, AddressType.ERC721, fetchConfig, preprocessHandler)
@@ -222,7 +230,11 @@ export class AccountProcessor {
     defaultFilter: (address: string) => AddressOrTypeEventFilter,
     addressType: AddressType,
     fetchConfig?: Partial<EthFetchConfig>,
-    preprocessHandler: (event: any, ctx: AccountContext) => Promise<PreprocessResult> = defaultPreprocessHandler
+    preprocessHandler: (
+      event: any,
+      ctx: AccountContext,
+      preprocessStore: { [k: string]: any }
+    ) => Promise<PreprocessResult> = defaultPreprocessHandler
   ) {
     const filters = []
     for (const token of contractAddresses) {
@@ -243,7 +255,11 @@ export class AccountProcessor {
     handler: (event: TypedEvent, ctx: AccountContext) => PromiseOrVoid,
     filter: AddressOrTypeEventFilter | AddressOrTypeEventFilter[],
     fetchConfig?: Partial<EthFetchConfig>,
-    preprocessHandler: (event: TypedEvent, ctx: AccountContext) => Promise<PreprocessResult> = defaultPreprocessHandler
+    preprocessHandler: (
+      event: TypedEvent,
+      ctx: AccountContext,
+      preprocessStore: { [k: string]: any }
+    ) => Promise<PreprocessResult> = defaultPreprocessHandler
   ) {
     const chainId = this.getChainId()
 
@@ -302,7 +318,7 @@ export class AccountProcessor {
         }
         return ProcessResult.fromPartial({})
       },
-      preprocessHandler: async function (data) {
+      preprocessHandler: async function (data, preprocessStore: { [k: string]: any }) {
         const { log, block, transaction, transactionReceipt } = formatEthData(data)
         if (!log) {
           throw new ServerError(Status.INVALID_ARGUMENT, 'Log is empty')
@@ -323,7 +339,7 @@ export class AccountProcessor {
         const parsed = ERC20_INTERFACE.parseLog(logParam)
         if (parsed) {
           const event: TypedEvent = { ...log, name: parsed.name, args: fixEmptyKey(parsed) }
-          return preprocessHandler(event, ctx)
+          return preprocessHandler(event, ctx, preprocessStore)
         }
         return PreprocessResult.fromPartial({})
       }

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

@@ -26,7 +26,8 @@ export abstract class BaseProcessorTemplate<
     handler: (block: BlockParams, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid
     preprocessHandler: (
       block: BlockParams,
-      ctx: ContractContext<TContract, TBoundContractView>
+      ctx: ContractContext<TContract, TBoundContractView>,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult>
     blockInterval?: HandleInterval
     timeIntervalInMinutes?: HandleInterval
@@ -37,7 +38,8 @@ export abstract class BaseProcessorTemplate<
     handler: (trace: TypedCallTrace, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid
     preprocessHandler: (
       trace: TypedCallTrace,
-      ctx: ContractContext<TContract, TBoundContractView>
+      ctx: ContractContext<TContract, TBoundContractView>,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult>
     fetchConfig?: EthFetchConfig
   }[] = []
@@ -45,7 +47,8 @@ export abstract class BaseProcessorTemplate<
     handler: (event: TypedEvent, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid
     preprocessHandler: (
       event: TypedEvent,
-      ctx: ContractContext<TContract, TBoundContractView>
+      ctx: ContractContext<TContract, TBoundContractView>,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult>
     filter: DeferredTopicFilter | DeferredTopicFilter[]
     fetchConfig?: EthFetchConfig
@@ -112,7 +115,8 @@ export abstract class BaseProcessorTemplate<
     fetchConfig?: Partial<EthFetchConfig>,
     preprocessHandler: (
       event: TypedEvent,
-      ctx: ContractContext<TContract, TBoundContractView>
+      ctx: ContractContext<TContract, TBoundContractView>,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult> = defaultPreprocessHandler
   ) {
     this.eventHandlers.push({
@@ -131,7 +135,8 @@ export abstract class BaseProcessorTemplate<
     fetchConfig?: EthFetchConfig,
     preprocessHandler: (
       block: BlockParams,
-      ctx: ContractContext<TContract, TBoundContractView>
+      ctx: ContractContext<TContract, TBoundContractView>,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult> = defaultPreprocessHandler
   ) {
     return this.onInterval(
@@ -153,7 +158,8 @@ export abstract class BaseProcessorTemplate<
     fetchConfig?: EthFetchConfig,
     preprocessHandler: (
       block: BlockParams,
-      ctx: ContractContext<TContract, TBoundContractView>
+      ctx: ContractContext<TContract, TBoundContractView>,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult> = defaultPreprocessHandler
   ) {
     return this.onInterval(
@@ -172,7 +178,8 @@ export abstract class BaseProcessorTemplate<
     fetchConfig: EthFetchConfig | undefined,
     preprocessHandler: (
       block: BlockParams,
-      ctx: ContractContext<TContract, TBoundContractView>
+      ctx: ContractContext<TContract, TBoundContractView>,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult> = defaultPreprocessHandler
   ) {
     this.blockHandlers.push({
@@ -191,7 +198,8 @@ export abstract class BaseProcessorTemplate<
     fetchConfig?: Partial<EthFetchConfig>,
     preprocessHandler: (
       trace: TypedCallTrace,
-      ctx: ContractContext<TContract, TBoundContractView>
+      ctx: ContractContext<TContract, TBoundContractView>,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult> = defaultPreprocessHandler
   ) {
     this.traceHandlers.push({

package/src/eth/base-processor.ts

@@ -31,14 +31,14 @@ export const defaultPreprocessHandler = () => (<PreprocessResult>{ ethCallParams
 export class EventsHandler {
   filters: AddressOrTypeEventFilter[]
   handler: (event: Data_EthLog) => Promise<ProcessResult>
-  preprocessHandler?: (event: Data_EthLog) => Promise<PreprocessResult>
+  preprocessHandler?: (event: Data_EthLog, preprocessStore: { [k: string]: any }) => Promise<PreprocessResult>
   fetchConfig: EthFetchConfig
 }
 
 export class TraceHandler {
   signatures: string[]
   handler: (trace: Data_EthTrace) => Promise<ProcessResult>
-  preprocessHandler?: (event: Data_EthTrace) => Promise<PreprocessResult>
+  preprocessHandler?: (event: Data_EthTrace, preprocessStore: { [k: string]: any }) => Promise<PreprocessResult>
   fetchConfig: EthFetchConfig
 }
 
@@ -46,13 +46,13 @@ export class BlockHandler {
   blockInterval?: HandleInterval
   timeIntervalInMinutes?: HandleInterval
   handler: (block: Data_EthBlock) => Promise<ProcessResult>
-  preprocessHandler?: (event: Data_EthBlock) => Promise<PreprocessResult>
+  preprocessHandler?: (event: Data_EthBlock, preprocessStore: { [k: string]: any }) => Promise<PreprocessResult>
   fetchConfig: EthFetchConfig
 }
 
 export class TransactionHandler {
   handler: (block: Data_EthTransaction) => Promise<ProcessResult>
-  preprocessHandler?: (event: Data_EthTransaction) => Promise<PreprocessResult>
+  preprocessHandler?: (event: Data_EthTransaction, preprocessStore: { [k: string]: any }) => Promise<PreprocessResult>
   fetchConfig: EthFetchConfig
 }
 
@@ -314,7 +314,8 @@ export abstract class BaseProcessor<
     fetchConfig?: Partial<EthFetchConfig>,
     preprocessHandler: (
       event: TypedEvent,
-      ctx: ContractContext<TContract, TBoundContractView>
+      ctx: ContractContext<TContract, TBoundContractView>,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult> = defaultPreprocessHandler
   ): this {
     const chainId = this.getChainId()
@@ -382,7 +383,10 @@ export abstract class BaseProcessor<
         }
         return ProcessResult.fromPartial({})
       },
-      preprocessHandler: async function (data: Data_EthLog): Promise<PreprocessResult> {
+      preprocessHandler: async function (
+        data: Data_EthLog,
+        preprocessStore: { [k: string]: any }
+      ): Promise<PreprocessResult> {
         const { log, block, transaction, transactionReceipt } = formatEthData(data)
         if (!log) {
           throw new ServerError(Status.INVALID_ARGUMENT, 'Log is empty')
@@ -427,7 +431,7 @@ export abstract class BaseProcessor<
         }
         if (parsed) {
           const event: TypedEvent = { ...log, name: parsed.name, args: fixEmptyKey(parsed) }
-          return preprocessHandler(event, ctx)
+          return preprocessHandler(event, ctx, preprocessStore)
         }
         return PreprocessResult.fromPartial({})
       }
@@ -442,7 +446,8 @@ export abstract class BaseProcessor<
     fetchConfig?: Partial<EthFetchConfig>,
     preprocessHandler: (
       block: RichBlock,
-      ctx: ContractContext<TContract, TBoundContractView>
+      ctx: ContractContext<TContract, TBoundContractView>,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult> = defaultPreprocessHandler
   ): this {
     return this.onInterval(
@@ -464,7 +469,8 @@ export abstract class BaseProcessor<
     fetchConfig?: Partial<EthFetchConfig>,
     preprocessHandler: (
       block: RichBlock,
-      ctx: ContractContext<TContract, TBoundContractView>
+      ctx: ContractContext<TContract, TBoundContractView>,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult> = defaultPreprocessHandler
   ): this {
     return this.onInterval(
@@ -483,7 +489,8 @@ export abstract class BaseProcessor<
     fetchConfig: Partial<EthFetchConfig> | undefined,
     preprocessHandler: (
       block: RichBlock,
-      ctx: ContractContext<TContract, TBoundContractView>
+      ctx: ContractContext<TContract, TBoundContractView>,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult> = defaultPreprocessHandler
   ): this {
     const chainId = this.getChainId()
@@ -516,7 +523,7 @@ export abstract class BaseProcessor<
         await handler(block, ctx)
         return ctx.stopAndGetResult()
       },
-      preprocessHandler: async function (data: Data_EthBlock) {
+      preprocessHandler: async function (data: Data_EthBlock, preprocessStore: { [k: string]: any }) {
         const { block } = formatEthData(data)
 
         if (!block) {
@@ -537,7 +544,7 @@ export abstract class BaseProcessor<
           undefined,
           processor.config.baseLabels
         )
-        return preprocessHandler(block, ctx)
+        return preprocessHandler(block, ctx, preprocessStore)
       },
       timeIntervalInMinutes: timeInterval,
       blockInterval: blockInterval,
@@ -552,7 +559,8 @@ export abstract class BaseProcessor<
     fetchConfig?: Partial<EthFetchConfig>,
     preprocessHandler: (
       trace: TypedCallTrace,
-      ctx: ContractContext<TContract, TBoundContractView>
+      ctx: ContractContext<TContract, TBoundContractView>,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult> = defaultPreprocessHandler
   ): this {
     const chainId = this.getChainId()
@@ -610,7 +618,7 @@ export abstract class BaseProcessor<
         await handler(typedTrace, ctx)
         return ctx.stopAndGetResult()
       },
-      preprocessHandler: async function (data: Data_EthTrace) {
+      preprocessHandler: async function (data: Data_EthTrace, preprocessStore: { [k: string]: any }) {
         const contractView = processor.CreateBoundContractView()
         const contractInterface = contractView.rawContract.interface
         const { trace, block, transaction, transactionReceipt } = formatEthData(data)
@@ -651,7 +659,7 @@ export abstract class BaseProcessor<
           transactionReceipt,
           processor.config.baseLabels
         )
-        return preprocessHandler(typedTrace, ctx)
+        return preprocessHandler(typedTrace, ctx, preprocessStore)
       }
     })
     return this
@@ -662,7 +670,8 @@ export abstract class BaseProcessor<
     fetchConfig?: Partial<EthFetchConfig>,
     preprocessHandler: (
       trace: TypedCallTrace,
-      ctx: ContractContext<TContract, TBoundContractView>
+      ctx: ContractContext<TContract, TBoundContractView>,
+      preprocessStore: { [k: string]: any }
     ) => Promise<PreprocessResult> = defaultPreprocessHandler
   ): this {
     const tmpContract = this.CreateBoundContractView()