@tezos-x/octez.connect-dapp 5.0.0-beta.7 → 5.0.2

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

@@ -1175,7 +1175,7 @@ class DAppClient extends octez_connect_core_1.Client {
             // reading response.message.version would always miss and collapse to '0',
             // misrouting v4 responses when no peer is persisted yet.
             const walletPeerV3 = yield this.getPeer();
-            const walletPeerVersionV3 = (_a = walletPeerV3 === null || walletPeerV3 === void 0 ? void 0 : walletPeerV3.version) !== null && _a !== void 0 ? _a : response.version;
+            const walletPeerVersionV3 = (_a = (0, octez_connect_core_1.effectivePeerVersion)(walletPeerV3)) !== null && _a !== void 0 ? _a : response.version;
             const partialAccountInfos = yield blockchain.getAccountInfosFromPermissionResponse(response.message, walletPeerVersionV3);
             const blockchainDataScopes = response.message.blockchainData.scopes;
             const accountInfos = partialAccountInfos.map((p) => ({
@@ -1323,10 +1323,11 @@ class DAppClient extends octez_connect_core_1.Client {
             this.sendMetrics('performance-metrics/save', yield this.buildPayload('connect', 'success'));
             logger.log('requestPermissions', '######## MESSAGE #######');
             logger.log('requestPermissions', message);
-            // walletPeer.version is the negotiated pairing version; fall back to the
-            // response envelope version when no peer is persisted yet.
+            // Capability-aware peer version (legacy wallets echo the dApp's version
+            // at pairing — see effectivePeerVersion); fall back to the response
+            // envelope version when no peer is persisted yet.
             const walletPeer = yield this.getPeer();
-            const walletPeerVersion = (_a = walletPeer === null || walletPeer === void 0 ? void 0 : walletPeer.version) !== null && _a !== void 0 ? _a : message.version;
+            const walletPeerVersion = (_a = (0, octez_connect_core_1.effectivePeerVersion)(walletPeer)) !== null && _a !== void 0 ? _a : message.version;
             // Gate the freshly-paired wallet against the dApp's required minimum (a
             // no-op under the default, permissive minimum). Throws
             // VersionUnsupportedBeaconError when the wallet is too old.
@@ -1949,10 +1950,15 @@ class DAppClient extends octez_connect_core_1.Client {
         });
     }
     // Throws VersionUnsupportedBeaconError when a wallet that reported a version
-    // is below requiredMinimumVersion (or reports a malformed one). A peer that
-    // never reported a version (legacy pairing predating versioning) is treated
-    // as unknown and allowed through, so raising the minimum never retroactively
-    // breaks an already-paired session on a pure read.
+    // is below requiredMinimumVersion (or reports a malformed one). Callers pass
+    // the EFFECTIVE version (see effectivePeerVersion): a declared version is
+    // only trusted alongside the v5 `protocolVersion` pairing marker; a
+    // marker-less wallet that declared one counts as '2' (legacy wallets echo
+    // the dApp's version, so the raw peer.version may read deceptively high).
+    // A peer that never reported a version (WalletConnect pairings, legacy
+    // pairings predating versioning) is treated as unknown and allowed through,
+    // so raising the minimum never retroactively breaks an already-paired
+    // session on a pure read.
     assertWalletVersionMeetsMinimum(walletVersion) {
         if (walletVersion === undefined) {
             return;
@@ -2162,13 +2168,16 @@ class DAppClient extends octez_connect_core_1.Client {
             // Enforce the dApp's required minimum before a request leaves the SDK.
             // No-op under the default (permissive) minimum; otherwise rejects an
             // under-minimum wallet with VersionUnsupportedBeaconError.
-            this.assertWalletVersionMeetsMinimum(peer === null || peer === void 0 ? void 0 : peer.version);
-            // The wire dialect is negotiated per peer — min(peer.version,
-            // BEACON_VERSION), floor '2'. A wrapped-capable peer (>= 3) receives the
-            // flat requestInput (the unchanged public shape) mapped onto the wrapped
-            // Tezos payload; a legacy peer receives the flat v2 message it has
-            // always spoken. Integrators never see either dialect.
-            const negotiatedVersion = (0, octez_connect_core_1.negotiateEnvelopeVersion)(peer === null || peer === void 0 ? void 0 : peer.version);
+            this.assertWalletVersionMeetsMinimum((0, octez_connect_core_1.effectivePeerVersion)(peer));
+            // The wire dialect is negotiated per peer — min(effective peer version,
+            // BEACON_VERSION), floor '2'. The effective version is capability-aware:
+            // legacy wallets ECHO the dApp's version in their pairing response, so
+            // peer.version alone would misread a 4.8.x wallet as v4; only peers that
+            // sent the v5 `protocolVersion` marker are trusted. A wrapped-capable
+            // peer receives the flat requestInput (the unchanged public shape)
+            // mapped onto the wrapped Tezos payload; a legacy peer receives the flat
+            // v2 message it has always spoken. Integrators never see either dialect.
+            const negotiatedVersion = (0, octez_connect_core_1.negotiateEnvelopeVersion)((0, octez_connect_core_1.effectivePeerVersion)(peer));
             const requestSenderId = yield (0, octez_connect_core_1.getSenderId)(yield this.beaconId);
             let request;
             if ((0, octez_connect_core_1.usesWrappedMessages)(negotiatedVersion)) {
@@ -2275,14 +2284,21 @@ class DAppClient extends octez_connect_core_1.Client {
             const account = yield this.getActiveAccount();
             const peer = yield this.getPeer(account);
             // Enforce the dApp's required minimum before a request leaves the SDK.
-            this.assertWalletVersionMeetsMinimum(peer === null || peer === void 0 ? void 0 : peer.version);
+            this.assertWalletVersionMeetsMinimum((0, octez_connect_core_1.effectivePeerVersion)(peer));
+            // The envelope carries the version negotiated against the effective
+            // (capability-aware) peer version — see effectivePeerVersion: legacy
+            // wallets echo the dApp's version, so only peers that sent the v5
+            // `protocolVersion` marker are trusted with the v4 dialect. Unlike
+            // makeRequest, this path is wrapper-only (the v3 blockchainData shape
+            // has no flat equivalent), so it floors at '3' instead of '2': a legacy
+            // wallet routes a version-'3' wrapper through its v3 branch, whereas a
+            // '2'-stamped wrapper would be misrouted as flat and silently dropped.
+            const negotiatedVersion = (0, octez_connect_core_1.negotiateEnvelopeVersion)((0, octez_connect_core_1.effectivePeerVersion)(peer));
             const request = {
                 id: messageId,
-                // The envelope carries the version negotiated against the peer:
-                // min(peer.version, BEACON_VERSION), floor '3'. A v3 wallet treats any
-                // version >= 3 as a wrapped message; a v4 wallet reaches its
-                // multi-network branch only when it declared v4 at pairing.
-                version: (0, octez_connect_core_1.negotiateEnvelopeVersion)(peer === null || peer === void 0 ? void 0 : peer.version),
+                version: (0, octez_connect_core_1.usesWrappedMessages)(negotiatedVersion)
+                    ? negotiatedVersion
+                    : String(octez_connect_core_1.MESSAGE_WRAPPED_FROM_VERSION),
                 senderId: yield (0, octez_connect_core_1.getSenderId)(yield this.beaconId),
                 message: requestInput
             };