@sentio/sdk 1.7.15 → 1.7.18

package/src/builtin/weth9/test-utils.ts

@@ -0,0 +1,89 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import { Log } from "@ethersproject/providers";
+import {
+  getWeth9Contract,
+  ApprovalEventObject,
+  TransferEventObject,
+  DepositEventObject,
+  WithdrawalEventObject,
+} from ".";
+const mockField = {
+  blockHash:
+    "0x0000000000000000000000000000000000000000000000000000000000000000",
+  blockNumber: 0,
+  logIndex: 0,
+  removed: false,
+  transactionHash:
+    "0x0000000000000000000000000000000000000000000000000000000000000000",
+  transactionIndex: 0,
+};
+
+export function mockApprovalLog(
+  contractAddress: string,
+  event: ApprovalEventObject
+): Log {
+  const contract = getWeth9Contract(contractAddress);
+  const encodedLog = contract.rawContract.interface.encodeEventLog(
+    contract.rawContract.interface.getEvent("Approval"),
+    Object.values(event)
+  );
+  return {
+    ...mockField,
+    address: contractAddress,
+    data: encodedLog.data,
+    topics: encodedLog.topics,
+  };
+}
+
+export function mockTransferLog(
+  contractAddress: string,
+  event: TransferEventObject
+): Log {
+  const contract = getWeth9Contract(contractAddress);
+  const encodedLog = contract.rawContract.interface.encodeEventLog(
+    contract.rawContract.interface.getEvent("Transfer"),
+    Object.values(event)
+  );
+  return {
+    ...mockField,
+    address: contractAddress,
+    data: encodedLog.data,
+    topics: encodedLog.topics,
+  };
+}
+
+export function mockDepositLog(
+  contractAddress: string,
+  event: DepositEventObject
+): Log {
+  const contract = getWeth9Contract(contractAddress);
+  const encodedLog = contract.rawContract.interface.encodeEventLog(
+    contract.rawContract.interface.getEvent("Deposit"),
+    Object.values(event)
+  );
+  return {
+    ...mockField,
+    address: contractAddress,
+    data: encodedLog.data,
+    topics: encodedLog.topics,
+  };
+}
+
+export function mockWithdrawalLog(
+  contractAddress: string,
+  event: WithdrawalEventObject
+): Log {
+  const contract = getWeth9Contract(contractAddress);
+  const encodedLog = contract.rawContract.interface.encodeEventLog(
+    contract.rawContract.interface.getEvent("Withdrawal"),
+    Object.values(event)
+  );
+  return {
+    ...mockField,
+    address: contractAddress,
+    data: encodedLog.data,
+    topics: encodedLog.topics,
+  };
+}

package/src/cli/build.ts

