@aptos-labs/wallet-adapter-core 5.5.1 → 5.6.0

package/dist/sdkWallets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sdkWallets.d.ts","sourceRoot":"","sources":["../src/sdkWallets.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAEzD,wBAAgB,aAAa,CAAC,UAAU,CAAC,EAAE,UAAU,mBAyCpD"}
+{"version":3,"file":"sdkWallets.d.ts","sourceRoot":"","sources":["../src/sdkWallets.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAEzD,wBAAgB,aAAa,CAAC,UAAU,CAAC,EAAE,UAAU,mBA2CpD"}

package/dist/utils/types.d.ts

@@ -8,6 +8,7 @@ export interface AptosStandardSupportedWallet {
     readyState: WalletReadyState.NotDetected;
     isAIP62Standard: true;
     deeplinkProvider?: string;
+    isAptosNativeWallet?: boolean;
 }
 export type AvailableWallets = "Continue with Apple" | "Continue with Google" | "MSafe" | "Mizu Wallet" | "Nightly" | "OKX Wallet" | "Petra" | "Pontem Wallet" | "Rimosafe" | "T wallet";
 export type InputTransactionData = {

package/dist/utils/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/utils/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,+BAA+B,EAChC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mCAAmC,EAAE,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD,MAAM,WAAW,4BAA4B;IAE3C,IAAI,EAAE,MAAM,CAAC;IAEb,GAAG,EAAE,MAAM,CAAC;IAEZ,IAAI,EAAE,cAAc,SAAS,GAAG,MAAM,GAAG,KAAK,GAAG,KAAK,WAAW,MAAM,EAAE,CAAC;IAG1E,UAAU,EAAE,gBAAgB,CAAC,WAAW,CAAC;IAGzC,eAAe,EAAE,IAAI,CAAC;IAGtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAGD,MAAM,MAAM,gBAAgB,GACxB,qBAAqB,GACrB,sBAAsB,GACtB,OAAO,GACP,aAAa,GACb,SAAS,GACT,YAAY,GACZ,OAAO,GACP,eAAe,GACf,UAAU,GACV,UAAU,CAAC;AAEf,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,CAAC,EAAE,mBAAmB,CAAC;IAC7B,IAAI,EAAE,mCAAmC,CAAC;IAC1C,OAAO,CAAC,EAAE,+BAA+B,GAAG;QAC1C,wBAAwB,CAAC,EAAE,MAAM,CAAC;QAClC,mBAAmB,CAAC,EAAE,MAAM,CAAC;KAC9B,CAAC;IACF,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;CACb,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/utils/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,+BAA+B,EAChC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mCAAmC,EAAE,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD,MAAM,WAAW,4BAA4B;IAE3C,IAAI,EAAE,MAAM,CAAC;IAEb,GAAG,EAAE,MAAM,CAAC;IAEZ,IAAI,EAAE,cAAc,SAAS,GAAG,MAAM,GAAG,KAAK,GAAG,KAAK,WAAW,MAAM,EAAE,CAAC;IAG1E,UAAU,EAAE,gBAAgB,CAAC,WAAW,CAAC;IAGzC,eAAe,EAAE,IAAI,CAAC;IAGtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAGD,MAAM,MAAM,gBAAgB,GACxB,qBAAqB,GACrB,sBAAsB,GACtB,OAAO,GACP,aAAa,GACb,SAAS,GACT,YAAY,GACZ,OAAO,GACP,eAAe,GACf,UAAU,GACV,UAAU,CAAC;AAEf,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,CAAC,EAAE,mBAAmB,CAAC;IAC7B,IAAI,EAAE,mCAAmC,CAAC;IAC1C,OAAO,CAAC,EAAE,+BAA+B,GAAG;QAC1C,wBAAwB,CAAC,EAAE,MAAM,CAAC;QAClC,mBAAmB,CAAC,EAAE,MAAM,CAAC;KAC9B,CAAC;IACF,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;CACb,CAAC"}

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-export declare const WALLET_ADAPTER_CORE_VERSION = "5.5.1";
+export declare const WALLET_ADAPTER_CORE_VERSION = "5.6.0";
 //# sourceMappingURL=version.d.ts.map

package/package.json

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

package/src/WalletCore.ts

@@ -98,6 +98,7 @@ import {
 // An adapter wallet types is a wallet that is compatible with the wallet standard and the wallet adapter properties
 export type AdapterWallet = AptosWallet & {
   readyState?: WalletReadyState;
+  isAptosNativeWallet?: boolean;
 };
 
 // An adapter not detected wallet types is a wallet that is compatible with the wallet standard but not detected
@@ -234,12 +235,8 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
         return;
       }
 
-      // Remove optional duplications in the _all_wallets array
-      this._standard_wallets = this._standard_wallets.filter(
-        (item) => item.name !== wallet.name
-      );
-
       const isValid = isWalletWithRequiredFeatureSet(wallet);
+
       if (isValid) {
         // check if we already have this wallet as a not detected wallet
         const index = this._standard_not_detected_wallets.findIndex(
@@ -250,9 +247,16 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
           this._standard_not_detected_wallets.splice(index, 1);
         }
 
-        wallet.readyState = WalletReadyState.Installed;
-        this._standard_wallets.push(wallet);
-        this.emit("standardWalletsAdded", wallet);
+        // ✅ Check if wallet already exists in _standard_wallets
+        const alreadyExists = this._standard_wallets.some(
+          (w) => w.name === wallet.name
+        );
+        if (!alreadyExists) {
+          wallet.readyState = WalletReadyState.Installed;
+          wallet.isAptosNativeWallet = this.isAptosNativeWallet(wallet);
+          this._standard_wallets.push(wallet);
+          this.emit("standardWalletsAdded", wallet);
+        }
       }
     });
   }
