@sentio/sdk 1.14.4 → 1.15.1

package/src/service.ts

@@ -205,7 +205,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
     try {
       this.loader()
     } catch (e) {
-      throw new ServerError(Status.INVALID_ARGUMENT, 'Failed to load processor : ' + e.toString())
+      throw new ServerError(Status.INVALID_ARGUMENT, 'Failed to load processor: ' + errorString(e))
     }
 
     for (const instance of request.templateInstances) {
@@ -227,7 +227,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
     try {
       await this.configure()
     } catch (e) {
-      throw new ServerError(Status.INTERNAL, 'Failed to start processor : ' + e.toString())
+      throw new ServerError(Status.INTERNAL, 'Failed to start processor : ' + errorString(e))
     }
     this.started = true
     return {}
@@ -265,7 +265,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
         const log: Log = JSON.parse(jsonString)
         const handler = this.eventHandlers[l.handlerId]
         const promise = handler(log).catch((e) => {
-          throw new ServerError(Status.INTERNAL, 'error processing log: ' + jsonString + '\n' + e.toString())
+          throw new ServerError(Status.INTERNAL, 'error processing log: ' + jsonString + '\n' + errorString(e))
         })
 
         promises.push(promise)
@@ -310,7 +310,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
       logs: [],
     }
 
-    if (global.PROCESSOR_STATE.suiProcessors) {
+    if (request.chainId.toLowerCase().startsWith('sui') && global.PROCESSOR_STATE.suiProcessors) {
       const processorPromises: Promise<void>[] = []
       for (const txn of request.transactions) {
         processorPromises.push(
@@ -319,14 +319,14 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
               const res = processor.handleTransaction(JSON.parse(new TextDecoder().decode(txn.raw)))
               if (res) {
                 res.gauges.forEach((g) => {
-                  if (g.metadata) {
-                    g.metadata.blockNumber = Long.fromString(txn.programAccountId)
+                  if (g.metadata && txn.slot) {
+                    g.metadata.blockNumber = txn.slot
                   }
                   result.gauges.push(g)
                 })
                 res.counters.forEach((c) => {
-                  if (c.metadata) {
-                    c.metadata.blockNumber = Long.fromString(txn.programAccountId)
+                  if (c.metadata && txn.slot) {
+                    c.metadata.blockNumber = txn.slot
                   }
                   result.counters.push(c)
                 })
@@ -394,7 +394,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
                       result.counters.push(c)
                     })
                   } catch (e) {
-                    console.error('error processing instruction ' + e.toString())
+                    console.error('error processing instruction ' + errorString(e))
                   }
                 } else {
                   console.warn(
@@ -455,7 +455,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
     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())
+        throw new ServerError(Status.INTERNAL, 'error processing block: ' + block.number + '\n' + errorString(e))
       })
       promises.push(promise)
     }
@@ -496,7 +496,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
     const trace: Trace = JSON.parse(jsonString)
 
     return this.traceHandlers[binding.handlerId](trace).catch((e) => {
-      throw new ServerError(Status.INTERNAL, 'error processing trace: ' + jsonString + '\n' + e.toString())
+      throw new ServerError(Status.INTERNAL, 'error processing trace: ' + jsonString + '\n' + errorString(e))
     })
   }
 }
@@ -555,3 +555,7 @@ function recordRuntimeInfo(results: ProcessResult, handlerType: HandlerType) {
     }
   })
 }
+
+function errorString(e: Error): string {
+  return e.stack || e.message
+}

package/src/target-ethers-sentio/codegen.ts

@@ -7,7 +7,7 @@ import {
 } from 'typechain'
 
 import { reservedKeywords } from '@typechain/ethers-v5/dist/codegen/reserved-keywords'
-import { generateInputTypes } from '@typechain/ethers-v5/dist/codegen/types'
+import { generateInputTypes, generateOutputTypes } from '@typechain/ethers-v5/dist/codegen/types'
 import { getFullSignatureForEvent } from 'typechain/dist/utils/signatures'
 import { codegenCallTraceTypes, codegenFunctions } from './functions'
 
