@sentio/sdk 1.19.6 → 1.20.0

package/lib/tests/types/aptos/account-4188c8.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"account-4188c8.js","sourceRoot":"","sources":["../../../../src/tests/types/aptos/account-4188c8.ts"],"names":[],"mappings":"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","sourcesContent":["/* Autogenerated file. Do not edit manually. */\n/* tslint:disable */\n/* eslint-disable */\n\n/* Generated modules for account 0x4188c8694687e844677c2aa87171019e23d61cac60de5082a278a8aa47e9d807 */\n\nimport { aptos } from \"@sentio/sdk\";\n\nexport class CandyMachine extends aptos.AptosBaseProcessor {\n  static DEFAULT_OPTIONS: aptos.NamedAptosBindOptions = {\n    address:\n      \"0x4188c8694687e844677c2aa87171019e23d61cac60de5082a278a8aa47e9d807\",\n    network: aptos.AptosNetwork.TEST_NET,\n  };\n  static bind(options = CandyMachine.DEFAULT_OPTIONS): CandyMachine {\n    return new CandyMachine({ ...options, name: \"CandyMachine\" });\n  }\n\n  onEntryAddAcl(\n    func: (\n      call: aptos.TransactionPayload_EntryFunctionPayload,\n      ctx: aptos.AptosContext\n    ) => void\n  ): CandyMachine {\n    this.onEntryFunctionCall(func, {\n      function: \"CandyMachine::add_acl\",\n    });\n    return this;\n  }\n\n  onEntryCreateCandyMachine(\n    func: (\n      call: aptos.TransactionPayload_EntryFunctionPayload,\n      ctx: aptos.AptosContext\n    ) => void\n  ): CandyMachine {\n    this.onEntryFunctionCall(func, {\n      function: \"CandyMachine::create_candy_machine\",\n    });\n    return this;\n  }\n\n  onEntryCreateCollection(\n    func: (\n      call: aptos.TransactionPayload_EntryFunctionPayload,\n      ctx: aptos.AptosContext\n    ) => void\n  ): CandyMachine {\n    this.onEntryFunctionCall(func, {\n      function: \"CandyMachine::create_collection\",\n    });\n    return this;\n  }\n\n  onEntryPullToken(\n    func: (\n      call: aptos.TransactionPayload_EntryFunctionPayload,\n      ctx: aptos.AptosContext\n    ) => void\n  ): CandyMachine {\n    this.onEntryFunctionCall(func, {\n      function: \"CandyMachine::pull_token\",\n    });\n    return this;\n  }\n\n  onEntryUpdateTokenProperty(\n    func: (\n      call: aptos.TransactionPayload_EntryFunctionPayload,\n      ctx: aptos.AptosContext\n    ) => void\n  ): CandyMachine {\n    this.onEntryFunctionCall(func, {\n      function: \"CandyMachine::update_token_property\",\n    });\n    return this;\n  }\n}\n\nexport class SouffleChefCampaign extends aptos.AptosBaseProcessor {\n  static DEFAULT_OPTIONS: aptos.NamedAptosBindOptions = {\n    address:\n      \"0x4188c8694687e844677c2aa87171019e23d61cac60de5082a278a8aa47e9d807\",\n    network: aptos.AptosNetwork.TEST_NET,\n  };\n  static bind(\n    options = SouffleChefCampaign.DEFAULT_OPTIONS\n  ): SouffleChefCampaign {\n    return new SouffleChefCampaign({ ...options, name: \"SouffleChefCampaign\" });\n  }\n\n  onEntryAddAcl(\n    func: (\n      call: aptos.TransactionPayload_EntryFunctionPayload,\n      ctx: aptos.AptosContext\n    ) => void\n  ): SouffleChefCampaign {\n    this.onEntryFunctionCall(func, {\n      function: \"SouffleChefCampaign::add_acl\",\n    });\n    return this;\n  }\n\n  onEntryAddBurnTokenRule(\n    func: (\n      call: aptos.TransactionPayload_EntryFunctionPayload,\n      ctx: aptos.AptosContext\n    ) => void\n  ): SouffleChefCampaign {\n    this.onEntryFunctionCall(func, {\n      function: \"SouffleChefCampaign::add_burn_token_rule\",\n    });\n    return this;\n  }\n\n  onEntryBatchAddAcl(\n    func: (\n      call: aptos.TransactionPayload_EntryFunctionPayload,\n      ctx: aptos.AptosContext\n    ) => void\n  ): SouffleChefCampaign {\n    this.onEntryFunctionCall(func, {\n      function: \"SouffleChefCampaign::batch_add_acl\",\n    });\n    return this;\n  }\n\n  onEntryBurnAndEnjoy(\n    func: (\n      call: aptos.TransactionPayload_EntryFunctionPayload,\n      ctx: aptos.AptosContext\n    ) => void\n  ): SouffleChefCampaign {\n    this.onEntryFunctionCall(func, {\n      function: \"SouffleChefCampaign::burn_and_enjoy\",\n    });\n    return this;\n  }\n\n  onEntryClaim(\n    func: (\n      call: aptos.TransactionPayload_EntryFunctionPayload,\n      ctx: aptos.AptosContext\n    ) => void\n  ): SouffleChefCampaign {\n    this.onEntryFunctionCall(func, {\n      function: \"SouffleChefCampaign::claim\",\n    });\n    return this;\n  }\n\n  onEntryCreateCandyMachine(\n    func: (\n      call: aptos.TransactionPayload_EntryFunctionPayload,\n      ctx: aptos.AptosContext\n    ) => void\n  ): SouffleChefCampaign {\n    this.onEntryFunctionCall(func, {\n      function: \"SouffleChefCampaign::create_candy_machine\",\n    });\n    return this;\n  }\n\n  onEntryCreateCollection(\n    func: (\n      call: aptos.TransactionPayload_EntryFunctionPayload,\n      ctx: aptos.AptosContext\n    ) => void\n  ): SouffleChefCampaign {\n    this.onEntryFunctionCall(func, {\n      function: \"SouffleChefCampaign::create_collection\",\n    });\n    return this;\n  }\n\n  onEntryPullToken(\n    func: (\n      call: aptos.TransactionPayload_EntryFunctionPayload,\n      ctx: aptos.AptosContext\n    ) => void\n  ): SouffleChefCampaign {\n    this.onEntryFunctionCall(func, {\n      function: \"SouffleChefCampaign::pull_token\",\n    });\n    return this;\n  }\n\n  onEntryPullTokenV2(\n    func: (\n      call: aptos.TransactionPayload_EntryFunctionPayload,\n      ctx: aptos.AptosContext\n    ) => void\n  ): SouffleChefCampaign {\n    this.onEntryFunctionCall(func, {\n      function: \"SouffleChefCampaign::pull_token_v2\",\n    });\n    return this;\n  }\n\n  onEntryRemoveBurnTokenRule(\n    func: (\n      call: aptos.TransactionPayload_EntryFunctionPayload,\n      ctx: aptos.AptosContext\n    ) => void\n  ): SouffleChefCampaign {\n    this.onEntryFunctionCall(func, {\n      function: \"SouffleChefCampaign::remove_burn_token_rule\",\n    });\n    return this;\n  }\n\n  onEntryUpdateTokenProperty(\n    func: (\n      call: aptos.TransactionPayload_EntryFunctionPayload,\n      ctx: aptos.AptosContext\n    ) => void\n  ): SouffleChefCampaign {\n    this.onEntryFunctionCall(func, {\n      function: \"SouffleChefCampaign::update_token_property\",\n    });\n    return this;\n  }\n\n  onEventBurnEnjoyEvent(\n    func: (event: aptos.Event, ctx: aptos.AptosContext) => void\n  ): SouffleChefCampaign {\n    this.onEvent(func, {\n      type: \"0x4188c8694687e844677c2aa87171019e23d61cac60de5082a278a8aa47e9d807::SouffleChefCampaign::BurnEnjoyEvent\",\n    });\n    return this;\n  }\n\n  onEventPullTokenEvent(\n    func: (event: aptos.Event, ctx: aptos.AptosContext) => void\n  ): SouffleChefCampaign {\n    this.onEvent(func, {\n      type: \"0x4188c8694687e844677c2aa87171019e23d61cac60de5082a278a8aa47e9d807::SouffleChefCampaign::PullTokenEvent\",\n    });\n    return this;\n  }\n}\n"]}

