@manahippo/aptos-wallet-adapter 1.0.6 → 1.0.7

package/dist/WalletAdapters/MsafeWallet.js

@@ -1,227 +1,230 @@
-// import { HexString, MaybeHexString, Types } from 'aptos';
-// import {
-//   WalletAccountChangeError,
-//   WalletDisconnectionError,
-//   WalletGetNetworkError,
-//   WalletNetworkChangeError,
-//   WalletNotConnectedError,
-//   WalletNotReadyError,
-//   WalletSignAndSubmitMessageError,
-//   WalletSignMessageError,
-//   WalletSignTransactionError
-// } from '../WalletProviders/errors';
-// import {
-//   AccountKeys,
-//   BaseWalletAdapter,
-//   NetworkInfo,
-//   SignMessagePayload,
-//   SignMessageResponse,
-//   WalletAdapterNetwork,
-//   WalletName,
-//   WalletReadyState
-// } from './BaseAdapter';
-// import { Account, MsafeWallet } from 'msafe-iframe';
-// export const MsafeWalletName = 'Msafe' as WalletName<'Msafe'>;
-// interface MsafeAccount {
-//   address: MaybeHexString;
-//   publicKey: MaybeHexString;
-//   authKey: MaybeHexString;
-//   isConnected: boolean;
-// }
-// export class MsafeWalletAdapter extends BaseWalletAdapter {
-//   name = MsafeWalletName;
-//   url = 'https://app.m-safe.io';
-//   icon = 'https://raw.githubusercontent.com/hippospace/aptos-wallet-adapter/main/logos/msafe.png';
-//   protected _provider: MsafeWallet | undefined;
-//   protected _network: WalletAdapterNetwork;
-//   protected _chainId: string;
-//   protected _api: string;
-//   protected _readyState: WalletReadyState =
-//     typeof window === 'undefined' || typeof document === 'undefined'
-//       ? WalletReadyState.Unsupported
-//       : WalletReadyState.NotDetected;
-//   protected _connecting: boolean;
-//   protected _wallet: MsafeAccount | null;
-//   constructor(origin?: string) {
-//     super();
-//     this._network = undefined;
-//     this._connecting = false;
-//     MsafeWallet.new(origin)
-//       .then((msafe) => {
-//         this._provider = msafe;
-//         this._readyState = WalletReadyState.Installed;
-//         this.emit('readyStateChange', this._readyState);
-//       })
-//       .catch((e) => console.log(e));
-//   }
-//   get publicAccount(): AccountKeys {
-//     return {
-//       publicKey: this._wallet?.publicKey || null,
-//       address: this._wallet?.address || null,
-//       authKey: this._wallet?.authKey || null
-//     };
-//   }
-//   get network(): NetworkInfo {
-//     return {
-//       name: this._network,
-//       chainId: this._chainId
-//     };
-//   }
-//   get connecting(): boolean {
-//     return this._connecting;
-//   }
-//   get connected(): boolean {
-//     return !!this._wallet?.isConnected;
-//   }
-//   get readyState(): WalletReadyState {
-//     return this._readyState;
-//   }
-//   async connect(): Promise<void> {
-//     try {
-//       if (this.connected || this.connecting) return;
-//       if (
-//         !(
-//           this._readyState === WalletReadyState.Loadable ||
-//           this._readyState === WalletReadyState.Installed
-//         )
-//       )
-//         throw new WalletNotReadyError();
-//       this._connecting = true;
-//       const provider = this._provider;
-//       const isConnected = await provider?.isConnected();
-//       if (isConnected) {
-//         await provider?.disconnect();
-//       }
-//       const response = await provider?.connect();
-//       if (!response) {
-//         throw new WalletNotConnectedError('No connect response');
-//       }
-//       const walletAccount = await provider?.account();
-//       if (walletAccount) {
-//         this._wallet = {
-//           ...walletAccount,
-//           isConnected: true
-//         } as any;
-//         try {
-//           const name = await provider?.network();
-//           const chainId = await provider?.chainId();
-//           this._network = name as WalletAdapterNetwork;
-//           this._chainId = chainId.toString();
-//         } catch (error: any) {
-//           const errMsg = error.message;
-//           this.emit('error', new WalletGetNetworkError(errMsg));
-//           throw error;
-//         }
-//       }
-//       this.emit('connect', this._wallet?.address || '');
-//     } catch (error: any) {
-//       this.emit('error', new Error(error));
-//       throw error;
-//     } finally {
-//       this._connecting = false;
-//     }
-//   }
-//   async disconnect(): Promise<void> {
-//     const wallet = this._wallet;
-//     const provider = this._provider;
-//     if (wallet) {
-//       this._wallet = null;
-//       try {
-//         await provider?.disconnect();
-//       } catch (error: any) {
-//         this.emit('error', new WalletDisconnectionError(error?.message, error));
-//       }
-//     }
-//     this.emit('disconnect');
-//   }
-//   async signTransaction(
-//     transactionPyld: Types.TransactionPayload,
-//     options?: any
-//   ): Promise<Uint8Array> {
-//     try {
-//       const wallet = this._wallet;
-//       const provider = this._provider;
-//       if (!wallet || !provider) throw new WalletNotConnectedError();
-//       const response = await provider.signTransaction(transactionPyld as any, options);
-//       if (!response) {
-//         throw new Error('No response');
-//       }
-//       return response;
-//     } catch (error: any) {
-//       this.emit('error', new WalletSignTransactionError(error));
-//       throw error;
-//     }
-//   }
-//   async signAndSubmitTransaction(
-//     transactionPyld: Types.TransactionPayload,
-//     options?: any
-//   ): Promise<{ hash: Types.HexEncodedBytes }> {
-//     try {
-//       const wallet = this._wallet;
-//       const provider = this._provider;
-//       if (!wallet || !provider) throw new WalletNotConnectedError();
-//       const response = await provider.signAndSubmit(transactionPyld as any, options);
-//       if (!response) {
-//         throw new Error('No response');
-//       }
-//       return { hash: HexString.fromUint8Array(response).hex() };
-//     } catch (error: any) {
-//       this.emit('error', new WalletSignAndSubmitMessageError(error));
-//       throw error;
-//     }
-//   }
-//   async signMessage(msgPayload: SignMessagePayload): Promise<SignMessageResponse> {
-//     try {
-//       const wallet = this._wallet;
-//       const provider = this._provider;
-//       if (!wallet || !provider) throw new WalletNotConnectedError();
-//       const response = await provider.signMessage(msgPayload as any);
-//       if (response) {
-//         return response as any;
-//       } else {
-//         throw new Error('Sign Message failed');
-//       }
-//     } catch (error: any) {
-//       const errMsg = error.message;
-//       this.emit('error', new WalletSignMessageError(errMsg));
-//       throw error;
-//     }
-//   }
-//   async onAccountChange(): Promise<void> {
-//     try {
-//       const wallet = this._wallet;
-//       const provider = this._provider;
-//       if (!wallet || !provider) throw new WalletNotConnectedError();
-//       const handleChangeAccount = async (newAccount: Account) => {
-//         this._wallet = {
-//           ...this._wallet,
-//           ...newAccount
-//         };
-//         this.emit('accountChange', newAccount.address);
-//       };
-//       provider.onChangeAccount(handleChangeAccount);
-//     } catch (error: any) {
-//       const errMsg = error.message;
-//       this.emit('error', new WalletAccountChangeError(errMsg));
-//       throw error;
-//     }
-//   }
-//   async onNetworkChange(): Promise<void> {
-//     try {
-//       const wallet = this._wallet;
-//       const provider = this._provider;
-//       if (!wallet || !provider) throw new WalletNotConnectedError();
-//       const handleNetworkChange = async (newNetwork: WalletAdapterNetwork) => {
-//         this._network = newNetwork;
-//         this._chainId = (await this._provider.chainId()).toString();
-//         this.emit('networkChange', this._network);
-//       };
-//       provider.onChangeNetwork(handleNetworkChange);
-//     } catch (error: any) {
-//       const errMsg = error.message;
-//       this.emit('error', new WalletNetworkChangeError(errMsg));
-//       throw error;
-//     }
-//   }
-// }
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MsafeWalletAdapter = exports.MsafeWalletName = void 0;
+const aptos_1 = require("aptos");
+const errors_1 = require("../WalletProviders/errors");
+const BaseAdapter_1 = require("./BaseAdapter");
+const msafe_wallet_1 = require("msafe-wallet");
+exports.MsafeWalletName = 'Msafe';
+class MsafeWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
+    constructor(origin = 'Mainnet') {
+        super();
+        this.name = exports.MsafeWalletName;
+        this.url = msafe_wallet_1.MsafeWallet.getOrigin();
+        this.icon = 'https://raw.githubusercontent.com/hippospace/aptos-wallet-adapter/main/logos/msafe.png';
+        // MsafeWallet only works in msafe appstore iframe
+        this._readyState = msafe_wallet_1.MsafeWallet.inMsafeWallet()
+            ? BaseAdapter_1.WalletReadyState.NotDetected
+            : BaseAdapter_1.WalletReadyState.Unsupported;
+        this._network = undefined;
+        this._connecting = false;
+        const msafeOrigin = msafe_wallet_1.MsafeWallet.getOrigin(origin);
+        this.url = msafe_wallet_1.MsafeWallet.getAppUrl(origin);
+        if (this._readyState === BaseAdapter_1.WalletReadyState.NotDetected) {
+            msafe_wallet_1.MsafeWallet.new(msafeOrigin)
+                .then((msafe) => {
+                this._provider = msafe;
+                this._readyState = BaseAdapter_1.WalletReadyState.Installed;
+                this.emit('readyStateChange', this._readyState);
+            })
+                .catch((e) => console.log(e));
+        }
+    }
+    get publicAccount() {
+        var _a, _b, _c;
+        return {
+            publicKey: ((_a = this._wallet) === null || _a === void 0 ? void 0 : _a.publicKey) || null,
+            address: ((_b = this._wallet) === null || _b === void 0 ? void 0 : _b.address) || null,
+            authKey: ((_c = this._wallet) === null || _c === void 0 ? void 0 : _c.authKey) || null
+        };
+    }
+    get network() {
+        return {
+            name: this._network,
+            chainId: this._chainId
+        };
+    }
+    get connecting() {
+        return this._connecting;
+    }
+    get connected() {
+        var _a;
+        return !!((_a = this._wallet) === null || _a === void 0 ? void 0 : _a.isConnected);
+    }
+    get readyState() {
+        return this._readyState;
+    }
+    connect() {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (this.connected || this.connecting)
+                    return;
+                if (!(this._readyState === BaseAdapter_1.WalletReadyState.Loadable ||
+                    this._readyState === BaseAdapter_1.WalletReadyState.Installed))
+                    throw new errors_1.WalletNotReadyError();
+                this._connecting = true;
+                const provider = this._provider;
+                const isConnected = yield (provider === null || provider === void 0 ? void 0 : provider.isConnected());
+                if (isConnected) {
+                    yield (provider === null || provider === void 0 ? void 0 : provider.disconnect());
+                }
+                const response = yield (provider === null || provider === void 0 ? void 0 : provider.connect());
+                if (!response) {
+                    throw new errors_1.WalletNotConnectedError('No connect response');
+                }
+                const walletAccount = yield (provider === null || provider === void 0 ? void 0 : provider.account());
+                if (walletAccount) {
+                    this._wallet = Object.assign(Object.assign({}, walletAccount), { isConnected: true });
+                    try {
+                        const name = yield (provider === null || provider === void 0 ? void 0 : provider.network());
+                        const chainId = yield (provider === null || provider === void 0 ? void 0 : provider.chainId());
+                        this._network = name;
+                        this._chainId = chainId.toString();
+                    }
+                    catch (error) {
+                        const errMsg = error.message;
+                        this.emit('error', new errors_1.WalletGetNetworkError(errMsg));
+                        throw error;
+                    }
+                }
+                this.emit('connect', ((_a = this._wallet) === null || _a === void 0 ? void 0 : _a.address) || '');
+            }
+            catch (error) {
+                this.emit('error', new Error(error));
+                throw error;
+            }
+            finally {
+                this._connecting = false;
+            }
+        });
+    }
+    disconnect() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const wallet = this._wallet;
+            const provider = this._provider;
+            if (wallet) {
+                this._wallet = null;
+                try {
+                    yield (provider === null || provider === void 0 ? void 0 : provider.disconnect());
+                }
+                catch (error) {
+                    this.emit('error', new errors_1.WalletDisconnectionError(error === null || error === void 0 ? void 0 : error.message, error));
+                }
+            }
+            this.emit('disconnect');
+        });
+    }
+    signTransaction(transactionPyld, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const wallet = this._wallet;
+                const provider = this._provider;
+                if (!wallet || !provider)
+                    throw new errors_1.WalletNotConnectedError();
+                const response = yield provider.signTransaction(transactionPyld, options);
+                if (!response) {
+                    throw new Error('No response');
+                }
+                return response;
+            }
+            catch (error) {
+                this.emit('error', new errors_1.WalletSignTransactionError(error));
+                throw error;
+            }
+        });
+    }
+    signAndSubmitTransaction(transactionPyld, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const wallet = this._wallet;
+                const provider = this._provider;
+                if (!wallet || !provider)
+                    throw new errors_1.WalletNotConnectedError();
+                const response = yield provider.signAndSubmit(transactionPyld, options);
+                if (!response) {
+                    throw new Error('No response');
+                }
+                return { hash: aptos_1.HexString.fromUint8Array(response).hex() };
+            }
+            catch (error) {
+                this.emit('error', new errors_1.WalletSignAndSubmitMessageError(error));
+                throw error;
+            }
+        });
+    }
+    signMessage(msgPayload) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const wallet = this._wallet;
+                const provider = this._provider;
+                if (!wallet || !provider)
+                    throw new errors_1.WalletNotConnectedError();
+                const response = yield provider.signMessage(msgPayload);
+                if (response) {
+                    return response;
+                }
+                else {
+                    throw new Error('Sign Message failed');
+                }
+            }
+            catch (error) {
+                const errMsg = error.message;
+                this.emit('error', new errors_1.WalletSignMessageError(errMsg));
+                throw error;
+            }
+        });
+    }
+    onAccountChange() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const wallet = this._wallet;
+                const provider = this._provider;
+                if (!wallet || !provider)
+                    throw new errors_1.WalletNotConnectedError();
+                const handleChangeAccount = (newAccount) => __awaiter(this, void 0, void 0, function* () {
+                    this._wallet = Object.assign(Object.assign({}, this._wallet), newAccount);
+                    this.emit('accountChange', newAccount.address);
+                });
+                provider.onChangeAccount(handleChangeAccount);
+            }
+            catch (error) {
+                const errMsg = error.message;
+                this.emit('error', new errors_1.WalletAccountChangeError(errMsg));
+                throw error;
+            }
+        });
+    }
+    onNetworkChange() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const wallet = this._wallet;
+                const provider = this._provider;
+                if (!wallet || !provider)
+                    throw new errors_1.WalletNotConnectedError();
+                const handleNetworkChange = (newNetwork) => __awaiter(this, void 0, void 0, function* () {
+                    this._network = newNetwork;
+                    this._chainId = (yield this._provider.chainId()).toString();
+                    this.emit('networkChange', this._network);
+                });
+                provider.onChangeNetwork(handleNetworkChange);
+            }
+            catch (error) {
+                const errMsg = error.message;
+                this.emit('error', new errors_1.WalletNetworkChangeError(errMsg));
+                throw error;
+            }
+        });
+    }
+}
+exports.MsafeWalletAdapter = MsafeWalletAdapter;
 //# sourceMappingURL=MsafeWallet.js.map