@@ -246,9 +246,17 @@ function generateOnEventFunction(event: EventDeclaration, contractName: string,
   `
 }
 
+// https://github.com/dethcrypto/TypeChain/blob/015abb28bd22826611051f27e0ec96a00f9a0b61/packages/target-ethers-v5/src/codegen/functions.ts#L54
+function generateReturnTypes(fn: FunctionDeclaration) {
+  // sounds like returnResultObject should be true but we need to set false to make it work
+  return `Promise<${generateOutputTypes({ returnResultObject: false, useStructs: true }, fn.outputs)}>`
+}
+
 function generateViewFunction(func: FunctionDeclaration): string {
   return `
-  async ${func.name}(${generateInputTypes(func.inputs, { useStructs: true })}overrides?: CallOverrides) {
+  async ${func.name}(${generateInputTypes(func.inputs, {
+    useStructs: true,
+  })}overrides?: CallOverrides): ${generateReturnTypes(func)} {
     try {
       if (overrides) {
         return await this.contract.${func.name}(${
@@ -268,7 +276,9 @@ function generateViewFunction(func: FunctionDeclaration): string {
 
 function generateBoundViewFunction(func: FunctionDeclaration): string {
   return `
-  async ${func.name}(${generateInputTypes(func.inputs, { useStructs: true })}overrides?: CallOverrides) {
+  async ${func.name}(${generateInputTypes(func.inputs, {
+    useStructs: true,
+  })}overrides?: CallOverrides): ${generateReturnTypes(func)} {
     try {
       if (!overrides && this.context) {
         overrides = {

package/src/test/erc20.test.ts

@@ -7,7 +7,7 @@ import { HandlerType } from '..'
 import { TestProcessorServer } from './test-processor-server'
 import { firstCounterValue, firstGaugeValue } from './metric-utils'
 import { BigNumber } from 'ethers'
-import { mockTransferLog } from '../builtin/erc20/test-utils'
+import { mockApprovalLog, mockTransferLog } from '../builtin/erc20/test-utils'
 import { Trace } from '../trace'
 
 describe('Test Basic Examples', () => {
@@ -80,6 +80,20 @@ describe('Test Basic Examples', () => {
     expect(config).deep.equals(config2)
   })
 
+  test('Check log exception', async () => {
+    const logData = mockApprovalLog('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48', {
+      owner: '0x0000000000000000000000000000000000000000',
+      spender: '0xB329e39Ebefd16f40d38f07643652cE17Ca5Bac1',
+      value: BigNumber.from('1111'),
+    })
+
+    try {
+      await service.testLog(logData, 56)
+    } catch (e) {
+      expect(e.message.indexOf('sdk/src/test/erc20.ts') != -1).eq(true)
+    }
+  })
+
   const blockData = {
     hash: '0x2b9b7cce1f17f3b7e1f3c2472cc806a07bee3f0baca07d021350950d81d73a42',
     number: 14373295,

package/src/test/erc20.ts

@@ -1,4 +1,5 @@
 import { ERC20Processor, ERC20ProcessorTemplate } from '../builtin/erc20'
+import { BigNumber } from '@ethersproject/bignumber'
 
 export const filter = ERC20Processor.filters.Transfer(
   '0x0000000000000000000000000000000000000000',
@@ -34,7 +35,10 @@ ERC20Processor.bind({ address: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48', net
   .onBlock(async function (block, ctx) {
     ctx.meter.Gauge('g2').record(20, { k: 'v' })
   })
-
+  .onEventApproval(async function (event, ctx) {
+    BigNumber.from(10 ** 18)
+    // console.log(n)
+  })
 ERC20Processor.bind({ address: 'xxxx', network: 56 })
 
 ERC20Processor.bind({ address: 'yyyy', network: 1 })

package/src/test/sui.test.ts

@@ -20,9 +20,10 @@ describe('Test Sui Example', () => {
 
   test('Check tictactoe transaction dispatch', async () => {
     const request: ProcessTransactionsRequest = {
+      chainId: 'SUI_devnet',
       transactions: [
         {
-          txHash: 'z3HjnnFFKAaszOi0pMSImtGMpRd2r7ljLjAjUoqs3Kw=',
+          // txHash: 'z3HjnnFFKAaszOi0pMSImtGMpRd2r7ljLjAjUoqs3Kw=',
           raw: new TextEncoder().encode(JSON.stringify(testData)),
           programAccountId: '0xb8252513f0b9efaa3e260842c4b84d8ff933522d',
         },