@aptos-labs/wallet-adapter-core 2.3.1 → 2.3.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @aptos-labs/wallet-adapter-core
 
+## 2.3.3
+
+### Patch Changes
+
+- dc98bf4: fix sendAndSubmitTransaction params
+
+## 2.3.2
+
+### Patch Changes
+
+- 22ecf6a: Throw `wallet already connected` error when trying to connect to an already connected wallet
+
 ## 2.3.1
 
 ### Patch Changes

package/dist/index.d.ts

@@ -114,6 +114,10 @@ interface SignMessageResponse {
     signature: string | string[];
     bitmap?: Uint8Array;
 }
+interface TransactionOptions {
+    max_gas_amount?: bigint;
+    gas_unit_price?: bigint;
+}
 
 declare class WalletCore extends EventEmitter<WalletCoreEvents> {
     private _wallets;
@@ -160,7 +164,7 @@ declare class WalletCore extends EventEmitter<WalletCoreEvents> {
     @emit emits "connect" event
     @throws WalletConnectionError
     */
-    connect(walletName: WalletName): Promise<void>;
+    connect(walletName: WalletName): Promise<void | string>;
     /**
     Disconnect the exisitng wallet. On success, we clear the
     current account, current network and LocalStorage data.
@@ -171,24 +175,27 @@ declare class WalletCore extends EventEmitter<WalletCoreEvents> {
     /**
     Sign and submit an entry (not bcs serialized) transaction type to chain.
     @param transaction a non-bcs serialized transaction
+    @param options max_gas_amount and gas_unit_limit
     @return response from the wallet's signAndSubmitTransaction function
     @throws WalletSignAndSubmitMessageError
     */
-    signAndSubmitTransaction(transaction: Types.TransactionPayload): Promise<any>;
+    signAndSubmitTransaction(transaction: Types.TransactionPayload, options?: TransactionOptions): Promise<any>;
     /**
     Sign and submit a bsc serialized transaction type to chain.
     @param transaction a bcs serialized transaction
+    @param options max_gas_amount and gas_unit_limit
     @return response from the wallet's signAndSubmitBCSTransaction function
     @throws WalletSignAndSubmitMessageError
     */
-    signAndSubmitBCSTransaction(transaction: TxnBuilderTypes.TransactionPayload): Promise<any>;
+    signAndSubmitBCSTransaction(transaction: TxnBuilderTypes.TransactionPayload, options?: TransactionOptions): Promise<any>;
     /**
     Sign transaction (doesnt submit to chain).
     @param transaction
+    @param options max_gas_amount and gas_unit_limit
     @return response from the wallet's signTransaction function
     @throws WalletSignTransactionError
     */
-    signTransaction(transaction: Types.TransactionPayload): Promise<Uint8Array | null>;
+    signTransaction(transaction: Types.TransactionPayload, options?: TransactionOptions): Promise<Uint8Array | null>;
     /**
     Sign message (doesnt submit to chain).
     @param message
@@ -221,4 +228,4 @@ declare function isMobile(): boolean;
 declare function isInAppBrowser(): boolean;
 declare function isRedirectable(): boolean;
 
-export { AccountInfo, AdapterPlugin, AdapterPluginEvents, AdapterPluginProps, AptosWalletErrorResult, NetworkInfo, NetworkName, PluginProvider, SignMessagePayload, SignMessageResponse, Wallet, WalletCore, WalletCoreEvents, WalletInfo, WalletName, WalletReadyState, getLocalStorage, isInAppBrowser, isMobile, isRedirectable, removeLocalStorage, scopePollingDetectionStrategy, setLocalStorage };
+export { AccountInfo, AdapterPlugin, AdapterPluginEvents, AdapterPluginProps, AptosWalletErrorResult, NetworkInfo, NetworkName, PluginProvider, SignMessagePayload, SignMessageResponse, TransactionOptions, Wallet, WalletCore, WalletCoreEvents, WalletInfo, WalletName, WalletReadyState, getLocalStorage, isInAppBrowser, isMobile, isRedirectable, removeLocalStorage, scopePollingDetectionStrategy, setLocalStorage };

package/dist/index.js

@@ -344,7 +344,9 @@ var WalletCore = class extends import_eventemitter3.default {
         return;
       if (this._connected) {
         if (((_b = this.wallet) == null ? void 0 : _b.name) === walletName)
-          return;
+          throw new WalletConnectionError(
+            `${walletName} wallet is already connected`
+          ).message;
         await this.disconnect();
       }
       if (isRedirectable()) {
@@ -385,12 +387,13 @@ var WalletCore = class extends import_eventemitter3.default {
       throw new WalletDisconnectionError(error).message;
     }
   }
-  async signAndSubmitTransaction(transaction) {
+  async signAndSubmitTransaction(transaction, options) {
     var _a;
     try {
       this.doesWalletExist();
       const response = await ((_a = this._wallet) == null ? void 0 : _a.signAndSubmitTransaction(
-        transaction
+        transaction,
+        options
       ));
       return response;
     } catch (error) {
@@ -398,7 +401,7 @@ var WalletCore = class extends import_eventemitter3.default {
       throw new WalletSignAndSubmitMessageError(errMsg).message;
     }
   }
-  async signAndSubmitBCSTransaction(transaction) {
+  async signAndSubmitBCSTransaction(transaction, options) {
     var _a;
     if (this._wallet && !("signAndSubmitBCSTransaction" in this._wallet)) {
       throw new WalletNotSupportedMethod(
@@ -408,7 +411,8 @@ var WalletCore = class extends import_eventemitter3.default {
     try {
       this.doesWalletExist();
       const response = await this._wallet.signAndSubmitBCSTransaction(
-        transaction
+        transaction,
+        options
       );
       return response;
     } catch (error) {
@@ -416,7 +420,7 @@ var WalletCore = class extends import_eventemitter3.default {
       throw new WalletSignAndSubmitMessageError(errMsg).message;
     }
   }
-  async signTransaction(transaction) {
+  async signTransaction(transaction, options) {
     var _a;
     if (this._wallet && !("signTransaction" in this._wallet)) {
       throw new WalletNotSupportedMethod(
@@ -425,7 +429,7 @@ var WalletCore = class extends import_eventemitter3.default {
     }
     try {
       this.doesWalletExist();
-      const response = await this._wallet.signTransaction(transaction);
+      const response = await this._wallet.signTransaction(transaction, options);
       return response;
     } catch (error) {
       const errMsg = typeof error == "object" && "message" in error ? error.message : error;

package/dist/index.mjs

@@ -303,7 +303,9 @@ var WalletCore = class extends EventEmitter {
         return;
       if (this._connected) {
         if (((_b = this.wallet) == null ? void 0 : _b.name) === walletName)
-          return;
+          throw new WalletConnectionError(
+            `${walletName} wallet is already connected`
+          ).message;
         await this.disconnect();
       }
       if (isRedirectable()) {
@@ -344,12 +346,13 @@ var WalletCore = class extends EventEmitter {
       throw new WalletDisconnectionError(error).message;
     }
   }
-  async signAndSubmitTransaction(transaction) {
+  async signAndSubmitTransaction(transaction, options) {
     var _a;
     try {
       this.doesWalletExist();
       const response = await ((_a = this._wallet) == null ? void 0 : _a.signAndSubmitTransaction(
-        transaction
+        transaction,
+        options
       ));
       return response;
     } catch (error) {
@@ -357,7 +360,7 @@ var WalletCore = class extends EventEmitter {
       throw new WalletSignAndSubmitMessageError(errMsg).message;
     }
   }
-  async signAndSubmitBCSTransaction(transaction) {
+  async signAndSubmitBCSTransaction(transaction, options) {
     var _a;
     if (this._wallet && !("signAndSubmitBCSTransaction" in this._wallet)) {
       throw new WalletNotSupportedMethod(
@@ -367,7 +370,8 @@ var WalletCore = class extends EventEmitter {
     try {
       this.doesWalletExist();
       const response = await this._wallet.signAndSubmitBCSTransaction(
-        transaction
+        transaction,
+        options
       );
       return response;
     } catch (error) {
@@ -375,7 +379,7 @@ var WalletCore = class extends EventEmitter {
       throw new WalletSignAndSubmitMessageError(errMsg).message;
     }
   }
-  async signTransaction(transaction) {
+  async signTransaction(transaction, options) {
     var _a;
     if (this._wallet && !("signTransaction" in this._wallet)) {
       throw new WalletNotSupportedMethod(
@@ -384,7 +388,7 @@ var WalletCore = class extends EventEmitter {
     }
     try {
       this.doesWalletExist();
-      const response = await this._wallet.signTransaction(transaction);
+      const response = await this._wallet.signTransaction(transaction, options);
       return response;
     } catch (error) {
       const errMsg = typeof error == "object" && "message" in error ? error.message : error;

package/package.json

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

package/src/WalletCore.ts

@@ -29,6 +29,7 @@ import {
   Wallet,
   WalletInfo,
   WalletCoreEvents,
+  TransactionOptions,
 } from "./types";
 import {
   removeLocalStorage,
@@ -181,7 +182,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
   @emit emits "connect" event
   @throws WalletConnectionError
   */
-  async connect(walletName: WalletName): Promise<void> {
+  async connect(walletName: WalletName): Promise<void | string> {
     try {
       const selectedWallet = this._wallets?.find(
         (wallet: Wallet) => wallet.name === walletName
@@ -191,7 +192,10 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
 
       if (this._connected) {
         // if the selected wallet is already connected, we don't need to connect again
-        if (this.wallet?.name === walletName) return;
+        if (this.wallet?.name === walletName)
+          throw new WalletConnectionError(
+            `${walletName} wallet is already connected`
+          ).message;
 
         await this.disconnect();
       }
@@ -251,16 +255,19 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
   /** 
   Sign and submit an entry (not bcs serialized) transaction type to chain.
   @param transaction a non-bcs serialized transaction
+  @param options max_gas_amount and gas_unit_limit
   @return response from the wallet's signAndSubmitTransaction function
   @throws WalletSignAndSubmitMessageError
   */
   async signAndSubmitTransaction(
-    transaction: Types.TransactionPayload
+    transaction: Types.TransactionPayload,
+    options?: TransactionOptions
   ): Promise<any> {
     try {
       this.doesWalletExist();
       const response = await this._wallet?.signAndSubmitTransaction(
-        transaction
+        transaction,
+        options
       );
       return response;
     } catch (error: any) {
@@ -273,11 +280,13 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
   /** 
   Sign and submit a bsc serialized transaction type to chain.
   @param transaction a bcs serialized transaction
+  @param options max_gas_amount and gas_unit_limit
   @return response from the wallet's signAndSubmitBCSTransaction function
   @throws WalletSignAndSubmitMessageError
   */
   async signAndSubmitBCSTransaction(
-    transaction: TxnBuilderTypes.TransactionPayload
+    transaction: TxnBuilderTypes.TransactionPayload,
+    options?: TransactionOptions
   ): Promise<any> {
     if (this._wallet && !("signAndSubmitBCSTransaction" in this._wallet)) {
       throw new WalletNotSupportedMethod(
@@ -288,7 +297,8 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
     try {
       this.doesWalletExist();
       const response = await (this._wallet as any).signAndSubmitBCSTransaction(
-        transaction
+        transaction,
+        options
       );
       return response;
     } catch (error: any) {
@@ -301,11 +311,13 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
   /** 
   Sign transaction (doesnt submit to chain).
   @param transaction
+  @param options max_gas_amount and gas_unit_limit
   @return response from the wallet's signTransaction function
   @throws WalletSignTransactionError
   */
   async signTransaction(
-    transaction: Types.TransactionPayload
+    transaction: Types.TransactionPayload,
+    options?: TransactionOptions
   ): Promise<Uint8Array | null> {
     if (this._wallet && !("signTransaction" in this._wallet)) {
       throw new WalletNotSupportedMethod(
@@ -315,7 +327,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
 
     try {
       this.doesWalletExist();
-      const response = await (this._wallet as any).signTransaction(transaction);
+      const response = await (this._wallet as any).signTransaction(transaction, options);
       return response;
     } catch (error: any) {
       const errMsg =

package/src/types.ts

@@ -106,3 +106,8 @@ export interface SignMessageResponse {
   signature: string | string[]; // The signed full message
   bitmap?: Uint8Array; // a 4-byte (32 bits) bit-vector of length N
 }
+
+export interface TransactionOptions {
+  max_gas_amount?: bigint;
+  gas_unit_price?: bigint;
+}