@aptos-labs/wallet-adapter-core 4.24.0 → 5.0.0

package/dist/index.mjs

@@ -1,87 +1,55 @@
 // src/version.ts
-var WALLET_ADAPTER_CORE_VERSION = "4.24.0";
+var WALLET_ADAPTER_CORE_VERSION = "5.0.0";
 
 // src/WalletCore.ts
-import { TxnBuilderTypes as TxnBuilderTypes4, BCS as BCS2 } from "aptos";
+import EventEmitter from "eventemitter3";
 import {
-  Network as Network4,
   AccountAddress,
-  AccountAuthenticatorEd25519,
-  Ed25519PublicKey,
-  Ed25519Signature,
-  Aptos as Aptos3,
-  generateRawTransaction,
-  SimpleTransaction,
+  AnyPublicKey,
+  AnyPublicKeyVariant,
+  Aptos as Aptos2,
+  MultiEd25519PublicKey,
+  MultiEd25519Signature,
+  Network as Network3,
   NetworkToChainId
 } from "@aptos-labs/ts-sdk";
-import EventEmitter2 from "eventemitter3";
 import {
   getAptosWallets,
-  UserResponseStatus as UserResponseStatus2,
-  isWalletWithRequiredFeatureSet
+  isWalletWithRequiredFeatureSet,
+  UserResponseStatus
 } from "@aptos-labs/wallet-standard";
 