package/dist/WalletAdapters/MsafeWallet.js.map

@@ -1 +1 @@
-{"version":3,"file":"MsafeWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/MsafeWallet.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MsafeWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/MsafeWallet.ts"],"names":[],"mappings":"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"}

package/dist/WalletAdapters/index.d.ts

@@ -18,6 +18,7 @@ export * from './BloctoWallet';
 export * from './Coin98Wallet';
 export * from './SafePalWallet';
 export * from './FoxWallet';
+export * from './MsafeWallet';
 export * from './OpenBlockWallet';
 export * from './CloverWallet';
 export * from './SpacecyWallet';

package/dist/WalletAdapters/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,wBAAwB,CAAC;AACvC,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,cAAc,CAAC;AAC7B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,aAAa,CAAC;AAE5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,wBAAwB,CAAC;AACvC,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,cAAc,CAAC;AAC7B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC"}

package/dist/WalletAdapters/index.js

@@ -34,7 +34,7 @@ __exportStar(require("./BloctoWallet"), exports);
 __exportStar(require("./Coin98Wallet"), exports);
 __exportStar(require("./SafePalWallet"), exports);
 __exportStar(require("./FoxWallet"), exports);
-// export * from './MsafeWallet';
+__exportStar(require("./MsafeWallet"), exports);
 __exportStar(require("./OpenBlockWallet"), exports);
 __exportStar(require("./CloverWallet"), exports);
 __exportStar(require("./SpacecyWallet"), exports);

