@tezos-x/octez.connect-dapp 5.0.4 → 5.0.5

package/dist/cjs/transports/DappP2PTransport.js

@@ -46,6 +46,7 @@ class DappP2PTransport extends octez_connect_transport_matrix_1.P2PTransport {
         return __awaiter(this, void 0, void 0, function* () {
             logger.log('stopListeningForNewPeers');
             this.newPeerListener = undefined;
+            this.client.clearPendingPairings();
         });
     }
 }

package/dist/cjs/transports/DappP2PTransport.js.map

@@ -1 +1 @@
-{"version":3,"file":"DappP2PTransport.js","sourceRoot":"","sources":["../../../src/transports/DappP2PTransport.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sEAMqC;AACrC,oEAAoD;AACpD,4FAAsE;AAGtE,MAAM,MAAM,GAAG,IAAI,2BAAM,CAAC,kBAAkB,CAAC,CAAA;AAE7C;;;;GAIG;AACH,MAAa,gBAAiB,SAAQ,6CAGrC;IACC,YACE,IAAY,EACZ,OAAgB,EAChB,OAAgB,EAChB,WAA8B,EAC9B,OAAgB,EAChB,MAAe;QAEf,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,gCAAU,CAAC,wBAAwB,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;IAClG,CAAC;IAEY,wBAAwB;;YACnC,OAAO,IAAI,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAO,IAAI,EAAE,EAAE;gBACxD,MAAM,CAAC,GAAG,CAAC,kBAAkB,EAAE,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;gBAE/D,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;gBAExB,IAAI,CAAC,YAAY,GAAG,qCAAe,CAAC,SAAS,CAAA;gBAE7C,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;oBACzB,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;oBAC1B,IAAI,CAAC,eAAe,GAAG,SAAS,CAAA,CAAC,uCAAuC;gBAC1E,CAAC;YACH,CAAC,CAAA,CAAC,CAAA;QACJ,CAAC;KAAA;IAEY,gBAAgB,CAC3B,eAA2D;;YAE3D,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAA;YAC9B,IAAI,CAAC,eAAe,GAAG,eAAe,CAAA;QACxC,CAAC;KAAA;IAEY,wBAAwB;;YACnC,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAA;YACtC,IAAI,CAAC,eAAe,GAAG,SAAS,CAAA;QAClC,CAAC;KAAA;CACF;AAzCD,4CAyCC","sourcesContent":["import {\n  Storage,\n  StorageKey,\n  TransportStatus,\n  ExtendedP2PPairingResponse,\n  NodeDistributions\n} from '@tezos-x/octez.connect-types'\nimport { Logger } from '@tezos-x/octez.connect-core'\nimport { P2PTransport } from '@tezos-x/octez.connect-transport-matrix'\nimport { KeyPair } from '@tezos-x/octez.connect-utils'\n\nconst logger = new Logger('DappP2PTransport')\n\n/**\n * @internalapi\n *\n *\n */\nexport class DappP2PTransport extends P2PTransport<\n  ExtendedP2PPairingResponse,\n  StorageKey.TRANSPORT_P2P_PEERS_DAPP\n> {\n  constructor(\n    name: string,\n    keyPair: KeyPair,\n    storage: Storage,\n    matrixNodes: NodeDistributions,\n    iconUrl?: string,\n    appUrl?: string\n  ) {\n    super(name, keyPair, storage, matrixNodes, StorageKey.TRANSPORT_P2P_PEERS_DAPP, iconUrl, appUrl)\n  }\n\n  public async startOpenChannelListener(): Promise<void> {\n    return this.client.listenForChannelOpening(async (peer) => {\n      logger.log('listenForNewPeer', `new publicKey`, peer.publicKey)\n\n      await this.addPeer(peer)\n\n      this._isConnected = TransportStatus.CONNECTED\n\n      if (this.newPeerListener) {\n        this.newPeerListener(peer)\n        this.newPeerListener = undefined // TODO: Remove this once we use the id\n      }\n    })\n  }\n\n  public async listenForNewPeer(\n    newPeerListener: (peer: ExtendedP2PPairingResponse) => void\n  ): Promise<void> {\n    logger.log('listenForNewPeer')\n    this.newPeerListener = newPeerListener\n  }\n\n  public async stopListeningForNewPeers(): Promise<void> {\n    logger.log('stopListeningForNewPeers')\n    this.newPeerListener = undefined\n  }\n}\n"]}
+{"version":3,"file":"DappP2PTransport.js","sourceRoot":"","sources":["../../../src/transports/DappP2PTransport.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sEAMqC;AACrC,oEAAoD;AACpD,4FAAsE;AAGtE,MAAM,MAAM,GAAG,IAAI,2BAAM,CAAC,kBAAkB,CAAC,CAAA;AAE7C;;;;GAIG;AACH,MAAa,gBAAiB,SAAQ,6CAGrC;IACC,YACE,IAAY,EACZ,OAAgB,EAChB,OAAgB,EAChB,WAA8B,EAC9B,OAAgB,EAChB,MAAe;QAEf,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,gCAAU,CAAC,wBAAwB,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;IAClG,CAAC;IAEY,wBAAwB;;YACnC,OAAO,IAAI,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAO,IAAI,EAAE,EAAE;gBACxD,MAAM,CAAC,GAAG,CAAC,kBAAkB,EAAE,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;gBAE/D,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;gBAExB,IAAI,CAAC,YAAY,GAAG,qCAAe,CAAC,SAAS,CAAA;gBAE7C,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;oBACzB,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;oBAC1B,IAAI,CAAC,eAAe,GAAG,SAAS,CAAA,CAAC,uCAAuC;gBAC1E,CAAC;YACH,CAAC,CAAA,CAAC,CAAA;QACJ,CAAC;KAAA;IAEY,gBAAgB,CAC3B,eAA2D;;YAE3D,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAA;YAC9B,IAAI,CAAC,eAAe,GAAG,eAAe,CAAA;QACxC,CAAC;KAAA;IAEY,wBAAwB;;YACnC,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAA;YACtC,IAAI,CAAC,eAAe,GAAG,SAAS,CAAA;YAChC,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAA;QACpC,CAAC;KAAA;CACF;AA1CD,4CA0CC","sourcesContent":["import {\n  Storage,\n  StorageKey,\n  TransportStatus,\n  ExtendedP2PPairingResponse,\n  NodeDistributions\n} from '@tezos-x/octez.connect-types'\nimport { Logger } from '@tezos-x/octez.connect-core'\nimport { P2PTransport } from '@tezos-x/octez.connect-transport-matrix'\nimport { KeyPair } from '@tezos-x/octez.connect-utils'\n\nconst logger = new Logger('DappP2PTransport')\n\n/**\n * @internalapi\n *\n *\n */\nexport class DappP2PTransport extends P2PTransport<\n  ExtendedP2PPairingResponse,\n  StorageKey.TRANSPORT_P2P_PEERS_DAPP\n> {\n  constructor(\n    name: string,\n    keyPair: KeyPair,\n    storage: Storage,\n    matrixNodes: NodeDistributions,\n    iconUrl?: string,\n    appUrl?: string\n  ) {\n    super(name, keyPair, storage, matrixNodes, StorageKey.TRANSPORT_P2P_PEERS_DAPP, iconUrl, appUrl)\n  }\n\n  public async startOpenChannelListener(): Promise<void> {\n    return this.client.listenForChannelOpening(async (peer) => {\n      logger.log('listenForNewPeer', `new publicKey`, peer.publicKey)\n\n      await this.addPeer(peer)\n\n      this._isConnected = TransportStatus.CONNECTED\n\n      if (this.newPeerListener) {\n        this.newPeerListener(peer)\n        this.newPeerListener = undefined // TODO: Remove this once we use the id\n      }\n    })\n  }\n\n  public async listenForNewPeer(\n    newPeerListener: (peer: ExtendedP2PPairingResponse) => void\n  ): Promise<void> {\n    logger.log('listenForNewPeer')\n    this.newPeerListener = newPeerListener\n  }\n\n  public async stopListeningForNewPeers(): Promise<void> {\n    logger.log('stopListeningForNewPeers')\n    this.newPeerListener = undefined\n    this.client.clearPendingPairings()\n  }\n}\n"]}

package/dist/cjs/transports/DappPostMessageTransport.js

@@ -46,6 +46,7 @@ class DappPostMessageTransport extends octez_connect_transport_postmessage_1.Pos
         return __awaiter(this, void 0, void 0, function* () {
             logger.log('stopListeningForNewPeers');
             this.newPeerListener = undefined;
+            this.client.clearPendingPairings();
         });
     }
 }

