@aptos-labs/wallet-adapter-core 2.0.0 → 2.1.0

package/CHANGELOG.md

@@ -1,10 +1,14 @@
 # @aptos-labs/wallet-adapter-core
 
-## 2.0.0
+## 2.1.0
 
-### Major Changes
+### Minor Changes
+
+- 50968c4: Support to submit bcs serialized transactions
+
+### Patch Changes
 
-- 06a2e0d: Add support to submit BCS transaction
+- 8dea640: Fix wallet adapter auto reconnect on page refresh
 
 ## 1.0.0
 

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import EventEmitter from 'eventemitter3';
 import { Types, TxnBuilderTypes } from 'aptos';
+import EventEmitter from 'eventemitter3';
 
 declare enum WalletReadyState {
     /**
@@ -63,7 +63,6 @@ interface AdapterPluginEvents {
     onNetworkChange(callback: any): Promise<any>;
     onAccountChange(callback: any): Promise<any>;
 }
-declare type TransactionPayload = Types.TransactionPayload | TxnBuilderTypes.TransactionPayload;
 interface AdapterPluginProps<Name extends string = string> {
     name: WalletName<Name>;
     url: string;
@@ -73,7 +72,7 @@ interface AdapterPluginProps<Name extends string = string> {
     connect(): Promise<any>;
     disconnect: () => Promise<any>;
     network: () => Promise<any>;
-    signAndSubmitTransaction<T extends TransactionPayload, V>(transaction: T, options?: V): Promise<{
+    signAndSubmitTransaction<T extends Types.TransactionPayload, V>(transaction: T, options?: V): Promise<{
         hash: Types.HexEncodedBytes;
     }>;
     signMessage<T extends SignMessagePayload>(message: T): Promise<SignMessageResponse>;
@@ -167,19 +166,26 @@ declare class WalletCore extends EventEmitter<WalletCoreEvents> {
     */
     disconnect(): Promise<void>;
     /**
-    Sign and submit transaction to chain.
-    @param transaction
+    Sign and submit an entry (not bcs serialized) transaction type to chain.
+    @param transaction a non-bcs serialized transaction
     @return response from the wallet's signAndSubmitTransaction function
     @throws WalletSignAndSubmitMessageError
     */
-    signAndSubmitTransaction(transaction: TransactionPayload): Promise<any>;
+    signAndSubmitTransaction(transaction: Types.TransactionPayload): Promise<any>;
+    /**
+    Sign and submit a bsc serialized transaction type to chain.
+    @param transaction a bcs serialized transaction
+    @return response from the wallet's signAndSubmitBCSTransaction function
+    @throws WalletSignAndSubmitMessageError
+    */
+    signAndSubmitBCSTransaction(transaction: TxnBuilderTypes.TransactionPayload): Promise<any>;
     /**
     Sign transaction (doesnt submit to chain).
     @param transaction
     @return response from the wallet's signTransaction function
     @throws WalletSignTransactionError
     */
-    signTransaction(transaction: TransactionPayload): Promise<Uint8Array | null>;
+    signTransaction(transaction: Types.TransactionPayload): Promise<Uint8Array | null>;
     /**
     Sign message (doesnt submit to chain).
     @param message
@@ -202,4 +208,4 @@ declare class WalletCore extends EventEmitter<WalletCoreEvents> {
     signMessageAndVerify(message: SignMessagePayload): Promise<boolean>;
 }
 
-export { AccountInfo, AdapterPlugin, AdapterPluginEvents, AdapterPluginProps, AptosWalletErrorResult, NetworkInfo, NetworkName, PluginProvider, SignMessagePayload, SignMessageResponse, TransactionPayload, Wallet, WalletCore, WalletCoreEvents, WalletInfo, WalletName, WalletReadyState };
+export { AccountInfo, AdapterPlugin, AdapterPluginEvents, AdapterPluginProps, AptosWalletErrorResult, NetworkInfo, NetworkName, PluginProvider, SignMessagePayload, SignMessageResponse, Wallet, WalletCore, WalletCoreEvents, WalletInfo, WalletName, WalletReadyState };

package/dist/index.js

@@ -304,7 +304,7 @@ var WalletCore = class extends import_eventemitter3.default {
     }
   }
   async connect(walletName) {
-    var _a;
+    var _a, _b;
     try {
       const selectedWallet = (_a = this._wallets) == null ? void 0 : _a.find(
         (wallet) => wallet.name === walletName
@@ -313,6 +313,8 @@ var WalletCore = class extends import_eventemitter3.default {
         return;
       }
       if (this._connected) {
+        if (((_b = this.wallet) == null ? void 0 : _b.name) === walletName)
+          return;
         await this.disconnect();
       }
       this._connecting = true;
@@ -356,6 +358,24 @@ var WalletCore = class extends import_eventemitter3.default {
       throw new WalletSignAndSubmitMessageError(errMsg).message;
     }
   }
+  async signAndSubmitBCSTransaction(transaction) {
+    var _a;
+    if (this._wallet && !("signAndSubmitBCSTransaction" in this._wallet)) {
+      throw new WalletNotSupportedMethod(
+        `Submit a BCS Transaction is not supported by ${(_a = this.wallet) == null ? void 0 : _a.name}`
+      ).message;
+    }
+    try {
+      this.doesWalletExist();
+      const response = await this._wallet.signAndSubmitBCSTransaction(
+        transaction
+      );
+      return response;
+    } catch (error) {
+      const errMsg = typeof error == "object" && "message" in error ? error.message : error;
+      throw new WalletSignAndSubmitMessageError(errMsg).message;
+    }
+  }
   async signTransaction(transaction) {
     var _a;
     if (this._wallet && !("signTransaction" in this._wallet)) {

package/dist/index.mjs

@@ -270,7 +270,7 @@ var WalletCore = class extends EventEmitter {
     }
   }
   async connect(walletName) {
-    var _a;
+    var _a, _b;
     try {
       const selectedWallet = (_a = this._wallets) == null ? void 0 : _a.find(
         (wallet) => wallet.name === walletName
@@ -279,6 +279,8 @@ var WalletCore = class extends EventEmitter {
         return;
       }
       if (this._connected) {
+        if (((_b = this.wallet) == null ? void 0 : _b.name) === walletName)
+          return;
         await this.disconnect();
       }
       this._connecting = true;
@@ -322,6 +324,24 @@ var WalletCore = class extends EventEmitter {
       throw new WalletSignAndSubmitMessageError(errMsg).message;
     }
   }
+  async signAndSubmitBCSTransaction(transaction) {
+    var _a;
+    if (this._wallet && !("signAndSubmitBCSTransaction" in this._wallet)) {
+      throw new WalletNotSupportedMethod(
+        `Submit a BCS Transaction is not supported by ${(_a = this.wallet) == null ? void 0 : _a.name}`
+      ).message;
+    }
+    try {
+      this.doesWalletExist();
+      const response = await this._wallet.signAndSubmitBCSTransaction(
+        transaction
+      );
+      return response;
+    } catch (error) {
+      const errMsg = typeof error == "object" && "message" in error ? error.message : error;
+      throw new WalletSignAndSubmitMessageError(errMsg).message;
+    }
+  }
   async signTransaction(transaction) {
     var _a;
     if (this._wallet && !("signTransaction" in this._wallet)) {

package/package.json

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

package/src/WalletCore.ts

@@ -1,4 +1,4 @@
-import { HexString } from "aptos";
+import { HexString, TxnBuilderTypes, Types } from "aptos";
 import EventEmitter from "eventemitter3";
 import nacl from "tweetnacl";
 import { Buffer } from "buffer";
@@ -29,7 +29,6 @@ import {
   Wallet,
   WalletInfo,
   WalletCoreEvents,
-  TransactionPayload,
 } from "./types";
 import {
   removeLocalStorage,
@@ -196,6 +195,9 @@ 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;
+
         await this.disconnect();
       }
       this._connecting = true;
@@ -234,13 +236,13 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
   }
 
   /** 
-  Sign and submit transaction to chain.
-  @param transaction
+  Sign and submit an entry (not bcs serialized) transaction type to chain.
+  @param transaction a non-bcs serialized transaction
   @return response from the wallet's signAndSubmitTransaction function
   @throws WalletSignAndSubmitMessageError
   */
   async signAndSubmitTransaction(
-    transaction: TransactionPayload
+    transaction: Types.TransactionPayload
   ): Promise<any> {
     try {
       this.doesWalletExist();
@@ -255,6 +257,34 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
     }
   }
 
+  /** 
+  Sign and submit a bsc serialized transaction type to chain.
+  @param transaction a bcs serialized transaction
+  @return response from the wallet's signAndSubmitBCSTransaction function
+  @throws WalletSignAndSubmitMessageError
+  */
+  async signAndSubmitBCSTransaction(
+    transaction: TxnBuilderTypes.TransactionPayload
+  ): Promise<any> {
+    if (this._wallet && !("signAndSubmitBCSTransaction" in this._wallet)) {
+      throw new WalletNotSupportedMethod(
+        `Submit a BCS Transaction is not supported by ${this.wallet?.name}`
+      ).message;
+    }
+
+    try {
+      this.doesWalletExist();
+      const response = await (this._wallet as any).signAndSubmitBCSTransaction(
+        transaction
+      );
+      return response;
+    } catch (error: any) {
+      const errMsg =
+        typeof error == "object" && "message" in error ? error.message : error;
+      throw new WalletSignAndSubmitMessageError(errMsg).message;
+    }
+  }
+
   /** 
   Sign transaction (doesnt submit to chain).
   @param transaction
@@ -262,7 +292,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
   @throws WalletSignTransactionError
   */
   async signTransaction(
-    transaction: TransactionPayload
+    transaction: Types.TransactionPayload
   ): Promise<Uint8Array | null> {
     if (this._wallet && !("signTransaction" in this._wallet)) {
       throw new WalletNotSupportedMethod(

package/src/types.ts

@@ -1,4 +1,4 @@
-import { TxnBuilderTypes, Types } from "aptos";
+import { Types } from "aptos";
 import { NetworkName, WalletReadyState } from "./constants";
 
 // WalletName is a nominal type that wallet adapters should use, e.g. `'MyCryptoWallet' as WalletName<'MyCryptoWallet'>`
@@ -23,6 +23,7 @@ export interface AptosWalletErrorResult {
   name: string;
   message: string;
 }
+
 export interface PluginProvider {
   connect: () => Promise<AccountInfo>;
   account: () => Promise<AccountInfo>;
@@ -46,10 +47,6 @@ export interface AdapterPluginEvents {
   onAccountChange(callback: any): Promise<any>;
 }
 
-export type TransactionPayload =
-  | Types.TransactionPayload
-  | TxnBuilderTypes.TransactionPayload;
-
 export interface AdapterPluginProps<Name extends string = string> {
   name: WalletName<Name>;
   url: string;
@@ -59,7 +56,7 @@ export interface AdapterPluginProps<Name extends string = string> {
   connect(): Promise<any>;
   disconnect: () => Promise<any>;
   network: () => Promise<any>;
-  signAndSubmitTransaction<T extends TransactionPayload, V>(
+  signAndSubmitTransaction<T extends Types.TransactionPayload, V>(
     transaction: T,
     options?: V
   ): Promise<{ hash: Types.HexEncodedBytes }>;