@aptos-labs/wallet-adapter-core 2.5.1 → 3.0.0

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @aptos-labs/wallet-adapter-core
 
+## 3.0.0
+
+### Major Changes
+
+- 31e0084: Support TypeScript SDK V2. Fully compatible with existing SDK V1 and Wallet Adapter V1
+  but with a full SDK V2 support for the dapp.
+
+  - Add support for SDK V2 input types
+  - `signAndSubmitTransaction()` accept only SDK V2 transaction input type
+  - Implement a `submitTransaction()` function for multi signers transactions
+  - `signTransaction()` to support both SDK V1 and V2 versions
+  - Convert wallet `SignedTransaction` response from `signTransaction()` to TS SDK V2 `AccountAuthenticator`
+  - Demo app to demonstrate different trnsaction flows - single signer, sponsor and multi agent transactions
+  - Reject promise on core and/or provider errors instead of just returning `false`
+  - Use `@aptos-labs/ts-sdk@experimental` version `0.0.7`
+
+## 2.6.0
+
+### Minor Changes
+
+- 7acfa69: Adding support for the new Typescript SDK in the package `@aptos-labs/ts-sdk`. The wallet adapter now supports submitting a basic transaction with the new SDK types.
+
+### Patch Changes
+
+- dd6e1ed: Moves dependencies to peer dependencies as needed
+
 ## 2.5.1
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1,5 +1,7 @@
-import { Types, TxnBuilderTypes } from 'aptos';
+import { Types } from 'aptos';
 export { TxnBuilderTypes, Types } from 'aptos';
