fix(wallet): register boarding baseline contract under deprecated signers

Follow-up to d7b936c (which fanned the default/delegate baseline over deprecated
signers): the index-0 boarding baseline was still registered only under the
current signer, so a wallet loaded with boarding funds minted under a now-rotated
signer never restored — hence never watched — that boarding contract at boot
(only the boarding WATCH/history path saw the address).

Fan the boarding baseline over current ∪ deprecated signers (same axis as the
default/delegate matrix), deduped against the offchain matrix's scripts so a
boarding script that coincides with an already-registered default/delegate one
stays first-wins as that type (degenerate boardingExitDelay == a baseline
timelock; sound servers keep them distinct).

Extends the baseline test to require a boarding contract under the deprecated
signer too, using realistic distinct boarding/unilateral exit delays (the shared
mock equates them, which would mask the separate boarding row).

Author: Kukks

packages/ts-sdk/src/wallet/wallet.ts

@@ -1516,22 +1516,38 @@ export class ReadonlyWallet implements IReadonlyWallet {
         // the row exists.
         const boardingCsvTimelock =
             this.boardingTapscript.options.csvTimelock ?? DefaultVtxo.Script.DEFAULT_TIMELOCK;
-        const baselineBoarding = new DefaultVtxo.Script({
-            pubKey: baselinePubkey,
-            serverPubKey: this.boardingTapscript.options.serverPubKey,
-            csvTimelock: boardingCsvTimelock,
-        });
-        await ensureWalletContract(manager, {
-            type: "boarding",
-            params: {
-                pubKey: hex.encode(baselineBoarding.options.pubKey),
-                serverPubKey: hex.encode(baselineBoarding.options.serverPubKey),
-                csvTimelock: timelockToSequence(boardingCsvTimelock).toString(),
-            },
-            script: hex.encode(baselineBoarding.pkScript),
-            address: baselineBoarding.address(this.network.hrp, this.arkServerPublicKey).encode(),
-            state: "active",
-        });
+        // Register the baseline boarding contract under the current signer AND
+        // every deprecated signer — the same signer axis as the default/delegate
+        // matrix above — so a wallet loaded with boarding funds minted under a
+        // now-rotated signer restores (and watches) that boarding contract at
+        // boot, not only via the boarding WATCH/history path. Boarding-exit CSV
+        // is a single server-wide delay, so only the signer axis fans here.
+        // Deduped against the offchain matrix's scripts (shared
+        // `seenBaselineScripts`): a boarding script that coincides with an
+        // already-registered default/delegate one stays first-wins as that type
+        // (degenerate boardingExitDelay == a baseline timelock; sound servers
+        // keep them distinct).
+        for (const serverPubKey of baselineSigners) {
+            const baselineBoarding = new DefaultVtxo.Script({
+                pubKey: baselinePubkey,
+                serverPubKey,
+                csvTimelock: boardingCsvTimelock,
+            });
+            const boardingScriptHex = hex.encode(baselineBoarding.pkScript);
+            if (seenBaselineScripts.has(boardingScriptHex)) continue;
+            seenBaselineScripts.add(boardingScriptHex);
+            await ensureWalletContract(manager, {
+                type: "boarding",
+                params: {
+                    pubKey: hex.encode(baselineBoarding.options.pubKey),
+                    serverPubKey: hex.encode(serverPubKey),
+                    csvTimelock: timelockToSequence(boardingCsvTimelock).toString(),
+                },
+                script: boardingScriptHex,
+                address: baselineBoarding.address(this.network.hrp, serverPubKey).encode(),
+                state: "active",
+            });
+        }
 
         return manager;
     }

packages/ts-sdk/test/serverSignerRotation.test.ts

@@ -286,7 +286,7 @@ describe("Offchain baseline matrix across server-signer rotation", () => {
     const PREV_SERVER = "02c6047f9441ed7d6d3045406e95c07cd85c778e4b8cef3ca7abac09b95c709ee5";
     const PREV_SERVER_XONLY = PREV_SERVER.slice(2);
 
-    it("registers a baseline default contract under a deprecated signer at boot", async () => {
+    it("registers baseline default + boarding contracts under a deprecated signer at boot", async () => {
         // Advertise PREV as deprecated so the wallet caches it at setup, before
         // the contract manager builds its index-0 baseline matrix.
         vi.stubGlobal(
@@ -297,6 +297,11 @@ describe("Offchain baseline matrix across server-signer rotation", () => {
                 if (url.includes("/info"))
                     return reply({
                         ...mockArkInfo,
+                        // Distinct from unilateralExitDelay (mockArkInfo: 144) so the
+                        // boarding baseline is a SEPARATE contract, not a first-wins
+                        // script collision with the default baseline. Production keeps
+                        // these delays distinct; the shared mock happens to equate them.
+                        boardingExitDelay: 288,
                         deprecatedSigners: [{ pubkey: PREV_SERVER, cutoffDate: 9_999_999_999 }],
                     });
                 if (url.includes("subscribe") || url.includes("subscriptions"))
@@ -313,13 +318,16 @@ describe("Offchain baseline matrix across server-signer rotation", () => {
             ).getContractManager();
 
             const contracts = await contractRepository.getContracts({});
-            const underPrev = contracts.filter(
-                (c) => c.type === "default" && c.params.serverPubKey === PREV_SERVER_XONLY,
-            );
-            // The deprecated signer's baseline default contract must be registered
-            // at boot so funds minted under the now-rotated signer are watched
-            // without an explicit restore().
-            expect(underPrev.length).toBeGreaterThan(0);
+            const underPrev = (type: string) =>
+                contracts.filter(
+                    (c) => c.type === type && c.params.serverPubKey === PREV_SERVER_XONLY,
+                );
+            // Both the default and boarding baseline contracts under the deprecated
+            // signer must be registered at boot, so offchain VTXOs AND boarding
+            // UTXOs minted under the now-rotated signer are watched without an
+            // explicit restore().
+            expect(underPrev("default").length).toBeGreaterThan(0);
+            expect(underPrev("boarding").length).toBeGreaterThan(0);
         } finally {
             await wallet.dispose();
         }