package/lib/tests/types/solana/basic_1.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"basic_1.js","sourceRoot":"","sources":["../../../../src/tests/types/solana/basic_1.ts"],"names":[],"mappings":";;;AAAa,QAAA,WAAW,GAAG;IACzB,SAAS,EAAE,OAAO;IAClB,MAAM,EAAE,SAAS;IACjB,cAAc,EAAE;QACd;YACE,MAAM,EAAE,YAAY;YACpB,UAAU,EAAE;gBACV;oBACE,MAAM,EAAE,WAAW;oBACnB,OAAO,EAAE,IAAI;oBACb,UAAU,EAAE,IAAI;iBACjB;gBACD;oBACE,MAAM,EAAE,MAAM;oBACd,OAAO,EAAE,IAAI;oBACb,UAAU,EAAE,IAAI;iBACjB;gBACD;oBACE,MAAM,EAAE,eAAe;oBACvB,OAAO,EAAE,KAAK;oBACd,UAAU,EAAE,KAAK;iBAClB;aACF;YACD,MAAM,EAAE;gBACN;oBACE,MAAM,EAAE,MAAM;oBACd,MAAM,EAAE,KAAK;iBACd;aACF;SACF;QACD;YACE,MAAM,EAAE,QAAQ;YAChB,UAAU,EAAE;gBACV;oBACE,MAAM,EAAE,WAAW;oBACnB,OAAO,EAAE,IAAI;oBACb,UAAU,EAAE,KAAK;iBAClB;aACF;YACD,MAAM,EAAE;gBACN;oBACE,MAAM,EAAE,MAAM;oBACd,MAAM,EAAE,KAAK;iBACd;aACF;SACF;KACF;IACD,UAAU,EAAE;QACV;YACE,MAAM,EAAE,WAAW;YACnB,MAAM,EAAE;gBACN,MAAM,EAAE,QAAQ;gBAChB,QAAQ,EAAE;oBACR;wBACE,MAAM,EAAE,MAAM;wBACd,MAAM,EAAE,KAAK;qBACd;iBACF;aACF;SACF;KACF;CACF,CAAA","sourcesContent":["export const basic_1_idl = {\n  \"version\": \"0.1.0\",\n  \"name\": \"basic_1\",\n  \"instructions\": [\n    {\n      \"name\": \"initialize\",\n      \"accounts\": [\n        {\n          \"name\": \"myAccount\",\n          \"isMut\": true,\n          \"isSigner\": true\n        },\n        {\n          \"name\": \"user\",\n          \"isMut\": true,\n          \"isSigner\": true\n        },\n        {\n          \"name\": \"systemProgram\",\n          \"isMut\": false,\n          \"isSigner\": false\n        }\n      ],\n      \"args\": [\n        {\n          \"name\": \"data\",\n          \"type\": \"u64\"\n        }\n      ]\n    },\n    {\n      \"name\": \"update\",\n      \"accounts\": [\n        {\n          \"name\": \"myAccount\",\n          \"isMut\": true,\n          \"isSigner\": false\n        }\n      ],\n      \"args\": [\n        {\n          \"name\": \"data\",\n          \"type\": \"u64\"\n        }\n      ]\n    }\n  ],\n  \"accounts\": [\n    {\n      \"name\": \"MyAccount\",\n      \"type\": {\n        \"kind\": \"struct\",\n        \"fields\": [\n          {\n            \"name\": \"data\",\n            \"type\": \"u64\"\n          }\n        ]\n      }\n    }\n  ]\n}\n"]}

