@aptos-labs/wallet-adapter-core 3.9.0 → 3.11.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @aptos-labs/wallet-adapter-core
 
+## 3.11.0
+
+### Minor Changes
+
+- 245ce8d: Support a custom network defined in a Wallet
+
+## 3.10.0
+
+### Minor Changes
+
+- 41f9485: Implement GA4
+
 ## 3.9.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { Types } from 'aptos';
 export { TxnBuilderTypes, Types } from 'aptos';
-import { Network, Signature, AnyRawTransaction, InputGenerateTransactionOptions, PendingTransactionResponse, InputSubmitTransactionData, AccountAddressInput, InputGenerateTransactionPayloadData, Aptos, AccountAuthenticator, EntryFunctionArgumentTypes, SimpleEntryFunctionArgumentTypes } from '@aptos-labs/ts-sdk';
+import { Network, Signature, AnyRawTransaction, InputGenerateTransactionOptions, PendingTransactionResponse, InputSubmitTransactionData, AccountAddressInput, InputGenerateTransactionPayloadData, Aptos, AccountAuthenticator, EntryFunctionArgumentTypes, SimpleEntryFunctionArgumentTypes, AptosConfig } from '@aptos-labs/ts-sdk';
 export { AccountAuthenticator, AnyRawTransaction, InputGenerateTransactionData, InputGenerateTransactionOptions, InputSubmitTransactionData, PendingTransactionResponse } from '@aptos-labs/ts-sdk';
 import EventEmitter from 'eventemitter3';
 import { NetworkInfo as NetworkInfo$1, AccountInfo as AccountInfo$1, UserResponse, AptosSignAndSubmitTransactionOutput, AptosSignMessageOutput, AptosWallet, AptosSignTransactionOutput, AptosSignMessageInput } from '@aptos-labs/wallet-standard';
@@ -187,6 +187,7 @@ declare class WalletCore extends EventEmitter<WalletCoreEvents> {
     private readonly walletStandardCore;
     private _connecting;
     private _connected;
+    private readonly ga4;
     /**
      * Core functionality constructor.
      * For legacy wallet adapter v1 support we expect the dapp to pass in wallet plugins,
@@ -206,6 +207,7 @@ declare class WalletCore extends EventEmitter<WalletCoreEvents> {
      * @param standardWallet An AIP-62 standard compatible wallet
      */
     private standardizeStandardWalletToPluginWalletType;
+    private recordEvent;
     /**
      * Helper function to ensure wallet exists
      *
@@ -391,5 +393,19 @@ declare function isInAppBrowser(): boolean;
 declare function isRedirectable(): boolean;
 declare function generalizedErrorMessage(error: any): string;
 declare const areBCSArguments: (args: Array<EntryFunctionArgumentTypes | SimpleEntryFunctionArgumentTypes>) => boolean;
+/**
+ * Helper function to get AptosConfig that supports Aptos and Custom networks
+ *
+ * @param networkInfo
+ * @returns AptosConfig
+ */
+declare const getAptosConfig: (networkInfo: NetworkInfo | NetworkInfo$1 | null) => AptosConfig;
+/**
+ * Helper function to resolve if the current connected network is an Aptos network
+ *
+ * @param networkInfo
+ * @returns boolean
+ */
+declare const isAptosNetwork: (networkInfo: NetworkInfo | NetworkInfo$1 | null) => boolean;
 
-export { AccountInfo, AdapterPlugin, AdapterPluginEvents, AdapterPluginProps, AptosStandardWallet, AptosWalletErrorResult, ChainIdToAnsSupportedNetworkMap, InputTransactionData, NetworkInfo, NetworkName, OnAccountChange, OnNetworkChange, PluginProvider, SignMessagePayload, SignMessageResponse, TransactionOptions, Wallet, WalletCore, WalletCoreEvents, WalletInfo, WalletName, WalletReadyState, WalletStandardCore, areBCSArguments, generalizedErrorMessage, getLocalStorage, isInAppBrowser, isMobile, isRedirectable, removeLocalStorage, scopePollingDetectionStrategy, setLocalStorage };
+export { AccountInfo, AdapterPlugin, AdapterPluginEvents, AdapterPluginProps, AptosStandardWallet, AptosWalletErrorResult, ChainIdToAnsSupportedNetworkMap, InputTransactionData, NetworkInfo, NetworkName, OnAccountChange, OnNetworkChange, PluginProvider, SignMessagePayload, SignMessageResponse, TransactionOptions, Wallet, WalletCore, WalletCoreEvents, WalletInfo, WalletName, WalletReadyState, WalletStandardCore, areBCSArguments, generalizedErrorMessage, getAptosConfig, getLocalStorage, isAptosNetwork, isInAppBrowser, isMobile, isRedirectable, removeLocalStorage, scopePollingDetectionStrategy, setLocalStorage };

package/dist/index.js

@@ -35,7 +35,9 @@ __export(src_exports, {
   WalletStandardCore: () => WalletStandardCore,
   areBCSArguments: () => areBCSArguments,
   generalizedErrorMessage: () => generalizedErrorMessage,
+  getAptosConfig: () => getAptosConfig,
   getLocalStorage: () => getLocalStorage,
+  isAptosNetwork: () => isAptosNetwork,
   isInAppBrowser: () => isInAppBrowser,
   isMobile: () => isMobile,
   isRedirectable: () => isRedirectable,
@@ -204,50 +206,21 @@ function getLocalStorage() {
 }
 
 // src/utils/helpers.ts
-var import_ts_sdk = require("@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(
-    navigator.userAgent
-  );
-}
-function isInAppBrowser() {
-  const isIphone = /(iPhone|iPod|iPad).*AppleWebKit(?!.*Safari)/i.test(
-    navigator.userAgent
-  );
-  const isAndroid = /(Android).*Version\/[\d.]+.*Chrome\/[^\s]+ Mobile/i.test(
-    navigator.userAgent
-  );
-  return isIphone || isAndroid;
-}
-function isRedirectable() {
-  if (typeof navigator === "undefined" || !navigator)
-    return false;
-  return isMobile() && !isInAppBrowser();
-}
-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 import_ts_sdk.Serializable
-  );
-};
+var import_ts_sdk2 = require("@aptos-labs/ts-sdk");
 
 // src/LegacyWalletPlugins/conversion.ts
