@sentio/sdk 1.36.0-rc.1 → 1.36.0-rc.3

package/src/aptos-codegen/codegen.ts

@@ -5,7 +5,7 @@ import { MoveFunction, MoveModule, MoveModuleBytecode, MoveStruct } from 'aptos-
 import { AccountModulesImportInfo, AccountRegister, generateType } from './typegen'
 import { getMeaningfulFunctionParams, isFrameworkAccount, moduleQname, SPLITTER } from '../aptos/utils'
 import chalk from 'chalk'
-import { AptosNetwork, getChainName, getRpcClient } from '../aptos/network'
+import { AptosNetwork, getAptosChainName, getRpcClient } from '../aptos/network'
 import { parseMoveType } from '../aptos/types'
 
 export function codeGenAptosProcessor(abisDir: string, outDir = 'src/types/aptos') {
@@ -65,7 +65,7 @@ export async function generateForNetwork(srcDir: string, outputDir: string, netw
 
   while (loader.pendingAccounts.size > 0) {
     for (const account of loader.pendingAccounts) {
-      console.log(`download dependent module for account ${account} at ${getChainName(network)}`)
+      console.log(`download dependent module for account ${account} at ${getAptosChainName(network)}`)
 
       try {
         const modules = await client.getAccountModules(account)

package/src/core/bind-options.ts

@@ -38,11 +38,6 @@ export class BindInternalOptions {
   endBlock?: Long
 }
 
-export class SolanaBindOptions extends BindOptions {
-  declare network?: string
-  processInnerInstruction?: boolean
-}
-
 export class AccountBindOptions {
   address: string
   network?: Networkish

package/src/core/context.ts

@@ -5,7 +5,7 @@ import { normalizeLabels } from './meter'
 import Long from 'long'
 import { Trace } from './trace'
 import { Labels } from './metadata'
-import { SOL_MAINMET_ID, SUI_DEVNET_ID } from '../utils/chain'
+import { CHAIN_IDS } from '../utils/chain'
 import { BaseContext } from './base-context'
 
 export abstract class EthContext extends BaseContext {
@@ -156,33 +156,6 @@ export class BoundContractView<TContract extends BaseContract, TContractView ext
   }
 }
 
-export class SolanaContext extends BaseContext {
-  address: string
-  programName: string
-  blockNumber: Long
-
-  constructor(programName: string, address: string, slot: Long) {
-    super()
-    this.programName = programName
-    this.address = address
-    this.blockNumber = slot
-  }
-
-  getMetaData(name: string, labels: Labels): RecordMetaData {
-    return {
-      address: this.address,
-      contractName: this.programName,
-      blockNumber: this.blockNumber,
-      transactionIndex: 0,
-      transactionHash: '', // TODO add
-      logIndex: 0,
-      chainId: SOL_MAINMET_ID, // TODO set in context
-      name: name,
-      labels: normalizeLabels(labels),
-    }
-  }
-}
-
 export class SuiContext extends BaseContext {
   address: string
   moduleName: string
@@ -202,7 +175,7 @@ export class SuiContext extends BaseContext {
       transactionIndex: 0,
       transactionHash: '', // TODO
       logIndex: 0,
-      chainId: SUI_DEVNET_ID, // TODO set in context
+      chainId: CHAIN_IDS.SUI_DEVNET, // TODO set in context
       name: name,
       labels: normalizeLabels(labels),
     }

package/src/core/index.ts

@@ -1,16 +1,18 @@
 export { BigDecimal } from './big-decimal'
-export { ContractContext, ContractView, BoundContractView, SolanaContext } from './context'
+export { ContractContext, ContractView, BoundContractView } from './context'
 export { CounterBinding, Meter, GaugeBinding, Counter, Gauge, MetricOptions } from './meter'
 export { EventTracker, AccountEventTracker } from './event-tracker'
 export { type Numberish, toBigInteger, toMetricValue } from './numberish'
 
-export { BindOptions, SolanaBindOptions } from './bind-options'
+export { BindOptions } from './bind-options'
 
 export { BaseProcessor } from './base-processor'
 export { GenericProcessor } from './generic-processor'
 export { BaseProcessorTemplate } from './base-processor-template'
-export { SolanaBaseProcessor } from './solana-processor'
 export { SuiBaseProcessor, SuiBindOptions } from './sui-processor'
-// export * from '../aptos'
+
+export { SolanaContext } from './solana-context'
+export { SolanaBindOptions } from './solana-options'
+export { SolanaBaseProcessor } from './solana-processor'
 
 export type { TypedCallTrace, Trace } from './trace'

package/src/core/solana-context.ts

@@ -0,0 +1,35 @@
+import { BaseContext } from './base-context'
+import Long from 'long'
+import { Labels } from './metadata'
+import { RecordMetaData } from '@sentio/sdk'
+import { CHAIN_IDS } from '../utils/chain'
+import { normalizeLabels } from './meter'
+
+export class SolanaContext extends BaseContext {
+  network: string
+  address: string
+  programName: string
+  blockNumber: Long
+
+  constructor(programName: string, network: string, address: string, slot: Long) {
+    super()
+    this.network = network || CHAIN_IDS.SOLANA_MAINNET
+    this.programName = programName
+    this.address = address
+    this.blockNumber = slot
+  }
+
+  getMetaData(name: string, labels: Labels): RecordMetaData {
+    return {
+      address: this.address,
+      contractName: this.programName,
+      blockNumber: this.blockNumber,
+      transactionIndex: 0,
+      transactionHash: '', // TODO add
+      logIndex: 0,
+      chainId: this.network,
+      name: name,
+      labels: normalizeLabels(labels),
+    }
+  }
+}

package/src/core/solana-options.ts

@@ -0,0 +1,10 @@
+import Long from 'long'
+
+export class SolanaBindOptions {
+  address: string
+  network?: string
+  name?: string
+  startBlock?: Long | number
+  endBlock?: Long | number
+  processInnerInstruction?: boolean
+}

package/src/core/solana-processor.ts

@@ -1,9 +1,10 @@
 import { ProcessResult } from '../gen'
-import { SolanaContext } from './context'
+import { SolanaContext } from './solana-context'
 import Long from 'long'
 import { Instruction } from '@project-serum/anchor'
-import { SolanaBindOptions } from './bind-options'
+import { SolanaBindOptions } from './solana-options'
 import { ListStateStorage } from '../state/state-storage'
+import { CHAIN_IDS } from '../utils/chain'
 
 type IndexConfigure = {
   startSlot: Long
@@ -21,6 +22,7 @@ export class SolanaBaseProcessor {
   address: string
   endpoint: string
   contractName: string
+  network: string
   processInnerInstruction: boolean
   config: IndexConfigure = { startSlot: new Long(0) }
   decodeInstruction: (rawInstruction: string) => Instruction | null
@@ -37,6 +39,7 @@ export class SolanaBaseProcessor {
     this.address = options.address
     this.contractName = options.name || ''
     this.processInnerInstruction = options.processInnerInstruction || false
+    this.network = options.network || CHAIN_IDS.SOLANA_MAINNET
     if (options.startBlock) {
       this.startSlot(options.startBlock)
     }
@@ -84,7 +87,7 @@ export class SolanaBaseProcessor {
     handler: SolanaInstructionHandler,
     slot: Long
   ): ProcessResult {
-    const ctx = new SolanaContext(this.contractName, this.address, slot)
+    const ctx = new SolanaContext(this.contractName, this.network, this.address, slot)
     handler(parsedInstruction, ctx, accounts)
     return ctx.getProcessResult()
   }

package/src/service.ts

@@ -1,6 +1,6 @@
 import { Block, Log } from '@ethersproject/abstract-provider'
 import { CallContext, ServerError, Status } from 'nice-grpc'
-import { SOL_MAINMET_ID, SUI_DEVNET_ID } from './utils/chain'
+import { CHAIN_IDS } from './utils/chain'
 
 import {
   AccountConfig,
@@ -277,7 +277,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
         processorType: USER_PROCESSOR,
         contract: {
           name: solanaProcessor.contractName,
-          chainId: SOL_MAINMET_ID,
+          chainId: CHAIN_IDS.SOLANA_MAINNET,
           address: solanaProcessor.address,
           abi: '',
         },
@@ -303,7 +303,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
         processorType: USER_PROCESSOR,
         contract: {
           name: 'sui contract',
-          chainId: SUI_DEVNET_ID,
+          chainId: CHAIN_IDS.SUI_DEVNET,
           address: suiProcessor.address,
           abi: '',
         },

package/src/utils/chain.ts

@@ -1,100 +1,103 @@
 // copy from https://github.com/DefiLlama/chainlist/blob/main/constants/chainIds.js
 // and https://besu.hyperledger.org/en/stable/Concepts/NetworkID-And-ChainID/
 
-export const CHAIN_MAP: Record<string, string> = {
-  0: 'kardia',
-  1: 'ethereum',
-  2: 'expanse',
-  3: 'ropsten',
-  4: 'rinkeby',
-  5: 'goerli',
-  6: 'kotti',
-  8: 'ubiq',
-  10: 'optimism',
-  19: 'songbird',
-  20: 'elastos',
-  25: 'cronos',
-  30: 'rsk',
-  40: 'telos',
-  50: 'xdc',
-  52: 'csc',
-  55: 'zyx',
-  56: 'binance',
-  57: 'syscoin',
-  60: 'gochain',
-  61: 'ethclassic',
-  63: 'mordor',
-  66: 'okexchain',
-  70: 'hoo',
-  82: 'meter',
-  88: 'tomochain',
-  100: 'xdai',
-  106: 'velas',
-  108: 'thundercore',
-  122: 'fuse',
-  128: 'heco',
-  137: 'polygon',
-  200: 'xdaiarb',
-  212: 'astor',
-  246: 'energyweb',
-  250: 'fantom',
-  269: 'hpb',
-  288: 'boba',
-  321: 'kucoin',
-  336: 'shiden',
-  361: 'theta',
-  416: 'sx',
-  534: 'candle',
-  592: 'astar',
-  820: 'callisto',
-  888: 'wanchain',
-  1088: 'metis',
-  1246: 'omchain',
-  1284: 'moonbeam',
-  1285: 'moonriver',
-  2018: 'dev',
-  2020: 'ronin',
-  2222: 'kava',
-  2612: 'ezchain',
-  4181: 'phi',
-  4689: 'iotex',
-  5050: 'xlc',
-  5551: 'nahmii',
-  7777: 'nmactest',
-  8217: 'klaytn',
-  9001: 'evmos',
-  10000: 'smartbch',
-  103090: 'crystaleum',
-  32659: 'fusion',
-  42161: 'arbitrum',
-  42220: 'celo',
-  42262: 'oasis',
-  43114: 'avalanche',
-  71402: 'godwoken',
-  200625: 'akroma',
-  333999: 'polis',
-  421613: 'arbitrum test',
-  11155111: 'sepolia',
-  1313161554: 'aurora',
-  1666600000: 'harmony',
-  11297108109: 'palm',
-  836542336838601: 'curio',
+export const CHAIN_IDS = {
+  KARDIA: '0',
+  ETHEREUM: '1',
+  EXPANSE: '2',
+  ROPSTEN: '3',
+  RINKEBY: '4',
+  GOERLI: '5',
+  KOTTI: '6',
+  UBIQ: '8',
+  OPTIMISM: '10',
+  SONGBIRD: '19',
+  ELASTOS: '20',
+  CRONOS: '25',
+  RSK: '30',
+  TELOS: '40',
+  XDC: '50',
+  CSC: '52',
+  ZYX: '55',
+  BINANCE: '56',
+  SYSCOIN: '57',
+  GOCHAIN: '60',
+  ETHCLASSIC: '61',
+  MORDOR: '63',
+  OKEXCHAIN: '66',
+  HOO: '70',
+  METER: '82',
+  TOMOCHAIN: '88',
+  XDAI: '100',
+  VELAS: '106',
+  THUNDERCORE: '108',
+  FUSE: '122',
+  HECO: '128',
+  POLYGON: '137',
+  XDAIARB: '200',
+  ASTOR: '212',
+  ENERGYWEB: '246',
+  FANTOM: '250',
+  HPB: '269',
+  BOBA: '288',
+  KUCOIN: '321',
+  SHIDEN: '336',
+  THETA: '361',
+  SX: '416',
+  CANDLE: '534',
+  ASTAR: '592',
+  CALLISTO: '820',
+  WANCHAIN: '888',
+  METIS: '1088',
+  OMCHAIN: '1246',
+  MOONBEAM: '1284',
+  MOONRIVER: '1285',
+  DEV: '2018',
+  RONIN: '2020',
+  KAVA: '2222',
+  EZCHAIN: '2612',
+  PHI: '4181',
+  IOTEX: '4689',
+  XLC: '5050',
+  NAHMII: '5551',
+  NMACTEST: '7777',
+  KLAYTN: '8217',
+  EVMOS: '9001',
+  SMARTBCH: '10000',
+  CRYSTALEUM: '103090',
+  FUSION: '32659',
+  ARBITRUM: '42161',
+  CELO: '42220',
+  OASIS: '42262',
+  AVALANCHE: '43114',
+  GODWOKEN: '71402',
+  AKROMA: '200625',
+  POLIS: '333999',
+  ARBITRUM_TEST: '421613',
+  SEPOLIA: '11155111',
+  AURORA: '1313161554',
+  HARMONY: '1666600000',
+  PALM: '11297108109',
+  CURIO: '836542336838601',
+  SOLANA_MAINNET: 'sol_mainnet',
+  SOLANA_DEVNET: 'sol_devnet',
+  SOLANA_TESTNET: 'sol_testnet',
+  SOLANA_PYTH: 'sol_pyth',
+  SUI_DEVNET: 'sui_devnet',
+  APTOS_MAINNET: 'aptos_mainnet',
+  APTOS_TESTNET: 'aptos_testnet',
 }
 
-export const SOL_MAINMET_ID = 'sol_mainnet'
-export const SOL_DEVNET_ID = 'sol_devnet'
-export const SOL_TESTNENT_ID = 'sol_testnet'
-CHAIN_MAP[SOL_MAINMET_ID] = 'solana'
-CHAIN_MAP[SOL_DEVNET_ID] = 'solana-dev'
-CHAIN_MAP[SOL_TESTNENT_ID] = 'solana-test'
+export const CHAIN_MAP: Record<string, string> = {}
 
-export const SUI_DEVNET_ID = 'sui_devnet'
-CHAIN_MAP[SUI_DEVNET_ID] = 'sui-dev'
-
-export const APTOS_TESTNET_ID = 'aptos_testnet'
-export const APTOS_MAINNET_ID = 'aptos_mainnet'
-CHAIN_MAP[APTOS_TESTNET_ID] = 'aptos-test'
-CHAIN_MAP[APTOS_MAINNET_ID] = 'aptos-mainnet'
+for (const [key, value] of Object.entries(CHAIN_IDS)) {
+  const parts = key.split('_')
+  CHAIN_MAP[value] = parts
+    .map((part, index) => {
+      return part[0] + part.slice(1).toLowerCase()
+    })
+    .join(' ')
+}
 
 export function getChainName(chainId: string | number | null | undefined): string {
   if (typeof chainId === 'number') {