@typemove/aptos 1.10.1-rc.1 → 1.11.0

package/src/builtin/0x3.ts

@@ -711,7 +711,7 @@ export namespace token {
       },
       options?: InputGenerateTransactionOptions,
     ): Promise<PendingTransactionResponse> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const transaction = await client.transaction.build.simple({
         sender: account.accountAddress,
         data: {
@@ -736,7 +736,7 @@ export namespace token {
       },
       options?: InputGenerateTransactionOptions,
     ): Promise<PendingTransactionResponse> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const transaction = await client.transaction.build.simple({
         sender: account.accountAddress,
         data: {
@@ -761,7 +761,7 @@ export namespace token {
       },
       options?: InputGenerateTransactionOptions,
     ): Promise<PendingTransactionResponse> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const transaction = await client.transaction.build.simple({
         sender: account.accountAddress,
         data: {
@@ -800,7 +800,7 @@ export namespace token {
       },
       options?: InputGenerateTransactionOptions,
     ): Promise<PendingTransactionResponse> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const transaction = await client.transaction.build.simple({
         sender: account.accountAddress,
         data: {
@@ -832,7 +832,7 @@ export namespace token {
       },
       options?: InputGenerateTransactionOptions,
     ): Promise<PendingTransactionResponse> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const transaction = await client.transaction.build.simple({
         sender: account.accountAddress,
         data: {
@@ -857,7 +857,7 @@ export namespace token {
       },
       options?: InputGenerateTransactionOptions,
     ): Promise<PendingTransactionResponse> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const transaction = await client.transaction.build.simple({
         sender: account.accountAddress,
         data: {
@@ -882,7 +882,7 @@ export namespace token {
       },
       options?: InputGenerateTransactionOptions,
     ): Promise<PendingTransactionResponse> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const transaction = await client.transaction.build.simple({
         sender: account.accountAddress,
         data: {
@@ -917,7 +917,7 @@ export namespace token {
       },
       options?: InputGenerateTransactionOptions,
     ): Promise<PendingTransactionResponse> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const transaction = await client.transaction.build.simple({
         sender: account.accountAddress,
         data: {
@@ -942,7 +942,7 @@ export namespace token {
       },
       options?: InputGenerateTransactionOptions,
     ): Promise<PendingTransactionResponse> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const transaction = await client.transaction.build.simple({
         sender: account.accountAddress,
         data: {
@@ -974,7 +974,7 @@ export namespace token {
       },
       options?: InputGenerateTransactionOptions,
     ): Promise<PendingTransactionResponse> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const transaction = await client.transaction.build.simple({
         sender: account.accountAddress,
         data: {
@@ -998,7 +998,7 @@ export namespace token {
       },
       version?: bigint,
     ): Promise<[token.CollectionMutabilityConfig]> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const data: InputViewFunctionData = {
         function: "0x3::token::get_collection_mutability_config",
         functionArguments: coder.encodeArray(request.functionArguments),
@@ -1196,7 +1196,7 @@ export namespace token_coin_swap {
       },
       options?: InputGenerateTransactionOptions,
     ): Promise<PendingTransactionResponse> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const transaction = await client.transaction.build.simple({
         sender: account.accountAddress,
         data: {
@@ -1472,7 +1472,7 @@ export namespace token_transfers {
       },
       options?: InputGenerateTransactionOptions,
     ): Promise<PendingTransactionResponse> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const transaction = await client.transaction.build.simple({
         sender: account.accountAddress,
         data: {
@@ -1504,7 +1504,7 @@ export namespace token_transfers {
       },
       options?: InputGenerateTransactionOptions,
     ): Promise<PendingTransactionResponse> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const transaction = await client.transaction.build.simple({
         sender: account.accountAddress,
         data: {
@@ -1537,7 +1537,7 @@ export namespace token_transfers {
       },
       options?: InputGenerateTransactionOptions,
     ): Promise<PendingTransactionResponse> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const transaction = await client.transaction.build.simple({
         sender: account.accountAddress,
         data: {

package/src/builtin/0x4.ts

@@ -168,7 +168,7 @@ export namespace token {
       },
       version?: bigint,
     ): Promise<[bigint]> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const data: InputViewFunctionData = {
         function: "0x4::token::index",
         functionArguments: coder.encodeArray(request.functionArguments),
@@ -190,7 +190,7 @@ export namespace token {
       },
       version?: bigint,
     ): Promise<[MoveAddressType]> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const data: InputViewFunctionData = {
         function: "0x4::token::creator",
         functionArguments: coder.encodeArray(request.functionArguments),
@@ -211,7 +211,7 @@ export namespace token {
       },
       version?: bigint,
     ): Promise<[string]> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const data: InputViewFunctionData = {
         function: "0x4::token::name",
         functionArguments: coder.encodeArray(request.functionArguments),
@@ -233,7 +233,7 @@ export namespace token {
       },
       version?: bigint,
     ): Promise<[_0x1.option.Option<royalty.Royalty>]> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const data: InputViewFunctionData = {
         function: "0x4::token::royalty",
         functionArguments: coder.encodeArray(request.functionArguments),
@@ -255,7 +255,7 @@ export namespace token {
       },
       version?: bigint,
     ): Promise<[string]> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const data: InputViewFunctionData = {
         function: "0x4::token::description",
         functionArguments: coder.encodeArray(request.functionArguments),
@@ -276,7 +276,7 @@ export namespace token {
       },
       version?: bigint,
     ): Promise<[string]> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const data: InputViewFunctionData = {
         function: "0x4::token::uri",
         functionArguments: coder.encodeArray(request.functionArguments),
@@ -298,7 +298,7 @@ export namespace token {
       },
       version?: bigint,
     ): Promise<[string]> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const data: InputViewFunctionData = {
         function: "0x4::token::collection_name",
         functionArguments: coder.encodeArray(request.functionArguments),
@@ -319,7 +319,7 @@ export namespace token {
       },
       version?: bigint,
     ): Promise<[_0x1.object$.Object<collection.Collection>]> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const data: InputViewFunctionData = {
         function: "0x4::token::collection_object",
         functionArguments: coder.encodeArray(request.functionArguments),
@@ -340,7 +340,7 @@ export namespace token {
       },
       version?: bigint,
     ): Promise<[MoveAddressType]> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const data: InputViewFunctionData = {
         function: "0x4::token::create_token_address_with_seed",
         functionArguments: coder.encodeArray(request.functionArguments),
@@ -693,7 +693,7 @@ export namespace collection {
       },
       version?: bigint,
     ): Promise<[_0x1.option.Option<bigint>]> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const data: InputViewFunctionData = {
         function: "0x4::collection::count",
         functionArguments: coder.encodeArray(request.functionArguments),
@@ -714,7 +714,7 @@ export namespace collection {
       },
       version?: bigint,
     ): Promise<[MoveAddressType]> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const data: InputViewFunctionData = {
         function: "0x4::collection::creator",
         functionArguments: coder.encodeArray(request.functionArguments),
@@ -735,7 +735,7 @@ export namespace collection {
       },
       version?: bigint,
     ): Promise<[string]> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const data: InputViewFunctionData = {
         function: "0x4::collection::name",
         functionArguments: coder.encodeArray(request.functionArguments),
@@ -757,7 +757,7 @@ export namespace collection {
       },
       version?: bigint,
     ): Promise<[string]> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const data: InputViewFunctionData = {
         function: "0x4::collection::description",
         functionArguments: coder.encodeArray(request.functionArguments),
@@ -778,7 +778,7 @@ export namespace collection {
       },
       version?: bigint,
     ): Promise<[string]> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const data: InputViewFunctionData = {
         function: "0x4::collection::uri",
         functionArguments: coder.encodeArray(request.functionArguments),
@@ -847,7 +847,7 @@ export namespace aptos_token {
       },
       options?: InputGenerateTransactionOptions,
     ): Promise<PendingTransactionResponse> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const transaction = await client.transaction.build.simple({
         sender: account.accountAddress,
         data: {
@@ -879,7 +879,7 @@ export namespace aptos_token {
       },
       options?: InputGenerateTransactionOptions,
     ): Promise<PendingTransactionResponse> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const transaction = await client.transaction.build.simple({
         sender: account.accountAddress,
         data: {
@@ -903,7 +903,7 @@ export namespace aptos_token {
       },
       options?: InputGenerateTransactionOptions,
     ): Promise<PendingTransactionResponse> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const transaction = await client.transaction.build.simple({
         sender: account.accountAddress,
         data: {
@@ -927,7 +927,7 @@ export namespace aptos_token {
       },
       options?: InputGenerateTransactionOptions,
     ): Promise<PendingTransactionResponse> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const transaction = await client.transaction.build.simple({
         sender: account.accountAddress,
         data: {
@@ -951,7 +951,7 @@ export namespace aptos_token {
       },
       options?: InputGenerateTransactionOptions,
     ): Promise<PendingTransactionResponse> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const transaction = await client.transaction.build.simple({
         sender: account.accountAddress,
         data: {
@@ -975,7 +975,7 @@ export namespace aptos_token {
       },
       options?: InputGenerateTransactionOptions,
     ): Promise<PendingTransactionResponse> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const transaction = await client.transaction.build.simple({
         sender: account.accountAddress,
         data: {
@@ -999,7 +999,7 @@ export namespace aptos_token {
       },
       options?: InputGenerateTransactionOptions,
     ): Promise<PendingTransactionResponse> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const transaction = await client.transaction.build.simple({
         sender: account.accountAddress,
         data: {
@@ -1040,7 +1040,7 @@ export namespace aptos_token {
       },
       options?: InputGenerateTransactionOptions,
     ): Promise<PendingTransactionResponse> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const transaction = await client.transaction.build.simple({
         sender: account.accountAddress,
         data: {
@@ -1065,7 +1065,7 @@ export namespace aptos_token {
       },
       options?: InputGenerateTransactionOptions,
     ): Promise<PendingTransactionResponse> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const transaction = await client.transaction.build.simple({
         sender: account.accountAddress,
         data: {
@@ -1099,7 +1099,7 @@ export namespace aptos_token {
       },
       options?: InputGenerateTransactionOptions,
     ): Promise<PendingTransactionResponse> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const transaction = await client.transaction.build.simple({
         sender: account.accountAddress,
         data: {
@@ -1124,7 +1124,7 @@ export namespace aptos_token {
       },
       options?: InputGenerateTransactionOptions,
     ): Promise<PendingTransactionResponse> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const transaction = await client.transaction.build.simple({
         sender: account.accountAddress,
         data: {
@@ -1148,7 +1148,7 @@ export namespace aptos_token {
       },
       options?: InputGenerateTransactionOptions,
     ): Promise<PendingTransactionResponse> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const transaction = await client.transaction.build.simple({
         sender: account.accountAddress,
         data: {
@@ -1178,7 +1178,7 @@ export namespace aptos_token {
       },
       options?: InputGenerateTransactionOptions,
     ): Promise<PendingTransactionResponse> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const transaction = await client.transaction.build.simple({
         sender: account.accountAddress,
         data: {
@@ -1202,7 +1202,7 @@ export namespace aptos_token {
       },
       options?: InputGenerateTransactionOptions,
     ): Promise<PendingTransactionResponse> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const transaction = await client.transaction.build.simple({
         sender: account.accountAddress,
         data: {
@@ -1226,7 +1226,7 @@ export namespace aptos_token {
       },
       options?: InputGenerateTransactionOptions,
     ): Promise<PendingTransactionResponse> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const transaction = await client.transaction.build.simple({
         sender: account.accountAddress,
         data: {
@@ -1250,7 +1250,7 @@ export namespace aptos_token {
       },
       options?: InputGenerateTransactionOptions,
     ): Promise<PendingTransactionResponse> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const transaction = await client.transaction.build.simple({
         sender: account.accountAddress,
         data: {
@@ -1274,7 +1274,7 @@ export namespace aptos_token {
       },
       options?: InputGenerateTransactionOptions,
     ): Promise<PendingTransactionResponse> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const transaction = await client.transaction.build.simple({
         sender: account.accountAddress,
         data: {
@@ -1299,7 +1299,7 @@ export namespace aptos_token {
       },
       version?: bigint,
     ): Promise<[boolean]> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const data: InputViewFunctionData = {
         function: "0x4::aptos_token::are_properties_mutable",
         functionArguments: coder.encodeArray(request.functionArguments),
@@ -1323,7 +1323,7 @@ export namespace aptos_token {
       },
       version?: bigint,
     ): Promise<[boolean]> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const data: InputViewFunctionData = {
         function: "0x4::aptos_token::is_burnable",
         functionArguments: coder.encodeArray(request.functionArguments),
@@ -1344,7 +1344,7 @@ export namespace aptos_token {
       },
       version?: bigint,
     ): Promise<[boolean]> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const data: InputViewFunctionData = {
         function: "0x4::aptos_token::is_freezable_by_creator",
         functionArguments: coder.encodeArray(request.functionArguments),
@@ -1368,7 +1368,7 @@ export namespace aptos_token {
       },
       version?: bigint,
     ): Promise<[boolean]> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const data: InputViewFunctionData = {
         function: "0x4::aptos_token::is_mutable_description",
         functionArguments: coder.encodeArray(request.functionArguments),
@@ -1391,7 +1391,7 @@ export namespace aptos_token {
       },
       version?: bigint,
     ): Promise<[boolean]> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const data: InputViewFunctionData = {
         function: "0x4::aptos_token::is_mutable_name",
         functionArguments: coder.encodeArray(request.functionArguments),
@@ -1414,7 +1414,7 @@ export namespace aptos_token {
       },
       version?: bigint,
     ): Promise<[boolean]> {
-      const coder = defaultMoveCoder(client.config.fullnode);
+      const coder = defaultMoveCoder(client.config);
       const data: InputViewFunctionData = {
         function: "0x4::aptos_token::is_mutable_uri",
         functionArguments: coder.encodeArray(request.functionArguments),

package/src/codegen/codegen.ts

@@ -16,7 +16,7 @@ import { Aptos, AptosConfig, Event, MoveModuleBytecode, MoveResource } from '@ap
 export async function codegen(
   abisDir: string,
   outDir = join('src', 'types', 'aptos'),
-  endpoint: string,
+  config: AptosConfig,
   genExample = false,
   builtin = false
 ) {
@@ -24,7 +24,7 @@ export async function codegen(
     console.error(chalk.red(`ABIs directory ${abisDir} does not exist`))
     return 0
   }
-  const gen = new AptosCodegen(endpoint)
+  const gen = new AptosCodegen(config)
   try {
     const numFiles = await gen.generate(abisDir, outDir, builtin)
     if (numFiles > 0) {
@@ -46,10 +46,10 @@ export class AptosCodegen extends AbstractCodegen<MoveModuleBytecode, Event | Mo
   SYSTEM_PACKAGE = '@typemove/aptos'
 
   constructor(
-    endpoint: string,
+    config: AptosConfig,
     readonly useViewJson = false
   ) {
-    super(new AptosChainAdapter(new Aptos(new AptosConfig({ fullnode: endpoint }))))
+    super(new AptosChainAdapter(new Aptos(config)))
   }
 
   generateImports(): string {
@@ -145,7 +145,7 @@ export class AptosCodegen extends AbstractCodegen<MoveModuleBytecode, Event | Mo
   }
 
   protected getGetDefaultCoder() {
-    return `defaultMoveCoder(client.config.fullnode)`
+    return `defaultMoveCoder(client.config)`
   }
 
   protected generateEntryForFunction(module: InternalMoveModule, func: InternalMoveFunction): string {

package/src/codegen/run.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 import { codegen } from './codegen.js'
-import { Aptos, AptosConfig } from '@aptos-labs/ts-sdk'
+import { Aptos, AptosConfig, Network } from '@aptos-labs/ts-sdk'
 import * as path from 'path'
 import * as fs from 'fs'
 import { Command } from 'commander'
@@ -30,14 +30,23 @@ program
     'mainnet'
   )
   .action(async (location, options) => {
-    let endpoint = options.network
+    const endpoint = options.network
+    let config: AptosConfig
     if (endpoint == 'mainnet') {
-      endpoint = 'https://mainnet.aptoslabs.com/v1'
+      config = new AptosConfig({
+        network: Network.MAINNET
+      })
+    } else if (endpoint == 'testnet') {
+      config = new AptosConfig({
+        network: Network.TESTNET
+      })
+    } else {
+      config = new AptosConfig({
+        network: Network.CUSTOM,
+        fullnode: endpoint
+      })
     }
-    if (endpoint == 'testnet') {
-      endpoint = 'https://testnet.aptoslabs.com/v1'
-    }
-    const aptosClient = new Aptos(new AptosConfig({ fullnode: endpoint }))
+    const aptosClient = new Aptos(config)
 
     let abisDir = location
     if (location.startsWith('0x')) {

package/src/move-coder.ts

@@ -9,7 +9,8 @@ import {
   Event,
   MoveModuleBytecode,
   MoveResource,
-  MoveValue
+  MoveValue,
+  Network
 } from '@aptos-labs/ts-sdk'
 
 export class MoveCoder extends AbstractMoveCoder<MoveModuleBytecode, Event | MoveResource> {
@@ -107,25 +108,17 @@ export class MoveCoder extends AbstractMoveCoder<MoveModuleBytecode, Event | Mov
   }
 }
 
-// const MOVE_CODER = new MoveCoder(AptosNetwork.MAIN_NET)
-// const TESTNET_MOVE_CODER = new MoveCoder(AptosNetwork.TEST_NET)
-//
-// export function defaultMoveCoder(network: AptosNetwork = AptosNetwork.MAIN_NET): MoveCoder {
-//   if (network == AptosNetwork.MAIN_NET) {
-//     return MOVE_CODER
-//   }
-//   return TESTNET_MOVE_CODER
-// }
+const DEFAULT_CONFIG = new AptosConfig({ network: Network.MAINNET })
 
-const DEFAULT_ENDPOINT = 'https://mainnet.aptoslabs.com/v1'
 const CODER_MAP = new Map<string, MoveCoder>()
 
-export function defaultMoveCoder(endpoint: string = DEFAULT_ENDPOINT): MoveCoder {
-  let coder = CODER_MAP.get(endpoint)
+export function defaultMoveCoder(config = DEFAULT_CONFIG): MoveCoder {
+  const configKey = config.fullnode ? config.fullnode : config.network
+
+  let coder = CODER_MAP.get(configKey)
   if (!coder) {
-    const config = new AptosConfig({ fullnode: endpoint })
     coder = new MoveCoder(new Aptos(config))
-    CODER_MAP.set(endpoint, coder)
+    CODER_MAP.set(configKey, coder)
   }
   return coder
 }