@aptos-labs/wallet-adapter-core 3.1.0 → 3.1.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @aptos-labs/wallet-adapter-core
 
+## 3.1.1
+
+### Patch Changes
+
+- 6266a29: Consolidate options argument on signAndSubmitTransaction
+
 ## 3.1.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { Types } from 'aptos';
 export { TxnBuilderTypes, Types } from 'aptos';
-import { Network, InputGenerateTransactionData, InputGenerateTransactionOptions, PendingTransactionResponse, InputSubmitTransactionData, AccountAddressInput, AnyRawTransaction, AccountAuthenticator } from '@aptos-labs/ts-sdk';
+import { Network, InputGenerateTransactionData, InputGenerateTransactionOptions, PendingTransactionResponse, InputSubmitTransactionData, AccountAddressInput, InputGenerateTransactionPayloadData, AnyRawTransaction, AccountAuthenticator } from '@aptos-labs/ts-sdk';
 export { AccountAuthenticator, AnyRawTransaction, InputGenerateTransactionData, InputGenerateTransactionOptions, InputSubmitTransactionData, PendingTransactionResponse } from '@aptos-labs/ts-sdk';
 import EventEmitter from 'eventemitter3';
 
@@ -112,8 +112,10 @@ interface TransactionOptions {
     max_gas_amount?: bigint;
     gas_unit_price?: bigint;
 }