@@ -42,6 +42,22 @@ export async function codeGenEthersProcessor(
   ETHERS_TARGET = path.join(__dirname, '../target-ethers-sentio'),
   outDir = 'src/types/internal'
 ) {
+  if (!fs.existsSync(abisDir)) {
+    return
+  }
+
+  let haveJson = false
+  const files = fs.readdirSync(abisDir)
+  for (const file of files) {
+    if (file.toLowerCase().endsWith('.json')) {
+      haveJson = true
+      break
+    }
+  }
+  if (!haveJson) {
+    return
+  }
+
   // TODO this will fail during postinstall, need to locate real typechain path
   await execStep(
     'yarn typechain --target ' + ETHERS_TARGET + ` --out-dir ${outDir} ${path.join(abisDir, '*.json')}`,

package/src/cli/upload.ts

@@ -79,6 +79,8 @@ export async function uploadFile(options: SentioProjectConfig, apiKeyOverride: s
     if (commitSha) {
       console.log('\t', chalk.blue('Git commit SHA:'), commitSha)
     }
+    const { ProjectSlug } = await res.json()
+    console.log('\t', chalk.blue('Check status:'), `${options.host}/${ProjectSlug}/datasource`)
   } else {
     console.error(chalk.red('Upload Failed'))
     console.error(chalk.red(await res.text()))

package/src/loader.ts

@@ -0,0 +1,24 @@
+export function load(name: string): { module: any; name: string; path: string } | undefined {
+  const req = eval('require')
+
+  try {
+    let path: string
+    try {
+      path = req.resolve(name, { paths: [process.cwd()] })
+    } catch {
+      path = req.resolve(name)
+    }
+
+    const module = { module: req(path), name, path }
+    console.log('Load successfully: ', name)
+    return module
+  } catch (err) {
+    if (err instanceof Error && err.message.startsWith(`Cannot find module '${name}'`)) {
+      // this error is expected
+      console.log("Couldn't load (expected): ", name)
+      return undefined
+    } else {
+      throw err
+    }
+  }
+}

package/src/processor-runner.ts

@@ -9,35 +9,11 @@ import { setProvider } from './provider'
 import path from 'path'
 import fs from 'fs-extra'
 import { ProcessorState } from './processor-state'
+import { load } from './loader'
 
 global.sentio_sdk = require('.')
 global.PROCESSOR_STATE = new ProcessorState()
 
-function tryRequire(name: string): { module: any; name: string; path: string } | undefined {
-  const req = eval('require')
-
-  try {
-    let path: string
-    try {
-      path = req.resolve(name, { paths: [process.cwd()] })
-    } catch {
-      path = req.resolve(name)
-    }
-
-    const module = { module: req(path), name, path }
-    console.log('Load successfully: ', name)
-    return module
-  } catch (err) {
-    if (err instanceof Error && err.message.startsWith(`Cannot find module '${name}'`)) {
-      // this error is expected
-      console.log("Couldn't load (expected): ", name)
-      return undefined
-    } else {
-      throw err
-    }
-  }
-}
-
 const optionDefinitions = [
   { name: 'target', type: String, defaultOption: true },
   { name: 'port', alias: 'p', type: String, defaultValue: '4000' },
@@ -60,8 +36,6 @@ const chainsConfig = fs.readJsonSync(fullPath)
 
 setProvider(chainsConfig, options.concurrency, options['use-chainserver'])
 
-tryRequire(options.target)
-
 console.log('Start Server', options)
 
 console.log(global.PROCESSOR_STATE.processors.length, ' processors loaded')
@@ -69,7 +43,7 @@ console.log(global.PROCESSOR_STATE.solanaProcessors.length, ' solana processors
 
 const server = createServer()
 
-const service = new ProcessorServiceImpl(server.shutdown)
+const service = new ProcessorServiceImpl(() => load(options.target), server.shutdown)
 server.add(ProcessorDefinition, service)
 
 server.listen('0.0.0.0:' + options.port)

package/src/service.ts

@@ -40,10 +40,12 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
   private started = false
   private contractConfigs: ContractConfig[]
   private templateInstances: TemplateInstance[]
+  private readonly loader: () => void
 
   private readonly shutdownHandler?: () => void
 
-  constructor(shutdownHandler?: () => void) {
+  constructor(loader: () => void, shutdownHandler?: () => void) {
+    this.loader = loader
     this.shutdownHandler = shutdownHandler
   }
 
@@ -151,8 +153,8 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
         endBlock: DEFAULT_MAX_BLOCK,
         instructionConfig: {
           innerInstruction: solanaProcessor.processInnerInstruction,
-          parsedInstruction: solanaProcessor.fromParsedInstruction != null ? true : false,
-          rawDataInstruction: solanaProcessor.decodeInstruction != null ? true : false,
+          parsedInstruction: solanaProcessor.fromParsedInstruction !== null,
+          rawDataInstruction: solanaProcessor.decodeInstruction !== null,
         },
       }
       this.contractConfigs.push(contractConfig)
@@ -163,6 +165,9 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
     if (this.started) {
       return {}
     }
+
+    this.loader()
+
     for (const instance of request.templateInstances) {
       const template = global.PROCESSOR_STATE.templates[instance.templateId]
       if (!template) {

package/src/test/erc20-template.test.ts

@@ -7,11 +7,9 @@ import Long from 'long'
 import { TestProcessorServer } from './test-processor-server'
 
 describe('Test Template', () => {
-  const service = new TestProcessorServer()
+  const service = new TestProcessorServer(() => require('./erc20-template'))
 
   beforeAll(async () => {
-    service.setup()
-    require('./erc20-template')
     const request: StartRequest = {
       templateInstances: [
         {

package/src/test/erc20.test.ts

@@ -10,11 +10,9 @@ import { BigNumber } from 'ethers'
 import { mockTransferLog } from '../builtin/erc20/test-utils'
 
 describe('Test Basic Examples', () => {
-  const service = new TestProcessorServer()
+  const service = new TestProcessorServer(() => require('./erc20'))
 
   beforeAll(async () => {
-    service.setup()
-    require('./erc20')
     await service.start()
   })
 

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

@@ -9,11 +9,7 @@ import { TestProcessorServer } from './test-processor-server'
 import { firstCounterValue } from './metric-utils'
 
 describe('Test Generic Processor', () => {
-  const service = new TestProcessorServer()
-
-  beforeAll(async () => {
-    service.setup()
-
+  const service = new TestProcessorServer(() => {
     GenericProcessor.bind(
       [
         'event Transfer(address indexed from, address indexed to, uint256 value)',
@@ -29,7 +25,9 @@ describe('Test Generic Processor', () => {
     }).onAllEvents(function (log, ctx) {
       ctx.meter.Counter('wallet').add(1)
     })
+  })
 
+  beforeAll(async () => {
     await service.start()
   })
 

package/src/test/solana.test.ts

@@ -10,12 +10,12 @@ import { TestProcessorServer } from './test-processor-server'
 import { firstCounterValue } from './metric-utils'
 
 describe('Test Solana Example', () => {
-  const service = new TestProcessorServer()
-
-  beforeAll(async () => {
-    await service.setup()
+  const service = new TestProcessorServer(() => {
     require('./mirrorworld')
     require('./wormhole-token-bridge')
+  })
+
+  beforeAll(async () => {
     await service.start({ templateInstances: [] })
   })
 

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

@@ -33,11 +33,13 @@ function cleanTest() {
 }
 
 export class TestProcessorServer implements ProcessorServiceImplementation {
-  service = new ProcessorServiceImpl()
+  service: ProcessorServiceImpl
   contractConfig: ContractConfig[]
 
-  setup(httpEndpoints: Record<string, string> = {}) {
+  constructor(loader: () => void, httpEndpoints: Record<string, string> = {}) {
     cleanTest()
+
+    this.service = new ProcessorServiceImpl(loader)
     const dummyConfig: Record<string, ChainConfig> = {}
 
     for (const k in CHAIN_MAP) {
@@ -49,13 +51,6 @@ export class TestProcessorServer implements ProcessorServiceImplementation {
     }
 
     setProvider(dummyConfig)
-
-    // if (!Array.isArray(processorPath)) {
-    //   processorPath = [processorPath]
-    // }
-    // for (const path of processorPath) {
-    //   require(path)
-    // }
   }
 
   async start(request: StartRequest = { templateInstances: [] }, context = TEST_CONTEXT): Promise<Empty> {