package/dist/WalletAdapters/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/WalletAdapters/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,gDAA8B;AAC9B,yDAAuC;AACvC,gDAA8B;AAC9B,kDAAgC;AAChC,iDAA+B;AAC/B,iDAA+B;AAC/B,kDAAgC;AAChC,+CAA6B;AAC7B,gDAA8B;AAC9B,mDAAiC;AACjC,iDAA+B;AAC/B,8CAA4B;AAC5B,kDAAgC;AAChC,sDAAoC;AACpC,+CAA6B;AAC7B,iDAA+B;AAC/B,iDAA+B;AAC/B,kDAAgC;AAChC,8CAA4B;AAC5B,iCAAiC;AACjC,oDAAkC;AAClC,iDAA+B;AAC/B,kDAAgC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/WalletAdapters/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,gDAA8B;AAC9B,yDAAuC;AACvC,gDAA8B;AAC9B,kDAAgC;AAChC,iDAA+B;AAC/B,iDAA+B;AAC/B,kDAAgC;AAChC,+CAA6B;AAC7B,gDAA8B;AAC9B,mDAAiC;AACjC,iDAA+B;AAC/B,8CAA4B;AAC5B,kDAAgC;AAChC,sDAAoC;AACpC,+CAA6B;AAC7B,iDAA+B;AAC/B,iDAA+B;AAC/B,kDAAgC;AAChC,8CAA4B;AAC5B,gDAA8B;AAC9B,oDAAkC;AAClC,iDAA+B;AAC/B,kDAAgC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@manahippo/aptos-wallet-adapter",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -33,6 +33,7 @@
     "@keystonehq/aptossnap-adapter": "^0.2.8",
     "@openblockhq/dappsdk": "^5.0.2",
     "eventemitter3": "^4.0.7",
