@sentio/sdk 1.22.2 → 1.23.0

package/src/aptos/types.ts

@@ -4,7 +4,7 @@ import {
   MoveModule,
   MoveStruct,
   TransactionPayload_EntryFunctionPayload,
-} from 'aptos/src/generated'
+} from 'aptos-sdk/src/generated'
 import { moduleQname, SPLITTER, VECTOR_STR } from './utils'
 import { parseMoveType } from '../aptos-codegen/typegen'
 

package/src/aptos/utils.ts

@@ -1,4 +1,4 @@
-import { MoveModule } from 'aptos/src/generated'
+import { MoveModule } from 'aptos-sdk/src/generated'
 
 export const SPLITTER = '::'
 

package/src/aptos-codegen/codegen.ts

@@ -1,61 +1,107 @@
 import fs from 'fs'
 import path from 'path'
 import prettier from 'prettier'
-import { MoveFunction, MoveModule, MoveStruct, MoveModuleBytecode } from 'aptos/src/generated'
-import { generateType, AccountRegister } from './typegen'
+import { MoveFunction, MoveModule, MoveModuleBytecode, MoveStruct } from 'aptos-sdk/src/generated'
+import { AccountModulesImportInfo, AccountRegister, generateType } from './typegen'
 import { isFrameworkAccount } from '../aptos/utils'
+import chalk from 'chalk'
+import { AptosNetwork, getChainName, getChainRpcEndpoint } from '../aptos/network'
+import { AptosClient } from 'aptos-sdk'
 
