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

package/CHANGELOG.md

@@ -0,0 +1,19 @@
+# @aptos-labs/wallet-adapter-core
+
+## 0.2.1
+
+### Patch Changes
+
+- 1c3576e: Throw Sign Transaction is not supported error
+
+## 0.2.0
+
+### Minor Changes
+
+- 576bb57: Add chainId and url propoerties to NetworkInfo type
+- 6e53116: Add support to verify a signed message
+
+### Patch Changes
+
+- 18a0429: Add properties to SignMessageResponse interface
+- 42e29f6: Add multisig support for AccountInfo

package/dist/index.d.ts

@@ -30,11 +30,14 @@ declare type WalletName<T extends string = string> = T & {
     __brand__: "WalletName";
 };
 declare type NetworkInfo = {
-    name: NetworkName | undefined;
+    name: NetworkName;
+    chainId?: string;
+    url?: string;
 };
 declare type AccountInfo = {
     address: string;
-    publicKey: string;
+    publicKey: string | string[];
+    minKeysRequired?: number;
 };
 interface AptosWalletErrorResult {
     code: number;
@@ -96,14 +99,15 @@ interface SignMessagePayload {
     nonce: string;
 }
 interface SignMessageResponse {
-    address: string;
-    application: string;
-    chainId: number;
+    address?: string;
+    application?: string;
+    chainId?: number;
     fullMessage: string;
     message: string;
     nonce: string;
     prefix: "APTOS";
-    signature: string;
+    signature: string | string[];
+    bitmap?: Uint8Array;
 }
 
 declare class WalletCore extends EventEmitter<WalletCoreEvents> {
@@ -115,7 +119,7 @@ declare class WalletCore extends EventEmitter<WalletCoreEvents> {
     private _connected;
     constructor(plugins: Wallet[]);
     private scopePollingDetectionStrategy;
-    private isWalletExists;
+    private doesWalletExist;
     private clearData;
     setWallet(wallet: Wallet | null): void;
     setAccount(account: AccountInfo | null): void;
@@ -191,6 +195,7 @@ declare class WalletCore extends EventEmitter<WalletCoreEvents> {
     @throws WalletNetworkChangeError
     */
     onNetworkChange(): Promise<void>;
+    signMessageAndVerify(message: SignMessagePayload): Promise<boolean>;
 }
 
 export { AccountInfo, AdapterPlugin, AdapterPluginEvents, AdapterPluginProps, AptosWalletErrorResult, NetworkInfo, NetworkName, PluginProvider, SignMessagePayload, SignMessageResponse, Wallet, WalletCore, WalletCoreEvents, WalletInfo, WalletName, WalletReadyState };

package/dist/index.js

@@ -33,7 +33,10 @@ __export(src_exports, {
 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_buffer = require("buffer");
 
 // src/constants.ts
 var WalletReadyState = /* @__PURE__ */ ((WalletReadyState2) => {
@@ -117,6 +120,12 @@ var WalletSignMessageError = class extends WalletError {
     this.name = "WalletSignMessageError";
   }
 };
+var WalletSignMessageAndVerifyError = class extends WalletError {
+  constructor() {
+    super(...arguments);
+    this.name = "WalletSignMessageAndVerifyError";
+  }
+};
 var WalletSignAndSubmitMessageError = class extends WalletError {
   constructor() {
     super(...arguments);
@@ -129,6 +138,12 @@ var WalletSignTransactionError = class extends WalletError {
     this.name = "WalletSignTransactionError";
   }
 };
+var WalletNotSupportedMethod = class extends WalletError {
+  constructor() {
+    super(...arguments);
+    this.name = "WalletNotSupportedMethod";
+  }
+};
 
 // src/utils/scopePollingDetectionStrategy.ts
 function scopePollingDetectionStrategy(detect) {
@@ -199,7 +214,7 @@ var WalletCore = class extends import_eventemitter3.default {
       }
     });
   }
-  isWalletExists() {
+  doesWalletExist() {
     if (!this._connected || this._connecting || !this._wallet)
       throw new WalletNotConnectedError().name;
     if (!(this._wallet.readyState === "Loadable" /* Loadable */ || this._wallet.readyState === "Installed" /* Installed */))
@@ -287,7 +302,7 @@ var WalletCore = class extends import_eventemitter3.default {
   async disconnect() {
     var _a;
     try {
-      this.isWalletExists();
+      this.doesWalletExist();
       await ((_a = this._wallet) == null ? void 0 : _a.disconnect());
       this.clearData();
       this.emit("disconnect");
@@ -298,7 +313,7 @@ var WalletCore = class extends import_eventemitter3.default {
   async signAndSubmitTransaction(transaction) {
     var _a;
     try {
-      this.isWalletExists();
+      this.doesWalletExist();
       const response = await ((_a = this._wallet) == null ? void 0 : _a.signAndSubmitTransaction(
         transaction
       ));
@@ -309,10 +324,14 @@ var WalletCore = class extends import_eventemitter3.default {
     }
   }
   async signTransaction(transaction) {
+    var _a;
+    if (this._wallet && !("signTransaction" in this._wallet)) {
+      throw new WalletNotSupportedMethod(
+        `Sign Transaction is not supported by ${(_a = this.wallet) == null ? void 0 : _a.name}`
+      ).message;
+    }
     try {
-      if (this._wallet && !("signTransaction" in this._wallet))
-        return null;
-      this.isWalletExists();
+      this.doesWalletExist();
       const response = await this._wallet.signTransaction(transaction);
       return response;
     } catch (error) {
@@ -323,7 +342,7 @@ var WalletCore = class extends import_eventemitter3.default {
   async signMessage(message) {
     var _a;
     try {
-      this.isWalletExists();
+      this.doesWalletExist();
       if (!this._wallet)
         return null;
       const response = await ((_a = this._wallet) == null ? void 0 : _a.signMessage(message));
@@ -336,7 +355,7 @@ var WalletCore = class extends import_eventemitter3.default {
   async onAccountChange() {
     var _a;
     try {
-      this.isWalletExists();
+      this.doesWalletExist();
       await ((_a = this._wallet) == null ? void 0 : _a.onAccountChange((data) => {
         this.setAccount({ ...data });
         this.emit("accountChange", this._account);
@@ -349,7 +368,7 @@ var WalletCore = class extends import_eventemitter3.default {
   async onNetworkChange() {
     var _a;
     try {
-      this.isWalletExists();
+      this.doesWalletExist();
       await ((_a = this._wallet) == null ? void 0 : _a.onNetworkChange((data) => {
         this.setNetwork({ ...data });
         this.emit("networkChange", this._network);
@@ -359,6 +378,34 @@ var WalletCore = class extends import_eventemitter3.default {
       throw new WalletNetworkChangeError(errMsg).message;
     }
   }
+  async signMessageAndVerify(message) {
+    var _a;
+    try {
+      this.doesWalletExist();
+      if (!this._account)
+        throw new Error("No account found!");
+      const response = await ((_a = this._wallet) == null ? void 0 : _a.signMessage(message));
+      if (!response)
+        throw new WalletSignMessageAndVerifyError("Failed to sign a message").message;
+      let verified = false;
+      if (Array.isArray(response.signature)) {
+      } else {
+        const currentAccountPublicKey = new import_aptos.HexString(
+          this._account.publicKey
+        );
+        const signature = new import_aptos.HexString(response.signature);
+        verified = import_tweetnacl.sign.detached.verify(
+          import_buffer.Buffer.from(response.fullMessage),
+          import_buffer.Buffer.from(signature.noPrefix(), "hex"),
+          import_buffer.Buffer.from(currentAccountPublicKey.noPrefix(), "hex")
+        );
+      }
+      return verified;
+    } catch (error) {
+      const errMsg = typeof error == "object" && "message" in error ? error.message : error;
+      throw new WalletSignMessageAndVerifyError(errMsg).message;
+    }
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/index.mjs

@@ -1,5 +1,8 @@
 // src/WalletCore.ts
+import { HexString } from "aptos";
 import EventEmitter from "eventemitter3";
+import { sign } from "tweetnacl";
+import { Buffer } from "buffer";
 
 // src/constants.ts
 var WalletReadyState = /* @__PURE__ */ ((WalletReadyState2) => {
@@ -83,6 +86,12 @@ var WalletSignMessageError = class extends WalletError {
     this.name = "WalletSignMessageError";
   }
 };
+var WalletSignMessageAndVerifyError = class extends WalletError {
+  constructor() {
+    super(...arguments);
+    this.name = "WalletSignMessageAndVerifyError";
+  }
+};
 var WalletSignAndSubmitMessageError = class extends WalletError {
   constructor() {
     super(...arguments);
@@ -95,6 +104,12 @@ var WalletSignTransactionError = class extends WalletError {
     this.name = "WalletSignTransactionError";
   }
 };
+var WalletNotSupportedMethod = class extends WalletError {
+  constructor() {
+    super(...arguments);
+    this.name = "WalletNotSupportedMethod";
+  }
+};
 
 // src/utils/scopePollingDetectionStrategy.ts
 function scopePollingDetectionStrategy(detect) {
@@ -165,7 +180,7 @@ var WalletCore = class extends EventEmitter {
       }
     });
   }
-  isWalletExists() {
+  doesWalletExist() {
     if (!this._connected || this._connecting || !this._wallet)
       throw new WalletNotConnectedError().name;
     if (!(this._wallet.readyState === "Loadable" /* Loadable */ || this._wallet.readyState === "Installed" /* Installed */))
@@ -253,7 +268,7 @@ var WalletCore = class extends EventEmitter {
   async disconnect() {
     var _a;
     try {
-      this.isWalletExists();
+      this.doesWalletExist();
       await ((_a = this._wallet) == null ? void 0 : _a.disconnect());
       this.clearData();
       this.emit("disconnect");
@@ -264,7 +279,7 @@ var WalletCore = class extends EventEmitter {
   async signAndSubmitTransaction(transaction) {
     var _a;
     try {
-      this.isWalletExists();
+      this.doesWalletExist();
       const response = await ((_a = this._wallet) == null ? void 0 : _a.signAndSubmitTransaction(
         transaction
       ));
@@ -275,10 +290,14 @@ var WalletCore = class extends EventEmitter {
     }
   }
   async signTransaction(transaction) {
+    var _a;
+    if (this._wallet && !("signTransaction" in this._wallet)) {
+      throw new WalletNotSupportedMethod(
+        `Sign Transaction is not supported by ${(_a = this.wallet) == null ? void 0 : _a.name}`
+      ).message;
+    }
     try {
-      if (this._wallet && !("signTransaction" in this._wallet))
-        return null;
-      this.isWalletExists();
+      this.doesWalletExist();
       const response = await this._wallet.signTransaction(transaction);
       return response;
     } catch (error) {
@@ -289,7 +308,7 @@ var WalletCore = class extends EventEmitter {
   async signMessage(message) {
     var _a;
     try {
-      this.isWalletExists();
+      this.doesWalletExist();
       if (!this._wallet)
         return null;
       const response = await ((_a = this._wallet) == null ? void 0 : _a.signMessage(message));
@@ -302,7 +321,7 @@ var WalletCore = class extends EventEmitter {
   async onAccountChange() {
     var _a;
     try {
-      this.isWalletExists();
+      this.doesWalletExist();
       await ((_a = this._wallet) == null ? void 0 : _a.onAccountChange((data) => {
         this.setAccount({ ...data });
         this.emit("accountChange", this._account);
@@ -315,7 +334,7 @@ var WalletCore = class extends EventEmitter {
   async onNetworkChange() {
     var _a;
     try {
-      this.isWalletExists();
+      this.doesWalletExist();
       await ((_a = this._wallet) == null ? void 0 : _a.onNetworkChange((data) => {
         this.setNetwork({ ...data });
         this.emit("networkChange", this._network);
@@ -325,6 +344,34 @@ var WalletCore = class extends EventEmitter {
       throw new WalletNetworkChangeError(errMsg).message;
     }
   }
+  async signMessageAndVerify(message) {
+    var _a;
+    try {
+      this.doesWalletExist();
+      if (!this._account)
+        throw new Error("No account found!");
+      const response = await ((_a = this._wallet) == null ? void 0 : _a.signMessage(message));
+      if (!response)
+        throw new WalletSignMessageAndVerifyError("Failed to sign a message").message;
+      let verified = false;
+      if (Array.isArray(response.signature)) {
+      } else {
+        const currentAccountPublicKey = new HexString(
+          this._account.publicKey
+        );
+        const signature = new HexString(response.signature);
+        verified = sign.detached.verify(
+          Buffer.from(response.fullMessage),
+          Buffer.from(signature.noPrefix(), "hex"),
+          Buffer.from(currentAccountPublicKey.noPrefix(), "hex")
+        );
+      }
+      return verified;
+    } catch (error) {
+      const errMsg = typeof error == "object" && "message" in error ? error.message : error;
+      throw new WalletSignMessageAndVerifyError(errMsg).message;
+    }
+  }
 };
 export {
   NetworkName,

package/jest.config.js

@@ -0,0 +1,5 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+module.exports = {
+  preset: "ts-jest",
+  testEnvironment: "node",
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aptos-labs/wallet-adapter-core",
-  "version": "0.1.7",
+  "version": "0.2.1",
   "description": "Aptos Wallet Adapter Core",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -27,21 +27,27 @@
     "Wallet Adapter",
     "Aptos Wallet"
   ],
-  "scripts": {
-    "build": "tsup src/index.ts --format esm,cjs --dts",
-    "dev": "tsup src/index.ts --format esm,cjs --watch --dts",
-    "lint": "TIMING=1 eslint \"src/**/*.ts*\"",
-    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist"
-  },
   "devDependencies": {
-    "@aptos-labs/wallet-adapter-tsconfig": "workspace:*",
+    "@types/jest": "^29.2.4",
     "eslint": "^8.15.0",
-    "@aptos-labs/eslint-config-adapter": "workspace:*",
+    "jest": "^29.3.1",
+    "ts-jest": "^29.0.3",
     "tsup": "^5.10.1",
-    "typescript": "^4.5.3"
+    "typescript": "^4.5.3",
+    "@aptos-labs/eslint-config-adapter": "0.0.0",
+    "@aptos-labs/wallet-adapter-tsconfig": "0.0.0"
   },
   "dependencies": {
     "aptos": "^1.3.17",
-    "eventemitter3": "^4.0.7"
+    "buffer": "^6.0.3",
+    "eventemitter3": "^4.0.7",
+    "tweetnacl": "^1.0.3"
+  },
+  "scripts": {
+    "build": "tsup src/index.ts --format esm,cjs --dts",
+    "dev": "tsup src/index.ts --format esm,cjs --watch --dts",
+    "test": "jest",
+    "lint": "TIMING=1 eslint \"src/**/*.ts*\"",
+    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist"
   }
-}
+}

package/src/WalletCore.ts

@@ -1,5 +1,7 @@
-import { Types } from "aptos";
+import { HexString, Types } from "aptos";
 import EventEmitter from "eventemitter3";
+import { sign } from "tweetnacl";
+import { Buffer } from "buffer";
 
 import { WalletReadyState } from "./constants";
 import {
@@ -12,7 +14,9 @@ import {
   WalletNotConnectedError,
   WalletNotReadyError,
   WalletNotSelectedError,
+  WalletNotSupportedMethod,
   WalletSignAndSubmitMessageError,
+  WalletSignMessageAndVerifyError,
   WalletSignMessageError,
   WalletSignTransactionError,
 } from "./error";
@@ -67,7 +71,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
     });
   }
 
-  private isWalletExists(): boolean | WalletNotConnectedError {
+  private doesWalletExist(): boolean | WalletNotConnectedError {
     if (!this._connected || this._connecting || !this._wallet)
       throw new WalletNotConnectedError().name;
     if (
@@ -197,7 +201,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
   */
   async disconnect(): Promise<void> {
     try {
-      this.isWalletExists();
+      this.doesWalletExist();
       await this._wallet?.disconnect();
       this.clearData();
       this.emit("disconnect");
@@ -216,7 +220,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
     transaction: Types.TransactionPayload
   ): Promise<any> {
     try {
-      this.isWalletExists();
+      this.doesWalletExist();
       const response = await this._wallet?.signAndSubmitTransaction(
         transaction
       );
@@ -237,9 +241,14 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
   async signTransaction(
     transaction: Types.TransactionPayload
   ): Promise<Uint8Array | null> {
+    if (this._wallet && !("signTransaction" in this._wallet)) {
+      throw new WalletNotSupportedMethod(
+        `Sign Transaction is not supported by ${this.wallet?.name}`
+      ).message;
+    }
+
     try {
-      if (this._wallet && !("signTransaction" in this._wallet)) return null;
-      this.isWalletExists();
+      this.doesWalletExist();
       const response = await (this._wallet as any).signTransaction(transaction);
       return response;
     } catch (error: any) {
@@ -259,7 +268,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
     message: SignMessagePayload
   ): Promise<SignMessageResponse | null> {
     try {
-      this.isWalletExists();
+      this.doesWalletExist();
       if (!this._wallet) return null;
       const response = await this._wallet?.signMessage(message);
       return response;
@@ -277,7 +286,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
   */
   async onAccountChange(): Promise<void> {
     try {
-      this.isWalletExists();
+      this.doesWalletExist();
       await this._wallet?.onAccountChange((data: AccountInfo) => {
         this.setAccount({ ...data });
         this.emit("accountChange", this._account);
@@ -296,7 +305,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
   */
   async onNetworkChange(): Promise<void> {
     try {
-      this.isWalletExists();
+      this.doesWalletExist();
       await this._wallet?.onNetworkChange((data: NetworkInfo) => {
         this.setNetwork({ ...data });
         this.emit("networkChange", this._network);
@@ -307,4 +316,39 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
       throw new WalletNetworkChangeError(errMsg).message;
     }
   }
+
+  async signMessageAndVerify(message: SignMessagePayload): Promise<boolean> {
+    try {
+      this.doesWalletExist();
+      if (!this._account) throw new Error("No account found!");
+      const response = await this._wallet?.signMessage(message);
+      if (!response)
+        throw new WalletSignMessageAndVerifyError("Failed to sign a message")
+          .message;
+      // Verify that the bytes were signed using the private key that matches the known public key
+      let verified = false;
+      if (Array.isArray(response.signature)) {
+        // multi sig wallets
+        // TODO - implement multi sig wallets
+      } else {
+        // single sig wallets
+        // support for when address doesnt have hex prefix (0x)
+        const currentAccountPublicKey = new HexString(
+          this._account.publicKey as string
+        );
+        // support for when address doesnt have hex prefix (0x)
+        const signature = new HexString(response.signature);
+        verified = sign.detached.verify(
+          Buffer.from(response.fullMessage),
+          Buffer.from(signature.noPrefix(), "hex"),
+          Buffer.from(currentAccountPublicKey.noPrefix(), "hex")
+        );
+      }
+      return verified;
+    } catch (error: any) {
+      const errMsg =
+        typeof error == "object" && "message" in error ? error.message : error;
+      throw new WalletSignMessageAndVerifyError(errMsg).message;
+    }
+  }
 }

package/src/__tests__/WalletCore.test.ts

@@ -0,0 +1,106 @@
+import { AptosAccount } from "aptos";
+import {
+  SignMessagePayload,
+  SignMessageResponse,
+  Wallet,
+  WalletName,
+} from "../types";
+import { WalletCore } from "../WalletCore";
+
+const signMessageResponseMock: SignMessageResponse = {
+  fullMessage: "",
+  message: "message",
+  nonce: Date.now().toString(),
+  prefix: "APTOS",
+  signature: "",
+};
+
+const mockSignMessagePayload: SignMessagePayload = {
+  message: "my-message",
+  nonce: Date.now().toString(),
+};
+
+const connectMock = jest.fn(() => Promise.resolve(console.log("connect")));
+const disconnectMock = jest.fn(() =>
+  Promise.resolve(console.log("disconnect"))
+);
+const networkMock = jest.fn(() => Promise.resolve(console.log("network")));
+const signAndSubmitTransactionkMock = jest.fn((transaction, options?) =>
+  Promise.resolve({ hash: "signAndSubmitTransactionkMock" })
+);
+const signMessageMock = jest.fn((message) =>
+  Promise.resolve(signMessageResponseMock)
+);
+
+const onNetworkChangeeMock = jest.fn((callback: any) =>
+  Promise.resolve(console.log("onNetworkChange"))
+);
+const onAccountChangeMock = jest.fn((callback: any) =>
+  Promise.resolve(console.log("onAccountChangeMock"))
+);
+
+const walletMock: Wallet = {
+  name: "wallet-name" as WalletName<"wallet-name">,
+  url: "my-url",
+  icon: `data:image/png;base64,uri`,
+  provider: {},
+  connect: connectMock,
+  disconnect: disconnectMock,
+  network: networkMock,
+  signAndSubmitTransaction: signAndSubmitTransactionkMock,
+  signMessage: signMessageMock,
+  onNetworkChange: onNetworkChangeeMock,
+  onAccountChange: onAccountChangeMock,
+};
+
+const pluginsMock: Wallet[] = [walletMock];
+
+const walletCoreMock = new WalletCore(pluginsMock);
+
+describe("signMessageAndVerify", () => {
+  walletCoreMock.setWallet(walletMock);
+  const account = new AptosAccount();
+  walletCoreMock.setAccount({
+    address: account.address().hex(),
+    publicKey: account.pubKey().hex(),
+  });
+  signMessageResponseMock.fullMessage = `\nmessage: ${signMessageResponseMock.message} \nnonce: ${signMessageResponseMock.nonce}`;
+  jest
+    .spyOn(walletCoreMock as any, "doesWalletExist")
+    .mockImplementation(() => true);
+
+  it("it should verify a signed message", async () => {
+    const encoder = new TextEncoder();
+    const messageBytes = encoder.encode(signMessageResponseMock.fullMessage);
+    const signature = account.signBuffer(messageBytes);
+    const signatureString = signature.noPrefix();
+    signMessageResponseMock.signature = signatureString;
+
+    jest
+      .spyOn((walletCoreMock as any)._wallet, "signMessage")
+      .mockResolvedValue(signMessageResponseMock);
+
+    const verified = await walletCoreMock.signMessageAndVerify(
+      mockSignMessagePayload
+    );
+    expect(verified).toBeTruthy();
+  });
+
+  it("it should fails to verify signed message", async () => {
+    const account2 = new AptosAccount();
+    const encoder = new TextEncoder();
+    const messageBytes = encoder.encode(signMessageResponseMock.fullMessage);
+    const signature = account2.signBuffer(messageBytes);
+    const signatureString = signature.noPrefix();
+    signMessageResponseMock.signature = signatureString;
+
+    jest
+      .spyOn((walletCoreMock as any)._wallet, "signMessage")
+      .mockResolvedValue(signMessageResponseMock);
+
+    const verified = await walletCoreMock.signMessageAndVerify(
+      mockSignMessagePayload
+    );
+    expect(verified).toBeFalsy();
+  });
+});

package/src/error/index.ts

@@ -71,6 +71,10 @@ export class WalletSignMessageError extends WalletError {
   name = "WalletSignMessageError";
 }
 
+export class WalletSignMessageAndVerifyError extends WalletError {
+  name = "WalletSignMessageAndVerifyError";
+}
+
 export class WalletSignAndSubmitMessageError extends WalletError {
   name = "WalletSignAndSubmitMessageError";
 }
@@ -94,3 +98,7 @@ export class WalletWindowClosedError extends WalletError {
 export class WalletResponseError extends WalletError {
   name = "WalletResponseError";
 }
+
+export class WalletNotSupportedMethod extends WalletError {
+  name = "WalletNotSupportedMethod";
+}

package/src/types.ts

@@ -6,12 +6,15 @@ export type WalletName<T extends string = string> = T & {
   __brand__: "WalletName";
 };
 export type NetworkInfo = {
-  name: NetworkName | undefined;
+  name: NetworkName;
+  chainId?: string;
+  url?: string;
 };
 
 export type AccountInfo = {
   address: string;
-  publicKey: string;
+  publicKey: string | string[];
+  minKeysRequired?: number
 };
 
 export interface AptosWalletErrorResult {
@@ -90,12 +93,13 @@ export interface SignMessagePayload {
 }
 
 export interface SignMessageResponse {
-  address: string;
-  application: string;
-  chainId: number;
+  address?: string;
+  application?: string;
+  chainId?: number;
   fullMessage: string; // The message that was generated to sign
   message: string; // The message passed in by the user
   nonce: string;
   prefix: "APTOS"; // Should always be APTOS
-  signature: string; // The signed full message
+  signature: string | string[]; // The signed full message
+  bitmap?: Uint8Array; // a 4-byte (32 bits) bit-vector of length N
 }