@aptos-labs/wallet-adapter-core 5.2.0 → 5.4.0

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,SAAS,GACT,OAAO,GACP,UAAU,GACV,eAAe,GACf,aAAa,GACb,sBAAsB,CAAC;AAE3B,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;CACH,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;CAC3B;AAGD,MAAM,MAAM,gBAAgB,GACxB,SAAS,GACT,OAAO,GACP,UAAU,GACV,eAAe,GACf,aAAa,GACb,YAAY,GACZ,sBAAsB,GACtB,qBAAqB,GACrB,cAAc,CAAC;AAEnB,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;CACH,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.2.0";
+export declare const WALLET_ADAPTER_CORE_VERSION = "5.4.0";
 //# sourceMappingURL=version.d.ts.map

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@aptos-labs/wallet-adapter-core",
-  "version": "5.2.0",
+  "version": "5.4.0",
   "description": "Aptos Wallet Adapter Core",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "license": "Apache-2.0",
   "exports": {
+    "types": "./dist/index.d.ts",
     "require": "./dist/index.js",
-    "import": "./dist/index.mjs",
-    "types": "./dist/index.d.ts"
+    "import": "./dist/index.mjs"
   },
   "repository": {
     "type": "git",
@@ -28,12 +28,13 @@
     "Aptos Wallet"
   ],
   "devDependencies": {
+    "@swc/core": "^1.11.16",
     "@types/jest": "^29.2.4",
     "@types/node": "^20.10.4",
     "eslint": "^8.15.0",
     "jest": "^29.3.1",
     "ts-jest": "^29.0.3",
-    "tsup": "^5.10.1",
+    "tsup": "^8.4.0",
     "typescript": "^4.5.3",
     "@aptos-labs/eslint-config-adapter": "0.0.2",
     "@aptos-labs/wallet-adapter-tsconfig": "0.0.2"
@@ -43,6 +44,7 @@
     "@aptos-labs/wallet-standard": "^0.3.0",
     "@atomrigslab/aptos-wallet-adapter": "^0.1.20",
     "@mizuwallet-sdk/aptos-wallet-adapter": "^0.3.2",
+    "@msafe/aptos-aip62-wallet": "^1.0.17",
     "buffer": "^6.0.3",
     "eventemitter3": "^4.0.7",
     "tweetnacl": "^1.0.3"

package/src/WalletCore.ts

@@ -6,6 +6,7 @@ import {
   AnyPublicKeyVariant,
   AnyRawTransaction,
   Aptos,
+  Ed25519PublicKey,
   InputSubmitTransactionData,
   MultiEd25519PublicKey,
   MultiEd25519Signature,
@@ -116,6 +117,10 @@ export interface DappConfig {
     manifestURL: string;
     appId?: string;
   };
+  msafeWalletConfig?: {
+    appId?: string;
+    appUrl?: string;
+  };
 }
 
 export declare interface WalletCoreEvents {
@@ -1039,57 +1044,29 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
       this.ensureAccountExists(this._account);
       this.recordEvent("sign_message_and_verify");
 
-      try {
-        // sign the message
-        const response = (await this._wallet.features[
-          "aptos:signMessage"
-        ].signMessage(message)) as UserResponse<AptosSignMessageOutput>;
-
-        if (response.status === UserResponseStatus.REJECTED) {
-          throw new WalletConnectionError("Failed to sign a message").message;
-        }
+      // sign the message
+      const response = (await this._wallet.features[
+        "aptos:signMessage"
+      ].signMessage(message)) as UserResponse<AptosSignMessageOutput>;
 
-        // For Keyless wallet accounts we skip verification for now.
-        // TODO: Remove when client-side verification is done in SDK.
-        if (
-          this._account.publicKey instanceof AnyPublicKey &&
-          this._account.publicKey.variant === AnyPublicKeyVariant.Keyless
-        ) {
-          return true;
-        }
+      if (response.status === UserResponseStatus.REJECTED) {
+        throw new WalletConnectionError("Failed to sign a message").message;
+      }
 
-        let verified = false;
-        // if is a multi sig wallet with a MultiEd25519Signature type
-        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: any) {
-        const errMsg = generalizedErrorMessage(error);
-        throw new WalletSignMessageAndVerifyError(errMsg).message;
+      const aptosConfig = getAptosConfig(this._network, this._dappConfig);
+      const signingMessage = new TextEncoder().encode(response.args.fullMessage);
+      if ("verifySignatureAsync" in (this._account.publicKey as Object)) {
+        return await this._account.publicKey.verifySignatureAsync({
+          aptosConfig,
+          message: signingMessage,
+          signature: response.args.signature,
+          options: { throwErrorWithReason: true }
+        });
       }
+      return this._account.publicKey.verifySignature({
+        message: signingMessage,
+        signature: response.args.signature,
+      });
     } catch (error: any) {
       const errMsg = generalizedErrorMessage(error);
       throw new WalletSignMessageAndVerifyError(errMsg).message;

package/src/sdkWallets.ts

@@ -5,6 +5,7 @@ import {
 import { Network } from "@aptos-labs/ts-sdk";
 import { DevTWallet, TWallet } from "@atomrigslab/aptos-wallet-adapter";
 import { MizuWallet } from "@mizuwallet-sdk/aptos-wallet-adapter";
+import { MSafeWallet } from "@msafe/aptos-aip62-wallet";
 import { DappConfig, AdapterWallet } from "./WalletCore";
 
 export function getSDKWallets(dappConfig?: DappConfig) {
@@ -50,6 +51,15 @@ export function getSDKWallets(dappConfig?: DappConfig) {
     sdkWallets.push(new DevTWallet() as any);
   }
 
+  if (dappConfig?.network) {
+    sdkWallets.push(
+      new MSafeWallet({
+        ...dappConfig?.msafeWalletConfig,
+        network: dappConfig.network,
+      })
+    );
+  }
+
   // Add new SDK wallet plugins (ones that should be installed as packages) here:
   // Ex. sdkWallets.push(new YourSDKWallet(dappConfig))
 

package/src/utils/types.ts

@@ -30,7 +30,10 @@ export type AvailableWallets =
   | "T wallet"
   | "Pontem Wallet"
   | "Mizu Wallet"
-  | "Continue with Google";
+  | "OKX Wallet"
+  | "Continue with Google"
+  | "Continue with Apple"
+  | "MSafe Wallet";
 
 export type InputTransactionData = {
   sender?: AccountAddressInput;

package/src/version.ts

@@ -1 +1 @@
-export const WALLET_ADAPTER_CORE_VERSION = "5.2.0";
+export const WALLET_ADAPTER_CORE_VERSION = "5.4.0";