-export function generate(srcDir: string, outputDir: string) {
+export async function generate(srcDir: string, outputDir: string) {
+  await generateForNetwork(srcDir, outputDir, AptosNetwork.MAIN_NET)
+  await generateForNetwork(path.join(srcDir, 'testnet'), path.join(outputDir, 'testnet'), AptosNetwork.TEST_NET)
+}
+
+export async function generateForNetwork(srcDir: string, outputDir: string, network: AptosNetwork) {
+  if (!fs.existsSync(srcDir)) {
+    return
+  }
+  if (network === AptosNetwork.TEST_NET) {
+    console.log('Found testnet directory, generate code for testnet modules')
+  }
   const files = fs.readdirSync(srcDir)
   outputDir = path.resolve(outputDir)
+  const outputs: OutputFile[] = []
 
   fs.mkdirSync(outputDir, { recursive: true })
 
   const loader = new AccountRegister()
 
-  // The first path, identify import relation and module name (filename) of those imports
+  // when generating user code, don't need to generate framework account
+  loader.accountImports.set('0x1', new AccountModulesImportInfo('0x1', '0x1'))
+  loader.accountImports.set('0x2', new AccountModulesImportInfo('0x2', '0x2'))
+  loader.accountImports.set('0x3', new AccountModulesImportInfo('0x3', '0x3'))
+  const client = new AptosClient(getChainRpcEndpoint(network))
+
   for (const file of files) {
     if (!file.endsWith('.json')) {
       continue
     }
-    // Reading file is duplicated, but since they are small files probably file
-    // TODO add file manager class
-    const json = fs.readFileSync(path.join(srcDir, file), 'utf-8')
-    const modules = JSON.parse(json)
+    const fullPath = path.resolve(srcDir, file)
+    const modules = JSON.parse(fs.readFileSync(fullPath, 'utf-8'))
 
     for (const module of modules) {
       if (module.abi) {
         loader.register(module.abi, path.basename(file, '.json'))
       }
     }
-  }
-
-  for (const file of files) {
-    if (!file.endsWith('.json')) {
-      continue
-    }
-    const codeGen = new AccountCodegen(loader, {
-      srcFile: path.join(srcDir, file),
+    const codeGen = new AccountCodegen(loader, modules, {
+      fileName: path.basename(file, '.json'),
       outputDir: outputDir,
+      network,
     })
 
-    codeGen.generate()
+    outputs.push(...codeGen.generate())
   }
 
-  // when generating user code, don't need to generate framework account
-  loader.pendingAccounts.delete('0x1')
-  loader.pendingAccounts.delete('0x2')
-  loader.pendingAccounts.delete('0x3')
+  while (loader.pendingAccounts.size > 0) {
+    for (const account of loader.pendingAccounts) {
+      console.log(`download depended module for account ${account} at ${getChainName(network)}`)
 
-  if (loader.pendingAccounts.size > 0) {
-    // TODO automatic download dependencies
-    console.error('Missing ABIs from the following accounts', loader.pendingAccounts)
+      try {
+        const modules = await client.getAccountModules(account)
+        fs.writeFileSync(path.resolve(srcDir, account + '.json'), JSON.stringify(modules, null, '\t'))
+
+        for (const module of modules) {
+          if (module.abi) {
+            loader.register(module.abi, account)
+          }
+        }
+        const codeGen = new AccountCodegen(loader, modules, {
+          fileName: account,
+          outputDir: outputDir,
+          network,
+        })
+
+        outputs.push(...codeGen.generate())
+      } catch (e) {
+        console.error(
+          chalk.red(
+            'Error downloading account module, check if you choose the right network，or download account modules manually into your director'
+          )
+        )
+        console.error(e)
+        process.exit(1)
+      }
+    }
   }
+
+  for (const output of outputs) {
+    const content = prettier.format(output.fileContent, { parser: 'typescript' })
+    fs.writeFileSync(path.join(outputDir, output.fileName), content)
+  }
+}
+
+interface OutputFile {
+  fileName: string
+  fileContent: string
 }
 
 interface Config {
-  srcFile: string
+  fileName: string
   outputDir: string
+  network: AptosNetwork
 }
 
 export class AccountCodegen {
@@ -63,18 +109,18 @@ export class AccountCodegen {
   config: Config
   loader: AccountRegister
 
-  constructor(loader: AccountRegister, config: Config) {
-    const json = fs.readFileSync(config.srcFile, 'utf-8')
-    this.modules = JSON.parse(json)
+  constructor(loader: AccountRegister, modules: MoveModuleBytecode[], config: Config) {
+    // const json = fs.readFileSync(config.srcFile, 'utf-8')
+    this.modules = modules
     this.config = config
     this.loader = loader
   }
 
-  generate() {
+  generate(): OutputFile[] {
     if (!this.modules) {
-      return
+      return []
     }
-    const baseName = path.basename(this.config.srcFile, '.json')
+    // const baseName = path.basename(this.config.fileName, '.json')
 
     let address: string | undefined
     for (const module of this.modules) {
@@ -83,12 +129,12 @@ export class AccountCodegen {
       }
     }
     if (!address) {
-      return
+      return []
     }
 
     const imports = `
     import { aptos } from "@sentio/sdk"
-    import { Address, MoveModule } from "aptos/src/generated"
+    import { Address, MoveModule } from "aptos-sdk/src/generated"
     `
 
     const dependedAccounts: string[] = []
@@ -118,7 +164,7 @@ export class AccountCodegen {
       }
     }
 
-    let source = `
+    const source = `
     /* Autogenerated file. Do not edit manually. */
     /* tslint:disable */
     /* eslint-disable */
@@ -129,7 +175,7 @@ export class AccountCodegen {
     
     ${moduleImports.join('\n')}
     
-    ${this.modules.map((m) => generateModule(m, dependedAccounts)).join('\n')}
+    ${this.modules.map((m) => generateModule(m, this.config.network)).join('\n')}
     
     function loadAllTypes(registry: aptos.TypeRegistry) {
       ${dependedAccounts.map((m) => `${m}.loadTypes(registry)`).join('\n')}
@@ -142,12 +188,24 @@ export class AccountCodegen {
     }
     ` // source
 
-    source = prettier.format(source, { parser: 'typescript' })
-    fs.writeFileSync(path.join(this.config.outputDir, baseName + '.ts'), source)
+    return [
+      {
+        fileName: this.config.fileName + '.ts',
+        fileContent: source,
+      },
+    ]
+  }
+}
+
+function generateNetworkOption(network: AptosNetwork) {
+  switch (network) {
+    case AptosNetwork.TEST_NET:
+      return 'TEST_NET'
   }
+  return 'MAIN_NET'
 }
 
-function generateModule(moduleByteCode: MoveModuleBytecode, dependedModules: string[]) {
+function generateModule(moduleByteCode: MoveModuleBytecode, network: AptosNetwork) {
   if (!moduleByteCode.abi) {
     return ''
   }
@@ -167,7 +225,7 @@ function generateModule(moduleByteCode: MoveModuleBytecode, dependedModules: str
     }
     static DEFAULT_OPTIONS: aptos.AptosBindOptions = {
       address: "${module.address}",
-      network: aptos.AptosNetwork.TEST_NET       
+      network: aptos.AptosNetwork.${generateNetworkOption(network)}       
     }
 
     static bind(options: Partial<aptos.AptosBindOptions> = {}): ${module.name} {

package/src/aptos-codegen/typegen.ts

@@ -1,4 +1,4 @@
-import { MoveModule } from 'aptos/src/generated'
+import { MoveModule } from 'aptos-sdk/src/generated'
 import { TypeDescriptor } from '../aptos/types'
 import { moduleQname, moduleQnameForType, SPLITTER, VECTOR_STR } from '../aptos/utils'
 

package/src/builtin/aptos/0x1.ts

@@ -5,7 +5,7 @@
 /* Generated modules for account 0x1 */
 
 import { aptos } from "@sentio/sdk";
-import { Address, MoveModule } from "aptos/src/generated";
+import { Address, MoveModule } from "aptos-sdk/src/generated";
 
 export namespace acl {
   export class ACL {
@@ -49,7 +49,7 @@ export class code extends aptos.AptosBaseProcessor {
   }
   static DEFAULT_OPTIONS: aptos.AptosBindOptions = {
     address: "0x1",
-    network: aptos.AptosNetwork.TEST_NET,
+    network: aptos.AptosNetwork.MAIN_NET,
   };
 
   static bind(options: Partial<aptos.AptosBindOptions> = {}): code {
@@ -132,7 +132,7 @@ export class coin extends aptos.AptosBaseProcessor {
   }
   static DEFAULT_OPTIONS: aptos.AptosBindOptions = {
     address: "0x1",
-    network: aptos.AptosNetwork.TEST_NET,
+    network: aptos.AptosNetwork.MAIN_NET,
   };
 
   static bind(options: Partial<aptos.AptosBindOptions> = {}): coin {
@@ -338,7 +338,7 @@ export class block extends aptos.AptosBaseProcessor {
   }
   static DEFAULT_OPTIONS: aptos.AptosBindOptions = {
     address: "0x1",
-    network: aptos.AptosNetwork.TEST_NET,
+    network: aptos.AptosNetwork.MAIN_NET,
   };
 
   static bind(options: Partial<aptos.AptosBindOptions> = {}): block {
@@ -453,7 +453,7 @@ export class stake extends aptos.AptosBaseProcessor {
   }
   static DEFAULT_OPTIONS: aptos.AptosBindOptions = {
     address: "0x1",
-    network: aptos.AptosNetwork.TEST_NET,
+    network: aptos.AptosNetwork.MAIN_NET,
   };
 
   static bind(options: Partial<aptos.AptosBindOptions> = {}): stake {
@@ -1133,7 +1133,7 @@ export class voting extends aptos.AptosBaseProcessor {
   }
   static DEFAULT_OPTIONS: aptos.AptosBindOptions = {
     address: "0x1",
-    network: aptos.AptosNetwork.TEST_NET,
+    network: aptos.AptosNetwork.MAIN_NET,
   };
 
   static bind(options: Partial<aptos.AptosBindOptions> = {}): voting {
@@ -1265,7 +1265,7 @@ export class account extends aptos.AptosBaseProcessor {
   }
   static DEFAULT_OPTIONS: aptos.AptosBindOptions = {
     address: "0x1",
-    network: aptos.AptosNetwork.TEST_NET,
+    network: aptos.AptosNetwork.MAIN_NET,
   };
 
   static bind(options: Partial<aptos.AptosBindOptions> = {}): account {
@@ -1522,7 +1522,7 @@ export class version extends aptos.AptosBaseProcessor {
   }
   static DEFAULT_OPTIONS: aptos.AptosBindOptions = {
     address: "0x1",
-    network: aptos.AptosNetwork.TEST_NET,
+    network: aptos.AptosNetwork.MAIN_NET,
   };
 
   static bind(options: Partial<aptos.AptosBindOptions> = {}): version {
@@ -1574,7 +1574,7 @@ export class vesting extends aptos.AptosBaseProcessor {
   }
   static DEFAULT_OPTIONS: aptos.AptosBindOptions = {
     address: "0x1",
-    network: aptos.AptosNetwork.TEST_NET,
+    network: aptos.AptosNetwork.MAIN_NET,
   };
 
   static bind(options: Partial<aptos.AptosBindOptions> = {}): vesting {
@@ -2284,7 +2284,7 @@ export class aptos_coin extends aptos.AptosBaseProcessor {
   }
   static DEFAULT_OPTIONS: aptos.AptosBindOptions = {
     address: "0x1",
-    network: aptos.AptosNetwork.TEST_NET,
+    network: aptos.AptosNetwork.MAIN_NET,
   };
 
   static bind(options: Partial<aptos.AptosBindOptions> = {}): aptos_coin {
@@ -2554,7 +2554,7 @@ export class managed_coin extends aptos.AptosBaseProcessor {
   }
   static DEFAULT_OPTIONS: aptos.AptosBindOptions = {
     address: "0x1",
-    network: aptos.AptosNetwork.TEST_NET,
+    network: aptos.AptosNetwork.MAIN_NET,
   };
 
   static bind(options: Partial<aptos.AptosBindOptions> = {}): managed_coin {
@@ -2678,7 +2678,7 @@ export class aptos_account extends aptos.AptosBaseProcessor {
   }
   static DEFAULT_OPTIONS: aptos.AptosBindOptions = {
     address: "0x1",
-    network: aptos.AptosNetwork.TEST_NET,
+    network: aptos.AptosNetwork.MAIN_NET,
   };
 
   static bind(options: Partial<aptos.AptosBindOptions> = {}): aptos_account {
@@ -2779,7 +2779,7 @@ export class staking_proxy extends aptos.AptosBaseProcessor {
   }
   static DEFAULT_OPTIONS: aptos.AptosBindOptions = {
     address: "0x1",
-    network: aptos.AptosNetwork.TEST_NET,
+    network: aptos.AptosNetwork.MAIN_NET,
   };
 
   static bind(options: Partial<aptos.AptosBindOptions> = {}): staking_proxy {
@@ -3008,7 +3008,7 @@ export class reconfiguration extends aptos.AptosBaseProcessor {
   }
   static DEFAULT_OPTIONS: aptos.AptosBindOptions = {
     address: "0x1",
-    network: aptos.AptosNetwork.TEST_NET,
+    network: aptos.AptosNetwork.MAIN_NET,
   };
 
   static bind(options: Partial<aptos.AptosBindOptions> = {}): reconfiguration {
@@ -3083,7 +3083,7 @@ export class aptos_governance extends aptos.AptosBaseProcessor {
   }
   static DEFAULT_OPTIONS: aptos.AptosBindOptions = {
     address: "0x1",
-    network: aptos.AptosNetwork.TEST_NET,
+    network: aptos.AptosNetwork.MAIN_NET,
   };
 
   static bind(options: Partial<aptos.AptosBindOptions> = {}): aptos_governance {
@@ -3288,7 +3288,7 @@ export class resource_account extends aptos.AptosBaseProcessor {
   }
   static DEFAULT_OPTIONS: aptos.AptosBindOptions = {
     address: "0x1",
-    network: aptos.AptosNetwork.TEST_NET,
+    network: aptos.AptosNetwork.MAIN_NET,
   };
 
   static bind(options: Partial<aptos.AptosBindOptions> = {}): resource_account {
@@ -3382,7 +3382,7 @@ export class staking_contract extends aptos.AptosBaseProcessor {
   }
   static DEFAULT_OPTIONS: aptos.AptosBindOptions = {
     address: "0x1",
-    network: aptos.AptosNetwork.TEST_NET,
+    network: aptos.AptosNetwork.MAIN_NET,
   };
 
   static bind(options: Partial<aptos.AptosBindOptions> = {}): staking_contract {

package/src/builtin/aptos/0x3.ts

@@ -5,7 +5,7 @@
 /* Generated modules for account 0x3 */
 
 import { aptos } from "@sentio/sdk";
-import { Address, MoveModule } from "aptos/src/generated";
+import { Address, MoveModule } from "aptos-sdk/src/generated";
 
 import { table, event, simple_map, type_info } from "./0x1";
 
@@ -15,7 +15,7 @@ export class token extends aptos.AptosBaseProcessor {
   }
   static DEFAULT_OPTIONS: aptos.AptosBindOptions = {
     address: "0x3",
-    network: aptos.AptosNetwork.TEST_NET,
+    network: aptos.AptosNetwork.MAIN_NET,
   };
 
   static bind(options: Partial<aptos.AptosBindOptions> = {}): token {
@@ -538,7 +538,7 @@ export class token_coin_swap extends aptos.AptosBaseProcessor {
   }
   static DEFAULT_OPTIONS: aptos.AptosBindOptions = {
     address: "0x3",
-    network: aptos.AptosNetwork.TEST_NET,
+    network: aptos.AptosNetwork.MAIN_NET,
   };
 
   static bind(options: Partial<aptos.AptosBindOptions> = {}): token_coin_swap {
@@ -662,7 +662,7 @@ export class token_transfers extends aptos.AptosBaseProcessor {
   }
   static DEFAULT_OPTIONS: aptos.AptosBindOptions = {
     address: "0x3",
-    network: aptos.AptosNetwork.TEST_NET,
+    network: aptos.AptosNetwork.MAIN_NET,
   };
 
   static bind(options: Partial<aptos.AptosBindOptions> = {}): token_transfers {

package/src/cli/webpack.config.js

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

package/src/service.ts

@@ -29,7 +29,6 @@ import Long from 'long'
 import { TextDecoder } from 'util'
 import { Trace } from './core'
 import { Instruction } from '@project-serum/anchor'
-import { account } from './builtin/aptos/0x1'
 
 const DEFAULT_MAX_BLOCK = Long.ZERO
 

package/src/tests/types/aptos/souffle.ts

@@ -5,7 +5,7 @@
 /* Generated modules for account 0x4188c8694687e844677c2aa87171019e23d61cac60de5082a278a8aa47e9d807 */
 
 import { aptos } from "@sentio/sdk";
-import { Address, MoveModule } from "aptos/src/generated";
+import { Address, MoveModule } from "aptos-sdk/src/generated";
 
 import { acl, account, table, event } from "@sentio/sdk/src/builtin/aptos/0x1";
 import { token } from "@sentio/sdk/src/builtin/aptos/0x3";
@@ -17,7 +17,7 @@ export class CandyMachine extends aptos.AptosBaseProcessor {
   static DEFAULT_OPTIONS: aptos.AptosBindOptions = {
     address:
       "0x4188c8694687e844677c2aa87171019e23d61cac60de5082a278a8aa47e9d807",
-    network: aptos.AptosNetwork.TEST_NET,
+    network: aptos.AptosNetwork.MAIN_NET,
   };
 
   static bind(options: Partial<aptos.AptosBindOptions> = {}): CandyMachine {
@@ -237,7 +237,7 @@ export class SouffleChefCampaign extends aptos.AptosBaseProcessor {
   static DEFAULT_OPTIONS: aptos.AptosBindOptions = {
     address:
       "0x4188c8694687e844677c2aa87171019e23d61cac60de5082a278a8aa47e9d807",
-    network: aptos.AptosNetwork.TEST_NET,
+    network: aptos.AptosNetwork.MAIN_NET,
   };
 
   static bind(

package/lib/aptos/bind-options.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AptosBindOptions = exports.AptosNetwork = void 0;
-var AptosNetwork;
-(function (AptosNetwork) {
-    AptosNetwork[AptosNetwork["MAIN_NET"] = 1] = "MAIN_NET";
-    AptosNetwork[AptosNetwork["TEST_NET"] = 2] = "TEST_NET";
-    // DEV_NET,
-})(AptosNetwork = exports.AptosNetwork || (exports.AptosNetwork = {}));
-class AptosBindOptions {
-    address;
-    network = AptosNetwork.TEST_NET;
-    startVersion;
-}
-exports.AptosBindOptions = AptosBindOptions;
-//# sourceMappingURL=bind-options.js.map

package/lib/aptos/bind-options.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"bind-options.js","sourceRoot":"","sources":["../../src/aptos/bind-options.ts"],"names":[],"mappings":";;;AAEA,IAAY,YAIX;AAJD,WAAY,YAAY;IACtB,uDAAY,CAAA;IACZ,uDAAY,CAAA;IACZ,WAAW;AACb,CAAC,EAJW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAIvB;AAED,MAAa,gBAAgB;IAC3B,OAAO,CAAQ;IACf,OAAO,GAAkB,YAAY,CAAC,QAAQ,CAAA;IAC9C,YAAY,CAAgB;CAE7B;AALD,4CAKC","sourcesContent":["import Long from 'long'\n\nexport enum AptosNetwork {\n  MAIN_NET = 1,\n  TEST_NET = 2,\n  // DEV_NET,\n}\n\nexport class AptosBindOptions {\n  address: string\n  network?: AptosNetwork = AptosNetwork.TEST_NET\n  startVersion?: Long | number\n  // endBlock?: Long | number\n}\n"]}

package/src/aptos/bind-options.ts

@@ -1,14 +0,0 @@
-import Long from 'long'
-
-export enum AptosNetwork {
-  MAIN_NET = 1,
-  TEST_NET = 2,
-  // DEV_NET,
-}
-
-export class AptosBindOptions {
-  address: string
-  network?: AptosNetwork = AptosNetwork.TEST_NET
-  startVersion?: Long | number
-  // endBlock?: Long | number
-}