@dynamic-labs/global-wallet 3.0.0-alpha.45 → 3.0.0-alpha.47

package/index.js

@@ -33,37 +33,73 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
+const buildCombinedNamespaces = (params) => {
+    var _a, _b;
+    const requiredEip155 = ((_a = params.requiredNamespaces) === null || _a === void 0 ? void 0 : _a.eip155) || {};
+    const optionalEip155 = ((_b = params.optionalNamespaces) === null || _b === void 0 ? void 0 : _b.eip155) || {};
+    const chains = new Set([
+        ...(requiredEip155.chains || []),
+        ...(optionalEip155.chains || []),
+    ]);
+    const events = new Set([
+        ...(requiredEip155.events || []),
+        ...(optionalEip155.events || []),
+    ]);
+    const methods = new Set([
+        ...(requiredEip155.methods || []),
+        ...(optionalEip155.methods || []),
+    ]);
+    return {
+        chains: Array.from(chains),
+        events: Array.from(events),
+        methods: Array.from(methods),
+    };
+};
 const GlobalWalletExtension = {
     extend: (connector) => __awaiter(void 0, void 0, void 0, function* () {
         let web3wallet;
         let WCListenersOn = false;
         const signer = (yield connector.getSigner());
+        let pendingSessionProposal;
         const globalWallet = {
+            confirmPairing: (confirm) => __awaiter(void 0, void 0, void 0, function* () {
+                const { params, id } = pendingSessionProposal;
+                if (!confirm) {
+                    yield web3wallet.rejectSession({
+                        id,
+                        reason: getSdkError('USER_REJECTED'),
+                    });
+                    return;
+                }
+                const { chains, events, methods } = buildCombinedNamespaces(params);
+                const address = yield connector.getAddress();
+                const approvedNamespaces = buildApprovedNamespaces({
+                    proposal: params,
+                    supportedNamespaces: {
+                        eip155: {
+                            accounts: chains.map((chain) => `${chain}:${address}`),
+                            chains,
+                            events,
+                            methods,
+                        },
+                    },
+                });
+                yield web3wallet.approveSession({
+                    id,
+                    namespaces: approvedNamespaces,
+                });
+            }),
             disconnectWCSession: (topic) => __awaiter(void 0, void 0, void 0, function* () {
                 if (web3wallet) {
-                    yield web3wallet.disconnect({
+                    yield web3wallet.disconnectSession({
                         reason: getSdkError('USER_DISCONNECTED'),
                         topic,
                     });
                 }
             }),
-            getConnectedWCSessions: () => __awaiter(void 0, void 0, void 0, function* () {
-                try {
-                    const request = indexedDB.open('WALLET_CONNECT_V2_INDEXED_DB');
-                    return new Promise((resolve) => {
-                        request.onsuccess = (event) => {
-                            const db = event.target.result;
-                            const transaction = db.transaction('keyvaluestorage', 'readonly');
-                            const objectStore = transaction.objectStore('keyvaluestorage');
-                            const getRequest = objectStore.get('wc@2:core:0.3:pairing');
-                            getRequest.onsuccess = () => resolve(getRequest.result);
-                        };
-                    });
-                }
-                catch (e) {
-                    return undefined;
-                }
-            }),
+            // topic => session mapping, with peer metadata in the session
+            getConnectedWCSessions: () => __awaiter(void 0, void 0, void 0, function* () { return web3wallet.getActiveSessions(); }),
+            getPendingPairing: () => pendingSessionProposal,
             initWeb3Wallet: () => __awaiter(void 0, void 0, void 0, function* () {
                 if (!web3wallet) {
                     const core = new Core({
@@ -84,34 +120,16 @@ const GlobalWalletExtension = {
                 if (WCListenersOn)
                     return;
                 const onSessionProposal = (_a) => __awaiter(void 0, [_a], void 0, function* ({ params, id }) {
-                    const { chains, events, methods } = params.optionalNamespaces.eip155;
-                    const address = yield connector.getAddress();
-                    const approvedNamespaces = buildApprovedNamespaces({
-                        proposal: params,
-                        supportedNamespaces: {
-                            eip155: {
-                                accounts: chains.map((chain) => `${chain}:${address}`),
-                                chains,
-                                events,
-                                methods,
-                            },
-                        },
-                    });
-                    try {
-                        yield web3wallet.approveSession({
-                            id,
-                            namespaces: approvedNamespaces,
-                        });
-                    }
-                    catch (error) {
-                        yield web3wallet.rejectSession({
-                            id,
-                            reason: getSdkError('USER_REJECTED'),
-                        });
-                    }
+                    pendingSessionProposal = { id, params };
                 });
                 const sessionMessageListener = (_b) => __awaiter(void 0, [_b], void 0, function* ({ params, id, topic }) {
-                    const { request } = params;
+                    const { request, chainId } = params;
+                    // since we cant listen to chain events from the dapp, just change when a request comes in
+                    if (chainId) {
+                        yield connector.switchNetwork({
+                            networkChainId: chainId.split(':')[1],
+                        });
+                    }
                     const [requestParamsMessage, typedDataToSign] = request.params;
                     const handleRequest = (handler) => __awaiter(void 0, void 0, void 0, function* () {
                         try {
@@ -146,14 +164,31 @@ const GlobalWalletExtension = {
                                     : BigInt(0) }));
                         }));
                     }
-                    yield web3wallet.respondSessionRequest({
-                        response,
-                        topic,
-                    });
+                    if (response) {
+                        yield web3wallet.respondSessionRequest({
+                            response,
+                            topic,
+                        });
+                    }
                 });
                 yield globalWallet.initWeb3Wallet();
                 web3wallet.on('session_proposal', onSessionProposal);
                 web3wallet.on('session_request', sessionMessageListener);
+                connector.on('chainChange', (_c) => __awaiter(void 0, [_c], void 0, function* ({ chain }) {
+                    const connections = yield web3wallet.getActiveSessions();
+                    const connectionTopics = Object.keys(connections !== null && connections !== void 0 ? connections : {});
+                    // tell all connected dapps that the chain has changed
+                    yield Promise.all(connectionTopics.map((topic) => __awaiter(void 0, void 0, void 0, function* () {
+                        yield web3wallet.emitSessionEvent({
+                            chainId: `eip155:${chain}`,
+                            event: {
+                                data: chain,
+                                name: 'chainChanged',
+                            },
+                            topic,
+                        });
+                    })));
+                }));
                 WCListenersOn = true;
             }),
             pairWithWC: (uri) => __awaiter(void 0, void 0, void 0, function* () {
@@ -166,4 +201,4 @@ const GlobalWalletExtension = {
     name: 'global-wallet-extension',
 };
 
-export { GlobalWalletExtension };
+export { GlobalWalletExtension, buildCombinedNamespaces };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/global-wallet",
-  "version": "3.0.0-alpha.45",
+  "version": "3.0.0-alpha.47",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dynamic-labs/dynamic-auth.git",
@@ -32,6 +32,6 @@
   },
   "peerDependencies": {
     "viem": "2.7.6",
-    "@dynamic-labs/wallet-connector-core": "3.0.0-alpha.45"
+    "@dynamic-labs/wallet-connector-core": "3.0.0-alpha.47"
   }
 }

package/src/GlobalWalletConnector.d.ts

@@ -7,10 +7,17 @@ declare module '@dynamic-labs/wallet-connector-core' {
         interface IGlobalWalletExtension {
             initializeListeners: () => Promise<void>;
             pairWithWC: (uri: string) => Promise<void>;
-            getConnectedWCSessions: () => Promise<unknown>;
+            getConnectedWCSessions: () => Promise<Record<string, object> | undefined>;
             disconnectWCSession: (topic: string) => Promise<void>;
             initWeb3Wallet: () => Promise<void>;
+            confirmPairing: (confirm: boolean) => Promise<void>;
+            getPendingPairing: () => object;
         }
     }
 }
+export declare const buildCombinedNamespaces: (params: any) => {
+    chains: any[];
+    events: any[];
+    methods: any[];
+};
 export declare const GlobalWalletExtension: WalletConnectorExtension;