@sentio/sdk 1.19.5 → 1.20.0

package/src/cli/build.ts

@@ -2,17 +2,18 @@ import chalk from 'chalk'
 import path from 'path'
 import fs from 'fs'
 import { exec } from 'child_process'
-import { EVM, SOLANA, Target } from './config'
+import { AptosCodegen } from '../aptos-codegen/codegen'
+// import { EVM, SOLANA, Target } from './config'
 
-export async function buildProcessor(onlyGen: boolean, targets: Target[]) {
+export async function buildProcessor(onlyGen: boolean) {
   if (!onlyGen) {
     await installDeps()
   }
 
   // targets.forEach(async (target) => await buildProcessorForTarget(onlyGen, target))
-  for (const target of targets) {
-    await buildProcessorForTarget(onlyGen, target)
-  }
+  // for (const target) {
+  await buildProcessorForTarget(onlyGen)
+  // }
 
   if (!onlyGen) {
     const WEBPACK_CONFIG = path.join(__dirname, 'webpack.config.js')
@@ -21,12 +22,10 @@ export async function buildProcessor(onlyGen: boolean, targets: Target[]) {
   }
 }
 
-async function buildProcessorForTarget(onlyGen: boolean, target: Target) {
-  if (target.chain === EVM) {
-    await codeGenEthersProcessor(target.abisDir ?? path.join('abis', 'evm'))
-  } else if (target.chain === SOLANA) {
-    codeGenSolanaProcessor(target.abisDir ?? path.join('abis', 'solana'))
-  }
+async function buildProcessorForTarget(onlyGen: boolean) {
+  await codeGenEthersProcessor(path.join('abis', 'evm'))
+  codeGenSolanaProcessor(path.join('abis', 'solana'))
+  codeGenAptosProcessor(path.join('abis', 'aptos'))
 
   if (onlyGen) {
     return
@@ -37,6 +36,27 @@ async function installDeps() {
   await execStep('yarn install --ignore-scripts', 'Yarn Install')
 }
 
+export function codeGenAptosProcessor(abisDir: string, outDir = 'src/types/aptos') {
+  if (!fs.existsSync(abisDir)) {
+    return
+  }
+
+  const files = fs.readdirSync(abisDir)
+
+  console.log(chalk.green('Generated Types for Aptos'))
+  for (const file of files) {
+    if (path.extname(file) === '.json') {
+      if (!fs.existsSync(outDir)) {
+        fs.mkdirSync(outDir, { recursive: true })
+      }
+    }
+    const codegen = new AptosCodegen(path.join(abisDir, file), {
+      outputDir: outDir,
+    })
+    codegen.generate()
+  }
+}
+
 export async function codeGenEthersProcessor(
   abisDir: string,
   ETHERS_TARGET = path.join(__dirname, '../target-ethers-sentio'),
@@ -58,6 +78,8 @@ export async function codeGenEthersProcessor(
     return
   }
 
+  console.log(chalk.green('Generated Types for EVM'))
+
   // 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')}`,
@@ -65,21 +87,28 @@ export async function codeGenEthersProcessor(
   )
 }
 
-export function codeGenSolanaProcessor(abisDir: string, root = '', targetPath = path.join('src', 'types')) {
-  const abisFolder = path.join(root, abisDir)
-  const abisFiles = fs.readdirSync(abisFolder)
-  const typeFolder = path.join(root, targetPath)
+export function codeGenSolanaProcessor(abisDir: string, targetPath = path.join('src', 'types', 'solana')) {
+  if (!fs.existsSync(abisDir)) {
+    return
+  }
+
+  const abisFiles = fs.readdirSync(abisDir)
+
+  if (abisFiles.length > 0) {
+    console.log(chalk.green('Generated Types for Solana'))
+  }
+
   for (const file of abisFiles) {
     if (path.extname(file) === '.json') {
-      if (!fs.existsSync(typeFolder)) {
-        fs.mkdirSync(typeFolder)
+      if (!fs.existsSync(targetPath)) {
+        fs.mkdirSync(targetPath, { recursive: true })
       }
-      const idlContent = fs.readFileSync(path.join(abisFolder, file), 'utf-8')
+      const idlContent = fs.readFileSync(path.join(abisDir, file), 'utf-8')
       const idlObj = JSON.parse(idlContent)
       const idlName = idlObj.name
-      const idlFile = path.join(typeFolder, idlName + '.ts')
+      const idlFile = path.join(targetPath, idlName + '.ts')
       fs.writeFileSync(idlFile, `export const ${idlName}_idl = ${idlContent}`)
-      fs.writeFileSync(path.join(typeFolder, `${idlName}_processor.ts`), codeGenSolanaIdlProcessor(idlObj))
+      fs.writeFileSync(path.join(targetPath, `${idlName}_processor.ts`), codeGenSolanaIdlProcessor(idlObj))
     }
   }
 }

package/src/cli/cli.ts

@@ -6,7 +6,7 @@ import fs from 'fs'
 import path from 'path'
 
 import yaml from 'js-yaml'
-import { EVM, finalizeHost, FinalizeProjectName, SentioProjectConfig } from './config'
+import { finalizeHost, FinalizeProjectName, SentioProjectConfig } from './config'
 import { uploadFile } from './upload'
 import chalk from 'chalk'
 import { buildProcessor } from './build'
@@ -35,7 +35,7 @@ if (mainOptions.command === 'login') {
   // TODO move them to their own modules
 
   // Process configs
-  let processorConfig: SentioProjectConfig = { host: '', project: '', source: '', build: true, targets: [] }
+  let processorConfig: SentioProjectConfig = { host: '', project: '', source: '', build: true }
   // Fist step, read from project yaml file
   try {
     console.log(chalk.blue('Loading Process config'))
@@ -68,14 +68,14 @@ if (mainOptions.command === 'login') {
     if (!processorConfig.source) {
       processorConfig.source = 'src/processor.ts'
     }
-    if (!processorConfig.targets) {
-      console.warn('targets is not defined, use EVM as the default target')
-      processorConfig.targets = []
-    }
-    if (processorConfig.targets.length === 0) {
-      // By default evm
-      processorConfig.targets.push({ chain: EVM })
-    }
+    // if (!processorConfig.targets) {
+    //   console.warn('targets is not defined, use EVM as the default target')
+    //   processorConfig.targets = []
+    // }
+    // if (processorConfig.targets.length === 0) {
+    //   // By default evm
+    //   processorConfig.targets.push({ chain: EVM })
+    // }
   } catch (e) {
     console.error(e)
     process.exit(1)
@@ -141,9 +141,9 @@ if (mainOptions.command === 'login') {
       uploadFile(processorConfig, apiOverride)
     }
   } else if (mainOptions.command === 'build') {
-    buildProcessor(false, processorConfig.targets)
+    buildProcessor(false)
   } else if (mainOptions.command === 'gen') {
-    buildProcessor(true, processorConfig.targets)
+    buildProcessor(true)
   } else {
     usage()
   }

package/src/cli/config.ts

@@ -3,7 +3,7 @@ export interface SentioProjectConfig {
   host: string
   source: string
   build: boolean
-  targets: Target[]
+  // targets: Target[]
 }
 
 export function getFinalizedHost(host: string): string {
@@ -36,11 +36,11 @@ export function FinalizeProjectName(config: SentioProjectConfig, owner: string |
   }
 }
 
-export interface Target {
-  chain: string
-  abisDir?: string
-}
-
-// Supported target chain, lower case
-export const EVM = 'evm'
-export const SOLANA = 'solana'
+// export interface Target {
+//   chain: string
+//   abisDir?: string
+// }
+//
+// // Supported target chain, lower case
+// export const EVM = 'evm'
+// export const SOLANA = 'solana'

package/src/cli/upload.ts

@@ -24,7 +24,7 @@ async function createProject(options: SentioProjectConfig, apiKey: string) {
 
 export async function uploadFile(options: SentioProjectConfig, apiKeyOverride: string) {
   if (options.build) {
-    await buildProcessor(false, options.targets)
+    await buildProcessor(false)
   }
 
   console.log(chalk.blue('Prepare to upload'))

package/src/cli/webpack.config.js

@@ -26,6 +26,7 @@ module.exports = {
   mode: 'production',
   externals: [
     {
+      aptos: 'commonjs2 aptos',
       ethers: 'commonjs2 ethers',
       bs58: 'commonjs2 bs58',
       "bignumber.js": 'commonjs2 bignumber.js',

package/src/processor-runner.ts

@@ -2,7 +2,7 @@
 
 import commandLineArgs from 'command-line-args'
 import { createServer } from 'nice-grpc'
-import { ProcessorDefinition } from './gen/processor/protos/processor'
+import { ProcessorDefinition } from './gen'
 import { ProcessorServiceImpl } from './service'
 import { setProvider } from './provider'
 

package/src/service.ts

@@ -1,6 +1,6 @@
 import { Block, Log } from '@ethersproject/abstract-provider'
 import { CallContext, ServerError, Status } from 'nice-grpc'
-import { APTOS_TESTNET_ID, SOL_MAINMET_ID, SUI_DEVNET_ID } from './utils/chain'
+import { SOL_MAINMET_ID, SUI_DEVNET_ID } from './utils/chain'
 
 import {
   AptosCallHandlerConfig,
@@ -212,7 +212,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
         processorType: USER_PROCESSOR,
         contract: {
           name: aptosProcessor.name,
-          chainId: APTOS_TESTNET_ID,
+          chainId: aptosProcessor.getChainId(),
           address: aptosProcessor.config.address,
           abi: '',
         },

package/src/test-abi-code-gen.ts

@@ -0,0 +1,14 @@
+#!/usr/bin/env node
+
+import { codeGenAptosProcessor, codeGenSolanaProcessor } from './cli/build'
+import path from 'path'
+
+if (process.argv.length > 3) {
+  const abisDir = process.argv[2]
+  const targetDir = process.argv[3]
+  codeGenAptosProcessor(path.join(abisDir, 'aptos'), path.join(targetDir, 'aptos'))
+  codeGenSolanaProcessor(path.join(abisDir, 'solana'), path.join(targetDir, 'solana'))
+} else {
+  console.error('Not enough argument')
+  process.exit(1)
+}