@@ -269,37 +273,49 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
 
       if (isValid) {
         wallet.readyState = WalletReadyState.Installed;
+        wallet.isAptosNativeWallet = this.isAptosNativeWallet(wallet);
         this._standard_wallets.push(wallet);
       }
     });
   }
 
+  // Aptos native wallets do not have an authenticationFunction property
+  private isAptosNativeWallet(wallet: AptosWallet): boolean {
+    return !("authenticationFunction" in wallet);
+  }
+
   // Since we can't discover AIP-62 wallets that are not installed on the user machine,
   // we hold a AIP-62 wallets registry to show on the wallet selector modal for the users.
   // Append wallets from wallet standard support registry to the `_standard_not_detected_wallets` array
   // when wallet is not installed on the user machine
   private appendNotDetectedStandardSupportedWallets(): void {
     // Loop over the registry map
-    aptosStandardSupportedWalletList.map((supportedWallet) => {
-      // Check if we already have this wallet as a detected AIP-62 wallet standard
-      const existingStandardWallet = this._standard_wallets.find(
-        (wallet) => wallet.name == supportedWallet.name
-      );
-      // If it is detected, it means the user has the wallet installed, so dont add it to the wallets array
-      if (existingStandardWallet) {
-        return;
-      }
-      // If AIP-62 wallet detected but it is excluded by the dapp, dont add it to the wallets array
-      if (this.excludeWallet(supportedWallet)) {
-        return;
-      }
-      // If AIP-62 wallet does not exist, append it to the wallet selector modal
-      // as an undetected wallet
-      if (!existingStandardWallet) {
-        this._standard_not_detected_wallets.push(supportedWallet);
-        this.emit("standardNotDetectedWalletAdded", supportedWallet);
+    aptosStandardSupportedWalletList.map(
+      (supportedWallet: AptosStandardSupportedWallet) => {
+        // Check if we already have this wallet as a detected AIP-62 wallet standard
+        const existingStandardWallet = this._standard_wallets.find(
+          (wallet) => wallet.name == supportedWallet.name
+        );
+        // If it is detected, it means the user has the wallet installed, so dont add it to the wallets array
+        if (existingStandardWallet) {
+          return;
+        }
+        // If AIP-62 wallet detected but it is excluded by the dapp, dont add it to the wallets array
+        if (this.excludeWallet(supportedWallet)) {
+          return;
+        }
+        // If AIP-62 wallet does not exist, append it to the wallet selector modal
+        // as an undetected wallet
+        if (!existingStandardWallet) {
+          // Aptos native wallets do not have an authenticationFunction property
+          supportedWallet.isAptosNativeWallet = !(
+            "authenticationFunction" in supportedWallet
+          );
+          this._standard_not_detected_wallets.push(supportedWallet);
+          this.emit("standardNotDetectedWalletAdded", supportedWallet);
+        }
       }
-    });
+    );
   }
 
   /**

package/src/sdkWallets.ts

@@ -4,7 +4,7 @@ import {
 } from "@aptos-connect/wallet-adapter-plugin";
 import { Network } from "@aptos-labs/ts-sdk";
 import { DevTWallet, TWallet } from "@atomrigslab/aptos-wallet-adapter";
-import { MSafeWallet } from "@msafe/aptos-aip62-wallet";
+import { inMSafeWallet, MSafeWallet } from "@msafe/aptos-aip62-wallet";
 import { DappConfig, AdapterWallet } from "./WalletCore";
 
 export function getSDKWallets(dappConfig?: DappConfig) {
@@ -35,7 +35,9 @@ export function getSDKWallets(dappConfig?: DappConfig) {
     sdkWallets.push(new DevTWallet() as any);
   }
 
-  if (dappConfig?.network) {
+  // MSafe only works if the dapp is open within the MSafe App store
+  // https://doc.m-safe.io/aptos/developers/integrate-with-msafe-dapp/faq
+  if (dappConfig?.msafeWalletConfig && dappConfig.network && inMSafeWallet()) {
     sdkWallets.push(
       new MSafeWallet({
         ...dappConfig?.msafeWalletConfig,

package/src/utils/types.ts

@@ -21,6 +21,8 @@ export interface AptosStandardSupportedWallet {
   // An optional deeplink provider for the wallet. If the wallet is not installed, we can redirect the user to the wallet's deeplink provider
   // @example "https://myWallet.app/explore?link="
   deeplinkProvider?: string;
+  // A flag to indicate that this AptosStandardSupportedWallet is an Aptos native wallet.
+  isAptosNativeWallet?: boolean;
 }
 
 // Update this with the name of your wallet when you create a new wallet plugin.

package/src/version.ts

@@ -1 +1 @@
-export const WALLET_ADAPTER_CORE_VERSION = "5.5.1";
+export const WALLET_ADAPTER_CORE_VERSION = "5.6.0";