-// src/AIP62StandardWallets/sdkWallets.ts
-import {
-  AptosConnectAppleWallet,
-  AptosConnectGoogleWallet
-} from "@aptos-connect/wallet-adapter-plugin";
-import { Network } from "@aptos-labs/ts-sdk";
-import { DevTWallet, TWallet } from "@atomrigslab/aptos-wallet-adapter";
-import { MizuWallet } from "@mizuwallet-sdk/aptos-wallet-adapter";
-function getSDKWallets(dappConfig) {
-  const sdkWallets = [];
-  if (typeof window !== "undefined") {
-    sdkWallets.push(
-      new AptosConnectGoogleWallet({
-        network: dappConfig == null ? void 0 : dappConfig.network,
-        dappId: dappConfig == null ? void 0 : dappConfig.aptosConnectDappId,
-        ...dappConfig == null ? void 0 : dappConfig.aptosConnect
-      }),
-      new AptosConnectAppleWallet({
-        network: dappConfig == null ? void 0 : dappConfig.network,
-        dappId: dappConfig == null ? void 0 : dappConfig.aptosConnectDappId,
-        ...dappConfig == null ? void 0 : dappConfig.aptosConnect
-      })
-    );
-    if ((dappConfig == null ? void 0 : dappConfig.mizuwallet) && (dappConfig == null ? void 0 : dappConfig.network) && [Network.MAINNET, Network.TESTNET].includes(dappConfig.network)) {
-      sdkWallets.push(
-        new MizuWallet({
-          network: dappConfig.network,
-          manifestURL: dappConfig.mizuwallet.manifestURL,
-          appId: dappConfig.mizuwallet.appId
-        })
-      );
-    }
+// src/ga/index.ts
+var GA4 = class {
+  constructor() {
+    this.aptosGAID = "G-GNVVWBL3J9";
+    this.injectGA(this.aptosGAID);
   }
-  if ((dappConfig == null ? void 0 : dappConfig.network) === Network.MAINNET) {
-    sdkWallets.push(new TWallet());
-  } else {
-    sdkWallets.push(new DevTWallet());
+  gtag(a, b, c) {
+    let dataLayer = window.dataLayer || [];
+    dataLayer.push(arguments);
+  }
+  injectGA(gaID) {
+    if (typeof window === "undefined")
+      return;
+    if (!gaID)
+      return;
+    const head = document.getElementsByTagName("head")[0];
+    var myScript = document.createElement("script");
+    myScript.setAttribute(
+      "src",
+      `https://www.googletagmanager.com/gtag/js?id=${gaID}`
+    );
+    const that = this;
+    myScript.onload = function() {
+      that.gtag("js", new Date());
+      that.gtag("config", `${gaID}`, {
+        send_page_view: false
+      });
+    };
+    head.insertBefore(myScript, head.children[1]);
   }
-  return sdkWallets;
-}
-
-// src/constants.ts
-var WalletReadyState = /* @__PURE__ */ ((WalletReadyState2) => {
-  WalletReadyState2["Installed"] = "Installed";
-  WalletReadyState2["NotDetected"] = "NotDetected";
-  WalletReadyState2["Loadable"] = "Loadable";
-  WalletReadyState2["Unsupported"] = "Unsupported";
-  return WalletReadyState2;
-})(WalletReadyState || {});
-var NetworkName = /* @__PURE__ */ ((NetworkName2) => {
-  NetworkName2["Mainnet"] = "mainnet";
-  NetworkName2["Testnet"] = "testnet";
-  NetworkName2["Devnet"] = "devnet";
-  return NetworkName2;
-})(NetworkName || {});
-var ChainIdToAnsSupportedNetworkMap = {
-  "1": "mainnet",
-  "2": "testnet"
 };
-var APTOS_CONNECT_BASE_URL = "https://aptosconnect.app";
-var APTOS_CONNECT_ACCOUNT_URL = "https://aptosconnect.app/dashboard/main-account";
 
 // src/error/index.ts
 var WalletError = class extends Error {
@@ -168,119 +136,45 @@ var WalletSignTransactionError = class extends WalletError {
     this.name = "WalletSignTransactionError";
   }
 };
-var WalletNotSupportedMethod = class extends WalletError {
+var WalletChangeNetworkError = class extends WalletError {
   constructor() {
     super(...arguments);
-    this.name = "WalletNotSupportedMethod";
+    this.name = "WalletChangeNetworkError";
   }
 };
-var WalletChangeNetworkError = class extends WalletError {
+var WalletSubmitTransactionError = class extends WalletError {
   constructor() {
     super(...arguments);
-    this.name = "WalletChangeNetworkError";
+    this.name = "WalletSubmitTransactionError";
   }
 };
 
-// src/LegacyWalletPlugins/WalletCoreV1.ts
-import { HexString } from "aptos";
-import EventEmitter from "eventemitter3";
-import { Buffer } from "buffer";
-import {
-  generateTransactionPayload as generateTransactionPayload2
-} from "@aptos-labs/ts-sdk";
-import nacl from "tweetnacl";
-
-// src/LegacyWalletPlugins/conversion.ts
-import {
-  Network as Network2,
-  TypeTag,
-  generateTransactionPayload
-} from "@aptos-labs/ts-sdk";
-import { BCS, TxnBuilderTypes } from "aptos";
-function convertNetwork(networkInfo) {
-  switch (networkInfo == null ? void 0 : networkInfo.name) {
-    case "mainnet":
-      return Network2.MAINNET;
-    case "testnet":
-      return Network2.TESTNET;
-    case "devnet":
-      return Network2.DEVNET;
-    case "local":
-      return Network2.LOCAL;
-    default:
-      throw new Error("Invalid Aptos network name");
-  }
-}
-function convertV2TransactionPayloadToV1BCSPayload(payload) {
-  const deserializer = new BCS.Deserializer(payload.bcsToBytes());
-  return TxnBuilderTypes.TransactionPayload.deserialize(deserializer);
-}
-function convertV2PayloadToV1JSONPayload(payload) {
-  var _a, _b;
-  if ("bytecode" in payload) {
-    throw new Error("script payload not supported");
-  } else if ("multisigAddress" in payload) {
-    const stringTypeTags = (_a = payload.typeArguments) == null ? void 0 : _a.map(
-      (typeTag) => {
-        if (typeTag instanceof TypeTag) {
-          return typeTag.toString();
-        }
-        return typeTag;
-      }
-    );
-    const newPayload = {
-      type: "multisig_payload",
-      multisig_address: payload.multisigAddress.toString(),
-      function: payload.function,
-      type_arguments: stringTypeTags || [],
-      arguments: payload.functionArguments
-    };
-    return newPayload;
-  } else {
-    const stringTypeTags = (_b = payload.typeArguments) == null ? void 0 : _b.map(
-      (typeTag) => {
-        if (typeTag instanceof TypeTag) {
-          return typeTag.toString();
-        }
-        return typeTag;
-      }
-    );
-    const newPayload = {
-      type: "entry_function_payload",
-      function: payload.function,
-      type_arguments: stringTypeTags || [],
-      arguments: payload.functionArguments
-    };
-    return newPayload;
-  }
-}
-function convertPayloadInputV1ToV2(inputV1) {
-  if ("function" in inputV1) {
-    const inputV2 = {
-      function: inputV1.function,
-      functionArguments: inputV1.arguments,
-      typeArguments: inputV1.type_arguments
-    };
-    return inputV2;
-  }
-  throw new Error("Payload type not supported");
-}
-async function generateTransactionPayloadFromV1Input(aptosConfig, inputV1) {
-  if ("function" in inputV1) {
-    const inputV2 = convertPayloadInputV1ToV2(inputV1);
-    return generateTransactionPayload({ ...inputV2, aptosConfig });
-  }
-  throw new Error("Payload type not supported");
-}
+// src/constants.ts
+var WalletReadyState = /* @__PURE__ */ ((WalletReadyState2) => {
+  WalletReadyState2["Installed"] = "Installed";
+  WalletReadyState2["NotDetected"] = "NotDetected";
+  return WalletReadyState2;
+})(WalletReadyState || {});
+var NetworkName = /* @__PURE__ */ ((NetworkName2) => {
+  NetworkName2["Mainnet"] = "mainnet";
+  NetworkName2["Testnet"] = "testnet";
+  NetworkName2["Devnet"] = "devnet";
+  return NetworkName2;
+})(NetworkName || {});
+var ChainIdToAnsSupportedNetworkMap = {
+  "1": "mainnet",
+  "2": "testnet"
+};
+var APTOS_CONNECT_BASE_URL = "https://aptosconnect.app";
+var APTOS_CONNECT_ACCOUNT_URL = "https://aptosconnect.app/dashboard/main-account";
 
 // src/utils/helpers.ts
 import {
   Aptos,
-  AptosConfig as AptosConfig2,
+  AptosConfig,
   Hex,
-  Network as Network3,
-  NetworkToNodeAPI,
-  Serializable
+  Network,
+  NetworkToNodeAPI
 } from "@aptos-labs/ts-sdk";
 function isMobile() {
   return /Mobile|iP(hone|od|ad)|Android|BlackBerry|IEMobile|Kindle|NetFront|Silk-Accelerated|(hpw|web)OS|Fennec|Minimo|Opera M(obi|ini)|Blazer|Dolfin|Dolphin|Skyfire|Zune/i.test(
@@ -304,13 +198,6 @@ function isRedirectable() {
 function generalizedErrorMessage(error) {
   return typeof error === "object" && "message" in error ? error.message : error;
 }
-var areBCSArguments = (args) => {
-  if (args.length === 0)
-    return false;
-  return args.every(
-    (arg) => arg instanceof Serializable
-  );
-};
 var getAptosConfig = (networkInfo, dappConfig) => {
   if (!networkInfo) {
     throw new Error("Undefined network");
@@ -319,19 +206,32 @@ var getAptosConfig = (networkInfo, dappConfig) => {
     const currentNetwork = convertNetwork(networkInfo);
     if (isAptosLiveNetwork(currentNetwork)) {
       const apiKey = dappConfig == null ? void 0 : dappConfig.aptosApiKeys;
-      return new AptosConfig2({
+      return new AptosConfig({
         network: currentNetwork,
         clientConfig: { API_KEY: apiKey ? apiKey[currentNetwork] : void 0 }
       });
     }
-    return new AptosConfig2({
+    return new AptosConfig({
       network: currentNetwork
     });
   }
-  return new AptosConfig2({
-    network: Network3.CUSTOM,
-    fullnode: networkInfo.url
-  });
+  const knownNetworks = {
+    okx: "https://wallet.okx.com/fullnode/aptos/discover/rpc"
+  };
+  if (networkInfo.url) {
+    const isKnownNetwork = Object.values(knownNetworks).includes(
+      networkInfo.url
+    );
+    if (isKnownNetwork) {
+      return new AptosConfig({
+        network: Network.CUSTOM,
+        fullnode: networkInfo.url
+      });
+    }
+  }
+  throw new Error(
+    `Invalid network, network ${networkInfo.name} not supported with Aptos wallet adapter to prevent user from using an unexpected network.`
+  );
 };
 var isAptosNetwork = (networkInfo) => {
   if (!networkInfo) {
@@ -366,6 +266,20 @@ var handlePublishPackageTransaction = (transactionInput) => {
   }
   return { metadataBytes, byteCode };
 };
+function convertNetwork(networkInfo) {
+  switch (networkInfo == null ? void 0 : networkInfo.name) {
+    case "mainnet":
+      return Network.MAINNET;
+    case "testnet":
+      return Network.TESTNET;
+    case "devnet":
+      return Network.DEVNET;
+    case "local":
+      return Network.LOCAL;
+    default:
+      throw new Error("Invalid Aptos network name");
+  }
+}
 
 // src/utils/localStorage.ts
 var LOCAL_STORAGE_ITEM_KEY = "AptosWalletName";
@@ -379,36 +293,6 @@ function getLocalStorage() {
   localStorage.getItem(LOCAL_STORAGE_ITEM_KEY);
 }
 
-// src/utils/scopePollingDetectionStrategy.ts
-function scopePollingDetectionStrategy(detect) {
-  if (typeof window === "undefined" || typeof document === "undefined")
-    return;
-  const disposers = [];
-  function detectAndDispose() {
-    const detected = detect();
-    if (detected) {
-      for (const dispose of disposers) {
-        dispose();
-      }
-    }
-  }
-  const interval = setInterval(detectAndDispose, 1e3);
-  disposers.push(() => clearInterval(interval));
-  if (document.readyState === "loading") {
-    document.addEventListener("DOMContentLoaded", detectAndDispose, {
-      once: true
-    });
-    disposers.push(
-      () => document.removeEventListener("DOMContentLoaded", detectAndDispose)
-    );
-  }
-  if (document.readyState !== "complete") {
-    window.addEventListener("load", detectAndDispose, { once: true });
-    disposers.push(() => window.removeEventListener("load", detectAndDispose));
-  }
-  detectAndDispose();
-}
-
 // src/utils/walletSelector.ts
 function partitionWallets(wallets, partitionFunction = isInstalledOrLoadable) {
   const defaultWallets = [];
@@ -422,7 +306,7 @@ function partitionWallets(wallets, partitionFunction = isInstalledOrLoadable) {
   return { defaultWallets, moreWallets };
 }
 function isInstalledOrLoadable(wallet) {
-  return wallet.readyState === "Installed" /* Installed */ || wallet.readyState === "Loadable" /* Loadable */;
+  return wallet.readyState === "Installed" /* Installed */;
 }
 function isInstallRequired(wallet) {
   const isWalletReady = isInstalledOrLoadable(wallet);
@@ -436,333 +320,44 @@ function truncateAddress(address) {
 }
 function isAptosConnectWallet(wallet) {
   if (!wallet.url)
-    return false;
-  return wallet.url.startsWith(APTOS_CONNECT_BASE_URL);
-}
-function getAptosConnectWallets(wallets) {
-  const { defaultWallets, moreWallets } = partitionWallets(
-    wallets,
-    isAptosConnectWallet
-  );
-  return { aptosConnectWallets: defaultWallets, otherWallets: moreWallets };
-}
-function groupAndSortWallets(wallets, options) {
-  const { aptosConnectWallets, otherWallets } = getAptosConnectWallets(wallets);
-  const { defaultWallets, moreWallets } = partitionWallets(otherWallets);
-  if (options == null ? void 0 : options.sortAptosConnectWallets) {
-    aptosConnectWallets.sort(options.sortAptosConnectWallets);
-  }
-  if (options == null ? void 0 : options.sortAvailableWallets) {
-    defaultWallets.sort(options.sortAvailableWallets);
-  }
-  if (options == null ? void 0 : options.sortInstallableWallets) {
-    moreWallets.sort(options.sortInstallableWallets);
-  }
-  return {
-    aptosConnectWallets,
-    availableWallets: defaultWallets,
-    installableWallets: moreWallets
-  };
-}
-
-// src/LegacyWalletPlugins/WalletCoreV1.ts
-var WalletCoreV1 = class extends EventEmitter {
-  async connect(wallet) {
-    const account = await wallet.connect();
-    return account;
-  }
-  async resolveSignAndSubmitTransaction(payloadData, network, wallet, transactionInput, dappConfig) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
-    if (areBCSArguments(payloadData.functionArguments)) {
-      const aptosConfig = getAptosConfig(network, dappConfig);
-      const newPayload = await generateTransactionPayload2({
-        ...payloadData,
-        aptosConfig
-      });
-      const oldTransactionPayload2 = convertV2TransactionPayloadToV1BCSPayload(newPayload);
-      return await this.signAndSubmitBCSTransaction(
-        oldTransactionPayload2,
-        wallet,
-        {
-          max_gas_amount: ((_a = transactionInput.options) == null ? void 0 : _a.maxGasAmount) ? BigInt((_b = transactionInput.options) == null ? void 0 : _b.maxGasAmount) : void 0,
-          gas_unit_price: ((_c = transactionInput.options) == null ? void 0 : _c.gasUnitPrice) ? BigInt((_d = transactionInput.options) == null ? void 0 : _d.gasUnitPrice) : void 0
-        }
-      );
-    }
-    const oldTransactionPayload = convertV2PayloadToV1JSONPayload(payloadData);
-    return await this.signAndSubmitTransaction(oldTransactionPayload, wallet, {
-      max_gas_amount: ((_e = transactionInput.options) == null ? void 0 : _e.maxGasAmount) ? BigInt((_f = transactionInput.options) == null ? void 0 : _f.maxGasAmount) : void 0,
-      gas_unit_price: ((_g = transactionInput.options) == null ? void 0 : _g.gasUnitPrice) ? BigInt((_h = transactionInput.options) == null ? void 0 : _h.gasUnitPrice) : void 0
-    });
-  }
-  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) {
-    if (!("signAndSubmitBCSTransaction" in wallet)) {
-      throw new WalletNotSupportedMethod(
-        `Submit a BCS Transaction is not supported by ${wallet.name}`
-      ).message;
-    }
-    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;
-    }
-  }
-  async signMessageAndVerify(message, wallet, account) {
-    try {
-      const response = await wallet.signMessage(message);
-      if (!response)
-        throw new WalletSignMessageAndVerifyError("Failed to sign a message").message;
-      console.log("signMessageAndVerify signMessage response", response);
-      let verified = false;
-      if (Array.isArray(response.signature)) {
-        const { fullMessage, signature, bitmap } = response;
-        if (bitmap) {
-          const minKeysRequired = account.minKeysRequired;
-          if (signature.length < minKeysRequired) {
-            verified = false;
-          } else {
-            const bits = Array.from(bitmap).flatMap(
-              (n) => Array.from({ length: 8 }).map((_, i) => n >> i & 1)
-            );
-            const index = bits.map((_, i) => i).filter((i) => bits[i]);
-            const publicKeys = account.publicKey;
-            const matchedPublicKeys = publicKeys.filter(
-              (_, i) => index.includes(i)
-            );
-            verified = true;
-            for (let i = 0; i < signature.length; i++) {
-              const isSigVerified = nacl.sign.detached.verify(
-                Buffer.from(fullMessage),
-                Buffer.from(signature[i], "hex"),
-                Buffer.from(matchedPublicKeys[i], "hex")
-              );
-              if (!isSigVerified) {
-                verified = false;
-                break;
-              }
-            }
-          }
-        } else {
-          throw new WalletSignMessageAndVerifyError("Failed to get a bitmap").message;
-        }
-      } else {
-        const currentAccountPublicKey = new HexString(
-          account.publicKey
-        );
-        const signature = new HexString(
-          response.signature
-        );
-        verified = nacl.sign.detached.verify(
-          Buffer.from(response.fullMessage),
-          Buffer.from(signature.noPrefix(), "hex"),
-          Buffer.from(currentAccountPublicKey.noPrefix(), "hex")
-        );
-      }
-      return verified;
-    } catch (error) {
-      const errMsg = generalizedErrorMessage(error);
-      throw new WalletSignMessageAndVerifyError(errMsg).message;
-    }
-  }
-};
-
-// src/LegacyWalletPlugins/types.ts
-import { TxnBuilderTypes as TxnBuilderTypes3, Types as Types3 } from "aptos";
-
-// src/AIP62StandardWallets/WalletStandard.ts
-import {
-  UserResponseStatus
-} from "@aptos-labs/wallet-standard";
-import {
-  AnyPublicKey,
-  AnyPublicKeyVariant,
-  MultiEd25519Signature,
-  MultiEd25519PublicKey
-} from "@aptos-labs/ts-sdk";
-var WalletStandardCore = class {
-  async connect(wallet) {
-    const response = await wallet.connect();
-    if (response.status === UserResponseStatus.REJECTED) {
-      throw new WalletConnectionError("User has rejected the request").message;
-    }
-    return response.args;
-  }
-  async signAndSubmitTransaction(transactionInput, aptos, account, wallet, standardWallets) {
-    var _a, _b, _c;
-    try {
-      const standardWallet = standardWallets.find(
-        (standardWallet2) => wallet.name === standardWallet2.name
-      );
-      if (((_a = standardWallet == null ? void 0 : standardWallet.features["aptos:signAndSubmitTransaction"]) == null ? void 0 : _a.version) !== "1.1.0") {
-        const transaction2 = await aptos.transaction.build.simple({
-          sender: account.address.toString(),
-          data: transactionInput.data,
-          options: transactionInput.options
-        });
-        const response2 = await wallet.signAndSubmitTransaction(
-          transaction2
-        );
-        if (response2.status === UserResponseStatus.REJECTED) {
-          throw new WalletConnectionError("User has rejected the request").message;
-        }
-        return response2.args;
-      }
-      const transaction = {
-        gasUnitPrice: (_b = transactionInput.options) == null ? void 0 : _b.gasUnitPrice,
-        maxGasAmount: (_c = transactionInput.options) == null ? void 0 : _c.maxGasAmount,
-        payload: transactionInput.data
-      };
-      const response = await wallet.signAndSubmitTransaction(
-        transaction
-      );
-      if (response.status === UserResponseStatus.REJECTED) {
-        throw new WalletConnectionError("User has rejected the request").message;
-      }
-      return response.args;
-    } catch (error) {
-      const errMsg = generalizedErrorMessage(error);
-      throw new WalletSignAndSubmitMessageError(errMsg).message;
-    }
-  }
-  async signTransaction(transactionOrInput, wallet, asFeePayer) {
-    const response = await wallet.signTransaction(
-      transactionOrInput,
-      asFeePayer
-    );
-    if (response.status === UserResponseStatus.REJECTED) {
-      throw new WalletConnectionError("User has rejected the request").message;
-    }
-    return response.args;
-  }
-  async signMessage(message, wallet) {
-    try {
-      const response = await wallet.signMessage(
-        message
-      );
-      if (response.status === UserResponseStatus.REJECTED) {
-        throw new WalletConnectionError("User has rejected the request").message;
-      }
-      return response.args;
-    } catch (error) {
-      const errMsg = generalizedErrorMessage(error);
-      throw new WalletSignMessageError(errMsg).message;
-    }
-  }
-  async signMessageAndVerify(message, wallet) {
-    try {
-      const response = await wallet.signMessage(
-        message
-      );
-      const account = await wallet.account();
-      if (response.status === UserResponseStatus.REJECTED) {
-        throw new WalletConnectionError("Failed to sign a message").message;
-      }
-      if (account.publicKey instanceof AnyPublicKey && account.publicKey.variant === AnyPublicKeyVariant.Keyless) {
-        return true;
-      }
-      let verified = false;
-      if (response.args.signature instanceof MultiEd25519Signature) {
-        if (!(account.publicKey instanceof MultiEd25519PublicKey)) {
-          throw new WalletSignMessageAndVerifyError(
-            "Public key and Signature type mismatch"
-          ).message;
-        }
-        const { fullMessage, signature } = response.args;
-        const bitmap = signature.bitmap;
-        if (bitmap) {
-          const minKeysRequired = account.publicKey.threshold;
-          if (signature.signatures.length < minKeysRequired) {
-            verified = false;
-          } else {
-            verified = account.publicKey.verifySignature({
-              message: new TextEncoder().encode(fullMessage),
-              signature
-            });
-          }
-        }
-      } else {
-        verified = account.publicKey.verifySignature({
-          message: new TextEncoder().encode(response.args.fullMessage),
-          signature: response.args.signature
-        });
-      }
-      return verified;
-    } catch (error) {
-      const errMsg = generalizedErrorMessage(error);
-      throw new WalletSignMessageAndVerifyError(errMsg).message;
-    }
-  }
-};
-
-// src/ga/index.ts
-var GA4 = class {
-  constructor() {
-    this.aptosGAID = "G-GNVVWBL3J9";
-    this.injectGA(this.aptosGAID);
+    return false;
+  return wallet.url.startsWith(APTOS_CONNECT_BASE_URL);
+}
+function getAptosConnectWallets(wallets) {
+  const { defaultWallets, moreWallets } = partitionWallets(
+    wallets,
+    isAptosConnectWallet
+  );
+  return { aptosConnectWallets: defaultWallets, otherWallets: moreWallets };
+}
+function groupAndSortWallets(wallets, options) {
+  const { aptosConnectWallets, otherWallets } = getAptosConnectWallets(wallets);
+  const { defaultWallets, moreWallets } = partitionWallets(otherWallets);
+  if (options == null ? void 0 : options.sortAptosConnectWallets) {
+    aptosConnectWallets.sort(options.sortAptosConnectWallets);
   }
-  gtag(a, b, c) {
-    let dataLayer = window.dataLayer || [];
-    dataLayer.push(arguments);
+  if (options == null ? void 0 : options.sortAvailableWallets) {
+    defaultWallets.sort(options.sortAvailableWallets);
   }
-  injectGA(gaID) {
-    if (typeof window === "undefined")
-      return;
-    if (!gaID)
-      return;
-    const head = document.getElementsByTagName("head")[0];
-    var myScript = document.createElement("script");
-    myScript.setAttribute(
-      "src",
-      `https://www.googletagmanager.com/gtag/js?id=${gaID}`
-    );
-    const that = this;
-    myScript.onload = function() {
-      that.gtag("js", new Date());
-      that.gtag("config", `${gaID}`, {
-        send_page_view: false
-      });
-    };
-    head.insertBefore(myScript, head.children[1]);
+  if (options == null ? void 0 : options.sortInstallableWallets) {
+    moreWallets.sort(options.sortInstallableWallets);
   }
-};
+  return {
+    aptosConnectWallets,
+    availableWallets: defaultWallets,
+    installableWallets: moreWallets
+  };
+}
 
-// src/AIP62StandardWallets/registry.ts
+// src/registry.ts
 var aptosStandardSupportedWalletList = [
   {
     name: "Nightly",
-    url: "https://chromewebstore.google.com/detail/nightly/fiikommddbeccaoicoejoniammnalkfa?hl=en",
+    url: "https://nightly.app/",
     icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAyOC4wLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iV2Fyc3R3YV8xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCINCgkgdmlld0JveD0iMCAwIDg1MS41IDg1MS41IiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCA4NTEuNSA4NTEuNTsiIHhtbDpzcGFjZT0icHJlc2VydmUiPg0KPHN0eWxlIHR5cGU9InRleHQvY3NzIj4NCgkuc3Qwe2ZpbGw6IzYwNjdGOTt9DQoJLnN0MXtmaWxsOiNGN0Y3Rjc7fQ0KPC9zdHlsZT4NCjxnPg0KCTxnIGlkPSJXYXJzdHdhXzJfMDAwMDAwMTQ2MDk2NTQyNTMxODA5NDY0NjAwMDAwMDg2NDc4NTIwMDIxMTY5MTg2ODhfIj4NCgkJPHBhdGggY2xhc3M9InN0MCIgZD0iTTEyNCwwaDYwMy42YzY4LjUsMCwxMjQsNTUuNSwxMjQsMTI0djYwMy42YzAsNjguNS01NS41LDEyNC0xMjQsMTI0SDEyNGMtNjguNSwwLTEyNC01NS41LTEyNC0xMjRWMTI0DQoJCQlDMCw1NS41LDU1LjUsMCwxMjQsMHoiLz4NCgk8L2c+DQoJPGcgaWQ9IldhcnN0d2FfMyI+DQoJCTxwYXRoIGNsYXNzPSJzdDEiIGQ9Ik02MjMuNSwxNzAuM2MtMzcuNCw1Mi4yLTg0LjIsODguNC0xMzkuNSwxMTIuNmMtMTkuMi01LjMtMzguOS04LTU4LjMtNy44Yy0xOS40LTAuMi0zOS4xLDIuNi01OC4zLDcuOA0KCQkJYy01NS4zLTI0LjMtMTAyLjEtNjAuMy0xMzkuNS0xMTIuNmMtMTEuMywyOC40LTU0LjgsMTI2LjQtMi42LDI2My40YzAsMC0xNi43LDcxLjUsMTQsMTMyLjljMCwwLDQ0LjQtMjAuMSw3OS43LDguMg0KCQkJYzM2LjksMjkuOSwyNS4xLDU4LjcsNTEuMSw4My41YzIyLjQsMjIuOSw1NS43LDIyLjksNTUuNywyMi45czMzLjMsMCw1NS43LTIyLjhjMjYtMjQuNywxNC4zLTUzLjUsNTEuMS04My41DQoJCQljMzUuMi0yOC4zLDc5LjctOC4yLDc5LjctOC4yYzMwLjYtNjEuNCwxNC0xMzIuOSwxNC0xMzIuOUM2NzguMywyOTYuNyw2MzQuOSwxOTguNyw2MjMuNSwxNzAuM3ogTTI1My4xLDQxNC44DQoJCQljLTI4LjQtNTguMy0zNi4yLTEzOC4zLTE4LjMtMjAxLjVjMjMuNyw2MCw1NS45LDg2LjksOTQuMiwxMTUuM0MzMTIuOCwzNjIuMywyODIuMywzOTQuMSwyNTMuMSw0MTQuOHogTTMzNC44LDUxNy41DQoJCQljLTIyLjQtOS45LTI3LjEtMjkuNC0yNy4xLTI5LjRjMzAuNS0xOS4yLDc1LjQtNC41LDc2LjgsNDAuOUMzNjAuOSw1MTQuNywzNTMsNTI1LjQsMzM0LjgsNTE3LjV6IE00MjUuNyw2NzguNw0KCQkJYy0xNiwwLTI5LTExLjUtMjktMjUuNnMxMy0yNS42LDI5LTI1LjZzMjksMTEuNSwyOSwyNS42QzQ1NC43LDY2Ny4zLDQ0MS43LDY3OC43LDQyNS43LDY3OC43eiBNNTE2LjcsNTE3LjUNCgkJCWMtMTguMiw4LTI2LTIuOC00OS43LDExLjVjMS41LTQ1LjQsNDYuMi02MC4xLDc2LjgtNDAuOUM1NDMuOCw0ODgsNTM5LDUwNy42LDUxNi43LDUxNy41eiBNNTk4LjMsNDE0LjgNCgkJCWMtMjkuMS0yMC43LTU5LjctNTIuNC03Ni04Ni4yYzM4LjMtMjguNCw3MC42LTU1LjQsOTQuMi0xMTUuM0M2MzQuNiwyNzYuNSw2MjYuOCwzNTYuNiw1OTguMyw0MTQuOHoiLz4NCgk8L2c+DQo8L2c+DQo8L3N2Zz4NCg==",
     readyState: "NotDetected" /* NotDetected */,
-    isAIP62Standard: true
+    isAIP62Standard: true,
+    deeplinkProvider: "nightly://v1?network=aptos&url="
   },
   {
     name: "Petra",
@@ -778,99 +373,90 @@ var aptosStandardSupportedWalletList = [
     icon: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMzYiIGhlaWdodD0iMzYiIHZpZXdCb3g9IjAgMCAzNiAzNiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTE4IDBDOC4wNzMwNCAwIDAgOC4wNzEzOSAwIDE3Ljk5NjNDMCAyNS4xMjk4IDQuMTczMTYgMzEuMzEwOCAxMC4yMDc2IDM0LjIyMDNWMzQuMjM1MUgxMC4yMzcyQzEyLjU4NiAzNS4zNjQ5IDE1LjIyMjggMzYgMTggMzZDMjcuOTI3IDM2IDM2IDI3LjkyODYgMzYgMTguMDAzN0MzNiA4LjA3MTM4IDI3LjkyNyAwIDE4IDBaTTE4IDEuNDc2OTJDMjcuMTA3MSAxLjQ3NjkyIDM0LjUyMjggOC44OTEwOCAzNC41MjI4IDE3Ljk5NjNDMzQuNTIyOCAyMC42MTA1IDMzLjkwOTcgMjMuMDkxNyAzMi44MjQgMjUuMjkyM0MzMC40NDU2IDI0LjE0MDMgMjguMDMwNCAyMy4yODM3IDI1LjU5MjkgMjIuNzAwM1Y4LjkyMDYyQzI1LjU5MjkgOC40NDA2MiAyNS4yMTYyIDguMDU2NjIgMjQuNzQzNSA4LjA1NjYySDIxLjcxNTJIMTQuMDg1NEgxMS4wNTdDMTAuNTkxNyA4LjA1NjYyIDEwLjIwNzYgOC40NDA2MiAxMC4yMDc2IDguOTIwNjJWMjIuNzY2OEM3Ljg0NDA3IDIzLjM1MDIgNS40OTUyOCAyNC4xOTIgMy4xODM0MiAyNS4yOTk3QzIuMDkwMjcgMjMuMDkxNyAxLjQ3NzIzIDIwLjYxNzggMS40NzcyMyAxNy45OTYzQzEuNDc3MjMgOC44OTEwOCA4Ljg5MjkgMS40NzY5MiAxOCAxLjQ3NjkyWk00LjEzNjIzIDI2Ljk2MTJDNi4wOTM1NiAyNS45OTM4IDguMTI0NzQgMjUuMjQ4IDEwLjIxNSAyNC43MzExVjMyLjU1ODhDNy43NDA2NiAzMS4yMzY5IDUuNjUwMzkgMjkuMzAyMiA0LjEzNjIzIDI2Ljk2MTJaTTE0LjA4NTQgMzQuMDQzMVYxNS42MDM3QzE0LjA4NTQgMTMuNDY5NSAxNS44MzU5IDExLjcwNDYgMTcuOTI2MSAxMS43MDQ2QzIwLjAxNjQgMTEuNzA0NiAyMS43MTUyIDEzLjQzMjYgMjEuNzE1MiAxNS41NTk0QzIxLjcxNTIgMTUuNTc0MiAyMS43MDc4IDE1LjU4ODkgMjEuNzA3OCAxNS42MDM3SDIxLjcxNTJWMjIuMDIwOUMxOS45MzUyIDIxLjgxNDIgMTguMTQ3NyAyMS43NDc3IDE2LjM2MDMgMjEuODQzN0wxNC44OTA0IDIzLjk3NzhDMTcuMTgwMSAyMy43ODU4IDE5LjQxMDcgMjMuODAwNiAyMS42MTE4IDI0LjA1MTdDMjEuNjM0IDI0LjA1MTcgMjEuNjQ4NyAyNC4wNTE3IDIxLjY3MDkgMjQuMDU5MUMyMS42ODU3IDI0LjA1OTEgMjEuNzAwNSAyNC4wNTkxIDIxLjcyMjYgMjQuMDY2NUMyMi4xMDY3IDI0LjExMDggMjMuNTAyNyAyNC4yODggMjQuNzgwNSAyNC42MDU1TDIxLjcyMjYgMjUuNjQ2OFYzNC4xMDIyQzIwLjUyNjEgMzQuMzc1NCAxOS4yODUyIDM0LjUzMDUgMTguMDE0OCAzNC41MzA1QzE2LjY0ODMgMzQuNTE1NyAxNS4zNDEgMzQuMzQ1OCAxNC4wODU0IDM0LjA0MzFaTTI1LjU4NTYgMzIuNjYyMlYyNC43NjhDMjcuNjY4NCAyNS4yOTIzIDI5LjcyOTIgMjYuMDYwMyAzMS43OTczIDI3LjA2NDZDMzAuMjQ2MiAyOS40MjAzIDI4LjEwNDIgMzEuMzU1MSAyNS41ODU2IDMyLjY2MjJaIiBmaWxsPSJ1cmwoI3BhaW50MF9saW5lYXJfMjIyXzE2NzApIi8+CjxkZWZzPgo8bGluZWFyR3JhZGllbnQgaWQ9InBhaW50MF9saW5lYXJfMjIyXzE2NzAiIHgxPSIxNy45OTk3IiB5MT0iMzYuNzc4OSIgeDI9IjE3Ljk5OTciIHkyPSItNS41MTk3OCIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPgo8c3RvcCBvZmZzZXQ9IjAuMDg1OCIgc3RvcC1jb2xvcj0iIzhEMjlDMSIvPgo8c3RvcCBvZmZzZXQ9IjAuMjM4MyIgc3RvcC1jb2xvcj0iIzk0MkJCQiIvPgo8c3RvcCBvZmZzZXQ9IjAuNDY2NyIgc3RvcC1jb2xvcj0iI0E5MkZBQyIvPgo8c3RvcCBvZmZzZXQ9IjAuNzQxMyIgc3RvcC1jb2xvcj0iI0NBMzc5MyIvPgo8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiNGMDNGNzciLz4KPC9saW5lYXJHcmFkaWVudD4KPC9kZWZzPgo8L3N2Zz4K",
     readyState: "NotDetected" /* NotDetected */,
     isAIP62Standard: true
+  },
+  {
+    name: "Rimosafe",
+    url: "https://chromewebstore.google.com/detail/rimo-safe-wallet/kiicddjcakdmobjkcpppkgcjbpakcagp",
+    icon: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMzAiIGhlaWdodD0iMzAiIHZpZXdCb3g9IjAgMCAzMCAzMCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KICA8cmVjdCB3aWR0aD0iMzAiIGhlaWdodD0iMzAiIGZpbGw9Im5vbmUiLz4KICA8ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSgzLCAzKSBzY2FsZSgwLjgpIj4KICAgIDxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIiBkPSJNMjkuNTMxMSA5Ljg0MzY5VjBIMTkuNjg3NEwxOS42ODc3IDAuMDAwMzQwNTU1TDAgMC4wMDAzNDE0MTVMNC4zMjEzNGUtMDcgOS44NDQwM0g5Ljg0MzY5QzQuNDA3MTcgOS44NDQwMyAwIDE0LjI1MTIgMCAxOS42ODc3VjMwLjAwMDFIOS44NDM2OVYxOS42ODc5TDE5LjY4NzEgMzAuMDAwMUwxOS42ODcxIDE5LjY4NzdMMjkuNTMwOCA5Ljg0NDAzTDI5LjUzMTEgOS44NDQwM1Y5Ljg0MzY1TDI5LjUzMTEgOS44NDM2OVpNMTkuNjg3MSAxOS42ODc2TDE5LjY4NzEgOS44NDQwM0g5Ljg0MzY5VjE5LjY4NzZIMTkuNjg3MVpNMjkuNTMxMSA5Ljg0MzY1TDE5LjY4NzcgMC4wMDAzNDA1NTVMMjkuNTMxMSAwLjAwMDM0MDEyNVY5Ljg0MzY1Wk0xOS42ODc0IDE5LjY4NzZIMjkuNTMxMVYzMC4wMDAxSDE5LjY4NzRWMTkuNjg3NloiIGZpbGw9IiNGRjVDMjgiLz4KICA8L2c+Cjwvc3ZnPgo=",
+    readyState: "NotDetected" /* NotDetected */,
+    isAIP62Standard: true
+  },
+  {
+    name: "OKX Wallet",
+    url: "https://chromewebstore.google.com/detail/okx-wallet/mcohilncbfahbmgdjkbpemcciiolgcge",
+    icon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAJDSURBVHgB7Zq9jtpAEMfHlhEgQLiioXEkoAGECwoKxMcTRHmC5E3IoyRPkPAEkI7unJYmTgEFTYwA8a3NTKScLnCHN6c9r1e3P2llWQy7M/s1Gv1twCP0ej37dDq9x+Zut1t3t9vZjDEHIiSRSPg4ZpDL5fxkMvn1cDh8m0wmfugfO53OoFQq/crn8wxfY9EymQyrVCqMfHvScZx1p9ls3pFxXBy/bKlUipGPrVbLuQqAfsCliq3zl0H84zwtjQrOw4Mt1W63P5LvBm2d+Xz+YzqdgkqUy+WgWCy+Mc/nc282m4FqLBYL+3g8fjDxenq72WxANZbLJeA13zDX67UDioL5ybXwafMYu64Ltn3bdDweQ5R97fd7GyhBQMipx4POeEDHIu2LfDdBIGGz+hJ9CQ1ABjoA2egAZPM6AgiCAEQhsi/C4jHyPA/6/f5NG3Ks2+3CYDC4aTccDrn6ojG54MnEvG00GoVmWLIRNZ7wTCwDHYBsdACy0QHIhiuRETxlICWpMMhGZHmqS8qH6JLyGegAZKMDkI0uKf8X4SWlaZo+Pp1bRrwlJU8ZKLIvUjKh0WiQ3sRUbNVq9c5Ebew7KEo2m/1p4jJ4qAmDaqDQBzj5XyiAT4VCQezJigAU+IDU+z8vJFnGWeC+bKQV/5VZ71FV6L7PA3gg3tXrdQ+DgLhC+75Wq3no69P3MC0NFQpx2lL04Ql9gHK1bRDjsSBIvScBnDTk1WrlGIZBorIDEYJj+rhdgnQ67VmWRe0zlplXl81vcyEt0rSoYDUAAAAASUVORK5CYII=",
+    readyState: "NotDetected" /* NotDetected */,
+    isAIP62Standard: true
   }
 ];
 
+// src/sdkWallets.ts
+import {
+  AptosConnectAppleWallet,
+  AptosConnectGoogleWallet
+} from "@aptos-connect/wallet-adapter-plugin";
+import { Network as Network2 } from "@aptos-labs/ts-sdk";
+import { DevTWallet, TWallet } from "@atomrigslab/aptos-wallet-adapter";
+import { MizuWallet } from "@mizuwallet-sdk/aptos-wallet-adapter";
+function getSDKWallets(dappConfig) {
+  const sdkWallets = [];
+  if (typeof window !== "undefined") {
+    sdkWallets.push(
+      new AptosConnectGoogleWallet({
+        network: dappConfig == null ? void 0 : dappConfig.network,
+        dappId: dappConfig == null ? void 0 : dappConfig.aptosConnectDappId,
+        ...dappConfig == null ? void 0 : dappConfig.aptosConnect
+      }),
+      new AptosConnectAppleWallet({
+        network: dappConfig == null ? void 0 : dappConfig.network,
+        dappId: dappConfig == null ? void 0 : dappConfig.aptosConnectDappId,
+        ...dappConfig == null ? void 0 : dappConfig.aptosConnect
+      })
+    );
+    if ((dappConfig == null ? void 0 : dappConfig.mizuwallet) && (dappConfig == null ? void 0 : dappConfig.network) && [Network2.MAINNET, Network2.TESTNET].includes(dappConfig.network)) {
+      sdkWallets.push(
+        new MizuWallet({
+          network: dappConfig.network,
+          manifestURL: dappConfig.mizuwallet.manifestURL,
+          appId: dappConfig.mizuwallet.appId
+        })
+      );
+    }
+  }
+  if ((dappConfig == null ? void 0 : dappConfig.network) === Network2.MAINNET) {
+    sdkWallets.push(new TWallet());
+  } else {
+    sdkWallets.push(new DevTWallet());
+  }
+  return sdkWallets;
+}
+
 // src/WalletCore.ts
-var WalletCore = class extends EventEmitter2 {
-  constructor(plugins, optInWallets, dappConfig, disableTelemetry) {
+var WalletCore = class extends EventEmitter {
+  constructor(optInWallets, dappConfig, disableTelemetry) {
     super();
-    this._wallets = [];
-    this._optInWallets = [];
-    this._standard_wallets = [];
-    this._all_wallets = [];
     this._wallet = null;
-    this._account = null;
+    this._sdkWallets = [];
+    this._standard_wallets = [];
+    this._standard_not_detected_wallets = [];
     this._network = null;
-    this.walletCoreV1 = new WalletCoreV1();
-    this.walletStandardCore = new WalletStandardCore();
-    this._connecting = false;
     this._connected = false;
-    this.ga4 = null;
+    this._connecting = false;
+    this._account = null;
+    this._optInWallets = [];
     this._disableTelemetry = false;
-    this.standardizeStandardWalletToPluginWalletType = (standardWallet) => {
-      var _a, _b, _c, _d;
-      let standardWalletConvertedToWallet = {
-        name: standardWallet.name,
-        url: standardWallet.url,
-        icon: standardWallet.icon,
-        provider: standardWallet,
-        connect: standardWallet.features["aptos:connect"].connect,
-        disconnect: standardWallet.features["aptos:disconnect"].disconnect,
-        network: standardWallet.features["aptos:network"].network,
-        account: standardWallet.features["aptos:account"].account,
-        signAndSubmitTransaction: (_a = standardWallet.features["aptos:signAndSubmitTransaction"]) == null ? void 0 : _a.signAndSubmitTransaction,
-        signMessage: standardWallet.features["aptos:signMessage"].signMessage,
-        onAccountChange: standardWallet.features["aptos:onAccountChange"].onAccountChange,
-        onNetworkChange: standardWallet.features["aptos:onNetworkChange"].onNetworkChange,
-        signTransaction: standardWallet.features["aptos:signTransaction"].signTransaction,
-        openInMobileApp: (_b = standardWallet.features["aptos:openInMobileApp"]) == null ? void 0 : _b.openInMobileApp,
-        changeNetwork: (_c = standardWallet.features["aptos:changeNetwork"]) == null ? void 0 : _c.changeNetwork,
-        readyState: "Installed" /* Installed */,
-        isAIP62Standard: true,
-        isSignTransactionV1_1: ((_d = standardWallet.features["aptos:signTransaction"]) == null ? void 0 : _d.version) === "1.1"
-      };
-      this._all_wallets = this._all_wallets.filter(
-        (item) => item.name !== standardWalletConvertedToWallet.name
-      );
-      this._all_wallets.push(standardWalletConvertedToWallet);
-      this.emit("standardWalletsAdded", standardWalletConvertedToWallet);
-    };
-    this._wallets = plugins;
-    this._optInWallets = optInWallets;
+    this.ga4 = null;
+    this._optInWallets = optInWallets || [];
     this._dappConfig = dappConfig;
-    this._disableTelemetry = disableTelemetry;
+    this._disableTelemetry = disableTelemetry != null ? disableTelemetry : false;
     this._sdkWallets = getSDKWallets(this._dappConfig);
     if (!this._disableTelemetry) {
       this.ga4 = new GA4();
     }
     this.fetchExtensionAIP62AptosWallets();
     this.fetchSDKAIP62AptosWallets();
-    this.scopePollingDetectionStrategy();
     this.appendNotDetectedStandardSupportedWallets();
   }
-  scopePollingDetectionStrategy() {
-    var _a;
-    (_a = this._wallets) == null ? void 0 : _a.forEach((wallet) => {
-      const existingStandardPontemWallet = this._standard_wallets.find(
-        (wallet2) => wallet2.name == "Pontem Wallet"
-      );
-      if (wallet.name === "Pontem" && existingStandardPontemWallet) {
-        return;
-      }
-      const existingWalletIndex = this._standard_wallets.findIndex(
-        (standardWallet) => standardWallet.name == wallet.name
-      );
-      if (existingWalletIndex !== -1)
-        return;
-      this._all_wallets.push(wallet);
-      if (!wallet.readyState) {
-        wallet.readyState = typeof window === "undefined" || typeof document === "undefined" ? "Unsupported" /* Unsupported */ : "NotDetected" /* NotDetected */;
-      }
-      if (typeof window !== "undefined") {
-        scopePollingDetectionStrategy(() => {
-          const providerName = wallet.providerName || wallet.name.toLowerCase();
-          if (Object.keys(window).includes(providerName)) {
-            wallet.readyState = "Installed" /* Installed */;
-            wallet.provider = window[providerName];
-            this.emit("readyStateChange", wallet);
-            return true;
-          }
-          return false;
-        });
-      }
-    });
-  }
   fetchExtensionAIP62AptosWallets() {
     let { aptosWallets, on } = getAptosWallets();
     this.setExtensionAIP62Wallets(aptosWallets);
@@ -886,62 +472,63 @@ var WalletCore = class extends EventEmitter2 {
       that.setExtensionAIP62Wallets(aptosWallets2);
     });
   }
-  appendNotDetectedStandardSupportedWallets() {
-    aptosStandardSupportedWalletList.map((supportedWallet) => {
-      const existingPluginWalletIndex = this.wallets.findIndex(
-        (wallet) => wallet.name === supportedWallet.name
-      );
-      if (existingPluginWalletIndex !== -1)
+  setExtensionAIP62Wallets(extensionwWallets) {
+    extensionwWallets.map((wallet) => {
+      if (this.excludeWallet(wallet)) {
         return;
-      const existingStandardPontemWallet = this.wallets.find(
-        (wallet) => wallet.name == "Pontem"
+      }
+      this._standard_wallets = this._standard_wallets.filter(
+        (item) => item.name !== wallet.name
       );
-      if (supportedWallet.name === "Pontem Wallet" && existingStandardPontemWallet) {
+      const isValid = isWalletWithRequiredFeatureSet(wallet);
+      if (isValid) {
+        const index = this._standard_not_detected_wallets.findIndex(
+          (notDetctedWallet) => notDetctedWallet.name == wallet.name
+        );
+        if (index !== -1) {
+          this._standard_not_detected_wallets.splice(index, 1);
+        }
+        wallet.readyState = "Installed" /* Installed */;
+        this._standard_wallets.push(wallet);
+        this.emit("standardWalletsAdded", wallet);
+      }
+    });
+  }
+  fetchSDKAIP62AptosWallets() {
+    this._sdkWallets.map((wallet) => {
+      if (this.excludeWallet(wallet)) {
         return;
       }
+      const isValid = isWalletWithRequiredFeatureSet(wallet);
+      if (isValid) {
+        wallet.readyState = "Installed" /* Installed */;
+        this._standard_wallets.push(wallet);
+      }
+    });
+  }
+  appendNotDetectedStandardSupportedWallets() {
+    aptosStandardSupportedWalletList.map((supportedWallet) => {
       const existingStandardWallet = this._standard_wallets.find(
         (wallet) => wallet.name == supportedWallet.name
       );
-      if (existingStandardWallet && this.excludeWallet(existingStandardWallet)) {
+      if (existingStandardWallet) {
+        return;
+      }
+      if (this.excludeWallet(supportedWallet)) {
         return;
       }
       if (!existingStandardWallet) {
-        this._all_wallets.push(supportedWallet);
-        this.emit("standardWalletsAdded", supportedWallet);
+        this._standard_not_detected_wallets.push(supportedWallet);
+        this.emit("standardNotDetectedWalletAdded", supportedWallet);
       }
     });
   }
-  fetchSDKAIP62AptosWallets() {
-    this._sdkWallets.map((wallet) => {
-      this.standardizeAIP62WalletType(wallet);
-    });
-  }
-  setExtensionAIP62Wallets(extensionwWallets) {
-    const wallets = extensionwWallets.filter(
-      (wallet) => wallet.name !== "Dev T wallet" && wallet.name !== "T wallet"
-    );
-    wallets.map((wallet) => {
-      this.standardizeAIP62WalletType(wallet);
-      this._standard_wallets.push(wallet);
-    });
-  }
   excludeWallet(wallet) {
     if (this._optInWallets.length > 0 && !this._optInWallets.includes(wallet.name)) {
       return true;
     }
     return false;
   }
-  standardizeAIP62WalletType(wallet) {
-    if (this.excludeWallet(wallet)) {
-      return;
-    }
-    const isValid = isWalletWithRequiredFeatureSet(wallet);
-    if (isValid) {
-      wallet.readyState = "Installed" /* Installed */;
-      this.standardizeStandardWalletToPluginWalletType(wallet);
-      this._standard_wallets.push(wallet);
-    }
-  }
   recordEvent(eventName, additionalInfo) {
     var _a, _b, _c, _d;
     (_d = this.ga4) == null ? void 0 : _d.gtag("event", `wallet_adapter_${eventName}`, {
@@ -957,7 +544,7 @@ var WalletCore = class extends EventEmitter2 {
     if (!wallet) {
       throw new WalletNotConnectedError().name;
     }
-    if (!(wallet.readyState === "Loadable" /* Loadable */ || wallet.readyState === "Installed" /* Installed */))
+    if (!(wallet.readyState === "Installed" /* Installed */))
       throw new WalletNotReadyError("Wallet is not set").name;
   }
   ensureAccountExists(account) {
@@ -965,119 +552,53 @@ var WalletCore = class extends EventEmitter2 {
       throw new WalletAccountError("Account is not set").name;
     }
   }
-  doesWalletExist() {
-    if (!this._connected || this._connecting || !this._wallet)
-      throw new WalletNotConnectedError().name;
-    if (!(this._wallet.readyState === "Loadable" /* Loadable */ || this._wallet.readyState === "Installed" /* Installed */))
-      throw new WalletNotReadyError().name;
-    return true;
-  }
-  clearData() {
-    this._connected = false;
-    this.setWallet(null);
-    this.setAccount(null);
-    this.setNetwork(null);
-    removeLocalStorage();
-  }
   async setAnsName() {
     var _a;
     if (((_a = this._network) == null ? void 0 : _a.chainId) && this._account) {
+      if (this._account.ansName)
+        return;
       if (!ChainIdToAnsSupportedNetworkMap[this._network.chainId] || !isAptosNetwork(this._network)) {
         this._account.ansName = void 0;
         return;
       }
       const aptosConfig = getAptosConfig(this._network, this._dappConfig);
-      const aptos = new Aptos3(aptosConfig);
+      const aptos = new Aptos2(aptosConfig);
       const name = await aptos.ans.getPrimaryName({
         address: this._account.address.toString()
       });
       this._account.ansName = name;
     }
   }
+  clearData() {
+    this._connected = false;
+    this.setWallet(null);
+    this.setAccount(null);
+    this.setNetwork(null);
+    removeLocalStorage();
+  }
   setWallet(wallet) {
     this._wallet = wallet;
   }
   setAccount(account) {
-    var _a;
-    if (account === null) {
-      this._account = null;
-      return;
-    }
-    if ((_a = this._wallet) == null ? void 0 : _a.isAIP62Standard) {
-      if ("status" in account) {
-        const connectStandardAccount = account;
-        if (connectStandardAccount.status === UserResponseStatus2.REJECTED) {
-          this._connecting = false;
-          throw new WalletConnectionError("User has rejected the request").message;
-        }
-        this._account = {
-          address: connectStandardAccount.args.address.toString(),
-          publicKey: connectStandardAccount.args.publicKey.toString(),
-          ansName: connectStandardAccount.args.ansName
-        };
-        return;
-      } else {
-        const standardAccount = account;
-        this._account = {
-          address: standardAccount.address.toString(),
-          publicKey: standardAccount.publicKey.toString(),
-          ansName: standardAccount.ansName
-        };
-        return;
-      }
-    }
-    this._account = { ...account };
-    return;
+    this._account = account;
   }
   setNetwork(network) {
-    var _a, _b, _c;
-    if (network === null) {
-      this._network = null;
-      return;
-    }
-    if ((_a = this._wallet) == null ? void 0 : _a.isAIP62Standard) {
-      const standardizeNetwork = network;
-      this.recordEvent("network_change", {
-        from: (_b = this._network) == null ? void 0 : _b.name,
-        to: standardizeNetwork.name
-      });
-      this._network = {
-        name: standardizeNetwork.name.toLowerCase(),
-        chainId: standardizeNetwork.chainId.toString(),
-        url: standardizeNetwork.url
-      };
-      return;
-    }
-    this.recordEvent("network_change", {
-      from: (_c = this._network) == null ? void 0 : _c.name,
-      to: network.name
-    });
-    this._network = {
-      ...network,
-      name: network.name.toLowerCase()
-    };
+    this._network = network;
   }
   isConnected() {
     return this._connected;
   }
   get wallets() {
-    return this._all_wallets;
-  }
-  get pluginWallets() {
-    return this._wallets;
-  }
-  get standardWallets() {
     return this._standard_wallets;
   }
+  get notDetectedWallets() {
+    return this._standard_not_detected_wallets;
+  }
   get wallet() {
     try {
       if (!this._wallet)
         return null;
-      return {
-        name: this._wallet.name,
-        icon: this._wallet.icon,
-        url: this._wallet.url
-      };
+      return this._wallet;
     } catch (error) {
       throw new WalletNotSelectedError(error).message;
     }
@@ -1097,8 +618,8 @@ var WalletCore = class extends EventEmitter2 {
     }
   }
   async connect(walletName) {
-    var _a;
-    const allDetectedWallets = this._all_wallets;
+    var _a, _b, _c;
+    const allDetectedWallets = this._standard_wallets;
     const selectedWallet = allDetectedWallets.find(
       (wallet) => wallet.name === walletName
     );
@@ -1110,12 +631,14 @@ var WalletCore = class extends EventEmitter2 {
           `${walletName} wallet is already connected`
         ).message;
     }
-    if (isRedirectable() && selectedWallet.readyState !== "Installed" /* Installed */) {
-      if (selectedWallet.isAIP62Standard) {
-        if (selectedWallet.openInMobileApp) {
-          selectedWallet.openInMobileApp();
+    if (isRedirectable()) {
+      if (selectedWallet.readyState === "Installed" /* Installed */) {
+        if ((_b = selectedWallet.features["aptos:openInMobileApp"]) == null ? void 0 : _b.openInMobileApp) {
+          (_c = selectedWallet.features["aptos:openInMobileApp"]) == null ? void 0 : _c.openInMobileApp();
           return;
         }
+      }
+      if (selectedWallet.readyState === "NotDetected" /* NotDetected */) {
         const uninstalledWallet = selectedWallet;
         if (uninstalledWallet.deeplinkProvider) {
           const url = encodeURIComponent(window.location.href);
@@ -1124,15 +647,6 @@ var WalletCore = class extends EventEmitter2 {
           return;
         }
       }
-      if (selectedWallet.deeplinkProvider) {
-        const url = encodeURIComponent(window.location.href);
-        const location = selectedWallet.deeplinkProvider({ url });
-        window.location.href = location;
-      }
-      return;
-    }
-    if (selectedWallet.readyState !== "Installed" /* Installed */ && selectedWallet.readyState !== "Loadable" /* Loadable */) {
-      return;
     }
     await this.connectWallet(selectedWallet);
   }
@@ -1140,14 +654,13 @@ var WalletCore = class extends EventEmitter2 {
     try {
       this._connecting = true;
       this.setWallet(selectedWallet);
-      let account;
-      if (selectedWallet.isAIP62Standard) {
-        account = await this.walletStandardCore.connect(selectedWallet);
-      } else {
-        account = await this.walletCoreV1.connect(selectedWallet);
+      const response = await selectedWallet.features["aptos:connect"].connect();
+      if (response.status === UserResponseStatus.REJECTED) {
+        throw new WalletConnectionError("User has rejected the request").message;
       }
+      const account = response.args;
       this.setAccount(account);
-      const network = await selectedWallet.network();
+      const network = await selectedWallet.features["aptos:network"].network();
       this.setNetwork(network);
       await this.setAnsName();
       setLocalStorage(selectedWallet.name);
@@ -1165,7 +678,7 @@ var WalletCore = class extends EventEmitter2 {
   async disconnect() {
     try {
       this.ensureWalletExists(this._wallet);
-      await this._wallet.disconnect();
+      await this._wallet.features["aptos:disconnect"].disconnect();
       this.clearData();
       this.recordEvent("wallet_disconnect");
       this.emit("disconnect");
@@ -1175,6 +688,7 @@ var WalletCore = class extends EventEmitter2 {
     }
   }
   async signAndSubmitTransaction(transactionInput) {
+    var _a, _b;
     try {
       if ("function" in transactionInput.data) {
         if (transactionInput.data.function === "0x1::account::rotate_authentication_key_call") {
@@ -1190,150 +704,129 @@ var WalletCore = class extends EventEmitter2 {
       this.ensureWalletExists(this._wallet);
       this.ensureAccountExists(this._account);
       this.recordEvent("sign_and_submit_transaction");
-      const payloadData = transactionInput.data;
-      const aptosConfig = getAptosConfig(this._network, this._dappConfig);
-      const aptos = new Aptos3(aptosConfig);
-      if (this._wallet.signAndSubmitTransaction) {
-        if (this._wallet.isAIP62Standard) {
-          const { hash, ...output } = await this.walletStandardCore.signAndSubmitTransaction(
-            transactionInput,
-            aptos,
-            this._account,
-            this._wallet,
-            this._standard_wallets
-          );
-          return { hash, output };
-        } else {
-          const { hash, ...output } = await this.walletCoreV1.resolveSignAndSubmitTransaction(
-            payloadData,
-            this._network,
-            this._wallet,
-            transactionInput,
-            this._dappConfig
+      if (this._wallet.features["aptos:signAndSubmitTransaction"]) {
+        if (this._wallet.features["aptos:signAndSubmitTransaction"].version !== "1.1.0") {
+          const aptosConfig2 = getAptosConfig(this._network, this._dappConfig);
+          const aptos2 = new Aptos2(aptosConfig2);
+          const transaction2 = await aptos2.transaction.build.simple({
+            sender: this._account.address.toString(),
+            data: transactionInput.data,
+            options: transactionInput.options
+          });
+          const signAndSubmitTransactionMethod = this._wallet.features["aptos:signAndSubmitTransaction"].signAndSubmitTransaction;
+          const response3 = await signAndSubmitTransactionMethod(
+            transaction2
           );
-          return { hash, output };
+          if (response3.status === UserResponseStatus.REJECTED) {
+            throw new WalletConnectionError("User has rejected the request").message;
+          }
+          return response3.args;
         }
+        const response2 = await this._wallet.features["aptos:signAndSubmitTransaction"].signAndSubmitTransaction({
+          payload: transactionInput.data,
+          gasUnitPrice: (_a = transactionInput.options) == null ? void 0 : _a.gasUnitPrice,
+          maxGasAmount: (_b = transactionInput.options) == null ? void 0 : _b.maxGasAmount
+        });
+        if (response2.status === UserResponseStatus.REJECTED) {
+          throw new WalletConnectionError("User has rejected the request").message;
+        }
+        return response2.args;
       }
+      const aptosConfig = getAptosConfig(this._network, this._dappConfig);
+      const aptos = new Aptos2(aptosConfig);
       const transaction = await aptos.transaction.build.simple({
         sender: this._account.address,
         data: transactionInput.data,
         options: transactionInput.options
       });
-      const senderAuthenticator = await this.signTransaction(transaction);
+      const signTransactionResponse = await this.signTransaction({
+        transactionOrPayload: transaction
+      });
       const response = await this.submitTransaction({
         transaction,
-        senderAuthenticator
+        senderAuthenticator: signTransactionResponse.authenticator
       });
-      return response;
+      return { hash: response.hash };
     } catch (error) {
       const errMsg = generalizedErrorMessage(error);
       throw new WalletSignAndSubmitMessageError(errMsg).message;
     }
   }
-  async signTransaction(transactionOrPayload, asFeePayer, options) {
-    var _a, _b, _c, _d, _e, _f, _g;
+  async signTransaction(args) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    const { transactionOrPayload, asFeePayer } = args;
     try {
       this.ensureWalletExists(this._wallet);
+      this.ensureAccountExists(this._account);
       this.recordEvent("sign_transaction");
-      if (this._wallet.signTransaction) {
-        if (this._wallet.isAIP62Standard) {
-          if ("rawTransaction" in transactionOrPayload) {
-            return await this.walletStandardCore.signTransaction(
-              transactionOrPayload,
-              this._wallet,
-              asFeePayer
-            );
-          } else if (this._wallet.isSignTransactionV1_1) {
-            const payload = convertPayloadInputV1ToV2(transactionOrPayload);
-            const optionsV1 = options;
-            const { authenticator } = await this.walletStandardCore.signTransaction(
-              {
-                payload,
-                expirationTimestamp: (_a = optionsV1 == null ? void 0 : optionsV1.expireTimestamp) != null ? _a : optionsV1 == null ? void 0 : optionsV1.expirationTimestamp,
-                expirationSecondsFromNow: optionsV1 == null ? void 0 : optionsV1.expirationSecondsFromNow,
-                gasUnitPrice: (_b = optionsV1 == null ? void 0 : optionsV1.gasUnitPrice) != null ? _b : optionsV1 == null ? void 0 : optionsV1.gas_unit_price,
-                maxGasAmount: (_c = optionsV1 == null ? void 0 : optionsV1.maxGasAmount) != null ? _c : optionsV1 == null ? void 0 : optionsV1.max_gas_amount,
-                sequenceNumber: optionsV1 == null ? void 0 : optionsV1.sequenceNumber,
-                sender: (optionsV1 == null ? void 0 : optionsV1.sender) ? { address: AccountAddress.from(optionsV1.sender) } : void 0
-              },
-              this._wallet
-            );
-            return authenticator;
-          } else {
-            const aptosConfig = getAptosConfig(this._network, this._dappConfig);
-            this.ensureAccountExists(this._account);
-            const sender = this._account.address;
-            const payload = await generateTransactionPayloadFromV1Input(
-              aptosConfig,
-              transactionOrPayload
-            );
-            const optionsV1 = options;
-            const optionsV2 = {
-              accountSequenceNumber: optionsV1 == null ? void 0 : optionsV1.sequenceNumber,
-              expireTimestamp: (_d = optionsV1 == null ? void 0 : optionsV1.expireTimestamp) != null ? _d : optionsV1 == null ? void 0 : optionsV1.expirationTimestamp,
-              gasUnitPrice: (_e = optionsV1 == null ? void 0 : optionsV1.gasUnitPrice) != null ? _e : optionsV1 == null ? void 0 : optionsV1.gas_unit_price,
-              maxGasAmount: (_f = optionsV1 == null ? void 0 : optionsV1.maxGasAmount) != null ? _f : optionsV1 == null ? void 0 : optionsV1.max_gas_amount
-            };
-            const rawTransaction = await generateRawTransaction({
-              aptosConfig,
-              payload,
-              sender,
-              options: optionsV2
-            });
-            return await this.walletStandardCore.signTransaction(
-              new SimpleTransaction(rawTransaction),
-              this._wallet,
-              false
-            );
-          }
+      if ("rawTransaction" in transactionOrPayload) {
+        const response = await ((_a = this._wallet) == null ? void 0 : _a.features["aptos:signTransaction"].signTransaction(
+          transactionOrPayload,
+          asFeePayer
+        ));
+        if (response.status === UserResponseStatus.REJECTED) {
+          throw new WalletConnectionError("User has rejected the request").message;
         }
-        if ("rawTransaction" in transactionOrPayload) {
-          const accountAuthenticator = await this._wallet.signTransaction(
-            transactionOrPayload,
-            asFeePayer
-          );
-          return accountAuthenticator;
-        } else {
-          const response = await this.walletCoreV1.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
-            }
-          );
-          if (!response) {
-            throw new Error("error");
-          }
-          const deserializer1 = new BCS2.Deserializer(response);
-          const deserializedSignature = TxnBuilderTypes4.SignedTransaction.deserialize(deserializer1);
-          const transactionAuthenticator = deserializedSignature.authenticator;
-          const publicKey = transactionAuthenticator.public_key.value;
-          const signature = transactionAuthenticator.signature.value;
-          const accountAuthenticator = new AccountAuthenticatorEd25519(
-            new Ed25519PublicKey(publicKey),
-            new Ed25519Signature(signature)
-          );
-          return accountAuthenticator;
+        return {
+          authenticator: response.args,
+          rawTransaction: transactionOrPayload.rawTransaction.bcsToBytes()
+        };
+      } else if (((_b = this._wallet.features["aptos:signTransaction"]) == null ? void 0 : _b.version) === "1.1") {
+        const signTransactionV1_1StandardInput = {
+          payload: transactionOrPayload.data,
+          expirationTimestamp: (_c = transactionOrPayload.options) == null ? void 0 : _c.expirationTimestamp,
+          expirationSecondsFromNow: (_d = transactionOrPayload.options) == null ? void 0 : _d.expirationSecondsFromNow,
+          gasUnitPrice: (_e = transactionOrPayload.options) == null ? void 0 : _e.gasUnitPrice,
+          maxGasAmount: (_f = transactionOrPayload.options) == null ? void 0 : _f.maxGasAmount,
+          sequenceNumber: (_g = transactionOrPayload.options) == null ? void 0 : _g.accountSequenceNumber,
+          sender: transactionOrPayload.sender ? { address: AccountAddress.from(transactionOrPayload.sender) } : void 0
+        };
+        const walletSignTransactionMethod = (_h = this._wallet) == null ? void 0 : _h.features["aptos:signTransaction"].signTransaction;
+        const response = await walletSignTransactionMethod(
+          signTransactionV1_1StandardInput
+        );
+        if (response.status === UserResponseStatus.REJECTED) {
+          throw new WalletConnectionError("User has rejected the request").message;
+        }
+        return {
+          authenticator: response.args.authenticator,
+          rawTransaction: response.args.rawTransaction.bcsToBytes()
+        };
+      } else {
+        const aptosConfig = getAptosConfig(this._network, this._dappConfig);
+        const aptos = new Aptos2(aptosConfig);
+        const transaction = await aptos.transaction.build.simple({
+          sender: this._account.address,
+          data: transactionOrPayload.data,
+          options: transactionOrPayload.options
+        });
+        const response = await ((_i = this._wallet) == null ? void 0 : _i.features["aptos:signTransaction"].signTransaction(
+          transaction,
+          asFeePayer
+        ));
+        if (response.status === UserResponseStatus.REJECTED) {
+          throw new WalletConnectionError("User has rejected the request").message;
         }
+        return {
+          authenticator: response.args,
+          rawTransaction: transaction.bcsToBytes()
+        };
       }
-      throw new WalletNotSupportedMethod(
-        `Sign Transaction is not supported by ${(_g = this.wallet) == null ? void 0 : _g.name}`
-      ).message;
     } catch (error) {
       const errMsg = generalizedErrorMessage(error);
       throw new WalletSignTransactionError(errMsg).message;
     }
   }
   async signMessage(message) {
+    var _a, _b;
     try {
       this.ensureWalletExists(this._wallet);
       this.recordEvent("sign_message");
-      if (this._wallet.isAIP62Standard) {
-        return await this.walletStandardCore.signMessage(message, this._wallet);
+      const response = await ((_b = (_a = this._wallet) == null ? void 0 : _a.features["aptos:signMessage"]) == null ? void 0 : _b.signMessage(message));
+      if (response.status === UserResponseStatus.REJECTED) {
+        throw new WalletConnectionError("User has rejected the request").message;
       }
-      const response = await this._wallet.signMessage(message);
-      return response;
+      return response.args;
     } catch (error) {
       const errMsg = generalizedErrorMessage(error);
       throw new WalletSignMessageError(errMsg).message;
@@ -1347,12 +840,8 @@ var WalletCore = class extends EventEmitter2 {
       this.recordEvent("submit_transaction", {
         transaction_type: transactionType
       });
-      if (this._wallet.submitTransaction) {
-        const pendingTransaction = await this._wallet.submitTransaction(transaction);
-        return pendingTransaction;
-      }
       const aptosConfig = getAptosConfig(this._network, this._dappConfig);
-      const aptos = new Aptos3(aptosConfig);
+      const aptos = new Aptos2(aptosConfig);
       if (additionalSignersAuthenticators !== void 0) {
         const multiAgentTxn = {
           ...transaction,
@@ -1364,35 +853,37 @@ var WalletCore = class extends EventEmitter2 {
       }
     } catch (error) {
       const errMsg = generalizedErrorMessage(error);
-      throw new WalletSignTransactionError(errMsg).message;
+      throw new WalletSubmitTransactionError(errMsg).message;
     }
   }
   async onAccountChange() {
+    var _a;
     try {
       this.ensureWalletExists(this._wallet);
-      await this._wallet.onAccountChange(
+      await ((_a = this._wallet.features["aptos:onAccountChange"]) == null ? void 0 : _a.onAccountChange(
         async (data) => {
           this.setAccount(data);
           await this.setAnsName();
           this.recordEvent("account_change");
           this.emit("accountChange", this._account);
         }
-      );
+      ));
     } catch (error) {
       const errMsg = generalizedErrorMessage(error);
       throw new WalletAccountChangeError(errMsg).message;
     }
   }
   async onNetworkChange() {
+    var _a;
     try {
       this.ensureWalletExists(this._wallet);
-      await this._wallet.onNetworkChange(
+      await ((_a = this._wallet.features["aptos:onNetworkChange"]) == null ? void 0 : _a.onNetworkChange(
         async (data) => {
           this.setNetwork(data);
           await this.setAnsName();
           this.emit("networkChange", this._network);
         }
-      );
+      ));
     } catch (error) {
       const errMsg = generalizedErrorMessage(error);
       throw new WalletNetworkChangeError(errMsg).message;
@@ -1406,14 +897,16 @@ var WalletCore = class extends EventEmitter2 {
         from: (_a = this._network) == null ? void 0 : _a.name,
         to: network
       });
-      const chainId = network === Network4.DEVNET ? await fetchDevnetChainId() : NetworkToChainId[network];
-      if (this._wallet.changeNetwork) {
-        const networkInfo = {
-          name: network,
-          chainId
-        };
-        const response = await this._wallet.changeNetwork(networkInfo);
-        if (response.status === UserResponseStatus2.REJECTED) {
+      const chainId = network === Network3.DEVNET ? await fetchDevnetChainId() : NetworkToChainId[network];
+      const networkInfo = {
+        name: network,
+        chainId
+      };
+      if (this._wallet.features["aptos:changeNetwork"]) {
+        const response = await this._wallet.features["aptos:changeNetwork"].changeNetwork(
+          networkInfo
+        );
+        if (response.status === UserResponseStatus.REJECTED) {
           throw new WalletConnectionError("User has rejected the request").message;
         }
         return response.args;
@@ -1431,17 +924,45 @@ var WalletCore = class extends EventEmitter2 {
       this.ensureWalletExists(this._wallet);
       this.ensureAccountExists(this._account);
       this.recordEvent("sign_message_and_verify");
-      if (this._wallet.isAIP62Standard) {
-        return this.walletStandardCore.signMessageAndVerify(
-          message,
-          this._wallet
-        );
+      try {
+        const response = await this._wallet.features["aptos:signMessage"].signMessage(message);
+        if (response.status === UserResponseStatus.REJECTED) {
+          throw new WalletConnectionError("Failed to sign a message").message;
+        }
+        if (this._account.publicKey instanceof AnyPublicKey && this._account.publicKey.variant === AnyPublicKeyVariant.Keyless) {
+          return true;
+        }
+        let verified = false;
+        if (response.args.signature instanceof MultiEd25519Signature) {
+          if (!(this._account.publicKey instanceof MultiEd25519PublicKey)) {
+            throw new WalletSignMessageAndVerifyError(
+              "Public key and Signature type mismatch"
+            ).message;
+          }
+          const { fullMessage, signature } = response.args;
+          const bitmap = signature.bitmap;
+          if (bitmap) {
+            const minKeysRequired = this._account.publicKey.threshold;
+            if (signature.signatures.length < minKeysRequired) {
+              verified = false;
+            } else {
+              verified = this._account.publicKey.verifySignature({
+                message: new TextEncoder().encode(fullMessage),
+                signature
+              });
+            }
+          }
+        } else {
+          verified = this._account.publicKey.verifySignature({
+            message: new TextEncoder().encode(response.args.fullMessage),
+            signature: response.args.signature
+          });
+        }
+        return verified;
+      } catch (error) {
+        const errMsg = generalizedErrorMessage(error);
+        throw new WalletSignMessageAndVerifyError(errMsg).message;
       }
-      return await this.walletCoreV1.signMessageAndVerify(
-        message,
-        this._wallet,
-        this._account
-      );
     } catch (error) {
       const errMsg = generalizedErrorMessage(error);
       throw new WalletSignMessageAndVerifyError(errMsg).message;
@@ -1458,23 +979,16 @@ export {
   APTOS_CONNECT_BASE_URL,
   ChainIdToAnsSupportedNetworkMap,
   NetworkName,
-  TxnBuilderTypes3 as TxnBuilderTypes,
-  Types3 as Types,
   WalletCore,
-  WalletCoreV1,
   WalletReadyState,
-  WalletStandardCore,
-  areBCSArguments,
+  aptosStandardSupportedWalletList,
   convertNetwork,
-  convertPayloadInputV1ToV2,
-  convertV2PayloadToV1JSONPayload,
-  convertV2TransactionPayloadToV1BCSPayload,
   fetchDevnetChainId,
   generalizedErrorMessage,
-  generateTransactionPayloadFromV1Input,
   getAptosConfig,
   getAptosConnectWallets,
   getLocalStorage,
+  getSDKWallets,
   groupAndSortWallets,
   handlePublishPackageTransaction,
   isAptosConnectWallet,
@@ -1487,7 +1001,6 @@ export {
   isRedirectable,
   partitionWallets,
   removeLocalStorage,
-  scopePollingDetectionStrategy,
   setLocalStorage,
   truncateAddress
 };