package/dist/cjs/transports/DappPostMessageTransport.js.map

@@ -1 +1 @@
-{"version":3,"file":"DappPostMessageTransport.js","sourceRoot":"","sources":["../../../src/transports/DappPostMessageTransport.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sEAKqC;AACrC,oEAAoD;AACpD,sGAAmF;AAGnF,MAAM,MAAM,GAAG,IAAI,2BAAM,CAAC,0BAA0B,CAAC,CAAA;AAErD;;;;GAIG;AACH,MAAa,wBAAyB,SAAQ,0DAG7C;IACC,YAAY,IAAY,EAAE,OAAgB,EAAE,OAAgB;QAC1D,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,gCAAU,CAAC,gCAAgC,CAAC,CAAA;IAC5E,CAAC;IAEY,wBAAwB;;YACnC,OAAO,IAAI,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAO,IAAwC,EAAE,EAAE;gBAC5F,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,qCAAqC,EAAE,IAAI,CAAC,CAAA;gBAElE,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;gBAExB,IAAI,CAAC,YAAY,GAAG,qCAAe,CAAC,SAAS,CAAA;gBAE7C,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;oBACzB,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;oBAC1B,IAAI,CAAC,eAAe,GAAG,SAAS,CAAA,CAAC,uCAAuC;gBAC1E,CAAC;YACH,CAAC,CAAA,CAAC,CAAA;QACJ,CAAC;KAAA;IAEY,gBAAgB,CAC3B,eAAmE;;YAEnE,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAA;YAC9B,IAAI,CAAC,eAAe,GAAG,eAAe,CAAA;QACxC,CAAC;KAAA;IAEY,wBAAwB;;YACnC,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAA;YACtC,IAAI,CAAC,eAAe,GAAG,SAAS,CAAA;QAClC,CAAC;KAAA;CACF;AAlCD,4DAkCC","sourcesContent":["import {\n  TransportStatus,\n  StorageKey,\n  Storage,\n  ExtendedPostMessagePairingResponse\n} from '@tezos-x/octez.connect-types'\nimport { Logger } from '@tezos-x/octez.connect-core'\nimport { PostMessageTransport } from '@tezos-x/octez.connect-transport-postmessage'\nimport { KeyPair } from '@tezos-x/octez.connect-utils'\n\nconst logger = new Logger('DappPostMessageTransport')\n\n/**\n * @internalapi\n *\n *\n */\nexport class DappPostMessageTransport extends PostMessageTransport<\n  ExtendedPostMessagePairingResponse,\n  StorageKey.TRANSPORT_POSTMESSAGE_PEERS_DAPP\n> {\n  constructor(name: string, keyPair: KeyPair, storage: Storage) {\n    super(name, keyPair, storage, StorageKey.TRANSPORT_POSTMESSAGE_PEERS_DAPP)\n  }\n\n  public async startOpenChannelListener(): Promise<void> {\n    return this.client.listenForChannelOpening(async (peer: ExtendedPostMessagePairingResponse) => {\n      logger.log('connect', `received PostMessagePairingResponse`, peer)\n\n      await this.addPeer(peer)\n\n      this._isConnected = TransportStatus.CONNECTED\n\n      if (this.newPeerListener) {\n        this.newPeerListener(peer)\n        this.newPeerListener = undefined // TODO: Remove this once we use the id\n      }\n    })\n  }\n\n  public async listenForNewPeer(\n    newPeerListener: (peer: ExtendedPostMessagePairingResponse) => void\n  ): Promise<void> {\n    logger.log('listenForNewPeer')\n    this.newPeerListener = newPeerListener\n  }\n\n  public async stopListeningForNewPeers(): Promise<void> {\n    logger.log('stopListeningForNewPeers')\n    this.newPeerListener = undefined\n  }\n}\n"]}
+{"version":3,"file":"DappPostMessageTransport.js","sourceRoot":"","sources":["../../../src/transports/DappPostMessageTransport.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sEAKqC;AACrC,oEAAoD;AACpD,sGAAmF;AAGnF,MAAM,MAAM,GAAG,IAAI,2BAAM,CAAC,0BAA0B,CAAC,CAAA;AAErD;;;;GAIG;AACH,MAAa,wBAAyB,SAAQ,0DAG7C;IACC,YAAY,IAAY,EAAE,OAAgB,EAAE,OAAgB;QAC1D,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,gCAAU,CAAC,gCAAgC,CAAC,CAAA;IAC5E,CAAC;IAEY,wBAAwB;;YACnC,OAAO,IAAI,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAO,IAAwC,EAAE,EAAE;gBAC5F,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,qCAAqC,EAAE,IAAI,CAAC,CAAA;gBAElE,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;gBAExB,IAAI,CAAC,YAAY,GAAG,qCAAe,CAAC,SAAS,CAAA;gBAE7C,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;oBACzB,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;oBAC1B,IAAI,CAAC,eAAe,GAAG,SAAS,CAAA,CAAC,uCAAuC;gBAC1E,CAAC;YACH,CAAC,CAAA,CAAC,CAAA;QACJ,CAAC;KAAA;IAEY,gBAAgB,CAC3B,eAAmE;;YAEnE,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAA;YAC9B,IAAI,CAAC,eAAe,GAAG,eAAe,CAAA;QACxC,CAAC;KAAA;IAEY,wBAAwB;;YACnC,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAA;YACtC,IAAI,CAAC,eAAe,GAAG,SAAS,CAAA;YAChC,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAA;QACpC,CAAC;KAAA;CACF;AAnCD,4DAmCC","sourcesContent":["import {\n  TransportStatus,\n  StorageKey,\n  Storage,\n  ExtendedPostMessagePairingResponse\n} from '@tezos-x/octez.connect-types'\nimport { Logger } from '@tezos-x/octez.connect-core'\nimport { PostMessageTransport } from '@tezos-x/octez.connect-transport-postmessage'\nimport { KeyPair } from '@tezos-x/octez.connect-utils'\n\nconst logger = new Logger('DappPostMessageTransport')\n\n/**\n * @internalapi\n *\n *\n */\nexport class DappPostMessageTransport extends PostMessageTransport<\n  ExtendedPostMessagePairingResponse,\n  StorageKey.TRANSPORT_POSTMESSAGE_PEERS_DAPP\n> {\n  constructor(name: string, keyPair: KeyPair, storage: Storage) {\n    super(name, keyPair, storage, StorageKey.TRANSPORT_POSTMESSAGE_PEERS_DAPP)\n  }\n\n  public async startOpenChannelListener(): Promise<void> {\n    return this.client.listenForChannelOpening(async (peer: ExtendedPostMessagePairingResponse) => {\n      logger.log('connect', `received PostMessagePairingResponse`, peer)\n\n      await this.addPeer(peer)\n\n      this._isConnected = TransportStatus.CONNECTED\n\n      if (this.newPeerListener) {\n        this.newPeerListener(peer)\n        this.newPeerListener = undefined // TODO: Remove this once we use the id\n      }\n    })\n  }\n\n  public async listenForNewPeer(\n    newPeerListener: (peer: ExtendedPostMessagePairingResponse) => void\n  ): Promise<void> {\n    logger.log('listenForNewPeer')\n    this.newPeerListener = newPeerListener\n  }\n\n  public async stopListeningForNewPeers(): Promise<void> {\n    logger.log('stopListeningForNewPeers')\n    this.newPeerListener = undefined\n    this.client.clearPendingPairings()\n  }\n}\n"]}

package/dist/esm/dapp-client/DAppClient.d.ts

@@ -88,6 +88,18 @@ export declare class DAppClient extends Client {
     private prepareRequest;
     private createStateSnapshot;
     private initUserID;
+    /**
+     * Disconnect the postMessage and P2P transports and drop all three instances.
+     *
+     * A dropped transport is not garbage. Its communication client keeps its
+     * `window` handlers (postMessage) or its matrix sync (P2P) until it is told to
+     * stop, so every path that used to just forget the instances left one more
+     * live client behind per connection. Every such path goes through here.
+     *
+     * WalletConnect is left to each call site: its session is shared across tabs
+     * and only the leader may close it, which the callers already handle.
+     */
+    private dropTransports;
     initInternalTransports(): Promise<void>;
     private initEvents;
     private onRelayerError;
@@ -302,5 +314,18 @@ export declare class DAppClient extends Client {
     private addOpenRequest;
     private sendNotificationWithAccessToken;
     private buildAccountInfosFromV4Fanout;
+    /**
+     * Is this message from the wallet behind the active account? Over P2P the
+     * senderId is already bound to the decrypting key (see handleResponse).
+     */
+    private isActiveWallet;
+    /** Is this message from a wallet we are paired with on this connection? */
+    private isPairedWallet;
+    /**
+     * A wallet-initiated disconnect. Strangers are ignored; a saved but inactive
+     * wallet only removes its own records; only the active wallet (or any paired
+     * wallet when no account is active) ends the session.
+     */
+    private onUnsolicitedDisconnect;
     private onNewAccount;
 }

package/dist/esm/dapp-client/DAppClient.js

@@ -182,11 +182,25 @@ export class DAppClient extends Client {
             // normalized back to those same flat shapes — the wire dialect stays
             // invisible to integrators. Non-Tezos wrapped payloads keep the
             // pass-through of the generic permissionRequest/request API.
-            const isWrapped = usesWrappedMessages(wireMessage.version);
+            // The wrapped dialect is identified by its payload, not by the absence of
+            // a flat marker: `wrapBeaconMessage` only ever emits
+            // { id, version, senderId, message }. Routing on the version alone dropped
+            // every flat message stamped with the wrapped dialect's number -- which is
+            // how a wallet built outside this SDK (or on <= 4.8.6, echoing the peer's
+            // version) sends its `disconnect` -- so handleDisconnect never ran and the
+            // dApp kept the account connected until the user disconnected a second
+            // time (#52). Testing for `.message` positively routes that message down
+            // the flat path, and still reads a non-conformant wallet's wrapped
+            // envelope as wrapped even when it carries a redundant top-level `type`.
+            const hasWrappedPayload = Boolean(wireMessage.message);
+            const isWrapped = usesWrappedMessages(wireMessage.version) && hasWrappedPayload;
             // Issue #33: a V3-versioned message can arrive without its wrapped payload.
-            // Drop it safely instead of dereferencing an undefined payload, which would
-            // throw an unhandled rejection inside the transport subscription callback.
-            if (isWrapped && !wireMessage.message) {
+            // With no top-level `type` either it carries nothing to route on, so drop
+            // it instead of dereferencing an undefined payload, which would throw an
+            // unhandled rejection inside the transport subscription callback.
+            if (usesWrappedMessages(wireMessage.version) &&
+                !hasWrappedPayload &&
+                !('type' in wireMessage)) {
                 logger.log('handleResponse', 'Received wrapped message with undefined payload; dropping', wireMessage);
                 return;
             }
@@ -195,6 +209,13 @@ export class DAppClient extends Client {
                 : wireMessage;
             const message = normalized ?? wireMessage;
             const typedMessage = normalized ?? wireMessage.message;
+            if ((connectionInfo.origin === Origin.P2P &&
+                message.senderId !== (await getSenderId(connectionInfo.id))) ||
+                (connectionInfo.origin === Origin.EXTENSION &&
+                    !(await this.isPairedWallet(message.senderId, connectionInfo)))) {
+                logger.warn('handleResponse', 'dropping message: senderId does not match its sender');
+                return;
+            }
             let appMetadata = normalized
                 ? typedMessage.appMetadata
                 : typedMessage.blockchainData?.appMetadata;
@@ -242,7 +263,8 @@ export class DAppClient extends Client {
             logger.log('handleResponse', 'Received message', message, connectionInfo);
             logger.log('### message ###', JSON.stringify(message));
             logger.log('### connectionInfo ###', connectionInfo);
-            const handleDisconnect = async () => {
+            // endSession=false: a saved but inactive wallet removes only its own records.
+            const handleDisconnect = async (endSession = true) => {
                 this.analytics.track('event', 'DAppClient', 'Disconnect received from Wallet');
                 const relevantTransport = connectionInfo.origin === Origin.P2P
                     ? this.p2pTransport
@@ -257,11 +279,12 @@ export class DAppClient extends Client {
                     }
                 }
                 await this.removeAccountsForPeerIds([message.senderId]);
+                if (!endSession) {
+                    return;
+                }
                 await this.events.emit(BeaconEvent.CHANNEL_CLOSED);
                 // Reset transport state so next requestPermissions() shows pairing modal
-                this.postMessageTransport = undefined;
-                this.p2pTransport = undefined;
-                this.walletConnectTransport = undefined;
+                await this.dropTransports();
                 await this.setTransport(undefined);
                 await this.setActivePeer(undefined);
             };
@@ -308,10 +331,15 @@ export class DAppClient extends Client {
             }
             else {
                 if (typedMessage.type === BeaconMessageType.Disconnect) {
-                    await handleDisconnect();
+                    await this.onUnsolicitedDisconnect(message.senderId, connectionInfo, handleDisconnect);
                 }
                 else if (typedMessage.type === BeaconMessageType.ChangeAccountRequest) {
-                    await this.onNewAccount(typedMessage, connectionInfo);
+                    if (await this.isActiveWallet(message.senderId, connectionInfo)) {
+                        await this.onNewAccount(typedMessage, connectionInfo);
+                    }
+                    else {
+                        logger.warn('handleResponse', 'ignoring change account from a non-active wallet');
+                    }
                 }
             }
             if (this._transport.isResolved()) {
@@ -444,6 +472,28 @@ export class DAppClient extends Client {
         this.userId = await generateGUID();
         this.storage.set(StorageKey.USER_ID, this.userId);
     }
+    /**
+     * Disconnect the postMessage and P2P transports and drop all three instances.
+     *
+     * A dropped transport is not garbage. Its communication client keeps its
+     * `window` handlers (postMessage) or its matrix sync (P2P) until it is told to
+     * stop, so every path that used to just forget the instances left one more
+     * live client behind per connection. Every such path goes through here.
+     *
+     * WalletConnect is left to each call site: its session is shared across tabs
+     * and only the leader may close it, which the callers already handle.
+     */
+    async dropTransports() {
+        const dropped = [this.postMessageTransport, this.p2pTransport].filter((transport) => transport !== undefined);
+        this.postMessageTransport = undefined;
+        this.p2pTransport = undefined;
+        this.walletConnectTransport = undefined;
+        // Best effort: a transport that fails to disconnect is still dropped, and
+        // the others are still disconnected.
+        await Promise.all(dropped.map((transport) => transport.disconnect().catch((error) => {
+            logger.warn('dropTransports', error instanceof Error ? error.message : String(error));
+        })));
+    }
     async initInternalTransports() {
         const seed = await this.storage.get(StorageKey.BEACON_SDK_SECRET_SEED);
         if (!seed) {
@@ -542,6 +592,7 @@ export class DAppClient extends Client {
      */
     async destroy() {
         await this.createStateSnapshot();
+        await this.dropTransports();
         await super.destroy();
     }
     async init(transport, substratePairing) {
@@ -669,13 +720,19 @@ export class DAppClient extends Client {
                     });
                     const abortHandler = async () => {
                         logger.log('init', 'ABORTED');
+                        // Popup closed: replies to the QR code / request it showed no longer count.
+                        stopListening();
                         this.sendMetrics('performance-metrics/save', await this.buildPayload('connect', 'abort'));
                         await Promise.all([
-                            postMessageTransport.disconnect(),
-                            // p2pTransport.disconnect(), do not abort connection manually
-                            walletConnectTransport?.disconnect()
+                            walletConnectTransport?.disconnect(),
+                            // Disconnects postMessage and P2P -- `postMessageTransport` above
+                            // is this.postMessageTransport, so dropTransports() already owns
+                            // it -- and forgets all three. It also stops the P2P client
+                            // started for the pairing QR: if its start is still pending,
+                            // P2PCommunicationClient.start() notices the stop once the login
+                            // completes and shuts it down.
+                            this.dropTransports()
                         ]);
-                        this.postMessageTransport = this.walletConnectTransport = this.p2pTransport = undefined;
                         this._activeAccount.isResolved() && this.clearActiveAccount();
                         this.events.emit(BeaconEvent.PAIR_ABORTED).catch((emitError) => console.warn(emitError));
                         if (this._initPromiseReject) {
@@ -751,11 +808,8 @@ export class DAppClient extends Client {
         this.storage.set(StorageKey.ACTIVE_ACCOUNT, undefined);
         emit && this.events.emit(BeaconEvent.INVALID_ACTIVE_ACCOUNT_STATE);
         !emit && this.hideUI(['alert']);
-        await Promise.all([
-            this.postMessageTransport?.disconnect(),
-            this.walletConnectTransport?.disconnect()
-        ]);
-        this.postMessageTransport = this.p2pTransport = this.walletConnectTransport = undefined;
+        const walletConnectTransport = this.walletConnectTransport;
+        await Promise.all([walletConnectTransport?.disconnect(), this.dropTransports()]);
         await this.setActivePeer(undefined);
         await this.setTransport(undefined);
         this._initPromise = undefined;
@@ -787,7 +841,7 @@ export class DAppClient extends Client {
             if (!this.debounceSetActiveAccount && transport instanceof WalletConnectTransport) {
                 this.debounceSetActiveAccount = true;
                 this._initPromise = undefined;
-                this.postMessageTransport = this.p2pTransport = this.walletConnectTransport = undefined;
+                await this.dropTransports();
                 if (this.multiTabChannel.isLeader() || isMobileOS(window)) {
                     await transport.disconnect();
                     this.openRequestsOtherTabs.clear();
@@ -1750,9 +1804,7 @@ export class DAppClient extends Client {
             if (request.type === BeaconMessageType.PermissionRequest &&
                 (await this.getActiveAccount()) === undefined) {
                 this._initPromise = undefined;
-                this.postMessageTransport = undefined;
-                this.p2pTransport = undefined;
-                this.walletConnectTransport = undefined;
+                await this.dropTransports();
                 await this.setTransport();
                 await this.setActivePeer();
             }
@@ -2359,22 +2411,11 @@ export class DAppClient extends Client {
         }
         await this.clearActiveAccount();
         if (!(transport instanceof WalletConnectTransport)) {
-            try {
-                await transport.disconnect();
-            }
-            catch (disconnectError) {
-                const message = disconnectError instanceof Error ? disconnectError.message : String(disconnectError);
-                if (typeof message === 'string' && message.includes('Syncing stopped manually')) {
-                    logger.log('disconnect', 'Matrix sync stopped manually');
-                }
-                else {
-                    throw disconnectError;
-                }
-            }
+            await transport.disconnect();
         }
-        this.postMessageTransport = undefined;
-        this.p2pTransport = undefined;
-        this.walletConnectTransport = undefined;
+        // The active transport is already disconnected above; this stops the
+        // other one (a second disconnect is a no-op) and drops the instances.
+        await this.dropTransports();
         await this.setTransport();
         this._initPromise = undefined;
         this._initPromiseReject = undefined;
@@ -2500,6 +2541,54 @@ export class DAppClient extends Client {
             };
         }));
     }
+    /**
+     * Is this message from the wallet behind the active account? Over P2P the
+     * senderId is already bound to the decrypting key (see handleResponse).
+     */
+    async isActiveWallet(senderId, connectionInfo) {
+        if (connectionInfo.origin === Origin.WALLETCONNECT) {
+            return true;
+        }
+        await this.activeAccountLoaded;
+        const active = await this.getActiveAccount();
+        return Boolean(active &&
+            active.senderId === senderId &&
+            active.origin.type === connectionInfo.origin &&
+            active.origin.id === connectionInfo.id);
+    }
+    /** Is this message from a wallet we are paired with on this connection? */
+    async isPairedWallet(senderId, connectionInfo) {
+        if (connectionInfo.origin === Origin.P2P) {
+            const peers = (await this.storage.get(StorageKey.TRANSPORT_P2P_PEERS_DAPP)) ?? [];
+            return peers.some((peer) => peer.publicKey === connectionInfo.id);
+        }
+        if (connectionInfo.origin === Origin.EXTENSION) {
+            const peers = (await this.storage.get(StorageKey.TRANSPORT_POSTMESSAGE_PEERS_DAPP)) ?? [];
+            for (const peer of peers) {
+                if (peer.extensionId === connectionInfo.id &&
+                    (await getSenderId(peer.publicKey)) === senderId) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        return true; // WalletConnect: unchanged, see isActiveWallet
+    }
+    /**
+     * A wallet-initiated disconnect. Strangers are ignored; a saved but inactive
+     * wallet only removes its own records; only the active wallet (or any paired
+     * wallet when no account is active) ends the session.
+     */
+    async onUnsolicitedDisconnect(senderId, connectionInfo, handleDisconnect) {
+        if (!(await this.isPairedWallet(senderId, connectionInfo))) {
+            logger.warn('handleResponse', 'ignoring disconnect from an unknown wallet');
+            return;
+        }
+        await this.activeAccountLoaded;
+        const active = await this.getActiveAccount();
+        const endSession = !active || (await this.isActiveWallet(senderId, connectionInfo));
+        await handleDisconnect(endSession);
+    }
     async onNewAccount(message, connectionInfo) {
         // TODO: Migration code. Remove sometime after 1.0.0 release.
         const tempPK = message.publicKey || message.pubkey || message.pubKey;
@@ -2508,6 +2597,15 @@ export class DAppClient extends Client {
             throw new Error('PublicKey or Address must be defined');
         }
         const address = message.address ?? (await getAddressFromPublicKey(publicKey));
+        if (connectionInfo.origin !== Origin.WALLETCONNECT &&
+            publicKey &&
+            message.address &&
+            message.walletType !== 'abstracted_account') {
+            const derived = await getAddressFromPublicKey(publicKey).catch(() => undefined);
+            if (derived && derived !== message.address) {
+                throw new Error(`Address "${message.address}" does not match its public key`);
+            }
+        }
         if (!isValidAddress(address)) {
             throw new Error(`Invalid address: "${address}"`);
         }