-var import_ts_sdk2 = require("@aptos-labs/ts-sdk");
+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()) {
+  switch (networkInfo == null ? void 0 : networkInfo.name) {
     case "mainnet":
-      return import_ts_sdk2.Network.MAINNET;
+      return import_ts_sdk.Network.MAINNET;
     case "testnet":
-      return import_ts_sdk2.Network.TESTNET;
+      return import_ts_sdk.Network.TESTNET;
     case "devnet":
-      return import_ts_sdk2.Network.DEVNET;
+      return import_ts_sdk.Network.DEVNET;
     default:
-      throw new Error("Invalid network name");
+      throw new Error("Invalid Aptos network name");
   }
 }
 function convertV2TransactionPayloadToV1BCSPayload(payload) {
@@ -261,7 +234,7 @@ function convertV2PayloadToV1JSONPayload(payload) {
   } else {
     const stringTypeTags = (_a = payload.typeArguments) == null ? void 0 : _a.map(
       (typeTag) => {
-        if (typeTag instanceof import_ts_sdk2.TypeTag) {
+        if (typeTag instanceof import_ts_sdk.TypeTag) {
           return typeTag.toString();
         }
         return typeTag;
@@ -277,6 +250,57 @@ function convertV2PayloadToV1JSONPayload(payload) {
   }
 }
 
+// src/utils/helpers.ts
+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(
+    navigator.userAgent
+  );
+}
+function isInAppBrowser() {
+  const isIphone = /(iPhone|iPod|iPad).*AppleWebKit(?!.*Safari)/i.test(
+    navigator.userAgent
+  );
+  const isAndroid = /(Android).*Version\/[\d.]+.*Chrome\/[^\s]+ Mobile/i.test(
+    navigator.userAgent
+  );
+  return isIphone || isAndroid;
+}
+function isRedirectable() {
+  if (typeof navigator === "undefined" || !navigator)
+    return false;
+  return isMobile() && !isInAppBrowser();
+}
+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 import_ts_sdk2.Serializable
+  );
+};
+var getAptosConfig = (networkInfo) => {
+  if (!networkInfo) {
+    throw new Error("Undefined network");
+  }
+  if (isAptosNetwork(networkInfo)) {
+    return new import_ts_sdk2.AptosConfig({
+      network: convertNetwork(networkInfo)
+    });
+  }
+  return new import_ts_sdk2.AptosConfig({
+    network: import_ts_sdk2.Network.CUSTOM,
+    fullnode: networkInfo.url
+  });
+};
+var isAptosNetwork = (networkInfo) => {
+  if (!networkInfo) {
+    throw new Error("Undefined network");
+  }
+  return import_ts_sdk2.NetworkToNodeAPI[networkInfo.name] !== void 0;
+};
+
 // src/LegacyWalletPlugins/WalletCoreV1.ts
 var import_aptos2 = require("aptos");
 var import_eventemitter3 = __toESM(require("eventemitter3"));
@@ -291,9 +315,7 @@ var WalletCoreV1 = class extends import_eventemitter3.default {
   async resolveSignAndSubmitTransaction(payloadData, network, wallet, transactionInput) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
     if (areBCSArguments(payloadData.functionArguments)) {
-      const aptosConfig = new import_ts_sdk3.AptosConfig({
-        network: convertNetwork(network)
-      });
+      const aptosConfig = getAptosConfig(network);
       const newPayload = await (0, import_ts_sdk3.generateTransactionPayload)({
         ...payloadData,
         aptosConfig
@@ -514,6 +536,41 @@ var WalletStandardCore = class {
   }
 };
 
+// src/ga/index.ts
+var GA4 = class {
+  constructor() {
+    this.aptosGAID = "G-GNVVWBL3J9";
+    this.injectGA(this.aptosGAID);
+  }
+  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]);
+  }
+};
+
+// src/version.ts
+var WALLET_ADAPTER_CORE_VERSION = "3.11.0";
+
 // src/WalletCore.ts
 var WalletCore = class extends import_eventemitter32.default {
   constructor(plugins) {
@@ -528,6 +585,7 @@ var WalletCore = class extends import_eventemitter32.default {
     this.walletStandardCore = new WalletStandardCore();
     this._connecting = false;
     this._connected = false;
+    this.ga4 = new GA4();
     this.standardizeStandardWalletToPluginWalletType = (standardWallet) => {
       var _a, _b;
       let standardWalletConvertedToWallet = {
@@ -604,6 +662,17 @@ var WalletCore = class extends import_eventemitter32.default {
     });
     this._standard_wallets = aptosStandardWallets;
   }
+  recordEvent(eventName, additionalInfo) {
+    var _a, _b, _c;
+    this.ga4.gtag("event", `wallet_adapter_${eventName}`, {
+      wallet: (_a = this._wallet) == null ? void 0 : _a.name,
+      network: (_b = this._network) == null ? void 0 : _b.name,
+      network_url: (_c = this._network) == null ? void 0 : _c.url,
+      adapter_core_version: WALLET_ADAPTER_CORE_VERSION,
+      send_to: "G-GNVVWBL3J9",
+      ...additionalInfo
+    });
+  }
   ensureWalletExists(wallet) {
     if (!wallet) {
       throw new WalletNotConnectedError().name;
@@ -633,7 +702,7 @@ var WalletCore = class extends import_eventemitter32.default {
   async setAnsName() {
     var _a;
     if (((_a = this._network) == null ? void 0 : _a.chainId) && this._account) {
-      if (!ChainIdToAnsSupportedNetworkMap[this._network.chainId]) {
+      if (!ChainIdToAnsSupportedNetworkMap[this._network.chainId] || !isAptosNetwork(this._network)) {
         this._account.ansName = void 0;
         return;
       }
@@ -683,13 +752,17 @@ var WalletCore = class extends import_eventemitter32.default {
     return;
   }
   setNetwork(network) {
-    var _a;
+    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(),
@@ -697,7 +770,14 @@ var WalletCore = class extends import_eventemitter32.default {
       };
       return;
     }
-    this._network = { ...network, name: network.name.toLowerCase() };
+    this.recordEvent("network_change", {
+      from: (_c = this._network) == null ? void 0 : _c.name,
+      to: network.name
+    });
+    this._network = {
+      ...network,
+      name: network.name.toLowerCase()
+    };
   }
   isConnected() {
     return this._connected;
@@ -784,6 +864,7 @@ var WalletCore = class extends import_eventemitter32.default {
       await this.setAnsName();
       setLocalStorage(selectedWallet.name);
       this._connected = true;
+      this.recordEvent("wallet_connect");
       this.emit("connect", account);
     } catch (error) {
       this.clearData();
@@ -798,6 +879,7 @@ var WalletCore = class extends import_eventemitter32.default {
       this.ensureWalletExists(this._wallet);
       await this._wallet.disconnect();
       this.clearData();
+      this.recordEvent("wallet_disconnect");
       this.emit("disconnect");
     } catch (error) {
       const errMsg = generalizedErrorMessage(error);
@@ -808,10 +890,9 @@ var WalletCore = class extends import_eventemitter32.default {
     try {
       this.ensureWalletExists(this._wallet);
       this.ensureAccountExists(this._account);
+      this.recordEvent("sign_and_submit_transaction");
       const payloadData = transactionInput.data;
-      const aptosConfig = new import_ts_sdk5.AptosConfig({
-        network: convertNetwork(this._network)
-      });
+      const aptosConfig = getAptosConfig(this._network);
       const aptos = new import_ts_sdk5.Aptos(aptosConfig);
       if (this._wallet.signAndSubmitTransaction) {
         if (this._wallet.isAIP62Standard) {
@@ -852,7 +933,7 @@ var WalletCore = class extends import_eventemitter32.default {
     var _a, _b;
     try {
       this.ensureWalletExists(this._wallet);
-      console.log("this._account", this._account);
+      this.recordEvent("sign_transaction");
       if (this._wallet.signTransaction) {
         if (this._wallet.isAIP62Standard) {
           if ("rawTransaction" in transactionOrPayload) {
@@ -909,6 +990,7 @@ var WalletCore = class extends import_eventemitter32.default {
   async signMessage(message) {
     try {
       this.ensureWalletExists(this._wallet);
+      this.recordEvent("sign_message");
       if (this._wallet.isAIP62Standard) {
         return await this.walletStandardCore.signMessage(message, this._wallet);
       }
@@ -923,11 +1005,15 @@ var WalletCore = class extends import_eventemitter32.default {
   async submitTransaction(transaction) {
     try {
       this.ensureWalletExists(this._wallet);
+      const { additionalSignersAuthenticators } = transaction;
+      const transactionType = additionalSignersAuthenticators !== void 0 ? "multi-agent" : "simple";
+      this.recordEvent("submit_transaction", {
+        transaction_type: transactionType
+      });
       if (this._wallet.submitTransaction) {
         const pendingTransaction = await this._wallet.submitTransaction(transaction);
         return pendingTransaction;
       }
-      const { additionalSignersAuthenticators } = transaction;
       const aptosConfig = new import_ts_sdk5.AptosConfig({
         network: convertNetwork(this.network)
       });
@@ -953,6 +1039,7 @@ var WalletCore = class extends import_eventemitter32.default {
         async (data) => {
           this.setAccount(data);
           await this.setAnsName();
+          this.recordEvent("account_change");
           this.emit("accountChange", this._account);
         }
       );
@@ -980,6 +1067,7 @@ var WalletCore = class extends import_eventemitter32.default {
     try {
       this.ensureWalletExists(this._wallet);
       this.ensureAccountExists(this._account);
+      this.recordEvent("sign_message_and_verify");
       if (this._wallet.isAIP62Standard) {
         return this.walletStandardCore.signMessageAndVerify(
           message,
@@ -1011,7 +1099,9 @@ var import_aptos4 = require("aptos");
   WalletStandardCore,
   areBCSArguments,
   generalizedErrorMessage,
+  getAptosConfig,
   getLocalStorage,
+  isAptosNetwork,
   isInAppBrowser,
   isMobile,
   isRedirectable,

package/dist/index.mjs

@@ -164,37 +164,11 @@ function getLocalStorage() {
 
 // src/utils/helpers.ts
 import {
+  AptosConfig,
+  Network as Network2,
+  NetworkToNodeAPI,
   Serializable
 } 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(
-    navigator.userAgent
-  );
-}
-function isInAppBrowser() {
-  const isIphone = /(iPhone|iPod|iPad).*AppleWebKit(?!.*Safari)/i.test(
-    navigator.userAgent
-  );
-  const isAndroid = /(Android).*Version\/[\d.]+.*Chrome\/[^\s]+ Mobile/i.test(
-    navigator.userAgent
-  );
-  return isIphone || isAndroid;
-}
-function isRedirectable() {
-  if (typeof navigator === "undefined" || !navigator)
-    return false;
-  return isMobile() && !isInAppBrowser();
-}
-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
-  );
-};
 
 // src/LegacyWalletPlugins/conversion.ts
 import {
@@ -203,7 +177,7 @@ import {
 } from "@aptos-labs/ts-sdk";
 import { BCS, TxnBuilderTypes } from "aptos";
 function convertNetwork(networkInfo) {
-  switch (networkInfo == null ? void 0 : networkInfo.name.toLowerCase()) {
+  switch (networkInfo == null ? void 0 : networkInfo.name) {
     case "mainnet":
       return Network.MAINNET;
     case "testnet":
@@ -211,7 +185,7 @@ function convertNetwork(networkInfo) {
     case "devnet":
       return Network.DEVNET;
     default:
-      throw new Error("Invalid network name");
+      throw new Error("Invalid Aptos network name");
   }
 }
 function convertV2TransactionPayloadToV1BCSPayload(payload) {
@@ -241,12 +215,62 @@ function convertV2PayloadToV1JSONPayload(payload) {
   }
 }
 
+// src/utils/helpers.ts
+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(
+    navigator.userAgent
+  );
+}
+function isInAppBrowser() {
+  const isIphone = /(iPhone|iPod|iPad).*AppleWebKit(?!.*Safari)/i.test(
+    navigator.userAgent
+  );
+  const isAndroid = /(Android).*Version\/[\d.]+.*Chrome\/[^\s]+ Mobile/i.test(
+    navigator.userAgent
+  );
+  return isIphone || isAndroid;
+}
+function isRedirectable() {
+  if (typeof navigator === "undefined" || !navigator)
+    return false;
+  return isMobile() && !isInAppBrowser();
+}
+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) => {
+  if (!networkInfo) {
+    throw new Error("Undefined network");
+  }
+  if (isAptosNetwork(networkInfo)) {
+    return new AptosConfig({
+      network: convertNetwork(networkInfo)
+    });
+  }
+  return new AptosConfig({
+    network: Network2.CUSTOM,
+    fullnode: networkInfo.url
+  });
+};
+var isAptosNetwork = (networkInfo) => {
+  if (!networkInfo) {
+    throw new Error("Undefined network");
+  }
+  return NetworkToNodeAPI[networkInfo.name] !== void 0;
+};
+
 // src/LegacyWalletPlugins/WalletCoreV1.ts
 import { HexString } from "aptos";
 import EventEmitter from "eventemitter3";
 import { Buffer } from "buffer";
 import {
-  AptosConfig,
   generateTransactionPayload
 } from "@aptos-labs/ts-sdk";
 import nacl from "tweetnacl";
@@ -258,9 +282,7 @@ var WalletCoreV1 = class extends EventEmitter {
   async resolveSignAndSubmitTransaction(payloadData, network, wallet, transactionInput) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
     if (areBCSArguments(payloadData.functionArguments)) {
-      const aptosConfig = new AptosConfig({
-        network: convertNetwork(network)
-      });
+      const aptosConfig = getAptosConfig(network);
       const newPayload = await generateTransactionPayload({
         ...payloadData,
         aptosConfig
@@ -489,6 +511,41 @@ var WalletStandardCore = class {
   }
 };
 
+// src/ga/index.ts
+var GA4 = class {
+  constructor() {
+    this.aptosGAID = "G-GNVVWBL3J9";
+    this.injectGA(this.aptosGAID);
+  }
+  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]);
+  }
+};
+
+// src/version.ts
+var WALLET_ADAPTER_CORE_VERSION = "3.11.0";
+
 // src/WalletCore.ts
 var WalletCore = class extends EventEmitter2 {
   constructor(plugins) {
@@ -503,6 +560,7 @@ var WalletCore = class extends EventEmitter2 {
     this.walletStandardCore = new WalletStandardCore();
     this._connecting = false;
     this._connected = false;
+    this.ga4 = new GA4();
     this.standardizeStandardWalletToPluginWalletType = (standardWallet) => {
       var _a, _b;
       let standardWalletConvertedToWallet = {
@@ -579,6 +637,17 @@ var WalletCore = class extends EventEmitter2 {
     });
     this._standard_wallets = aptosStandardWallets;
   }
+  recordEvent(eventName, additionalInfo) {
+    var _a, _b, _c;
+    this.ga4.gtag("event", `wallet_adapter_${eventName}`, {
+      wallet: (_a = this._wallet) == null ? void 0 : _a.name,
+      network: (_b = this._network) == null ? void 0 : _b.name,
+      network_url: (_c = this._network) == null ? void 0 : _c.url,
+      adapter_core_version: WALLET_ADAPTER_CORE_VERSION,
+      send_to: "G-GNVVWBL3J9",
+      ...additionalInfo
+    });
+  }
   ensureWalletExists(wallet) {
     if (!wallet) {
       throw new WalletNotConnectedError().name;
@@ -608,7 +677,7 @@ var WalletCore = class extends EventEmitter2 {
   async setAnsName() {
     var _a;
     if (((_a = this._network) == null ? void 0 : _a.chainId) && this._account) {
-      if (!ChainIdToAnsSupportedNetworkMap[this._network.chainId]) {
+      if (!ChainIdToAnsSupportedNetworkMap[this._network.chainId] || !isAptosNetwork(this._network)) {
         this._account.ansName = void 0;
         return;
       }
@@ -658,13 +727,17 @@ var WalletCore = class extends EventEmitter2 {
     return;
   }
   setNetwork(network) {
-    var _a;
+    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(),
@@ -672,7 +745,14 @@ var WalletCore = class extends EventEmitter2 {
       };
       return;
     }
-    this._network = { ...network, name: network.name.toLowerCase() };
+    this.recordEvent("network_change", {
+      from: (_c = this._network) == null ? void 0 : _c.name,
+      to: network.name
+    });
+    this._network = {
+      ...network,
+      name: network.name.toLowerCase()
+    };
   }
   isConnected() {
     return this._connected;
@@ -759,6 +839,7 @@ var WalletCore = class extends EventEmitter2 {
       await this.setAnsName();
       setLocalStorage(selectedWallet.name);
       this._connected = true;
+      this.recordEvent("wallet_connect");
       this.emit("connect", account);
     } catch (error) {
       this.clearData();
@@ -773,6 +854,7 @@ var WalletCore = class extends EventEmitter2 {
       this.ensureWalletExists(this._wallet);
       await this._wallet.disconnect();
       this.clearData();
+      this.recordEvent("wallet_disconnect");
       this.emit("disconnect");
     } catch (error) {
       const errMsg = generalizedErrorMessage(error);
@@ -783,10 +865,9 @@ var WalletCore = class extends EventEmitter2 {
     try {
       this.ensureWalletExists(this._wallet);
       this.ensureAccountExists(this._account);
+      this.recordEvent("sign_and_submit_transaction");
       const payloadData = transactionInput.data;
-      const aptosConfig = new AptosConfig2({
-        network: convertNetwork(this._network)
-      });
+      const aptosConfig = getAptosConfig(this._network);
       const aptos = new Aptos2(aptosConfig);
       if (this._wallet.signAndSubmitTransaction) {
         if (this._wallet.isAIP62Standard) {
@@ -827,7 +908,7 @@ var WalletCore = class extends EventEmitter2 {
     var _a, _b;
     try {
       this.ensureWalletExists(this._wallet);
-      console.log("this._account", this._account);
+      this.recordEvent("sign_transaction");
       if (this._wallet.signTransaction) {
         if (this._wallet.isAIP62Standard) {
           if ("rawTransaction" in transactionOrPayload) {
@@ -884,6 +965,7 @@ var WalletCore = class extends EventEmitter2 {
   async signMessage(message) {
     try {
       this.ensureWalletExists(this._wallet);
+      this.recordEvent("sign_message");
       if (this._wallet.isAIP62Standard) {
         return await this.walletStandardCore.signMessage(message, this._wallet);
       }
@@ -898,11 +980,15 @@ var WalletCore = class extends EventEmitter2 {
   async submitTransaction(transaction) {
     try {
       this.ensureWalletExists(this._wallet);
+      const { additionalSignersAuthenticators } = transaction;
+      const transactionType = additionalSignersAuthenticators !== void 0 ? "multi-agent" : "simple";
+      this.recordEvent("submit_transaction", {
+        transaction_type: transactionType
+      });
       if (this._wallet.submitTransaction) {
         const pendingTransaction = await this._wallet.submitTransaction(transaction);
         return pendingTransaction;
       }
-      const { additionalSignersAuthenticators } = transaction;
       const aptosConfig = new AptosConfig2({
         network: convertNetwork(this.network)
       });
@@ -928,6 +1014,7 @@ var WalletCore = class extends EventEmitter2 {
         async (data) => {
           this.setAccount(data);
           await this.setAnsName();
+          this.recordEvent("account_change");
           this.emit("accountChange", this._account);
         }
       );
@@ -955,6 +1042,7 @@ var WalletCore = class extends EventEmitter2 {
     try {
       this.ensureWalletExists(this._wallet);
       this.ensureAccountExists(this._account);
+      this.recordEvent("sign_message_and_verify");
       if (this._wallet.isAIP62Standard) {
         return this.walletStandardCore.signMessageAndVerify(
           message,
@@ -985,7 +1073,9 @@ export {
   WalletStandardCore,
   areBCSArguments,
   generalizedErrorMessage,
+  getAptosConfig,
   getLocalStorage,
+  isAptosNetwork,
   isInAppBrowser,
   isMobile,
   isRedirectable,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aptos-labs/wallet-adapter-core",
-  "version": "3.9.0",
+  "version": "3.11.0",
   "description": "Aptos Wallet Adapter Core",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -29,6 +29,7 @@
   ],
   "devDependencies": {
     "@types/jest": "^29.2.4",
+    "@types/node": "^20.10.4",
     "eslint": "^8.15.0",
     "jest": "^29.3.1",
     "ts-jest": "^29.0.3",
@@ -48,8 +49,10 @@
     "aptos": "^1.21.0"
   },
   "scripts": {
-    "build": "tsup src/index.ts --format esm,cjs --dts",
-    "dev": "tsup src/index.ts --format esm,cjs --watch --dts",
+    "update-version": "node -p \"'export const WALLET_ADAPTER_CORE_VERSION = ' + JSON.stringify(require('./package.json').version) + ';'\" > src/version.ts",
+    "build-package": "export $(cat .env | xargs) && tsup src/index.ts --format esm,cjs --dts --env.GAID $GAID",
+    "build": "pnpm run update-version && pnpm run build-package",
+    "dev": "export $(cat .env | xargs) && tsup src/index.ts --format esm,cjs --watch --dts --env.GAID $GAID",
     "test": "jest",
     "lint": "TIMING=1 eslint \"src/**/*.ts*\"",
     "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist"

package/src/LegacyWalletPlugins/WalletCoreV1.ts

@@ -2,7 +2,6 @@ import { HexString, TxnBuilderTypes, Types } from "aptos";
 import EventEmitter from "eventemitter3";
 import { Buffer } from "buffer";
 import {
-  AptosConfig,
   InputEntryFunctionDataWithRemoteABI,
   InputGenerateTransactionPayloadData,
   generateTransactionPayload,
@@ -26,11 +25,14 @@ import {
 } from "./types";
 
 import {
-  convertNetwork,
   convertV2PayloadToV1JSONPayload,
   convertV2TransactionPayloadToV1BCSPayload,
 } from "./conversion";
-import { areBCSArguments, generalizedErrorMessage } from "../utils";
+import {
+  areBCSArguments,
+  generalizedErrorMessage,
+  getAptosConfig,
+} from "../utils";
 
 export class WalletCoreV1 extends EventEmitter<WalletCoreEvents> {
   async connect(wallet: Wallet) {
@@ -56,9 +58,7 @@ export class WalletCoreV1 extends EventEmitter<WalletCoreEvents> {
   ) {
     // first check if each argument is a BCS serialized argument
     if (areBCSArguments(payloadData.functionArguments)) {
-      const aptosConfig = new AptosConfig({
-        network: convertNetwork(network),
-      });
+      const aptosConfig = getAptosConfig(network);
       const newPayload = await generateTransactionPayload({
         ...(payloadData as InputEntryFunctionDataWithRemoteABI),
         aptosConfig: aptosConfig,

package/src/LegacyWalletPlugins/conversion.ts

@@ -12,7 +12,7 @@ import { NetworkInfo } from "./types";
 export function convertNetwork(
   networkInfo: NetworkInfo | StandardNetworkInfo | null
 ): Network {
-  switch (networkInfo?.name.toLowerCase()) {
+  switch (networkInfo?.name) {
     case "mainnet" as Network:
       return Network.MAINNET;
     case "testnet" as Network:
@@ -20,7 +20,7 @@ export function convertNetwork(
     case "devnet" as Network:
       return Network.DEVNET;
     default:
-      throw new Error("Invalid network name");
+      throw new Error("Invalid Aptos network name");
   }
 }
 

package/src/WalletCore.ts

@@ -33,28 +33,30 @@ import {
 } from "./error";
 import {
   AccountInfo,
+  InputTransactionData,
   NetworkInfo,
   SignMessagePayload,
+  SignMessageResponse,
   Wallet,
-  WalletInfo,
   WalletCoreEvents,
-  SignMessageResponse,
-  InputTransactionData,
+  WalletInfo,
   WalletName,
 } from "./LegacyWalletPlugins/types";
 import {
+  generalizedErrorMessage,
+  getAptosConfig,
+  isAptosNetwork,
+  isRedirectable,
   removeLocalStorage,
-  setLocalStorage,
   scopePollingDetectionStrategy,
-  isRedirectable,
-  generalizedErrorMessage,
+  setLocalStorage,
 } from "./utils";
 import { convertNetwork } from "./LegacyWalletPlugins/conversion";
 import { WalletCoreV1 } from "./LegacyWalletPlugins/WalletCoreV1";
 import {
+  AccountInfo as StandardAccountInfo,
   AptosWallet,
   getAptosWallets,
-  AccountInfo as StandardAccountInfo,
   NetworkInfo as StandardNetworkInfo,
   UserResponse,
   UserResponseStatus,
@@ -63,6 +65,8 @@ import {
   AptosStandardWallet,
   WalletStandardCore,
 } from "./AIP62StandardWallets/WalletStandard";
+import { GA4 } from "./ga";
+import { WALLET_ADAPTER_CORE_VERSION } from "./version";
 
 export type IAptosWallet = AptosStandardWallet & Wallet;
 
@@ -99,6 +103,9 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
   // Indicates whether the dapp is connected with a wallet
   private _connected: boolean = false;
 
+  // Google Analytics 4 module
+  private readonly ga4: GA4 = new GA4();
+
   /**
    * Core functionality constructor.
    * For legacy wallet adapter v1 support we expect the dapp to pass in wallet plugins,
@@ -216,6 +223,17 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
     this.emit("standardWalletsAdded", standardWalletConvertedToWallet);
   };
 
+  private recordEvent(eventName: string, additionalInfo?: object) {
+    this.ga4.gtag("event", `wallet_adapter_${eventName}`, {
+      wallet: this._wallet?.name,
+      network: this._network?.name,
+      network_url: this._network?.url,
+      adapter_core_version: WALLET_ADAPTER_CORE_VERSION,
+      send_to: process.env.GAID,
+      ...additionalInfo,
+    });
+  }
+
   /**
    * Helper function to ensure wallet exists
    *
@@ -285,7 +303,10 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
   private async setAnsName(): Promise<void> {
     if (this._network?.chainId && this._account) {
       // ANS supports only MAINNET or TESTNET
-      if (!ChainIdToAnsSupportedNetworkMap[this._network.chainId]) {
+      if (
+        !ChainIdToAnsSupportedNetworkMap[this._network.chainId] ||
+        !isAptosNetwork(this._network)
+      ) {
         this._account.ansName = undefined;
         return;
       }
@@ -383,14 +404,27 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
     }
     if (this._wallet?.isAIP62Standard) {
       const standardizeNetwork = network as StandardNetworkInfo;
+      this.recordEvent("network_change", {
+        from: this._network?.name,
+        to: standardizeNetwork.name,
+      });
       this._network = {
         name: standardizeNetwork.name.toLowerCase() as Network,
         chainId: standardizeNetwork.chainId.toString(),
         url: standardizeNetwork.url,
       };
+
       return;
     }
-    this._network = { ...(network as NetworkInfo), name: network.name.toLowerCase() as Network };
+
+    this.recordEvent("network_change", {
+      from: this._network?.name,
+      to: network.name,
+    });
+    this._network = {
+      ...(network as NetworkInfo),
+      name: network.name.toLowerCase() as Network,
+    };
   }
 
   /**
@@ -543,6 +577,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
       await this.setAnsName();
       setLocalStorage(selectedWallet.name);
       this._connected = true;
+      this.recordEvent("wallet_connect");
       this.emit("connect", account);
     } catch (error: any) {
       this.clearData();
@@ -565,6 +600,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
       this.ensureWalletExists(this._wallet);
       await this._wallet.disconnect();
       this.clearData();
+      this.recordEvent("wallet_disconnect");
       this.emit("disconnect");
     } catch (error: any) {
       const errMsg = generalizedErrorMessage(error);
@@ -587,12 +623,10 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
     try {
       this.ensureWalletExists(this._wallet);
       this.ensureAccountExists(this._account);
-
+      this.recordEvent("sign_and_submit_transaction");
       // get the payload piece from the input
       const payloadData = transactionInput.data;
-      const aptosConfig = new AptosConfig({
-        network: convertNetwork(this._network),
-      });
+      const aptosConfig = getAptosConfig(this._network);
 
       const aptos = new Aptos(aptosConfig);
 
@@ -659,7 +693,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
   ): Promise<AccountAuthenticator> {
     try {
       this.ensureWalletExists(this._wallet);
-      console.log("this._account", this._account);
+      this.recordEvent("sign_transaction");
       // Make sure wallet supports signTransaction
       if (this._wallet.signTransaction) {
         // If current connected wallet is AIP-62 standard compatible
@@ -750,7 +784,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
   async signMessage(message: SignMessagePayload): Promise<SignMessageResponse> {
     try {
       this.ensureWalletExists(this._wallet);
-
+      this.recordEvent("sign_message");
       if (this._wallet.isAIP62Standard) {
         return await this.walletStandardCore.signMessage(message, this._wallet);
       }
@@ -775,6 +809,14 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
     try {
       this.ensureWalletExists(this._wallet);
 
+      const { additionalSignersAuthenticators } = transaction;
+      const transactionType =
+        additionalSignersAuthenticators !== undefined
+          ? "multi-agent"
+          : "simple";
+      this.recordEvent("submit_transaction", {
+        transaction_type: transactionType,
+      });
       // If wallet supports submitTransaction transaction function
       if (this._wallet.submitTransaction) {
         const pendingTransaction =
@@ -783,7 +825,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
       }
 
       // Else have the adpater submits the transaction
-      const { additionalSignersAuthenticators } = transaction;
+
       const aptosConfig = new AptosConfig({
         network: convertNetwork(this.network),
       });
@@ -815,6 +857,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
         async (data: AccountInfo | StandardAccountInfo) => {
           this.setAccount(data);
           await this.setAnsName();
+          this.recordEvent("account_change");
           this.emit("accountChange", this._account);
         }
       );
@@ -854,7 +897,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
     try {
       this.ensureWalletExists(this._wallet);
       this.ensureAccountExists(this._account);
-
+      this.recordEvent("sign_message_and_verify");
       // If current connected wallet is AIP-62 standard compatible
       if (this._wallet.isAIP62Standard) {
         return this.walletStandardCore.signMessageAndVerify(

package/src/ga/index.ts

@@ -0,0 +1,37 @@
+export class GA4 {
+  readonly aptosGAID: string | undefined = process.env.GAID;
+
+  constructor() {
+    // Inject Aptos Google Analytics 4 script
+    this.injectGA(this.aptosGAID);
+  }
+
+  gtag(a: string, b: string | object, c?: object) {
+    let dataLayer = (window as any).dataLayer || [];
+    dataLayer.push(arguments);
+  }
+
+  private injectGA(gaID?: string) {
+    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]);
+  }
+}

package/src/utils/helpers.ts

@@ -1,8 +1,14 @@
 import {
+  AptosConfig,
   EntryFunctionArgumentTypes,
+  Network,
+  NetworkToNodeAPI,
   Serializable,
   SimpleEntryFunctionArgumentTypes,
 } from "@aptos-labs/ts-sdk";
+import { NetworkInfo as StandardNetworkInfo } from "@aptos-labs/wallet-standard";
+import { NetworkInfo } from "../LegacyWalletPlugins/types";
+import { convertNetwork } from "../LegacyWalletPlugins/conversion";
 
 export function isMobile(): boolean {
   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(
@@ -52,3 +58,41 @@ export const areBCSArguments = (
       arg instanceof Serializable
   );
 };
+
+/**
+ * Helper function to get AptosConfig that supports Aptos and Custom networks
+ *
+ * @param networkInfo
+ * @returns AptosConfig
+ */
+export const getAptosConfig = (
+  networkInfo: NetworkInfo | StandardNetworkInfo | null
+): AptosConfig => {
+  if (!networkInfo) {
+    throw new Error("Undefined network");
+  }
+  if (isAptosNetwork(networkInfo)) {
+    return new AptosConfig({
+      network: convertNetwork(networkInfo),
+    });
+  }
+  return new AptosConfig({
+    network: Network.CUSTOM,
+    fullnode: networkInfo.url,
+  });
+};
+
+/**
+ * Helper function to resolve if the current connected network is an Aptos network
+ *
+ * @param networkInfo
+ * @returns boolean
+ */
+export const isAptosNetwork = (
+  networkInfo: NetworkInfo | StandardNetworkInfo | null
+): boolean => {
+  if (!networkInfo) {
+    throw new Error("Undefined network");
+  }
+  return NetworkToNodeAPI[networkInfo.name] !== undefined;
+};

package/src/version.ts

@@ -0,0 +1 @@
+export const WALLET_ADAPTER_CORE_VERSION = "3.11.0";