-type InputTransactionData = Omit<InputGenerateTransactionData, "sender"> & {
+type InputTransactionData = {
     sender?: AccountAddressInput;
+    data: InputGenerateTransactionPayloadData;
+    options?: InputGenerateTransactionOptions;
 };
 
 declare class WalletCore extends EventEmitter<WalletCoreEvents> {
@@ -182,7 +184,7 @@ declare class WalletCore extends EventEmitter<WalletCoreEvents> {
      * @param options optional. A configuration object to generate a transaction by
      * @returns The pending transaction hash (V1 output) | PendingTransactionResponse (V2 output)
      */
-    signAndSubmitTransaction(transactionInput: InputTransactionData, options?: InputGenerateTransactionOptions): Promise<{
+    signAndSubmitTransaction(transactionInput: InputTransactionData): Promise<{
         hash: Types.HexEncodedBytes;
         output?: any;
     } | PendingTransactionResponse>;

package/dist/index.js

@@ -482,18 +482,15 @@ var WalletCore = class extends import_eventemitter32.default {
       throw new WalletDisconnectionError(errMsg).message;
     }
   }
-  async signAndSubmitTransaction(transactionInput, options) {
-    var _a, _b;
+  async signAndSubmitTransaction(transactionInput) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     try {
       this.doesWalletExist();
       if (((_a = this._wallet) == null ? void 0 : _a.version) === "v2") {
-        const response2 = await this._wallet.signAndSubmitTransaction(
-          {
-            ...transactionInput,
-            sender: (_b = transactionInput.sender) != null ? _b : this._account.address
-          },
-          options
-        );
+        const response2 = await this._wallet.signAndSubmitTransaction({
+          ...transactionInput,
+          sender: (_b = transactionInput.sender) != null ? _b : this._account.address
+        });
         return response2;
       }
       const payloadData = transactionInput.data;
@@ -510,8 +507,8 @@ var WalletCore = class extends import_eventemitter32.default {
           oldTransactionPayload2,
           this._wallet,
           {
-            max_gas_amount: (options == null ? void 0 : options.maxGasAmount) ? BigInt(options == null ? void 0 : options.maxGasAmount) : void 0,
-            gas_unit_price: (options == null ? void 0 : options.gasUnitPrice) ? BigInt(options == null ? void 0 : options.gasUnitPrice) : void 0
+            max_gas_amount: ((_c = transactionInput.options) == null ? void 0 : _c.maxGasAmount) ? BigInt((_d = transactionInput.options) == null ? void 0 : _d.maxGasAmount) : void 0,
+            gas_unit_price: ((_e = transactionInput.options) == null ? void 0 : _e.gasUnitPrice) ? BigInt((_f = transactionInput.options) == null ? void 0 : _f.gasUnitPrice) : void 0
           }
         );
         const { hash: hash2, ...output2 } = response2;
@@ -522,8 +519,8 @@ var WalletCore = class extends import_eventemitter32.default {
         oldTransactionPayload,
         this._wallet,
         {
-          max_gas_amount: (options == null ? void 0 : options.maxGasAmount) ? BigInt(options == null ? void 0 : options.maxGasAmount) : void 0,
-          gas_unit_price: (options == null ? void 0 : options.gasUnitPrice) ? BigInt(options == null ? void 0 : options.gasUnitPrice) : void 0
+          max_gas_amount: ((_g = transactionInput.options) == null ? void 0 : _g.maxGasAmount) ? BigInt((_h = transactionInput.options) == null ? void 0 : _h.maxGasAmount) : void 0,
+          gas_unit_price: ((_i = transactionInput.options) == null ? void 0 : _i.gasUnitPrice) ? BigInt((_j = transactionInput.options) == null ? void 0 : _j.gasUnitPrice) : void 0
         }
       );
       const { hash, ...output } = response;

package/dist/index.mjs

@@ -447,18 +447,15 @@ var WalletCore = class extends EventEmitter2 {
       throw new WalletDisconnectionError(errMsg).message;
     }
   }
-  async signAndSubmitTransaction(transactionInput, options) {
-    var _a, _b;
+  async signAndSubmitTransaction(transactionInput) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     try {
       this.doesWalletExist();
       if (((_a = this._wallet) == null ? void 0 : _a.version) === "v2") {
-        const response2 = await this._wallet.signAndSubmitTransaction(
-          {
-            ...transactionInput,
-            sender: (_b = transactionInput.sender) != null ? _b : this._account.address
-          },
-          options
-        );
+        const response2 = await this._wallet.signAndSubmitTransaction({
+          ...transactionInput,
+          sender: (_b = transactionInput.sender) != null ? _b : this._account.address
+        });
         return response2;
       }
       const payloadData = transactionInput.data;
@@ -475,8 +472,8 @@ var WalletCore = class extends EventEmitter2 {
           oldTransactionPayload2,
           this._wallet,
           {
-            max_gas_amount: (options == null ? void 0 : options.maxGasAmount) ? BigInt(options == null ? void 0 : options.maxGasAmount) : void 0,
-            gas_unit_price: (options == null ? void 0 : options.gasUnitPrice) ? BigInt(options == null ? void 0 : options.gasUnitPrice) : void 0
+            max_gas_amount: ((_c = transactionInput.options) == null ? void 0 : _c.maxGasAmount) ? BigInt((_d = transactionInput.options) == null ? void 0 : _d.maxGasAmount) : void 0,
+            gas_unit_price: ((_e = transactionInput.options) == null ? void 0 : _e.gasUnitPrice) ? BigInt((_f = transactionInput.options) == null ? void 0 : _f.gasUnitPrice) : void 0
           }
         );
         const { hash: hash2, ...output2 } = response2;
@@ -487,8 +484,8 @@ var WalletCore = class extends EventEmitter2 {
         oldTransactionPayload,
         this._wallet,
         {
-          max_gas_amount: (options == null ? void 0 : options.maxGasAmount) ? BigInt(options == null ? void 0 : options.maxGasAmount) : void 0,
-          gas_unit_price: (options == null ? void 0 : options.gasUnitPrice) ? BigInt(options == null ? void 0 : options.gasUnitPrice) : void 0
+          max_gas_amount: ((_g = transactionInput.options) == null ? void 0 : _g.maxGasAmount) ? BigInt((_h = transactionInput.options) == null ? void 0 : _h.maxGasAmount) : void 0,
+          gas_unit_price: ((_i = transactionInput.options) == null ? void 0 : _i.gasUnitPrice) ? BigInt((_j = transactionInput.options) == null ? void 0 : _j.gasUnitPrice) : void 0
         }
       );
       const { hash, ...output } = response;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aptos-labs/wallet-adapter-core",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "Aptos Wallet Adapter Core",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",

package/src/WalletCore.ts

@@ -290,8 +290,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
    * @returns The pending transaction hash (V1 output) | PendingTransactionResponse (V2 output)
    */
   async signAndSubmitTransaction(
-    transactionInput: InputTransactionData,
-    options?: InputGenerateTransactionOptions
+    transactionInput: InputTransactionData
   ): Promise<
     { hash: Types.HexEncodedBytes; output?: any } | PendingTransactionResponse
   > {
@@ -300,13 +299,10 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
 
       // wallet supports sdk v2
       if (this._wallet?.version === "v2") {
-        const response = await this._wallet.signAndSubmitTransaction(
-          {
-            ...transactionInput,
-            sender: transactionInput.sender ?? this._account!.address,
-          },
-          options
-        );
+        const response = await this._wallet.signAndSubmitTransaction({
+          ...transactionInput,
+          sender: transactionInput.sender ?? this._account!.address,
+        });
         // response should be PendingTransactionResponse
         return response;
       }
@@ -330,11 +326,11 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
           oldTransactionPayload,
           this._wallet!,
           {
-            max_gas_amount: options?.maxGasAmount
-              ? BigInt(options?.maxGasAmount)
+            max_gas_amount: transactionInput.options?.maxGasAmount
+              ? BigInt(transactionInput.options?.maxGasAmount)
               : undefined,
-            gas_unit_price: options?.gasUnitPrice
-              ? BigInt(options?.gasUnitPrice)
+            gas_unit_price: transactionInput.options?.gasUnitPrice
+              ? BigInt(transactionInput.options?.gasUnitPrice)
               : undefined,
           }
         );
@@ -350,11 +346,11 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
         oldTransactionPayload,
         this._wallet!,
         {
-          max_gas_amount: options?.maxGasAmount
-            ? BigInt(options?.maxGasAmount)
+          max_gas_amount: transactionInput.options?.maxGasAmount
+            ? BigInt(transactionInput.options?.maxGasAmount)
             : undefined,
-          gas_unit_price: options?.gasUnitPrice
-            ? BigInt(options?.gasUnitPrice)
+          gas_unit_price: transactionInput.options?.gasUnitPrice
+            ? BigInt(transactionInput.options?.gasUnitPrice)
             : undefined,
         }
       );

package/src/types.ts

@@ -6,6 +6,7 @@ import {
   InputSubmitTransactionData,
   PendingTransactionResponse,
   AccountAddressInput,
+  InputGenerateTransactionPayloadData,
 } from "@aptos-labs/ts-sdk";
 import { WalletReadyState } from "./constants";
 
@@ -128,8 +129,8 @@ export interface TransactionOptions {
   gas_unit_price?: bigint;
 }
 
-// Omit the ts-sdk InputGenerateTransactionData type to make "sender" optional
-export type InputTransactionData = Omit<
-  InputGenerateTransactionData,
-  "sender"
-> & { sender?: AccountAddressInput };
+export type InputTransactionData = {
+  sender?: AccountAddressInput;
+  data: InputGenerateTransactionPayloadData;
+  options?: InputGenerateTransactionOptions;
+};