@sentio/sdk 1.7.22 → 1.8.1

package/src/meter.ts

@@ -40,7 +40,7 @@ function GetRecordMetaData(ctx: EthContext | SolanaContext, name: string, labels
       blockNumber: Long.ZERO, // TODO need number type to be long
       transactionIndex: 0,
       logIndex: 0,
-      chainId: 'SOL:mainnet', // TODO set in context
+      chainId: 'SOL_mainnet', // TODO set in context
       name: name,
       labels: labels,
     }

package/src/service.ts

@@ -7,7 +7,7 @@ import {
   HandlerType,
   LogFilter,
   LogHandlerConfig,
-  O11yResult,
+  ProcessResult,
   ProcessBlocksRequest,
   ProcessBlocksResponse,
   ProcessConfigRequest,
@@ -17,6 +17,8 @@ import {
   ProcessLogsRequest,
   ProcessLogsResponse,
   ProcessorServiceImplementation,
+  ProcessTracesRequest,
+  ProcessTracesResponse,
   ProcessTransactionsRequest,
   ProcessTransactionsResponse,
   StartRequest,
@@ -30,11 +32,11 @@ import { TextDecoder } from 'util'
 const DEFAULT_MAX_BLOCK = Long.ZERO
 
 export class ProcessorServiceImpl implements ProcessorServiceImplementation {
-  private eventHandlers: ((event: Log) => Promise<O11yResult>)[] = []
-  private blockHandlers: ((block: Block) => Promise<O11yResult>)[] = []
+  private eventHandlers: ((event: Log) => Promise<ProcessResult>)[] = []
+  private blockHandlers: ((block: Block) => Promise<ProcessResult>)[] = []
 
   // map from chain id to list of processors
-  // private blockHandlers = new Map<string, ((block: Block) => Promise<O11yResult>)[]>()
+  // private blockHandlers = new Map<string, ((block: Block) => Promise<ProcessResult>)[]>()
   // private processorsByChainId = new Map<string, BaseProcessor<BaseContract, BoundContractView<BaseContract, any>>>()
 
   private started = false
@@ -143,7 +145,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
         processorType: 'user_processor',
         contract: {
           name: solanaProcessor.contractName,
-          chainId: 'SOL:mainnet', // TODO set in processor
+          chainId: 'SOL_mainnet', // TODO set in processor
           address: solanaProcessor.address,
           abi: '',
         },
@@ -202,12 +204,13 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
       throw new ServerError(Status.UNAVAILABLE, 'Service Not started.')
     }
 
-    const resp: O11yResult = {
+    const resp: ProcessResult = {
       gauges: [],
       counters: [],
+      logs: [],
     }
 
-    const promises: Promise<O11yResult>[] = []
+    const promises: Promise<ProcessResult>[] = []
     for (const l of request.logBindings) {
       if (!l.log) {
         throw new ServerError(Status.INVALID_ARGUMENT, "Log can't be null")
@@ -270,9 +273,10 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
       throw new ServerError(Status.UNAVAILABLE, 'Service not started.')
     }
 
-    const result: O11yResult = {
+    const result: ProcessResult = {
       gauges: [],
       counters: [],
+      logs: [],
     }
 
     // Only have instruction handlers for solana processors
@@ -287,7 +291,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
           new Promise((resolve, _) => {
             for (const processor of global.PROCESSOR_STATE.solanaProcessors) {
               if (processor.address === instruction.programAccountId) {
-                let res: O11yResult | null
+                let res: ProcessResult | null
                 if (instruction.parsed) {
                   res = processor.handleInstruction(JSON.parse(new TextDecoder().decode(instruction.parsed)))
                 } else if (instruction.instructionData) {
@@ -341,7 +345,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
     const promises = request.blockBindings.map((binding) => this.processBlock(binding))
     const results = await Promise.all(promises)
 
-    const res = O11yResult.fromPartial({})
+    const res = ProcessResult.fromPartial({})
 
     for (const r of results) {
       res.counters = res.counters.concat(r.counters)
@@ -354,7 +358,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
     }
   }
 
-  async processBlock(binding: BlockBinding): Promise<O11yResult> {
+  async processBlock(binding: BlockBinding): Promise<ProcessResult> {
     if (!binding.block) {
       throw new ServerError(Status.INVALID_ARGUMENT, "Block can't be empty")
     }
@@ -362,12 +366,13 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
 
     const block: Block = JSON.parse(jsonString)
 
-    const resp: O11yResult = {
+    const resp: ProcessResult = {
       gauges: [],
       counters: [],
+      logs: [],
     }
 
-    const promises: Promise<O11yResult>[] = []
+    const promises: Promise<ProcessResult>[] = []
     for (const handlerId of binding.handlerIds) {
       const promise = this.blockHandlers[handlerId](block).catch((e) => {
         throw new ServerError(Status.INTERNAL, 'error processing block: ' + block.number + '\n' + e.toString())
@@ -381,6 +386,12 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
     }
     return resp
   }
+
+  async processTraces(request: ProcessTracesRequest, context: CallContext): Promise<ProcessTracesResponse> {
+    return {
+      result: undefined,
+    }
+  }
 }
 
 // https://ourcodeworld.com/articles/read/164/how-to-convert-an-uint8array-to-string-in-javascript
@@ -424,7 +435,7 @@ function Utf8ArrayToStr(array: Uint8Array) {
   return out
 }
 
-function recordRuntimeInfo(results: O11yResult, handlerType: HandlerType) {
+function recordRuntimeInfo(results: ProcessResult, handlerType: HandlerType) {
   results.gauges.forEach((e) => {
     e.runtimeInfo = {
       from: handlerType,

package/src/solana-processor.ts

@@ -1,4 +1,4 @@
-import { O11yResult } from './gen/processor/protos/processor'
+import { ProcessResult } from './gen/processor/protos/processor'
 import { SolanaContext } from './context'
 import Long from 'long'
 import { Instruction } from '@project-serum/anchor'
@@ -54,7 +54,7 @@ export class SolanaBaseProcessor {
     return this
   }
 
-  public handleInstruction(ins: string | { type: string; info: any }): O11yResult | null {
+  public handleInstruction(ins: string | { type: string; info: any }): ProcessResult | null {
     const ctx = new SolanaContext(this.address)
     let parsedInstruction: Instruction | null = null
 
@@ -80,6 +80,7 @@ export class SolanaBaseProcessor {
     return {
       gauges: ctx.gauges,
       counters: ctx.counters,
+      logs: [],
     }
   }
 

package/src/test/erc20.test.ts

@@ -28,21 +28,19 @@ describe('Test Basic Examples', () => {
   })
 
   test('Check block dispatch', async () => {
-    const res = await service.testBlock(blockData)
-    const o11yRes = res.result
-    expect(o11yRes?.counters).length(0)
-    expect(o11yRes?.gauges).length(1)
-    expect(firstGaugeValue(o11yRes, 'g1')).equals(10n)
+    const res = (await service.testBlock(blockData)).result
+    expect(res?.counters).length(0)
+    expect(res?.gauges).length(1)
+    expect(firstGaugeValue(res, 'g1')).equals(10n)
 
-    const gauge = o11yRes?.gauges?.[0]
+    const gauge = res?.gauges?.[0]
     expect(gauge?.metadata?.blockNumber?.toString()).equals('14373295')
     expect(gauge?.runtimeInfo?.from).equals(HandlerType.BLOCK)
 
-    const res2 = await service.testBlock(blockData, 56)
-    const o11yRes2 = res2.result
-    expect(o11yRes2?.counters).length(0)
-    expect(o11yRes2?.gauges).length(1)
-    expect(firstGaugeValue(o11yRes2, 'g2')).equals(20n)
+    const res2 = (await service.testBlock(blockData, 56)).result
+    expect(res2?.counters).length(0)
+    expect(res2?.gauges).length(1)
+    expect(firstGaugeValue(res2, 'g2')).equals(20n)
   })
 
   test('Check log dispatch', async () => {

package/src/test/index.ts

@@ -1 +1,2 @@
 export { TestProcessorServer } from './test-processor-server'
+export { loadTestProvidersFromEnv } from './test-provider'

package/src/test/metric-utils.ts

@@ -1,5 +1,5 @@
 import { DeepPartial } from '../gen/builtin'
-import { BigDecimal, MetricValue, O11yResult } from '@sentio/sdk'
+import { BigDecimal, MetricValue, ProcessResult } from '@sentio/sdk'
 import { Numberish } from '../numberish'
 import { BigNumber } from 'ethers'
 
@@ -24,7 +24,7 @@ export function MetricValueToNumber(v: DeepPartial<MetricValue> | undefined): Nu
   return undefined
 }
 
-export function firstCounterValue(result: O11yResult | undefined, name: string): Numberish | undefined {
+export function firstCounterValue(result: ProcessResult | undefined, name: string): Numberish | undefined {
   if (!result) {
     return undefined
   }
@@ -36,7 +36,7 @@ export function firstCounterValue(result: O11yResult | undefined, name: string):
   return undefined
 }
 
-export function firstGaugeValue(result: O11yResult | undefined, name: string): Numberish | undefined {
+export function firstGaugeValue(result: ProcessResult | undefined, name: string): Numberish | undefined {
   if (!result) {
     return undefined
   }

package/src/test/test-processor-server.ts

@@ -13,6 +13,8 @@ import {
   ProcessorServiceImpl,
   ProcessorServiceImplementation,
   ProcessorState,
+  ProcessTracesRequest,
+  ProcessTracesResponse,
   ProcessTransactionsRequest,
   ProcessTransactionsResponse,
   setProvider,
@@ -82,6 +84,10 @@ export class TestProcessorServer implements ProcessorServiceImplementation {
     return this.service.processLogs(request, context)
   }
 
+  processTraces(request: ProcessTracesRequest, context: CallContext = TEST_CONTEXT): Promise<ProcessTracesResponse> {
+    return this.service.processTraces(request, context)
+  }
+
   processTransactions(
     request: ProcessTransactionsRequest,
     context = TEST_CONTEXT

package/src/test/test-provider.ts

@@ -0,0 +1,25 @@
+import { ChainConfig } from '../chain-config'
+import { setProvider } from '@sentio/sdk'
+
+export function loadTestProvidersFromEnv(ids: string[] | string): boolean {
+  const dummyConfig: Record<string, ChainConfig> = {}
+
+  if (!Array.isArray(ids)) {
+    ids = [ids]
+  }
+
+  for (const k of ids) {
+    const envKey = 'TEST_ENDPOINT_' + k
+    const http = process.env[envKey]
+    if (!http) {
+      return false
+    }
+    dummyConfig[k] = {
+      ChainID: k,
+      Https: [http],
+    }
+  }
+
+  setProvider(dummyConfig)
+  return true
+}

package/src/utils/chainmap.ts

@@ -2,9 +2,9 @@
 // and https://besu.hyperledger.org/en/stable/Concepts/NetworkID-And-ChainID/
 
 export const CHAIN_MAP: Record<string, string> = {
-  'SOL:mainnet': 'solana',
-  'SOL:devnet': 'solana-dev',
-  'SOL:testnet': 'solana-test',
+  SOL_mainnet: 'solana',
+  SOL_devnet: 'solana-dev',
+  SOL_testnet: 'solana-test',
   0: 'kardia',
   1: 'ethereum',
   2: 'expanse',

package/src/utils/erc20.test.ts

@@ -1,19 +1,14 @@
-import { ProcessorState, setProvider } from '@sentio/sdk'
+import { ProcessorState } from '@sentio/sdk'
 import { getERC20TokenInfo } from './erc20'
+import { loadTestProvidersFromEnv } from '../test'
 
 describe('erc20 tests', () => {
-  beforeAll(async () => {
-    global.PROCESSOR_STATE = new ProcessorState()
+  global.PROCESSOR_STATE = new ProcessorState()
+  const haveProviders = loadTestProvidersFromEnv('1')
 
-    setProvider({
-      '1': {
-        ChainID: '1',
-        Https: ['https://eth-mainnet.alchemyapi.io/v2/Gk024pFA-64RaEPIawL40n__1esXJFb2'], // Use env
-      },
-    })
-  })
+  const testIf = haveProviders ? test : test.skip
 
-  test('test bytes32', async () => {
+  testIf('test bytes32', async () => {
     const info = await getERC20TokenInfo('0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2')
 
     expect(info.decimal).toEqual(18)
@@ -21,7 +16,7 @@ describe('erc20 tests', () => {
     expect(info.name).toEqual('Maker')
   })
 
-  test('test normal', async () => {
+  testIf('test normal', async () => {
     const info = await getERC20TokenInfo('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48')
 
     expect(info.decimal).toEqual(6)