package/lib/tests/types/solana/basic_1_processor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"basic_1_processor.js","sourceRoot":"","sources":["../../../../src/tests/types/solana/basic_1_processor.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAmF;AACnF,qCAAmF;AACnF,uCAAuC;AACvC,gDAAuB;AAGvB,MAAa,eAAgB,SAAQ,yBAAmB;IACtD,MAAM,CAAC,IAAI,CAAC,OAA0B;QACpC,IAAI,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;YAC5B,OAAO,CAAC,IAAI,GAAG,QAAQ,CAAA;SACxB;QACD,OAAO,IAAI,eAAe,CAAC,OAAO,CAAC,CAAA;IACrC,CAAC;IAED,iBAAiB,GAAmD,CAAC,cAAc,EAAE,EAAE;QACrF,MAAM,gBAAgB,GAAG,IAAI,8BAAqB,CAAC,qBAAkB,CAAC,CAAA;QACtE,MAAM,UAAU,GAAG,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,cAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAA;QACpF,OAAO,UAAU,CAAA;IACnB,CAAC,CAAA;IAGD,YAAY,CAAC,OAAyD;QACpE,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,CAAC,GAAgB,EAAE,GAAG,EAAE,EAAE;YACzD,IAAI,GAAG,EAAE;gBACP,OAAO,CAAC,GAAG,CAAC,IAAoB,EAAE,GAAG,CAAC,CAAA;aACvC;QACH,CAAC,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC;IAED,QAAQ,CAAC,OAAyD;QAChE,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC,GAAgB,EAAE,GAAG,EAAE,EAAE;YACrD,IAAI,GAAG,EAAE;gBACP,OAAO,CAAC,GAAG,CAAC,IAAoB,EAAE,GAAG,CAAC,CAAA;aACvC;QACH,CAAC,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC;CAEF;AAjCD,0CAiCC","sourcesContent":["import { BorshInstructionCoder, Instruction, Idl, BN } from '@project-serum/anchor'\nimport { SolanaBaseProcessor, SolanaContext, SolanaBindOptions } from \"@sentio/sdk\"\nimport { basic_1_idl } from \"./basic_1\"\nimport bs58 from 'bs58'\nimport { PublicKey } from '@solana/web3.js'\n\nexport class Basic1Processor extends SolanaBaseProcessor {\n  static bind(options: SolanaBindOptions): Basic1Processor {\n    if (options && !options.name) {\n      options.name = 'Basic1'\n    }\n    return new Basic1Processor(options)\n  }\n\n  decodeInstruction: (rawInstruction: string) => Instruction | null = (rawInstruction) => {\n    const instructionCoder = new BorshInstructionCoder(basic_1_idl as Idl)\n    const decodedIns = instructionCoder.decode(Buffer.from(bs58.decode(rawInstruction)))\n    return decodedIns\n  }\n\n  \n  onInitialize(handler: (args: { data: BN }, ctx: SolanaContext) => void): Basic1Processor {\n    this.onInstruction('initialize', (ins: Instruction, ctx) => {\n      if (ins) {\n        handler(ins.data as { data: BN }, ctx)\n      }\n    })\n    return this\n  }\n  \n  onUpdate(handler: (args: { data: BN }, ctx: SolanaContext) => void): Basic1Processor {\n    this.onInstruction('update', (ins: Instruction, ctx) => {\n      if (ins) {\n        handler(ins.data as { data: BN }, ctx)\n      }\n    })\n    return this\n  }\n  \n}\n  "]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sentio/sdk",
   "license": "Apache-2.0",
-  "version": "1.19.6",
+  "version": "1.20.0",
   "scripts": {
     "compile_target": "yarn tsc -b src/target-ethers-sentio/tsconfig.json",
     "compile": "tsc -p . && cp src/cli/webpack.config.js lib/cli && cp src/utils/*.csv lib/utils",
@@ -13,9 +13,8 @@
     "cli": "ts-node src/cli/cli.ts",
     "test": "jest",
     "gen": "yarn compile_target && yarn gen_bultin_evm && yarn gen_test_abi",
-    "gen_test_abi": "yarn gen_solana_abi",
+    "gen_test_abi": "ts-node src/test-abi-code-gen.ts src/tests/abis src/tests/types",
     "gen_bultin_evm": "typechain --target lib/target-ethers-sentio --out-dir src/builtin/internal 'src/abis/*.json'",
-    "gen_solana_abi": "ts-node src/cli/solana-code-gen.ts src/tests types",
     "postbuild": "echo || clear-package-json package.json -o ./lib/package.json && cp release.config.js ./lib",
     "docs": "typedoc --options typedoc.json"
   },
@@ -59,7 +58,9 @@
     "chai": "^4.3.6",
     "clean-publish": "^4.0.1",
     "conventional-changelog-conventionalcommits": "^5.0.0",
+    "jest": "^29.0.3",
     "semantic-release": "^19.0.5",
+    "ts-jest": "^29.0.3",
     "ts-node": "^10.9.1",
     "tsconfig-paths": "^4.0.0",
     "typedoc": "^0.23.15",

package/src/aptos/aptos-processor.ts

@@ -151,14 +151,6 @@ export class AptosBaseProcessor {
       network: options.network || AptosNetwork.TEST_NET,
     }
   }