-    "js-sha3": "^0.8.0"
+    "js-sha3": "^0.8.0",
+    "msafe-wallet": "^1.1.9"
   }
 }

package/src/WalletAdapters/HyperPayWallet.ts

@@ -5,6 +5,7 @@ import {
   WalletNetworkChangeError,
   WalletNotConnectedError,
   WalletNotReadyError,
+  WalletGetNetworkError,
   WalletSignAndSubmitMessageError,
   WalletSignMessageError,
   WalletSignTransactionError
@@ -16,6 +17,8 @@ import {
   scopePollingDetectionStrategy,
   WalletAdapterNetwork,
   WalletName,
+  SignMessageResponse,
+  SignMessagePayload,
   WalletReadyState
 } from './BaseAdapter';
 
@@ -36,10 +39,12 @@ interface IHyperPayWallet {
   connect: () => Promise<ConnectHyperPayAccount>;
   account(): Promise<HyperPayAccount>;
   isConnected(): Promise<boolean>;
+  getChainId(): Promise<{ chainId: number }>;
+  network(): Promise<WalletAdapterNetwork>;
   generateTransaction(sender: MaybeHexString, payload: any, options?: any): Promise<any>;
   signAndSubmitTransaction(transaction: Types.TransactionPayload): Promise<Types.HexEncodedBytes>;
   signTransaction(transaction: Types.TransactionPayload): Promise<Uint8Array>;
-  signMessage(message: string): Promise<{ signature: string }>;
+  signMessage(message: SignMessagePayload): Promise<SignMessageResponse>;
   disconnect(): Promise<void>;
 }
 
@@ -166,6 +171,20 @@ export class HyperPayWalletAdapter extends BaseWalletAdapter {
           ...walletAccount,
           isConnected: true
         };
+
+        try {
+          const name = await provider?.network();
+          const { chainId } = await provider?.getChainId();
+          const api = null;
+
+          this._network = name;
+          this._chainId = chainId.toString();
+          this._api = api;
+        } catch (error: any) {
+          const errMsg = error.message;
+          this.emit('error', new WalletGetNetworkError(errMsg));
+          throw error;
+        }
       }
       this.emit('connect', this._wallet?.address || '');
     } catch (error: any) {
@@ -236,14 +255,17 @@ export class HyperPayWalletAdapter extends BaseWalletAdapter {
     }
   }
 
-  async signMessage(message: string): Promise<string> {
+  async signMessage(msgPayload: SignMessagePayload): Promise<SignMessageResponse> {
     try {
       const wallet = this._wallet;
       const provider = this._provider || window.hyperpay;
       if (!wallet || !provider) throw new WalletNotConnectedError();
-      const response = await provider?.signMessage(message);
-      if (response?.signature) {
-        return response?.signature;
+      if (typeof msgPayload !== 'object' || !msgPayload.nonce) {
+        throw new WalletSignMessageError('Invalid signMessage Payload');
+      }
+      const response = await provider?.signMessage(msgPayload);
+      if (response) {
+        return response;
       } else {
         throw new Error('Sign Message failed');
       }