@aptos-labs/wallet-adapter-core 0.2.1 → 0.2.2

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @aptos-labs/wallet-adapter-core
 
+## 0.2.2
+
+### Patch Changes
+
+- d4e298f: Support Lodable wallet
+  Implement multi signature verification
+  Add a new optional property propertyName for multi-chain wallet
+- 5fc6981: Throw wallet not found error when trying to connect to an uninstalled wallet
+- d711f43: Import tweetnacl package via default export to support commonJS
+
 ## 0.2.1
 
 ### Patch Changes

package/dist/index.d.ts

@@ -66,6 +66,7 @@ interface AdapterPluginProps<Name extends string = string> {
     name: WalletName<Name>;
     url: string;
     icon: `data:image/${"svg+xml" | "webp" | "png" | "gif"};base64,${string}`;
+    providerName?: string;
     provider: any;
     connect(): Promise<any>;
     disconnect: () => Promise<any>;

package/dist/index.js

@@ -35,7 +35,7 @@ module.exports = __toCommonJS(src_exports);
 // src/WalletCore.ts
 var import_aptos = require("aptos");
 var import_eventemitter3 = __toESM(require("eventemitter3"));
-var import_tweetnacl = require("tweetnacl");
+var import_tweetnacl = __toESM(require("tweetnacl"));
 var import_buffer = require("buffer");
 
 // src/constants.ts
@@ -200,12 +200,15 @@ var WalletCore = class extends import_eventemitter3.default {
   scopePollingDetectionStrategy() {
     var _a;
     (_a = this._wallets) == null ? void 0 : _a.forEach((wallet) => {
-      wallet.readyState = typeof window === "undefined" || typeof document === "undefined" ? "Unsupported" /* Unsupported */ : "NotDetected" /* NotDetected */;
+      if (!wallet.readyState) {
+        wallet.readyState = typeof window === "undefined" || typeof document === "undefined" ? "Unsupported" /* Unsupported */ : "NotDetected" /* NotDetected */;
+      }
       if (typeof window !== "undefined") {
         scopePollingDetectionStrategy(() => {
-          if (Object.keys(window).includes(wallet.name.toLowerCase())) {
+          const providerName = wallet.providerName || wallet.name.toLowerCase();
+          if (Object.keys(window).includes(providerName)) {
             wallet.readyState = "Installed" /* Installed */;
-            wallet.provider = window[wallet.name.toLowerCase()];
+            wallet.provider = window[providerName];
             this.emit("readyStateChange", wallet);
             return true;
           }
@@ -276,10 +279,9 @@ var WalletCore = class extends import_eventemitter3.default {
       const selectedWallet = (_a = this._wallets) == null ? void 0 : _a.find(
         (wallet) => wallet.name === walletName
       );
-      if (!selectedWallet)
-        return;
-      if (selectedWallet.readyState !== "Installed" /* Installed */)
-        return;
+      if (!selectedWallet || selectedWallet.readyState !== "Installed" /* Installed */ && selectedWallet.readyState !== "Loadable" /* Loadable */) {
+        throw new WalletConnectionError(`${walletName} wallet not found`).message;
+      }
       if (this._connected) {
         await this.disconnect();
       }
@@ -389,12 +391,42 @@ var WalletCore = class extends import_eventemitter3.default {
         throw new WalletSignMessageAndVerifyError("Failed to sign a message").message;
       let verified = false;
       if (Array.isArray(response.signature)) {
+        const { fullMessage, signature, bitmap } = response;
+        if (bitmap) {
+          const minKeysRequired = this._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 = this._account.publicKey;
+            const matchedPublicKeys = publicKeys.filter(
+              (_, i) => index.includes(i)
+            );
+            verified = true;
+            for (let i = 0; i < signature.length; i++) {
+              const isSigVerified = import_tweetnacl.default.sign.detached.verify(
+                import_buffer.Buffer.from(fullMessage),
+                import_buffer.Buffer.from(signature[i], "hex"),
+                import_buffer.Buffer.from(matchedPublicKeys[i], "hex")
+              );
+              if (!isSigVerified) {
+                verified = false;
+                break;
+              }
+            }
+          }
+        } else {
+          throw new WalletSignMessageAndVerifyError("Failed to get a bitmap").message;
+        }
       } else {
         const currentAccountPublicKey = new import_aptos.HexString(
           this._account.publicKey
         );
         const signature = new import_aptos.HexString(response.signature);
-        verified = import_tweetnacl.sign.detached.verify(
+        verified = import_tweetnacl.default.sign.detached.verify(
           import_buffer.Buffer.from(response.fullMessage),
           import_buffer.Buffer.from(signature.noPrefix(), "hex"),
           import_buffer.Buffer.from(currentAccountPublicKey.noPrefix(), "hex")

package/dist/index.mjs

@@ -1,7 +1,7 @@
 // src/WalletCore.ts
 import { HexString } from "aptos";
 import EventEmitter from "eventemitter3";
-import { sign } from "tweetnacl";
+import nacl from "tweetnacl";
 import { Buffer } from "buffer";
 
 // src/constants.ts
@@ -166,12 +166,15 @@ var WalletCore = class extends EventEmitter {
   scopePollingDetectionStrategy() {
     var _a;
     (_a = this._wallets) == null ? void 0 : _a.forEach((wallet) => {
-      wallet.readyState = typeof window === "undefined" || typeof document === "undefined" ? "Unsupported" /* Unsupported */ : "NotDetected" /* NotDetected */;
+      if (!wallet.readyState) {
+        wallet.readyState = typeof window === "undefined" || typeof document === "undefined" ? "Unsupported" /* Unsupported */ : "NotDetected" /* NotDetected */;
+      }
       if (typeof window !== "undefined") {
         scopePollingDetectionStrategy(() => {
-          if (Object.keys(window).includes(wallet.name.toLowerCase())) {
+          const providerName = wallet.providerName || wallet.name.toLowerCase();
+          if (Object.keys(window).includes(providerName)) {
             wallet.readyState = "Installed" /* Installed */;
-            wallet.provider = window[wallet.name.toLowerCase()];
+            wallet.provider = window[providerName];
             this.emit("readyStateChange", wallet);
             return true;
           }
@@ -242,10 +245,9 @@ var WalletCore = class extends EventEmitter {
       const selectedWallet = (_a = this._wallets) == null ? void 0 : _a.find(
         (wallet) => wallet.name === walletName
       );
-      if (!selectedWallet)
-        return;
-      if (selectedWallet.readyState !== "Installed" /* Installed */)
-        return;
+      if (!selectedWallet || selectedWallet.readyState !== "Installed" /* Installed */ && selectedWallet.readyState !== "Loadable" /* Loadable */) {
+        throw new WalletConnectionError(`${walletName} wallet not found`).message;
+      }
       if (this._connected) {
         await this.disconnect();
       }
@@ -355,12 +357,42 @@ var WalletCore = class extends EventEmitter {
         throw new WalletSignMessageAndVerifyError("Failed to sign a message").message;
       let verified = false;
       if (Array.isArray(response.signature)) {
+        const { fullMessage, signature, bitmap } = response;
+        if (bitmap) {
+          const minKeysRequired = this._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 = this._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(
           this._account.publicKey
         );
         const signature = new HexString(response.signature);
-        verified = sign.detached.verify(
+        verified = nacl.sign.detached.verify(
           Buffer.from(response.fullMessage),
           Buffer.from(signature.noPrefix(), "hex"),
           Buffer.from(currentAccountPublicKey.noPrefix(), "hex")

package/package.json

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

package/src/WalletCore.ts

@@ -1,6 +1,6 @@
 import { HexString, Types } from "aptos";
 import EventEmitter from "eventemitter3";
-import { sign } from "tweetnacl";
+import nacl from "tweetnacl";
 import { Buffer } from "buffer";
 
 import { WalletReadyState } from "./constants";
@@ -53,15 +53,18 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
 
   private scopePollingDetectionStrategy() {
     this._wallets?.forEach((wallet: Wallet) => {
-      wallet.readyState =
-        typeof window === "undefined" || typeof document === "undefined"
-          ? WalletReadyState.Unsupported
-          : WalletReadyState.NotDetected;
+      if (!wallet.readyState) {
+        wallet.readyState =
+          typeof window === "undefined" || typeof document === "undefined"
+            ? WalletReadyState.Unsupported
+            : WalletReadyState.NotDetected;
+      }
       if (typeof window !== "undefined") {
         scopePollingDetectionStrategy(() => {
-          if (Object.keys(window).includes(wallet.name.toLowerCase())) {
+          const providerName = wallet.providerName || wallet.name.toLowerCase();
+          if (Object.keys(window).includes(providerName)) {
             wallet.readyState = WalletReadyState.Installed;
-            wallet.provider = window[wallet.name.toLowerCase() as any];
+            wallet.provider = window[providerName as any];
             this.emit("readyStateChange", wallet);
             return true;
           }
@@ -171,8 +174,16 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
       const selectedWallet = this._wallets?.find(
         (wallet: Wallet) => wallet.name === walletName
       );
-      if (!selectedWallet) return;
-      if (selectedWallet.readyState !== WalletReadyState.Installed) return;
+
+      if (
+        !selectedWallet ||
+        (selectedWallet.readyState !== WalletReadyState.Installed &&
+          selectedWallet.readyState !== WalletReadyState.Loadable)
+      ) {
+        throw new WalletConnectionError(`${walletName} wallet not found`)
+          .message;
+      }
+
       if (this._connected) {
         await this.disconnect();
       }
@@ -329,7 +340,42 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
       let verified = false;
       if (Array.isArray(response.signature)) {
         // multi sig wallets
-        // TODO - implement multi sig wallets
+        const { fullMessage, signature, bitmap } = response;
+        if (bitmap) {
+          const minKeysRequired = this._account.minKeysRequired as number;
+          if (signature.length < minKeysRequired) {
+            verified = false;
+          } else {
+            // Getting an array which marks the keys signing the message with 1, while marking 0 for the keys not being used.
+            const bits = Array.from(bitmap).flatMap((n) =>
+              Array.from({ length: 8 }).map((_, i) => (n >> i) & 1)
+            );
+            // Filter out indexes of the keys we need
+            const index = bits.map((_, i) => i).filter((i) => bits[i]);
+
+            const publicKeys = this._account.publicKey as string[];
+            const matchedPublicKeys = publicKeys.filter(
+              (_: string, i: number) => 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")
+              ); // `isSigVerified` should be `true` for every signature
+
+              if (!isSigVerified) {
+                verified = false;
+                break;
+              }
+            }
+          }
+        } else {
+          throw new WalletSignMessageAndVerifyError("Failed to get a bitmap")
+            .message;
+        }
       } else {
         // single sig wallets
         // support for when address doesnt have hex prefix (0x)
@@ -338,7 +384,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
         );
         // support for when address doesnt have hex prefix (0x)
         const signature = new HexString(response.signature);
-        verified = sign.detached.verify(
+        verified = nacl.sign.detached.verify(
           Buffer.from(response.fullMessage),
           Buffer.from(signature.noPrefix(), "hex"),
           Buffer.from(currentAccountPublicKey.noPrefix(), "hex")

package/src/types.ts

@@ -50,6 +50,7 @@ export interface AdapterPluginProps<Name extends string = string> {
   name: WalletName<Name>;
   url: string;
   icon: `data:image/${"svg+xml" | "webp" | "png" | "gif"};base64,${string}`;
+  providerName?: string
   provider: any;
   connect(): Promise<any>;
   disconnect: () => Promise<any>;