-  //
-  // public endBlock(endBlock: Long | number) {
-  //   if (typeof endBlock === 'number') {
-  //     endBlock = Long.fromNumber(endBlock)
-  //   }
-  //   this.config.endSeqNumber = endBlock
-  //   return this
-  // }
 
   getChainId(): string {
     switch (this.config.network) {

package/src/aptos/bind-options.ts

@@ -13,3 +13,9 @@ export class AptosBindOptions {
   startVersion?: Long | number
   // endBlock?: Long | number
 }
+
+export class NamedAptosBindOptions {
+  address: string
+  network?: AptosNetwork = AptosNetwork.TEST_NET
+  startVersion?: Long | number
+}

package/src/aptos/index.ts

@@ -2,4 +2,4 @@ export type { Transaction_UserTransaction, TransactionPayload_EntryFunctionPaylo
 export type { Event, CallFilter, EventFilter } from './aptos-processor'
 export { AptosBaseProcessor } from './aptos-processor'
 export { AptosContext } from './context'
-export { AptosBindOptions, AptosNetwork } from './bind-options'
+export { AptosBindOptions, NamedAptosBindOptions, AptosNetwork } from './bind-options'

package/src/aptos-codegen/codegen.ts

@@ -0,0 +1,128 @@
+import { MoveModuleBytecode } from 'aptos/src/generated'
+import fs from 'fs'
+import path from 'path'
+import { MoveFunction, MoveModule } from 'aptos/src/generated'
+import { MoveStruct } from 'aptos/src/generated/models/MoveStruct'
+import prettier from 'prettier'
+
+interface Config {
+  outputDir: string
+}
+
+export class AptosCodegen {
+  modules: MoveModuleBytecode[]
+  config: Config
+
+  constructor(srcFile: string, config: Config) {
+    const json = fs.readFileSync(srcFile, 'utf-8')
+    this.modules = JSON.parse(json)
+    this.config = config
+  }
+
+  generate() {
+    if (!this.modules) {
+      return
+    }
+    let address: string | undefined
+    for (const module of this.modules) {
+      if (module.abi && module.abi.address) {
+        address = module.abi.address
+      }
+    }
+    if (!address) {
+      return
+    }
+
+    const imports = `import { aptos } from "@sentio/sdk"`
+
+    let source = `
+    /* Autogenerated file. Do not edit manually. */
+    /* tslint:disable */
+    /* eslint-disable */
+  
+    /* Generated modules for account ${address} */
+  
+    ${imports}
+    
+    ${this.modules.map(generateModule).join('\n')}
+    ` // source
+
+    source = prettier.format(source, { parser: 'typescript' })
+    fs.writeFileSync(path.join(this.config.outputDir, 'account-' + address.slice(2, 8) + '.ts'), source)
+  }
+}
+
+function generateModule(moduleByteCode: MoveModuleBytecode) {
+  if (!moduleByteCode.abi) {
+    return ''
+  }
+  const module = moduleByteCode.abi
+
+  const functions = module.exposed_functions.map((f) => generateOnEntryFunctions(module, f)).filter((s) => s !== '')
+  const events = module.structs.map((e) => generateOnEvents(module, e)).filter((s) => s !== '')
+
+  return `
+  export class ${module.name} extends aptos.AptosBaseProcessor {
+    static DEFAULT_OPTIONS: aptos.NamedAptosBindOptions = {
+      address: "${module.address}",
+      network: aptos.AptosNetwork.TEST_NET       
+    }
+    static bind(options = ${module.name}.DEFAULT_OPTIONS): ${module.name} {
+      return new ${module.name}({ ...options, name: "${module.name}" })
+    }
+    
+    ${functions.join('\n')}
+    
+    ${events.join('\n')}
+  }`
+}
+
+function generateOnEntryFunctions(module: MoveModule, func: MoveFunction) {
+  if (!func.is_entry) {
+    return ''
+  }
+
+  const camelFuncName = capitalizeFirstChar(camelize(func.name))
+  const source = `
+  onEntry${camelFuncName}(func: (call: aptos.TransactionPayload_EntryFunctionPayload, ctx: aptos.AptosContext) => void): ${module.name} {
+    this.onEntryFunctionCall(func, {
+      function: '${module.name}::${func.name}'
+    })
+    return this
+  }`
+
+  return source
+}
+
+function generateOnEvents(module: MoveModule, struct: MoveStruct): string {
+  // for struct that has drop + store
+  if (!struct.abilities.includes('drop') || !struct.abilities.includes('store') || !struct.name.endsWith('Event')) {
+    return ''
+  }
+  const source = `
+  onEvent${struct.name}(func: (event: aptos.Event, ctx: aptos.AptosContext) => void): ${module.name} {
+    this.onEvent(func, {
+      type: '${module.address}::${module.name}::${struct.name}'
+    })
+    return this
+  }
+  `
+  return source
+}
+
+function camelize(input: string): string {
+  return input
+    .split('_')
+    .reduce(
+      (res, word, i) =>
+        i === 0 ? word.toLowerCase() : `${res}${word.charAt(0).toUpperCase()}${word.substr(1).toLowerCase()}`,
+      ''
+    )
+}
+
+function capitalizeFirstChar(input: string): string {
+  if (!input) {
+    return input
+  }
+  return input[0].toUpperCase() + (input.length > 1 ? input.substring(1) : '')
+}

package/src/aptos-codegen/codgen.test.ts

@@ -0,0 +1,11 @@
+import path from 'path'
+import { AptosCodegen } from './codegen'
+
+describe('Test Aptos Example', () => {
+  test.skip('code gen for aptos', async () => {
+    const filename = path.join(__dirname, '0x4188c8694687e844677c2aa87171019e23d61cac60de5082a278a8aa47e9d807')
+
+    const codegen = new AptosCodegen(filename, { outputDir: path.join(__dirname, '..') })
+    codegen.generate()
+  })
+})

package/src/aptos-codegen/tsconfig.json

@@ -0,0 +1,9 @@
+{
+  "extends": "../../../tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "..",
+    "outDir": "../../lib"
+  },
+  "exclude": ["lib"],
+  "include": ["."]
+}

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/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)
+}