@typemove/aptos 1.2.9-rc.1 → 1.3.0-rc.1

package/src/tests/types/0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af.ts

@@ -9,16 +9,15 @@ import { MoveCoder, TypedEventInstance } from "@typemove/aptos";
 
 import { defaultMoveCoder } from "@typemove/aptos";
 
-import { Address } from "@typemove/aptos";
-
 import {
-  AptosClient,
-  AptosAccount,
-  TransactionBuilderRemoteABI,
-  Types,
-  TxnBuilderTypes,
-  OptionalTransactionArgs,
-} from "aptos";
+  Aptos,
+  Account as AptosAccount,
+  MoveAddressType,
+  PendingTransactionResponse,
+  InputGenerateTransactionOptions,
+  MoveStructId,
+  InputViewRequestData,
+} from "@aptos-labs/ts-sdk";
 
 import { _0x1 } from "@typemove/aptos/builtin";
 import * as _0x4dcae85fc5559071906cd5c76b7420fcbb4b0a92f00ab40ffc394aadbbff5ee9 from "./0x4dcae85fc5559071906cd5c76b7420fcbb4b0a92f00ab40ffc394aadbbff5ee9.js";
@@ -27,20 +26,23 @@ export namespace fees {
   export namespace entry {}
   export namespace view {
     export async function balance<T0 = any>(
-      client: AptosClient,
+      client: Aptos,
       request: {
-        type_arguments: [string];
+        typeArguments: [MoveStructId];
       },
       version?: bigint,
     ): Promise<[bigint]> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const data = {
-        type_arguments: request.type_arguments,
-        arguments: [],
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const data: InputViewRequestData = {
         function:
           "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::fees::balance",
+        functionArguments: [],
+        typeArguments: request.typeArguments,
       };
-      const res = await client.view(data, version?.toString());
+      const res = await client.view({
+        payload: data,
+        options: { ledgerVersion: version },
+      });
       const type = await coder.getMoveFunction(
         "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::fees::balance",
       );
@@ -52,26 +54,29 @@ export namespace fees {
 export namespace init {
   export namespace entry {
     export async function initialize(
-      client: AptosClient,
+      client: Aptos,
       account: AptosAccount,
       request: {
-        type_arguments: [];
-        arguments: [];
+        typeArguments: [];
+        functionArguments: [];
       },
-      extraArgs?: OptionalTransactionArgs,
-    ): Promise<Types.PendingTransaction> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const builder = new TransactionBuilderRemoteABI(client, {
-        sender: account.address(),
-        ...extraArgs,
-      });
-      const txn = await builder.build(
-        "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::init::initialize",
-        request.type_arguments,
-        coder.encodeArray(request.arguments),
-      );
-      const bcsTxn = AptosClient.generateBCSTransaction(account, txn);
-      return await client.submitSignedBCSTransaction(bcsTxn);
+      options?: InputGenerateTransactionOptions,
+    ): Promise<PendingTransactionResponse> {
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const transaction = await client.build.simple({
+        sender: account.accountAddress,
+        data: {
+          function:
+            "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::init::initialize",
+          functionArguments: coder.encodeArray(request.functionArguments),
+          typeArguments: [],
+        },
+        options,
+      });
+      return await client.signAndSubmitTransaction({
+        signer: account,
+        transaction,
+      });
     }
   }
   export namespace view {}
@@ -97,26 +102,29 @@ export namespace package_ {
 
   export namespace entry {
     export async function publishPackage(
-      client: AptosClient,
+      client: Aptos,
       account: AptosAccount,
       request: {
-        type_arguments: [];
-        arguments: [string, string[]];
+        typeArguments: [];
+        functionArguments: [string, string[]];
       },
-      extraArgs?: OptionalTransactionArgs,
-    ): Promise<Types.PendingTransaction> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const builder = new TransactionBuilderRemoteABI(client, {
-        sender: account.address(),
-        ...extraArgs,
-      });
-      const txn = await builder.build(
-        "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::package::publish_package",
-        request.type_arguments,
-        coder.encodeArray(request.arguments),
-      );
-      const bcsTxn = AptosClient.generateBCSTransaction(account, txn);
-      return await client.submitSignedBCSTransaction(bcsTxn);
+      options?: InputGenerateTransactionOptions,
+    ): Promise<PendingTransactionResponse> {
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const transaction = await client.build.simple({
+        sender: account.accountAddress,
+        data: {
+          function:
+            "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::package::publish_package",
+          functionArguments: coder.encodeArray(request.functionArguments),
+          typeArguments: [],
+        },
+        options,
+      });
+      return await client.signAndSubmitTransaction({
+        signer: account,
+        transaction,
+      });
     }
   }
   export namespace view {}
@@ -181,62 +189,71 @@ export namespace base_pool {
 
   export namespace entry {
     export async function setSwapFeeProtocolAllocationBps(
-      client: AptosClient,
+      client: Aptos,
       account: AptosAccount,
       request: {
-        type_arguments: [];
-        arguments: [bigint];
+        typeArguments: [];
+        functionArguments: [bigint];
       },
-      extraArgs?: OptionalTransactionArgs,
-    ): Promise<Types.PendingTransaction> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const builder = new TransactionBuilderRemoteABI(client, {
-        sender: account.address(),
-        ...extraArgs,
-      });
-      const txn = await builder.build(
-        "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::base_pool::set_swap_fee_protocol_allocation_bps",
-        request.type_arguments,
-        coder.encodeArray(request.arguments),
-      );
-      const bcsTxn = AptosClient.generateBCSTransaction(account, txn);
-      return await client.submitSignedBCSTransaction(bcsTxn);
+      options?: InputGenerateTransactionOptions,
+    ): Promise<PendingTransactionResponse> {
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const transaction = await client.build.simple({
+        sender: account.accountAddress,
+        data: {
+          function:
+            "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::base_pool::set_swap_fee_protocol_allocation_bps",
+          functionArguments: coder.encodeArray(request.functionArguments),
+          typeArguments: [],
+        },
+        options,
+      });
+      return await client.signAndSubmitTransaction({
+        signer: account,
+        transaction,
+      });
     }
   }
   export namespace view {
     export async function maxSupportedDecimals(
-      client: AptosClient,
+      client: Aptos,
 
       version?: bigint,
     ): Promise<[number]> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const data = {
-        type_arguments: [],
-        arguments: [],
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const data: InputViewRequestData = {
         function:
           "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::base_pool::max_supported_decimals",
+        functionArguments: [],
+        typeArguments: [],
       };
-      const res = await client.view(data, version?.toString());
+      const res = await client.view({
+        payload: data,
+        options: { ledgerVersion: version },
+      });
       const type = await coder.getMoveFunction(
         "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::base_pool::max_supported_decimals",
       );
       return (await coder.decodeArray(res, type.return)) as any;
     }
     export async function poolTokenSupply<T0 = any>(
-      client: AptosClient,
+      client: Aptos,
       request: {
-        type_arguments: [string];
+        typeArguments: [MoveStructId];
       },
       version?: bigint,
     ): Promise<[bigint]> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const data = {
-        type_arguments: request.type_arguments,
-        arguments: [],
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const data: InputViewRequestData = {
         function:
           "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::base_pool::pool_token_supply",
+        functionArguments: [],
+        typeArguments: request.typeArguments,
       };
-      const res = await client.view(data, version?.toString());
+      const res = await client.view({
+        payload: data,
+        options: { ledgerVersion: version },
+      });
       const type = await coder.getMoveFunction(
         "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::base_pool::pool_token_supply",
       );
@@ -244,7 +261,7 @@ export namespace base_pool {
     }
 
     export async function swapFeeProtocolAllocationRatio(
-      client: AptosClient,
+      client: Aptos,
 
       version?: bigint,
     ): Promise<
@@ -252,14 +269,17 @@ export namespace base_pool {
         _0x4dcae85fc5559071906cd5c76b7420fcbb4b0a92f00ab40ffc394aadbbff5ee9.fixed_point64.FixedPoint64,
       ]
     > {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const data = {
-        type_arguments: [],
-        arguments: [],
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const data: InputViewRequestData = {
         function:
           "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::base_pool::swap_fee_protocol_allocation_ratio",
+        functionArguments: [],
+        typeArguments: [],
       };
-      const res = await client.view(data, version?.toString());
+      const res = await client.view({
+        payload: data,
+        options: { ledgerVersion: version },
+      });
       const type = await coder.getMoveFunction(
         "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::base_pool::swap_fee_protocol_allocation_ratio",
       );
@@ -460,7 +480,7 @@ export namespace stable_pool {
   }
 
   export interface StablePoolCreationEvent<T0, T1, T2, T3> {
-    creator: Address;
+    creator: MoveAddressType;
     amount_0: bigint;
     amount_1: bigint;
     amount_2: bigint;
@@ -672,48 +692,54 @@ export namespace stable_pool {
 
   export namespace entry {
     export async function setAmpFactor<T0 = any, T1 = any, T2 = any, T3 = any>(
-      client: AptosClient,
+      client: Aptos,
       account: AptosAccount,
       request: {
-        type_arguments: [string, string, string, string];
-        arguments: [bigint];
+        typeArguments: [MoveStructId, MoveStructId, MoveStructId, MoveStructId];
+        functionArguments: [bigint];
       },
-      extraArgs?: OptionalTransactionArgs,
-    ): Promise<Types.PendingTransaction> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const builder = new TransactionBuilderRemoteABI(client, {
-        sender: account.address(),
-        ...extraArgs,
-      });
-      const txn = await builder.build(
-        "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool::set_amp_factor",
-        request.type_arguments,
-        coder.encodeArray(request.arguments),
-      );
-      const bcsTxn = AptosClient.generateBCSTransaction(account, txn);
-      return await client.submitSignedBCSTransaction(bcsTxn);
+      options?: InputGenerateTransactionOptions,
+    ): Promise<PendingTransactionResponse> {
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const transaction = await client.build.simple({
+        sender: account.accountAddress,
+        data: {
+          function:
+            "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool::set_amp_factor",
+          functionArguments: coder.encodeArray(request.functionArguments),
+          typeArguments: request.typeArguments,
+        },
+        options,
+      });
+      return await client.signAndSubmitTransaction({
+        signer: account,
+        transaction,
+      });
     }
     export async function setDefaultPoolSwapFeeBps(
-      client: AptosClient,
+      client: Aptos,
       account: AptosAccount,
       request: {
-        type_arguments: [];
-        arguments: [bigint];
+        typeArguments: [];
+        functionArguments: [bigint];
       },
-      extraArgs?: OptionalTransactionArgs,
-    ): Promise<Types.PendingTransaction> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const builder = new TransactionBuilderRemoteABI(client, {
-        sender: account.address(),
-        ...extraArgs,
-      });
-      const txn = await builder.build(
-        "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool::set_default_pool_swap_fee_bps",
-        request.type_arguments,
-        coder.encodeArray(request.arguments),
-      );
-      const bcsTxn = AptosClient.generateBCSTransaction(account, txn);
-      return await client.submitSignedBCSTransaction(bcsTxn);
+      options?: InputGenerateTransactionOptions,
+    ): Promise<PendingTransactionResponse> {
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const transaction = await client.build.simple({
+        sender: account.accountAddress,
+        data: {
+          function:
+            "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool::set_default_pool_swap_fee_bps",
+          functionArguments: coder.encodeArray(request.functionArguments),
+          typeArguments: [],
+        },
+        options,
+      });
+      return await client.signAndSubmitTransaction({
+        signer: account,
+        transaction,
+      });
     }
     export async function setFlashloanFeeBps<
       T0 = any,
@@ -721,26 +747,29 @@ export namespace stable_pool {
       T2 = any,
       T3 = any,
     >(
-      client: AptosClient,
+      client: Aptos,
       account: AptosAccount,
       request: {
-        type_arguments: [string, string, string, string];
-        arguments: [bigint];
+        typeArguments: [MoveStructId, MoveStructId, MoveStructId, MoveStructId];
+        functionArguments: [bigint];
       },
-      extraArgs?: OptionalTransactionArgs,
-    ): Promise<Types.PendingTransaction> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const builder = new TransactionBuilderRemoteABI(client, {
-        sender: account.address(),
-        ...extraArgs,
-      });
-      const txn = await builder.build(
-        "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool::set_flashloan_fee_bps",
-        request.type_arguments,
-        coder.encodeArray(request.arguments),
-      );
-      const bcsTxn = AptosClient.generateBCSTransaction(account, txn);
-      return await client.submitSignedBCSTransaction(bcsTxn);
+      options?: InputGenerateTransactionOptions,
+    ): Promise<PendingTransactionResponse> {
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const transaction = await client.build.simple({
+        sender: account.accountAddress,
+        data: {
+          function:
+            "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool::set_flashloan_fee_bps",
+          functionArguments: coder.encodeArray(request.functionArguments),
+          typeArguments: request.typeArguments,
+        },
+        options,
+      });
+      return await client.signAndSubmitTransaction({
+        signer: account,
+        transaction,
+      });
     }
     export async function setPoolSwapFeeBps<
       T0 = any,
@@ -748,26 +777,29 @@ export namespace stable_pool {
       T2 = any,
       T3 = any,
     >(
-      client: AptosClient,
+      client: Aptos,
       account: AptosAccount,
       request: {
-        type_arguments: [string, string, string, string];
-        arguments: [bigint];
+        typeArguments: [MoveStructId, MoveStructId, MoveStructId, MoveStructId];
+        functionArguments: [bigint];
       },
-      extraArgs?: OptionalTransactionArgs,
-    ): Promise<Types.PendingTransaction> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const builder = new TransactionBuilderRemoteABI(client, {
-        sender: account.address(),
-        ...extraArgs,
-      });
-      const txn = await builder.build(
-        "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool::set_pool_swap_fee_bps",
-        request.type_arguments,
-        coder.encodeArray(request.arguments),
-      );
-      const bcsTxn = AptosClient.generateBCSTransaction(account, txn);
-      return await client.submitSignedBCSTransaction(bcsTxn);
+      options?: InputGenerateTransactionOptions,
+    ): Promise<PendingTransactionResponse> {
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const transaction = await client.build.simple({
+        sender: account.accountAddress,
+        data: {
+          function:
+            "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool::set_pool_swap_fee_bps",
+          functionArguments: coder.encodeArray(request.functionArguments),
+          typeArguments: request.typeArguments,
+        },
+        options,
+      });
+      return await client.signAndSubmitTransaction({
+        signer: account,
+        transaction,
+      });
     }
   }
   export namespace view {
@@ -777,20 +809,23 @@ export namespace stable_pool {
       T2 = any,
       T3 = any,
     >(
-      client: AptosClient,
+      client: Aptos,
       request: {
-        type_arguments: [string, string, string, string];
+        typeArguments: [MoveStructId, MoveStructId, MoveStructId, MoveStructId];
       },
       version?: bigint,
     ): Promise<[bigint]> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const data = {
-        type_arguments: request.type_arguments,
-        arguments: [],
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const data: InputViewRequestData = {
         function:
           "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool::flashloan_fee_bps",
+        functionArguments: [],
+        typeArguments: request.typeArguments,
       };
-      const res = await client.view(data, version?.toString());
+      const res = await client.view({
+        payload: data,
+        options: { ledgerVersion: version },
+      });
       const type = await coder.getMoveFunction(
         "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool::flashloan_fee_bps",
       );
@@ -802,20 +837,23 @@ export namespace stable_pool {
       T2 = any,
       T3 = any,
     >(
-      client: AptosClient,
+      client: Aptos,
       request: {
-        type_arguments: [string, string, string, string];
+        typeArguments: [MoveStructId, MoveStructId, MoveStructId, MoveStructId];
       },
       version?: bigint,
     ): Promise<[bigint[]]> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const data = {
-        type_arguments: request.type_arguments,
-        arguments: [],
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const data: InputViewRequestData = {
         function:
           "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool::get_precision_multipliers",
+        functionArguments: [],
+        typeArguments: request.typeArguments,
       };
-      const res = await client.view(data, version?.toString());
+      const res = await client.view({
+        payload: data,
+        options: { ledgerVersion: version },
+      });
       const type = await coder.getMoveFunction(
         "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool::get_precision_multipliers",
       );
@@ -823,38 +861,44 @@ export namespace stable_pool {
     }
 
     export async function lpNameById(
-      client: AptosClient,
+      client: Aptos,
       request: {
-        arguments: [bigint];
+        functionArguments: [bigint];
       },
       version?: bigint,
     ): Promise<[string]> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const data = {
-        type_arguments: [],
-        arguments: coder.encodeArray(request.arguments),
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const data: InputViewRequestData = {
         function:
           "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool::lp_name_by_id",
+        functionArguments: coder.encodeArray(request.functionArguments),
+        typeArguments: [],
       };
-      const res = await client.view(data, version?.toString());
+      const res = await client.view({
+        payload: data,
+        options: { ledgerVersion: version },
+      });
       const type = await coder.getMoveFunction(
         "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool::lp_name_by_id",
       );
       return (await coder.decodeArray(res, type.return)) as any;
     }
     export async function nextPoolId(
-      client: AptosClient,
+      client: Aptos,
 
       version?: bigint,
     ): Promise<[bigint]> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const data = {
-        type_arguments: [],
-        arguments: [],
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const data: InputViewRequestData = {
         function:
           "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool::next_pool_id",
+        functionArguments: [],
+        typeArguments: [],
       };
-      const res = await client.view(data, version?.toString());
+      const res = await client.view({
+        payload: data,
+        options: { ledgerVersion: version },
+      });
       const type = await coder.getMoveFunction(
         "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool::next_pool_id",
       );
@@ -862,60 +906,69 @@ export namespace stable_pool {
     }
 
     export async function poolAmpFactor<T0 = any, T1 = any, T2 = any, T3 = any>(
-      client: AptosClient,
+      client: Aptos,
       request: {
-        type_arguments: [string, string, string, string];
+        typeArguments: [MoveStructId, MoveStructId, MoveStructId, MoveStructId];
       },
       version?: bigint,
     ): Promise<[bigint]> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const data = {
-        type_arguments: request.type_arguments,
-        arguments: [],
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const data: InputViewRequestData = {
         function:
           "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool::pool_amp_factor",
+        functionArguments: [],
+        typeArguments: request.typeArguments,
       };
-      const res = await client.view(data, version?.toString());
+      const res = await client.view({
+        payload: data,
+        options: { ledgerVersion: version },
+      });
       const type = await coder.getMoveFunction(
         "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool::pool_amp_factor",
       );
       return (await coder.decodeArray(res, type.return)) as any;
     }
     export async function poolBalances<T0 = any, T1 = any, T2 = any, T3 = any>(
-      client: AptosClient,
+      client: Aptos,
       request: {
-        type_arguments: [string, string, string, string];
+        typeArguments: [MoveStructId, MoveStructId, MoveStructId, MoveStructId];
       },
       version?: bigint,
     ): Promise<[bigint[]]> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const data = {
-        type_arguments: request.type_arguments,
-        arguments: [],
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const data: InputViewRequestData = {
         function:
           "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool::pool_balances",
+        functionArguments: [],
+        typeArguments: request.typeArguments,
       };
-      const res = await client.view(data, version?.toString());
+      const res = await client.view({
+        payload: data,
+        options: { ledgerVersion: version },
+      });
       const type = await coder.getMoveFunction(
         "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool::pool_balances",
       );
       return (await coder.decodeArray(res, type.return)) as any;
     }
     export async function poolInfo(
-      client: AptosClient,
+      client: Aptos,
       request: {
-        arguments: [string];
+        functionArguments: [string];
       },
       version?: bigint,
     ): Promise<[bigint[], bigint, bigint]> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const data = {
-        type_arguments: [],
-        arguments: coder.encodeArray(request.arguments),
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const data: InputViewRequestData = {
         function:
           "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool::pool_info",
+        functionArguments: coder.encodeArray(request.functionArguments),
+        typeArguments: [],
       };
-      const res = await client.view(data, version?.toString());
+      const res = await client.view({
+        payload: data,
+        options: { ledgerVersion: version },
+      });
       const type = await coder.getMoveFunction(
         "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool::pool_info",
       );
@@ -928,20 +981,23 @@ export namespace stable_pool {
       T2 = any,
       T3 = any,
     >(
-      client: AptosClient,
+      client: Aptos,
       request: {
-        type_arguments: [string, string, string, string];
+        typeArguments: [MoveStructId, MoveStructId, MoveStructId, MoveStructId];
       },
       version?: bigint,
     ): Promise<[Boolean]> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const data = {
-        type_arguments: request.type_arguments,
-        arguments: [],
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const data: InputViewRequestData = {
         function:
           "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool::stable_pool_exists",
+        functionArguments: [],
+        typeArguments: request.typeArguments,
       };
-      const res = await client.view(data, version?.toString());
+      const res = await client.view({
+        payload: data,
+        options: { ledgerVersion: version },
+      });
       const type = await coder.getMoveFunction(
         "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool::stable_pool_exists",
       );
@@ -949,9 +1005,9 @@ export namespace stable_pool {
     }
 
     export async function swapFeeRatio<T0 = any, T1 = any, T2 = any, T3 = any>(
-      client: AptosClient,
+      client: Aptos,
       request: {
-        type_arguments: [string, string, string, string];
+        typeArguments: [MoveStructId, MoveStructId, MoveStructId, MoveStructId];
       },
       version?: bigint,
     ): Promise<
@@ -959,14 +1015,17 @@ export namespace stable_pool {
         _0x4dcae85fc5559071906cd5c76b7420fcbb4b0a92f00ab40ffc394aadbbff5ee9.fixed_point64.FixedPoint64,
       ]
     > {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const data = {
-        type_arguments: request.type_arguments,
-        arguments: [],
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const data: InputViewRequestData = {
         function:
           "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool::swap_fee_ratio",
+        functionArguments: [],
+        typeArguments: request.typeArguments,
       };
-      const res = await client.view(data, version?.toString());
+      const res = await client.view({
+        payload: data,
+        options: { ledgerVersion: version },
+      });
       const type = await coder.getMoveFunction(
         "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool::swap_fee_ratio",
       );
@@ -978,26 +1037,29 @@ export namespace stable_pool {
 export namespace fees_scripts {
   export namespace entry {
     export async function transferFee<T0 = any>(
-      client: AptosClient,
+      client: Aptos,
       account: AptosAccount,
       request: {
-        type_arguments: [string];
-        arguments: [Address, bigint];
+        typeArguments: [MoveStructId];
+        functionArguments: [MoveAddressType, bigint];
       },
-      extraArgs?: OptionalTransactionArgs,
-    ): Promise<Types.PendingTransaction> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const builder = new TransactionBuilderRemoteABI(client, {
-        sender: account.address(),
-        ...extraArgs,
-      });
-      const txn = await builder.build(
-        "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::fees_scripts::transfer_fee",
-        request.type_arguments,
-        coder.encodeArray(request.arguments),
-      );
-      const bcsTxn = AptosClient.generateBCSTransaction(account, txn);
-      return await client.submitSignedBCSTransaction(bcsTxn);
+      options?: InputGenerateTransactionOptions,
+    ): Promise<PendingTransactionResponse> {
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const transaction = await client.build.simple({
+        sender: account.accountAddress,
+        data: {
+          function:
+            "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::fees_scripts::transfer_fee",
+          functionArguments: coder.encodeArray(request.functionArguments),
+          typeArguments: request.typeArguments,
+        },
+        options,
+      });
+      return await client.signAndSubmitTransaction({
+        signer: account,
+        transaction,
+      });
     }
   }
   export namespace view {}
@@ -1585,7 +1647,7 @@ export namespace weighted_pool {
   }
 
   export interface WeightedPoolCreationEvent<T0, T1, T2, T3, T4, T5, T6, T7> {
-    creator: Address;
+    creator: MoveAddressType;
     amount_0: bigint;
     amount_1: bigint;
     amount_2: bigint;
@@ -1797,26 +1859,29 @@ export namespace weighted_pool {
 
   export namespace entry {
     export async function setDefaultPoolSwapFeeBps(
-      client: AptosClient,
+      client: Aptos,
       account: AptosAccount,
       request: {
-        type_arguments: [];
-        arguments: [bigint];
+        typeArguments: [];
+        functionArguments: [bigint];
       },
-      extraArgs?: OptionalTransactionArgs,
-    ): Promise<Types.PendingTransaction> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const builder = new TransactionBuilderRemoteABI(client, {
-        sender: account.address(),
-        ...extraArgs,
-      });
-      const txn = await builder.build(
-        "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::weighted_pool::set_default_pool_swap_fee_bps",
-        request.type_arguments,
-        coder.encodeArray(request.arguments),
-      );
-      const bcsTxn = AptosClient.generateBCSTransaction(account, txn);
-      return await client.submitSignedBCSTransaction(bcsTxn);
+      options?: InputGenerateTransactionOptions,
+    ): Promise<PendingTransactionResponse> {
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const transaction = await client.build.simple({
+        sender: account.accountAddress,
+        data: {
+          function:
+            "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::weighted_pool::set_default_pool_swap_fee_bps",
+          functionArguments: coder.encodeArray(request.functionArguments),
+          typeArguments: [],
+        },
+        options,
+      });
+      return await client.signAndSubmitTransaction({
+        signer: account,
+        transaction,
+      });
     }
     export async function setFlashloanFeeBps<
       T0 = any,
@@ -1828,35 +1893,38 @@ export namespace weighted_pool {
       T6 = any,
       T7 = any,
     >(
-      client: AptosClient,
+      client: Aptos,
       account: AptosAccount,
       request: {
-        type_arguments: [
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
+        typeArguments: [
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
         ];
-        arguments: [bigint];
+        functionArguments: [bigint];
       },
-      extraArgs?: OptionalTransactionArgs,
-    ): Promise<Types.PendingTransaction> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const builder = new TransactionBuilderRemoteABI(client, {
-        sender: account.address(),
-        ...extraArgs,
-      });
-      const txn = await builder.build(
-        "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::weighted_pool::set_flashloan_fee_bps",
-        request.type_arguments,
-        coder.encodeArray(request.arguments),
-      );
-      const bcsTxn = AptosClient.generateBCSTransaction(account, txn);
-      return await client.submitSignedBCSTransaction(bcsTxn);
+      options?: InputGenerateTransactionOptions,
+    ): Promise<PendingTransactionResponse> {
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const transaction = await client.build.simple({
+        sender: account.accountAddress,
+        data: {
+          function:
+            "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::weighted_pool::set_flashloan_fee_bps",
+          functionArguments: coder.encodeArray(request.functionArguments),
+          typeArguments: request.typeArguments,
+        },
+        options,
+      });
+      return await client.signAndSubmitTransaction({
+        signer: account,
+        transaction,
+      });
     }
     export async function setPoolSwapFeeBps<
       T0 = any,
@@ -1868,35 +1936,38 @@ export namespace weighted_pool {
       T6 = any,
       T7 = any,
     >(
-      client: AptosClient,
+      client: Aptos,
       account: AptosAccount,
       request: {
-        type_arguments: [
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
+        typeArguments: [
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
         ];
-        arguments: [bigint];
+        functionArguments: [bigint];
       },
-      extraArgs?: OptionalTransactionArgs,
-    ): Promise<Types.PendingTransaction> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const builder = new TransactionBuilderRemoteABI(client, {
-        sender: account.address(),
-        ...extraArgs,
-      });
-      const txn = await builder.build(
-        "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::weighted_pool::set_pool_swap_fee_bps",
-        request.type_arguments,
-        coder.encodeArray(request.arguments),
-      );
-      const bcsTxn = AptosClient.generateBCSTransaction(account, txn);
-      return await client.submitSignedBCSTransaction(bcsTxn);
+      options?: InputGenerateTransactionOptions,
+    ): Promise<PendingTransactionResponse> {
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const transaction = await client.build.simple({
+        sender: account.accountAddress,
+        data: {
+          function:
+            "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::weighted_pool::set_pool_swap_fee_bps",
+          functionArguments: coder.encodeArray(request.functionArguments),
+          typeArguments: request.typeArguments,
+        },
+        options,
+      });
+      return await client.signAndSubmitTransaction({
+        signer: account,
+        transaction,
+      });
     }
   }
   export namespace view {
@@ -1910,49 +1981,55 @@ export namespace weighted_pool {
       T6 = any,
       T7 = any,
     >(
-      client: AptosClient,
+      client: Aptos,
       request: {
-        type_arguments: [
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
+        typeArguments: [
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
         ];
       },
       version?: bigint,
     ): Promise<[bigint]> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const data = {
-        type_arguments: request.type_arguments,
-        arguments: [],
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const data: InputViewRequestData = {
         function:
           "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::weighted_pool::flashloan_fee_bps",
+        functionArguments: [],
+        typeArguments: request.typeArguments,
       };
-      const res = await client.view(data, version?.toString());
+      const res = await client.view({
+        payload: data,
+        options: { ledgerVersion: version },
+      });
       const type = await coder.getMoveFunction(
         "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::weighted_pool::flashloan_fee_bps",
       );
       return (await coder.decodeArray(res, type.return)) as any;
     }
     export async function getWeight<T0 = any>(
-      client: AptosClient,
+      client: Aptos,
       request: {
-        type_arguments: [string];
+        typeArguments: [MoveStructId];
       },
       version?: bigint,
     ): Promise<[bigint]> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const data = {
-        type_arguments: request.type_arguments,
-        arguments: [],
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const data: InputViewRequestData = {
         function:
           "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::weighted_pool::get_weight",
+        functionArguments: [],
+        typeArguments: request.typeArguments,
       };
-      const res = await client.view(data, version?.toString());
+      const res = await client.view({
+        payload: data,
+        options: { ledgerVersion: version },
+      });
       const type = await coder.getMoveFunction(
         "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::weighted_pool::get_weight",
       );
@@ -1960,38 +2037,44 @@ export namespace weighted_pool {
     }
 
     export async function lpNameById(
-      client: AptosClient,
+      client: Aptos,
       request: {
-        arguments: [bigint];
+        functionArguments: [bigint];
       },
       version?: bigint,
     ): Promise<[string]> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const data = {
-        type_arguments: [],
-        arguments: coder.encodeArray(request.arguments),
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const data: InputViewRequestData = {
         function:
           "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::weighted_pool::lp_name_by_id",
+        functionArguments: coder.encodeArray(request.functionArguments),
+        typeArguments: [],
       };
-      const res = await client.view(data, version?.toString());
+      const res = await client.view({
+        payload: data,
+        options: { ledgerVersion: version },
+      });
       const type = await coder.getMoveFunction(
         "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::weighted_pool::lp_name_by_id",
       );
       return (await coder.decodeArray(res, type.return)) as any;
     }
     export async function nextPoolId(
-      client: AptosClient,
+      client: Aptos,
 
       version?: bigint,
     ): Promise<[bigint]> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const data = {
-        type_arguments: [],
-        arguments: [],
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const data: InputViewRequestData = {
         function:
           "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::weighted_pool::next_pool_id",
+        functionArguments: [],
+        typeArguments: [],
       };
-      const res = await client.view(data, version?.toString());
+      const res = await client.view({
+        payload: data,
+        options: { ledgerVersion: version },
+      });
       const type = await coder.getMoveFunction(
         "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::weighted_pool::next_pool_id",
       );
@@ -2008,49 +2091,55 @@ export namespace weighted_pool {
       T6 = any,
       T7 = any,
     >(
-      client: AptosClient,
+      client: Aptos,
       request: {
-        type_arguments: [
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
+        typeArguments: [
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
         ];
       },
       version?: bigint,
     ): Promise<[bigint[], bigint[]]> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const data = {
-        type_arguments: request.type_arguments,
-        arguments: [],
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const data: InputViewRequestData = {
         function:
           "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::weighted_pool::pool_balances_and_weights",
+        functionArguments: [],
+        typeArguments: request.typeArguments,
       };
-      const res = await client.view(data, version?.toString());
+      const res = await client.view({
+        payload: data,
+        options: { ledgerVersion: version },
+      });
       const type = await coder.getMoveFunction(
         "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::weighted_pool::pool_balances_and_weights",
       );
       return (await coder.decodeArray(res, type.return)) as any;
     }
     export async function poolInfo(
-      client: AptosClient,
+      client: Aptos,
       request: {
-        arguments: [string];
+        functionArguments: [string];
       },
       version?: bigint,
     ): Promise<[bigint[], bigint[], bigint]> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const data = {
-        type_arguments: [],
-        arguments: coder.encodeArray(request.arguments),
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const data: InputViewRequestData = {
         function:
           "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::weighted_pool::pool_info",
+        functionArguments: coder.encodeArray(request.functionArguments),
+        typeArguments: [],
       };
-      const res = await client.view(data, version?.toString());
+      const res = await client.view({
+        payload: data,
+        options: { ledgerVersion: version },
+      });
       const type = await coder.getMoveFunction(
         "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::weighted_pool::pool_info",
       );
@@ -2067,17 +2156,17 @@ export namespace weighted_pool {
       T6 = any,
       T7 = any,
     >(
-      client: AptosClient,
+      client: Aptos,
       request: {
-        type_arguments: [
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
+        typeArguments: [
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
         ];
       },
       version?: bigint,
@@ -2086,14 +2175,17 @@ export namespace weighted_pool {
         _0x4dcae85fc5559071906cd5c76b7420fcbb4b0a92f00ab40ffc394aadbbff5ee9.fixed_point64.FixedPoint64,
       ]
     > {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const data = {
-        type_arguments: request.type_arguments,
-        arguments: [],
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const data: InputViewRequestData = {
         function:
           "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::weighted_pool::swap_fee_ratio",
+        functionArguments: [],
+        typeArguments: request.typeArguments,
       };
-      const res = await client.view(data, version?.toString());
+      const res = await client.view({
+        payload: data,
+        options: { ledgerVersion: version },
+      });
       const type = await coder.getMoveFunction(
         "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::weighted_pool::swap_fee_ratio",
       );
@@ -2109,29 +2201,32 @@ export namespace weighted_pool {
       T6 = any,
       T7 = any,
     >(
-      client: AptosClient,
+      client: Aptos,
       request: {
-        type_arguments: [
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
+        typeArguments: [
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
         ];
       },
       version?: bigint,
     ): Promise<[Boolean]> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const data = {
-        type_arguments: request.type_arguments,
-        arguments: [],
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const data: InputViewRequestData = {
         function:
           "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::weighted_pool::weighted_pool_exists",
+        functionArguments: [],
+        typeArguments: request.typeArguments,
       };
-      const res = await client.view(data, version?.toString());
+      const res = await client.view({
+        payload: data,
+        options: { ledgerVersion: version },
+      });
       const type = await coder.getMoveFunction(
         "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::weighted_pool::weighted_pool_exists",
       );
@@ -2163,46 +2258,49 @@ export namespace multi_hop_scripts {
       T17 = any,
       T18 = any,
     >(
-      client: AptosClient,
+      client: Aptos,
       account: AptosAccount,
       request: {
-        type_arguments: [
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
+        typeArguments: [
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
         ];
-        arguments: [bigint, bigint];
+        functionArguments: [bigint, bigint];
       },
-      extraArgs?: OptionalTransactionArgs,
-    ): Promise<Types.PendingTransaction> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const builder = new TransactionBuilderRemoteABI(client, {
-        sender: account.address(),
-        ...extraArgs,
-      });
-      const txn = await builder.build(
-        "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::multi_hop_scripts::swap_exact_in_2",
-        request.type_arguments,
-        coder.encodeArray(request.arguments),
-      );
-      const bcsTxn = AptosClient.generateBCSTransaction(account, txn);
-      return await client.submitSignedBCSTransaction(bcsTxn);
+      options?: InputGenerateTransactionOptions,
+    ): Promise<PendingTransactionResponse> {
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const transaction = await client.build.simple({
+        sender: account.accountAddress,
+        data: {
+          function:
+            "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::multi_hop_scripts::swap_exact_in_2",
+          functionArguments: coder.encodeArray(request.functionArguments),
+          typeArguments: request.typeArguments,
+        },
+        options,
+      });
+      return await client.signAndSubmitTransaction({
+        signer: account,
+        transaction,
+      });
     }
     export async function swapExactIn3<
       T0 = any,
@@ -2234,55 +2332,58 @@ export namespace multi_hop_scripts {
       T26 = any,
       T27 = any,
     >(
-      client: AptosClient,
+      client: Aptos,
       account: AptosAccount,
       request: {
-        type_arguments: [
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
+        typeArguments: [
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
         ];
-        arguments: [bigint, bigint];
+        functionArguments: [bigint, bigint];
       },
-      extraArgs?: OptionalTransactionArgs,
-    ): Promise<Types.PendingTransaction> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const builder = new TransactionBuilderRemoteABI(client, {
-        sender: account.address(),
-        ...extraArgs,
-      });
-      const txn = await builder.build(
-        "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::multi_hop_scripts::swap_exact_in_3",
-        request.type_arguments,
-        coder.encodeArray(request.arguments),
-      );
-      const bcsTxn = AptosClient.generateBCSTransaction(account, txn);
-      return await client.submitSignedBCSTransaction(bcsTxn);
+      options?: InputGenerateTransactionOptions,
+    ): Promise<PendingTransactionResponse> {
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const transaction = await client.build.simple({
+        sender: account.accountAddress,
+        data: {
+          function:
+            "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::multi_hop_scripts::swap_exact_in_3",
+          functionArguments: coder.encodeArray(request.functionArguments),
+          typeArguments: request.typeArguments,
+        },
+        options,
+      });
+      return await client.signAndSubmitTransaction({
+        signer: account,
+        transaction,
+      });
     }
   }
   export namespace view {}
@@ -2291,26 +2392,29 @@ export namespace multi_hop_scripts {
 export namespace stable_pool_scripts {
   export namespace entry {
     export async function addLiquidity<T0 = any, T1 = any, T2 = any, T3 = any>(
-      client: AptosClient,
+      client: Aptos,
       account: AptosAccount,
       request: {
-        type_arguments: [string, string, string, string];
-        arguments: [bigint, bigint, bigint, bigint];
+        typeArguments: [MoveStructId, MoveStructId, MoveStructId, MoveStructId];
+        functionArguments: [bigint, bigint, bigint, bigint];
       },
-      extraArgs?: OptionalTransactionArgs,
-    ): Promise<Types.PendingTransaction> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const builder = new TransactionBuilderRemoteABI(client, {
-        sender: account.address(),
-        ...extraArgs,
-      });
-      const txn = await builder.build(
-        "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool_scripts::add_liquidity",
-        request.type_arguments,
-        coder.encodeArray(request.arguments),
-      );
-      const bcsTxn = AptosClient.generateBCSTransaction(account, txn);
-      return await client.submitSignedBCSTransaction(bcsTxn);
+      options?: InputGenerateTransactionOptions,
+    ): Promise<PendingTransactionResponse> {
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const transaction = await client.build.simple({
+        sender: account.accountAddress,
+        data: {
+          function:
+            "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool_scripts::add_liquidity",
+          functionArguments: coder.encodeArray(request.functionArguments),
+          typeArguments: request.typeArguments,
+        },
+        options,
+      });
+      return await client.signAndSubmitTransaction({
+        signer: account,
+        transaction,
+      });
     }
     export async function createStablePool<
       T0 = any,
@@ -2318,26 +2422,29 @@ export namespace stable_pool_scripts {
       T2 = any,
       T3 = any,
     >(
-      client: AptosClient,
+      client: Aptos,
       account: AptosAccount,
       request: {
-        type_arguments: [string, string, string, string];
-        arguments: [bigint, bigint, bigint, bigint, bigint];
+        typeArguments: [MoveStructId, MoveStructId, MoveStructId, MoveStructId];
+        functionArguments: [bigint, bigint, bigint, bigint, bigint];
       },
-      extraArgs?: OptionalTransactionArgs,
-    ): Promise<Types.PendingTransaction> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const builder = new TransactionBuilderRemoteABI(client, {
-        sender: account.address(),
-        ...extraArgs,
-      });
-      const txn = await builder.build(
-        "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool_scripts::create_stable_pool",
-        request.type_arguments,
-        coder.encodeArray(request.arguments),
-      );
-      const bcsTxn = AptosClient.generateBCSTransaction(account, txn);
-      return await client.submitSignedBCSTransaction(bcsTxn);
+      options?: InputGenerateTransactionOptions,
+    ): Promise<PendingTransactionResponse> {
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const transaction = await client.build.simple({
+        sender: account.accountAddress,
+        data: {
+          function:
+            "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool_scripts::create_stable_pool",
+          functionArguments: coder.encodeArray(request.functionArguments),
+          typeArguments: request.typeArguments,
+        },
+        options,
+      });
+      return await client.signAndSubmitTransaction({
+        signer: account,
+        transaction,
+      });
     }
     export async function removeLiquidity<
       T0 = any,
@@ -2345,26 +2452,29 @@ export namespace stable_pool_scripts {
       T2 = any,
       T3 = any,
     >(
-      client: AptosClient,
+      client: Aptos,
       account: AptosAccount,
       request: {
-        type_arguments: [string, string, string, string];
-        arguments: [bigint, bigint, bigint, bigint, bigint];
+        typeArguments: [MoveStructId, MoveStructId, MoveStructId, MoveStructId];
+        functionArguments: [bigint, bigint, bigint, bigint, bigint];
       },
-      extraArgs?: OptionalTransactionArgs,
-    ): Promise<Types.PendingTransaction> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const builder = new TransactionBuilderRemoteABI(client, {
-        sender: account.address(),
-        ...extraArgs,
-      });
-      const txn = await builder.build(
-        "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool_scripts::remove_liquidity",
-        request.type_arguments,
-        coder.encodeArray(request.arguments),
-      );
-      const bcsTxn = AptosClient.generateBCSTransaction(account, txn);
-      return await client.submitSignedBCSTransaction(bcsTxn);
+      options?: InputGenerateTransactionOptions,
+    ): Promise<PendingTransactionResponse> {
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const transaction = await client.build.simple({
+        sender: account.accountAddress,
+        data: {
+          function:
+            "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool_scripts::remove_liquidity",
+          functionArguments: coder.encodeArray(request.functionArguments),
+          typeArguments: request.typeArguments,
+        },
+        options,
+      });
+      return await client.signAndSubmitTransaction({
+        signer: account,
+        transaction,
+      });
     }
     export async function swapExactIn<
       T0 = any,
@@ -2374,26 +2484,36 @@ export namespace stable_pool_scripts {
       T4 = any,
       T5 = any,
     >(
-      client: AptosClient,
+      client: Aptos,
       account: AptosAccount,
       request: {
-        type_arguments: [string, string, string, string, string, string];
-        arguments: [bigint, bigint];
+        typeArguments: [
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+        ];
+        functionArguments: [bigint, bigint];
       },
-      extraArgs?: OptionalTransactionArgs,
-    ): Promise<Types.PendingTransaction> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const builder = new TransactionBuilderRemoteABI(client, {
-        sender: account.address(),
-        ...extraArgs,
-      });
-      const txn = await builder.build(
-        "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool_scripts::swap_exact_in",
-        request.type_arguments,
-        coder.encodeArray(request.arguments),
-      );
-      const bcsTxn = AptosClient.generateBCSTransaction(account, txn);
-      return await client.submitSignedBCSTransaction(bcsTxn);
+      options?: InputGenerateTransactionOptions,
+    ): Promise<PendingTransactionResponse> {
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const transaction = await client.build.simple({
+        sender: account.accountAddress,
+        data: {
+          function:
+            "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool_scripts::swap_exact_in",
+          functionArguments: coder.encodeArray(request.functionArguments),
+          typeArguments: request.typeArguments,
+        },
+        options,
+      });
+      return await client.signAndSubmitTransaction({
+        signer: account,
+        transaction,
+      });
     }
     export async function swapExactOut<
       T0 = any,
@@ -2403,26 +2523,36 @@ export namespace stable_pool_scripts {
       T4 = any,
       T5 = any,
     >(
-      client: AptosClient,
+      client: Aptos,
       account: AptosAccount,
       request: {
-        type_arguments: [string, string, string, string, string, string];
-        arguments: [bigint, bigint];
+        typeArguments: [
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+        ];
+        functionArguments: [bigint, bigint];
       },
-      extraArgs?: OptionalTransactionArgs,
-    ): Promise<Types.PendingTransaction> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const builder = new TransactionBuilderRemoteABI(client, {
-        sender: account.address(),
-        ...extraArgs,
-      });
-      const txn = await builder.build(
-        "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool_scripts::swap_exact_out",
-        request.type_arguments,
-        coder.encodeArray(request.arguments),
-      );
-      const bcsTxn = AptosClient.generateBCSTransaction(account, txn);
-      return await client.submitSignedBCSTransaction(bcsTxn);
+      options?: InputGenerateTransactionOptions,
+    ): Promise<PendingTransactionResponse> {
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const transaction = await client.build.simple({
+        sender: account.accountAddress,
+        data: {
+          function:
+            "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool_scripts::swap_exact_out",
+          functionArguments: coder.encodeArray(request.functionArguments),
+          typeArguments: request.typeArguments,
+        },
+        options,
+      });
+      return await client.signAndSubmitTransaction({
+        signer: account,
+        transaction,
+      });
     }
   }
   export namespace view {}
@@ -2440,20 +2570,20 @@ export namespace weighted_pool_scripts {
       T6 = any,
       T7 = any,
     >(
-      client: AptosClient,
+      client: Aptos,
       account: AptosAccount,
       request: {
-        type_arguments: [
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
+        typeArguments: [
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
         ];
-        arguments: [
+        functionArguments: [
           bigint,
           bigint,
           bigint,
@@ -2464,20 +2594,23 @@ export namespace weighted_pool_scripts {
           bigint,
         ];
       },
-      extraArgs?: OptionalTransactionArgs,
-    ): Promise<Types.PendingTransaction> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const builder = new TransactionBuilderRemoteABI(client, {
-        sender: account.address(),
-        ...extraArgs,
-      });
-      const txn = await builder.build(
-        "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::weighted_pool_scripts::add_liquidity",
-        request.type_arguments,
-        coder.encodeArray(request.arguments),
-      );
-      const bcsTxn = AptosClient.generateBCSTransaction(account, txn);
-      return await client.submitSignedBCSTransaction(bcsTxn);
+      options?: InputGenerateTransactionOptions,
+    ): Promise<PendingTransactionResponse> {
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const transaction = await client.build.simple({
+        sender: account.accountAddress,
+        data: {
+          function:
+            "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::weighted_pool_scripts::add_liquidity",
+          functionArguments: coder.encodeArray(request.functionArguments),
+          typeArguments: request.typeArguments,
+        },
+        options,
+      });
+      return await client.signAndSubmitTransaction({
+        signer: account,
+        transaction,
+      });
     }
     export async function createWeightedPool<
       T0 = any,
@@ -2489,35 +2622,38 @@ export namespace weighted_pool_scripts {
       T6 = any,
       T7 = any,
     >(
-      client: AptosClient,
+      client: Aptos,
       account: AptosAccount,
       request: {
-        type_arguments: [
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
+        typeArguments: [
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
         ];
-        arguments: [bigint, bigint, bigint, bigint];
+        functionArguments: [bigint, bigint, bigint, bigint];
       },
-      extraArgs?: OptionalTransactionArgs,
-    ): Promise<Types.PendingTransaction> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const builder = new TransactionBuilderRemoteABI(client, {
-        sender: account.address(),
-        ...extraArgs,
-      });
-      const txn = await builder.build(
-        "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::weighted_pool_scripts::create_weighted_pool",
-        request.type_arguments,
-        coder.encodeArray(request.arguments),
-      );
-      const bcsTxn = AptosClient.generateBCSTransaction(account, txn);
-      return await client.submitSignedBCSTransaction(bcsTxn);
+      options?: InputGenerateTransactionOptions,
+    ): Promise<PendingTransactionResponse> {
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const transaction = await client.build.simple({
+        sender: account.accountAddress,
+        data: {
+          function:
+            "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::weighted_pool_scripts::create_weighted_pool",
+          functionArguments: coder.encodeArray(request.functionArguments),
+          typeArguments: request.typeArguments,
+        },
+        options,
+      });
+      return await client.signAndSubmitTransaction({
+        signer: account,
+        transaction,
+      });
     }
     export async function removeLiquidity<
       T0 = any,
@@ -2529,35 +2665,38 @@ export namespace weighted_pool_scripts {
       T6 = any,
       T7 = any,
     >(
-      client: AptosClient,
+      client: Aptos,
       account: AptosAccount,
       request: {
-        type_arguments: [
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
+        typeArguments: [
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
         ];
-        arguments: [bigint, bigint, bigint, bigint, bigint];
+        functionArguments: [bigint, bigint, bigint, bigint, bigint];
       },
-      extraArgs?: OptionalTransactionArgs,
-    ): Promise<Types.PendingTransaction> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const builder = new TransactionBuilderRemoteABI(client, {
-        sender: account.address(),
-        ...extraArgs,
-      });
-      const txn = await builder.build(
-        "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::weighted_pool_scripts::remove_liquidity",
-        request.type_arguments,
-        coder.encodeArray(request.arguments),
-      );
-      const bcsTxn = AptosClient.generateBCSTransaction(account, txn);
-      return await client.submitSignedBCSTransaction(bcsTxn);
+      options?: InputGenerateTransactionOptions,
+    ): Promise<PendingTransactionResponse> {
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const transaction = await client.build.simple({
+        sender: account.accountAddress,
+        data: {
+          function:
+            "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::weighted_pool_scripts::remove_liquidity",
+          functionArguments: coder.encodeArray(request.functionArguments),
+          typeArguments: request.typeArguments,
+        },
+        options,
+      });
+      return await client.signAndSubmitTransaction({
+        signer: account,
+        transaction,
+      });
     }
     export async function swapExactIn<
       T0 = any,
@@ -2571,37 +2710,40 @@ export namespace weighted_pool_scripts {
       T8 = any,
       T9 = any,
     >(
-      client: AptosClient,
+      client: Aptos,
       account: AptosAccount,
       request: {
-        type_arguments: [
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
+        typeArguments: [
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
         ];
-        arguments: [bigint, bigint];
+        functionArguments: [bigint, bigint];
       },
-      extraArgs?: OptionalTransactionArgs,
-    ): Promise<Types.PendingTransaction> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const builder = new TransactionBuilderRemoteABI(client, {
-        sender: account.address(),
-        ...extraArgs,
-      });
-      const txn = await builder.build(
-        "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::weighted_pool_scripts::swap_exact_in",
-        request.type_arguments,
-        coder.encodeArray(request.arguments),
-      );
-      const bcsTxn = AptosClient.generateBCSTransaction(account, txn);
-      return await client.submitSignedBCSTransaction(bcsTxn);
+      options?: InputGenerateTransactionOptions,
+    ): Promise<PendingTransactionResponse> {
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const transaction = await client.build.simple({
+        sender: account.accountAddress,
+        data: {
+          function:
+            "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::weighted_pool_scripts::swap_exact_in",
+          functionArguments: coder.encodeArray(request.functionArguments),
+          typeArguments: request.typeArguments,
+        },
+        options,
+      });
+      return await client.signAndSubmitTransaction({
+        signer: account,
+        transaction,
+      });
     }
     export async function swapExactOut<
       T0 = any,
@@ -2615,37 +2757,40 @@ export namespace weighted_pool_scripts {
       T8 = any,
       T9 = any,
     >(
-      client: AptosClient,
+      client: Aptos,
       account: AptosAccount,
       request: {
-        type_arguments: [
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
-          string,
+        typeArguments: [
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
+          MoveStructId,
         ];
-        arguments: [bigint, bigint];
+        functionArguments: [bigint, bigint];
       },
-      extraArgs?: OptionalTransactionArgs,
-    ): Promise<Types.PendingTransaction> {
-      const coder = defaultMoveCoder(client.nodeUrl);
-      const builder = new TransactionBuilderRemoteABI(client, {
-        sender: account.address(),
-        ...extraArgs,
-      });
-      const txn = await builder.build(
-        "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::weighted_pool_scripts::swap_exact_out",
-        request.type_arguments,
-        coder.encodeArray(request.arguments),
-      );
-      const bcsTxn = AptosClient.generateBCSTransaction(account, txn);
-      return await client.submitSignedBCSTransaction(bcsTxn);
+      options?: InputGenerateTransactionOptions,
+    ): Promise<PendingTransactionResponse> {
+      const coder = defaultMoveCoder(client.config.fullnode);
+      const transaction = await client.build.simple({
+        sender: account.accountAddress,
+        data: {
+          function:
+            "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::weighted_pool_scripts::swap_exact_out",
+          functionArguments: coder.encodeArray(request.functionArguments),
+          typeArguments: request.typeArguments,
+        },
+        options,
+      });
+      return await client.signAndSubmitTransaction({
+        signer: account,
+        transaction,
+      });
     }
   }
   export namespace view {}