+import { Network, InputGenerateTransactionData, InputGenerateTransactionOptions, PendingTransactionResponse, InputSubmitTransactionData, AnyRawTransaction, AccountAuthenticator } from '@aptos-labs/ts-sdk';
+export { AccountAuthenticator, AnyRawTransaction, InputGenerateTransactionData, InputGenerateTransactionOptions, InputSubmitTransactionData, PendingTransactionResponse } from '@aptos-labs/ts-sdk';
 import EventEmitter from 'eventemitter3';
 
 declare enum WalletReadyState {
@@ -27,15 +29,20 @@ declare enum NetworkName {
     Devnet = "devnet"
 }
 
-declare type WalletName<T extends string = string> = T & {
+type WalletName<T extends string = string> = T & {
     __brand__: "WalletName";
 };
-declare type NetworkInfo = {
-    name: NetworkName;
+type NetworkInfo = {
+    name: Network;
     chainId?: string;
     url?: string;
 };
-declare type AccountInfo = {
+type WalletInfo = {
+    name: WalletName;
+    icon: string;
+    url: string;
+};
+type AccountInfo = {
     address: string;
     publicKey: string | string[];
     minKeysRequired?: number;
@@ -46,49 +53,6 @@ interface AptosWalletErrorResult {
     name: string;
     message: string;
 }
-declare type OnNetworkChange = (callBack: (networkInfo: NetworkInfo) => Promise<void>) => Promise<void>;
-interface PluginProvider {
-    connect: () => Promise<AccountInfo>;
-    account: () => Promise<AccountInfo>;
-    disconnect: () => Promise<void>;
-    signAndSubmitTransaction: (transaction: any, options?: any) => Promise<{
-        hash: Types.HexEncodedBytes;
-    } | AptosWalletErrorResult>;
-    signMessage: (message: SignMessagePayload) => Promise<SignMessageResponse>;
-    network: () => Promise<NetworkName>;
-    onAccountChange: (listener: (newAddress: AccountInfo) => Promise<void>) => Promise<void>;
-    onNetworkChange: OnNetworkChange;
-}
-interface AdapterPluginEvents {
-    onNetworkChange: OnNetworkChange;
-    onAccountChange(callback: any): Promise<any>;
-}
-interface AdapterPluginProps<Name extends string = string> {
-    name: WalletName<Name>;
-    url: string;
-    icon: `data:image/${"svg+xml" | "webp" | "png" | "gif"};base64,${string}`;
-    providerName?: string;
-    provider: any;
-    deeplinkProvider?: (data: {
-        url: string;
-    }) => string;
-    connect(): Promise<any>;
-    disconnect: () => Promise<any>;
-    network: () => Promise<any>;
-    signAndSubmitTransaction<T extends Types.TransactionPayload, V>(transaction: T, options?: V): Promise<{
-        hash: Types.HexEncodedBytes;
-    }>;
-    signMessage<T extends SignMessagePayload>(message: T): Promise<SignMessageResponse>;
-}
-declare type AdapterPlugin<Name extends string = string> = AdapterPluginProps<Name> & AdapterPluginEvents;
-declare type Wallet<Name extends string = string> = AdapterPlugin<Name> & {
-    readyState?: WalletReadyState;
-};
-declare type WalletInfo = {
-    name: WalletName;
-    icon: string;
-    url: string;
-};
 declare interface WalletCoreEvents {
     connect(account: AccountInfo | null): void;
     disconnect(): void;
@@ -114,6 +78,36 @@ interface SignMessageResponse {
     signature: string | string[];
     bitmap?: Uint8Array;
 }
+type OnNetworkChange = (callBack: (networkInfo: NetworkInfo) => Promise<void>) => Promise<void>;
+type OnAccountChange = (callBack: (accountInfo: AccountInfo) => Promise<any>) => Promise<void>;
+interface AdapterPluginEvents {
+    onNetworkChange: OnNetworkChange;
+    onAccountChange: OnAccountChange;
+}
+interface AdapterPluginProps<Name extends string = string> {
+    name: WalletName<Name>;
+    url: string;
+    icon: `data:image/${"svg+xml" | "webp" | "png" | "gif"};base64,${string}`;
+    version?: "v1" | "v2";
+    providerName?: string;
+    provider: any;
+    deeplinkProvider?: (data: {
+        url: string;
+    }) => string;
+    connect(): Promise<any>;
+    disconnect: () => Promise<any>;
+    network: () => Promise<any>;
+    signAndSubmitTransaction<V>(transaction: Types.TransactionPayload | InputGenerateTransactionData, options?: InputGenerateTransactionOptions): Promise<{
+        hash: Types.HexEncodedBytes;
+        output?: any;
+    } | PendingTransactionResponse>;
+    submitTransaction?(transaction: InputSubmitTransactionData): Promise<PendingTransactionResponse>;
+    signMessage<T extends SignMessagePayload>(message: T): Promise<SignMessageResponse>;
+}
+type AdapterPlugin<Name extends string = string> = AdapterPluginProps<Name> & AdapterPluginEvents;
+type Wallet<Name extends string = string> = AdapterPlugin<Name> & {
+    readyState?: WalletReadyState;
+};
 interface TransactionOptions {
     max_gas_amount?: bigint;
     gas_unit_price?: bigint;
@@ -124,6 +118,7 @@ declare class WalletCore extends EventEmitter<WalletCoreEvents> {
     private _wallet;
     private _account;
     private _network;
+    private readonly waletCoreV1;
     private _connecting;
     private _connected;
     constructor(plugins: ReadonlyArray<Wallet>);
@@ -159,7 +154,7 @@ declare class WalletCore extends EventEmitter<WalletCoreEvents> {
      * If all good, we connect the wallet by calling `this.connectWallet`
      * @param walletName. The wallet name we want to connect.
      */
-    connect(walletName: WalletName): Promise<void | string>;
+    connect(walletName: string): Promise<void | string>;
     /**
      * Connects a wallet to the dapp.
      * On connect success, we set the current account and the network, and keeping the selected wallet
@@ -178,36 +173,35 @@ declare class WalletCore extends EventEmitter<WalletCoreEvents> {
     */
     disconnect(): Promise<void>;
     /**
-    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, 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, options?: TransactionOptions): Promise<any>;
+     * Signs and submits a transaction to chain
+     *
+     * @param transactionInput InputGenerateTransactionData
+     * @param options optional. A configuration object to generate a transaction by
+     * @returns The pending transaction hash (V1 output) | PendingTransactionResponse (V2 output)
+     */
+    signAndSubmitTransaction(transactionInput: InputGenerateTransactionData, options?: InputGenerateTransactionOptions): Promise<{
+        hash: Types.HexEncodedBytes;
+        output?: any;
+    } | PendingTransactionResponse>;
     /**
-    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, options?: TransactionOptions): Promise<Uint8Array | null>;
+     * Signs a transaction
+     *
+     * To support both existing wallet adapter V1 and V2, we support 2 input types
+     *
+     * @param transactionOrPayload AnyRawTransaction - V2 input | Types.TransactionPayload - V1 input
+     * @param options optional. V1 input
+     *
+     * @returns AccountAuthenticator
+     */
+    signTransaction(transactionOrPayload: AnyRawTransaction | Types.TransactionPayload, asFeePayer?: boolean, options?: InputGenerateTransactionOptions): Promise<AccountAuthenticator>;
     /**
-    Sign message (doesnt submit to chain).
-    @param message
-    @return response from the wallet's signMessage function
-    @throws WalletSignMessageError
-    */
-    signMessage(message: SignMessagePayload): Promise<SignMessageResponse | null>;
+     Sign message (doesnt submit to chain).
+     @param message
+     @return response from the wallet's signMessage function
+     @throws WalletSignMessageError
+     */
+    signMessage(message: SignMessagePayload): Promise<SignMessageResponse>;
+    submitTransaction(transaction: InputSubmitTransactionData): Promise<PendingTransactionResponse>;
     /**
     Event for when account has changed on the wallet
     @return the new account info
@@ -220,6 +214,11 @@ declare class WalletCore extends EventEmitter<WalletCoreEvents> {
     @throws WalletNetworkChangeError
     */
     onNetworkChange(): Promise<void>;
+    /**
+     * Signs a message and verifies the signer
+     * @param message SignMessagePayload
+     * @returns boolean
+     */
     signMessageAndVerify(message: SignMessagePayload): Promise<boolean>;
 }
 
@@ -232,5 +231,6 @@ declare function getLocalStorage(): void;
 declare function isMobile(): boolean;
 declare function isInAppBrowser(): boolean;
 declare function isRedirectable(): boolean;
+declare function generalizedErrorMessage(error: any): string;
 
-export { AccountInfo, AdapterPlugin, AdapterPluginEvents, AdapterPluginProps, AptosWalletErrorResult, NetworkInfo, NetworkName, OnNetworkChange, PluginProvider, SignMessagePayload, SignMessageResponse, TransactionOptions, Wallet, WalletCore, WalletCoreEvents, WalletInfo, WalletName, WalletReadyState, getLocalStorage, isInAppBrowser, isMobile, isRedirectable, removeLocalStorage, scopePollingDetectionStrategy, setLocalStorage };
+export { AccountInfo, AdapterPlugin, AdapterPluginEvents, AdapterPluginProps, AptosWalletErrorResult, NetworkInfo, NetworkName, OnAccountChange, OnNetworkChange, SignMessagePayload, SignMessageResponse, TransactionOptions, Wallet, WalletCore, WalletCoreEvents, WalletInfo, WalletName, WalletReadyState, generalizedErrorMessage, getLocalStorage, isInAppBrowser, isMobile, isRedirectable, removeLocalStorage, scopePollingDetectionStrategy, setLocalStorage };

package/dist/index.js

@@ -27,10 +27,11 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var src_exports = {};
 __export(src_exports, {
   NetworkName: () => NetworkName,
-  TxnBuilderTypes: () => import_aptos2.TxnBuilderTypes,
-  Types: () => import_aptos2.Types,
+  TxnBuilderTypes: () => import_aptos3.TxnBuilderTypes,
+  Types: () => import_aptos3.Types,
   WalletCore: () => WalletCore,
   WalletReadyState: () => WalletReadyState,
+  generalizedErrorMessage: () => generalizedErrorMessage,
   getLocalStorage: () => getLocalStorage,
   isInAppBrowser: () => isInAppBrowser,
   isMobile: () => isMobile,
@@ -42,8 +43,9 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 
 // src/WalletCore.ts
-var import_aptos = require("aptos");
-var import_eventemitter3 = __toESM(require("eventemitter3"));
+var import_aptos2 = require("aptos");
+var import_ts_sdk2 = require("@aptos-labs/ts-sdk");
+var import_eventemitter32 = __toESM(require("eventemitter3"));
 var import_tweetnacl = __toESM(require("tweetnacl"));
 var import_buffer = require("buffer");
 
@@ -216,6 +218,9 @@ function isRedirectable() {
     return false;
   return isMobile() && !isInAppBrowser();
 }
+function generalizedErrorMessage(error) {
+  return typeof error === "object" && "message" in error ? error.message : error;
+}
 
 // src/ans.ts
 var ChainIdToAnsContractAddressMap = {
@@ -237,14 +242,98 @@ var getNameByAddress = async (chainId, address) => {
   }
 };
 
+// src/conversion.ts
+var import_ts_sdk = require("@aptos-labs/ts-sdk");
+var import_aptos = require("aptos");
+function convertNetwork(networkInfo) {
+  switch (networkInfo == null ? void 0 : networkInfo.name.toLowerCase()) {
+    case "mainnet":
+      return import_ts_sdk.Network.MAINNET;
+    case "testnet":
+      return import_ts_sdk.Network.TESTNET;
+    case "devnet":
+      return import_ts_sdk.Network.DEVNET;
+    default:
+      throw new Error("Invalid network name");
+  }
+}
+function convertV2TransactionPayloadToV1BCSPayload(payload) {
+  const deserializer = new import_aptos.BCS.Deserializer(payload.bcsToBytes());
+  return import_aptos.TxnBuilderTypes.TransactionPayload.deserialize(deserializer);
+}
+function convertV2PayloadToV1JSONPayload(payload) {
+  var _a;
+  if ("bytecode" in payload) {
+    throw new Error("script payload not supported");
+  } else {
+    const stringTypeTags = (_a = payload.typeArguments) == null ? void 0 : _a.map(
+      (typeTag) => {
+        if (typeTag instanceof import_ts_sdk.TypeTag) {
+          return typeTag.toString();
+        }
+        return typeTag;
+      }
+    );
+    const newPayload = {
+      type: "entry_function_payload",
+      function: payload.function,
+      type_arguments: stringTypeTags || [],
+      arguments: payload.functionArguments
+    };
+    return newPayload;
+  }
+}
+
+// src/WalletCoreV1.ts
+var import_eventemitter3 = __toESM(require("eventemitter3"));
+var WalletCoreV1 = class extends import_eventemitter3.default {
+  async signAndSubmitTransaction(transaction, wallet, options) {
+    try {
+      const response = await wallet.signAndSubmitTransaction(
+        transaction,
+        options
+      );
+      return response;
+    } catch (error) {
+      const errMsg = typeof error == "object" && "message" in error ? error.message : error;
+      throw new WalletSignAndSubmitMessageError(errMsg).message;
+    }
+  }
+  async signAndSubmitBCSTransaction(transaction, wallet, options) {
+    try {
+      const response = await wallet.signAndSubmitBCSTransaction(
+        transaction,
+        options
+      );
+      return response;
+    } catch (error) {
+      const errMsg = typeof error == "object" && "message" in error ? error.message : error;
+      throw new WalletSignAndSubmitMessageError(errMsg).message;
+    }
+  }
+  async signTransaction(transaction, wallet, options) {
+    try {
+      const response = await wallet.signTransaction(
+        transaction,
+        options
+      );
+      return response;
+    } catch (error) {
+      const errMsg = typeof error == "object" && "message" in error ? error.message : error;
+      throw new WalletSignTransactionError(errMsg).message;
+    }
+  }
+};
+
 // src/WalletCore.ts
-var WalletCore = class extends import_eventemitter3.default {
+var WalletCore = class extends import_eventemitter32.default {
   constructor(plugins) {
     super();
     this._wallets = [];
     this._wallet = null;
     this._account = null;
     this._network = null;
+    this.waletCoreV1 = new WalletCoreV1();
     this._connecting = false;
     this._connected = false;
     this._wallets = plugins;
@@ -375,7 +464,7 @@ var WalletCore = class extends import_eventemitter3.default {
       this.emit("connect", account);
     } catch (error) {
       this.clearData();
-      const errMsg = typeof error == "object" && "message" in error ? error.message : error;
+      const errMsg = generalizedErrorMessage(error);
       throw new WalletConnectionError(errMsg).message;
     } finally {
       this._connecting = false;
@@ -389,73 +478,131 @@ var WalletCore = class extends import_eventemitter3.default {
       this.clearData();
       this.emit("disconnect");
     } catch (error) {
-      const errMsg = typeof error == "object" && "message" in error ? error.message : error;
+      const errMsg = generalizedErrorMessage(error);
       throw new WalletDisconnectionError(errMsg).message;
     }
   }
-  async signAndSubmitTransaction(transaction, options) {
+  async signAndSubmitTransaction(transactionInput, options) {
     var _a;
     try {
       this.doesWalletExist();
-      const response = await ((_a = this._wallet) == null ? void 0 : _a.signAndSubmitTransaction(
-        transaction,
-        options
-      ));
-      return response;
+      if (((_a = this._wallet) == null ? void 0 : _a.version) === "v2") {
+        const response2 = await this._wallet.signAndSubmitTransaction(
+          transactionInput,
+          options
+        );
+        return response2;
+      }
+      const payloadData = transactionInput.data;
+      if (typeof payloadData.functionArguments[0] === "object") {
+        const aptosConfig = new import_ts_sdk2.AptosConfig({
+          network: convertNetwork(this._network)
+        });
+        const newPayload = await (0, import_ts_sdk2.generateTransactionPayload)({
+          ...payloadData,
+          aptosConfig
+        });
+        const oldTransactionPayload2 = convertV2TransactionPayloadToV1BCSPayload(newPayload);
+        const response2 = await this.waletCoreV1.signAndSubmitBCSTransaction(
+          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
+          }
+        );
+        const { hash: hash2, ...output2 } = response2;
+        return { hash: hash2, output: output2 };
+      }
+      const oldTransactionPayload = convertV2PayloadToV1JSONPayload(payloadData);
+      const response = await this.waletCoreV1.signAndSubmitTransaction(
+        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
+        }
+      );
+      const { hash, ...output } = response;
+      return { hash, output };
     } catch (error) {
-      const errMsg = typeof error == "object" && "message" in error ? error.message : error;
+      const errMsg = generalizedErrorMessage(error);
       throw new WalletSignAndSubmitMessageError(errMsg).message;
     }
   }
-  async signAndSubmitBCSTransaction(transaction, options) {
-    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;
-    }
+  async signTransaction(transactionOrPayload, asFeePayer, options) {
+    var _a, _b, _c;
     try {
       this.doesWalletExist();
-      const response = await this._wallet.signAndSubmitBCSTransaction(
-        transaction,
-        options
+      if ("rawTransaction" in transactionOrPayload) {
+        if (((_a = this._wallet) == null ? void 0 : _a.version) !== "v2") {
+          throw new WalletNotSupportedMethod(
+            `Sign Transaction V2 is not supported by ${(_b = this.wallet) == null ? void 0 : _b.name}`
+          ).message;
+        }
+        const accountAuthenticator2 = this._wallet.signTransaction(
+          transactionOrPayload,
+          asFeePayer
+        );
+        return accountAuthenticator2;
+      }
+      if (this._wallet && !("signTransaction" in this._wallet)) {
+        throw new WalletNotSupportedMethod(
+          `Sign Transaction is not supported by ${(_c = this.wallet) == null ? void 0 : _c.name}`
+        ).message;
+      }
+      const response = await this.waletCoreV1.signTransaction(
+        transactionOrPayload,
+        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
+        }
       );
-      return response;
+      if (!response) {
+        throw new Error("error");
+      }
+      const deserializer1 = new import_aptos2.BCS.Deserializer(response);
+      const deserializedSignature = import_aptos2.TxnBuilderTypes.SignedTransaction.deserialize(deserializer1);
+      const transactionAuthenticator = deserializedSignature.authenticator;
+      const publicKey = transactionAuthenticator.public_key.value;
+      const signature = transactionAuthenticator.signature.value;
+      const accountAuthenticator = new import_ts_sdk2.AccountAuthenticatorEd25519(
+        new import_ts_sdk2.Ed25519PublicKey(publicKey),
+        new import_ts_sdk2.Ed25519Signature(signature)
+      );
+      return accountAuthenticator;
     } catch (error) {
-      const errMsg = typeof error == "object" && "message" in error ? error.message : error;
-      throw new WalletSignAndSubmitMessageError(errMsg).message;
+      const errMsg = generalizedErrorMessage(error);
+      throw new WalletSignTransactionError(errMsg).message;
     }
   }
-  async signTransaction(transaction, options) {
-    var _a;
-    if (this._wallet && !("signTransaction" in this._wallet)) {
-      throw new WalletNotSupportedMethod(
-        `Sign Transaction is not supported by ${(_a = this.wallet) == null ? void 0 : _a.name}`
-      ).message;
-    }
+  async signMessage(message) {
     try {
       this.doesWalletExist();
-      const response = await this._wallet.signTransaction(
-        transaction,
-        options
-      );
+      const response = await this._wallet.signMessage(message);
       return response;
     } catch (error) {
-      const errMsg = typeof error == "object" && "message" in error ? error.message : error;
-      throw new WalletSignTransactionError(errMsg).message;
+      const errMsg = generalizedErrorMessage(error);
+      throw new WalletSignMessageError(errMsg).message;
     }
   }
-  async signMessage(message) {
+  async submitTransaction(transaction) {
     var _a;
+    if (this._wallet && !("submitTransaction" in this._wallet)) {
+      throw new WalletNotSupportedMethod(
+        `Submit Transaction is not supported by ${(_a = this.wallet) == null ? void 0 : _a.name}`
+      ).message;
+    }
     try {
       this.doesWalletExist();
-      if (!this._wallet)
-        return null;
-      const response = await ((_a = this._wallet) == null ? void 0 : _a.signMessage(message));
-      return response;
+      const pendingTransaction = this._wallet.submitTransaction(
+        transaction
+      );
+      return pendingTransaction;
     } catch (error) {
-      const errMsg = typeof error == "object" && "message" in error ? error.message : error;
-      throw new WalletSignMessageError(errMsg).message;
+      const errMsg = generalizedErrorMessage(error);
+      throw new WalletSignTransactionError(errMsg).message;
     }
   }
   async onAccountChange() {
@@ -468,7 +615,7 @@ var WalletCore = class extends import_eventemitter3.default {
         this.emit("accountChange", this._account);
       }));
     } catch (error) {
-      const errMsg = typeof error == "object" && "message" in error ? error.message : error;
+      const errMsg = generalizedErrorMessage(error);
       throw new WalletAccountChangeError(errMsg).message;
     }
   }
@@ -482,7 +629,7 @@ var WalletCore = class extends import_eventemitter3.default {
         this.emit("networkChange", this._network);
       }));
     } catch (error) {
-      const errMsg = typeof error == "object" && "message" in error ? error.message : error;
+      const errMsg = generalizedErrorMessage(error);
       throw new WalletNetworkChangeError(errMsg).message;
     }
   }
@@ -528,10 +675,10 @@ var WalletCore = class extends import_eventemitter3.default {
           throw new WalletSignMessageAndVerifyError("Failed to get a bitmap").message;
         }
       } else {
-        const currentAccountPublicKey = new import_aptos.HexString(
+        const currentAccountPublicKey = new import_aptos2.HexString(
           this._account.publicKey
         );
-        const signature = new import_aptos.HexString(response.signature);
+        const signature = new import_aptos2.HexString(response.signature);
         verified = import_tweetnacl.default.sign.detached.verify(
           import_buffer.Buffer.from(response.fullMessage),
           import_buffer.Buffer.from(signature.noPrefix(), "hex"),
@@ -540,14 +687,14 @@ var WalletCore = class extends import_eventemitter3.default {
       }
       return verified;
     } catch (error) {
-      const errMsg = typeof error == "object" && "message" in error ? error.message : error;
+      const errMsg = generalizedErrorMessage(error);
       throw new WalletSignMessageAndVerifyError(errMsg).message;
     }
   }
 };
 
 // src/types.ts
-var import_aptos2 = require("aptos");
+var import_aptos3 = require("aptos");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   NetworkName,
@@ -555,6 +702,7 @@ var import_aptos2 = require("aptos");
   Types,
   WalletCore,
   WalletReadyState,
+  generalizedErrorMessage,
   getLocalStorage,
   isInAppBrowser,
   isMobile,