Merge pull request #159 from paritytech/fix-deploy-paseo-v2-env

fix: wire deploys to paseo next v2

Author: charlesHetterich

.changeset/fix-paseo-v2-deploy-env.md

@@ -0,0 +1,5 @@
+---
+"playground-cli": patch
+---
+
+Pass the selected deploy environment through to `bulletin-deploy`, pin the paseo-next-v2 capable `bulletin-deploy` prerelease, resolve live CDM contracts through the active `cdm.json` target registry, pass the Asset Hub descriptor to playground registry handles, use the paseo-next-v2 IPFS gateway path for playground metadata reads, use `--suri` signers for DotNS in dev-mode deploys, and treat bare mnemonic SURIs as the root account.

cdm.json

@@ -1,24 +1,17 @@
 {
   "targets": {
-    "4963ba95e259237b": {
-      "asset-hub": "wss://paseo-asset-hub-next-rpc.polkadot.io",
-      "bulletin": "https://paseo-bulletin-next-ipfs.polkadot.io",
-      "registry": "0x5c7b23d386ff622c7f7a4e7a95d5c7a67b10a00d"
-    },
     "8e7e0cf0a51d8e5e": {
       "asset-hub": "wss://paseo-asset-hub-next-rpc.polkadot.io",
       "bulletin": "https://paseo-bulletin-next-ipfs.polkadot.io/ipfs",
       "registry": "0x5c7b23d386ff622c7f7a4e7a95d5c7a67b10a00d"
     }
   },
   "dependencies": {
-    "4963ba95e259237b": {},
     "8e7e0cf0a51d8e5e": {
       "@w3s/playground-registry": "latest"
     }
   },
   "contracts": {
-    "4963ba95e259237b": {},
     "8e7e0cf0a51d8e5e": {
       "@w3s/playground-registry": {
         "version": 0,

package.json

@@ -40,7 +40,7 @@
         "@parity/product-sdk-utils": "^0.1.1",
         "@polkadot-api/sdk-ink": "^0.7.0",
         "@sentry/node": "^9.47.1",
-        "bulletin-deploy": "0.7.19",
+        "bulletin-deploy": "0.7.20-rc.4",
         "commander": "^12.0.0",
         "ink": "^5.2.1",
         "polkadot-api": "^2.1.2",

pnpm-lock.yaml

@@ -292,12 +292,13 @@ export function DeployScreen({
             {stage.kind === "validate-domain" && (
                 <ValidateDomainStage
                     domain={stage.domain}
-                    // Only gate on the user's address in phone mode — see
-                    // `ownerSs58Address` docs in availability.ts. In dev mode
-                    // bulletin-deploy signs DotNS with its own DEFAULT_MNEMONIC,
-                    // so the user's H160 does not match the registrar's H160
-                    // and the preflight would mis-report re-deploys as "taken".
-                    ownerSs58Address={mode === "phone" ? userSigner?.address : undefined}
+                    ownerSs58Address={
+                        mode === "phone"
+                            ? userSigner?.address
+                            : userSigner?.source === "dev"
+                              ? userSigner.address
+                              : undefined
+                    }
                     onAvailable={(result) => {
                         setDomain(result.fullDomain);
                         setPlan(result.plan);

src/commands/deploy/DeployScreen.tsx

@@ -308,21 +308,24 @@ async function runHeadless(ctx: {
     //
     // `ownerSs58Address` MUST match whoever will actually sign the DotNS
     // `register()` extrinsic — otherwise the preflight reports "taken" on a
-    // re-deploy. In phone mode bulletin-deploy uses the user's signer, so
-    // passing the user's address is correct. In dev mode bulletin-deploy
-    // falls back to its built-in DEFAULT_MNEMONIC, so the user's H160 does
-    // NOT match the on-chain owner — we omit the address and let
-    // bulletin-deploy's own preflight (run with the right signer during
-    // `deploy()`) do the comparison.
+    // re-deploy. Phone mode signs with the session account; dev-with-SURI signs
+    // with that local account. Pure dev mode still falls back to bulletin-deploy's
+    // built-in DEFAULT_MNEMONIC, so we omit the address there.
     process.stdout.write(`\nChecking availability of ${domain.replace(/\.dot$/, "") + ".dot"}…\n`);
+    const dotnsOwnerSs58Address =
+        mode === "phone"
+            ? ctx.userSigner?.address
+            : ctx.userSigner?.source === "dev"
+              ? ctx.userSigner.address
+              : undefined;
     const availability = await withSpan(
         "cli.deploy.availability",
         "check domain availability",
         { "cli.deploy.domain": domain.replace(/\.dot$/, "") },
         () =>
             checkDomainAvailability(domain, {
                 env: ctx.env,
-                ownerSs58Address: mode === "phone" ? ctx.userSigner?.address : undefined,
+                ownerSs58Address: dotnsOwnerSs58Address,
             }),
     );
     if (availability.status !== "available") {

src/commands/deploy/index.ts

@@ -23,8 +23,6 @@
  * today; others throw from `getChainConfig` until they're populated.
  */
 
-import { REGISTRY_ADDRESS } from "@dotdm/contracts";
-
 export type Env =
     | "preview"
     | "paseo-next"
@@ -36,23 +34,6 @@ export type Env =
 export const ACTIVE_TESTNET_ENV: Env = "paseo-next-v2";
 export const DEFAULT_ENV: Env = ACTIVE_TESTNET_ENV;
 
-/**
- * DotNS contract addresses for an env. Resolved by bulletin-deploy when
- * `skipDotnsCli: true`; included here so other callers (mod, registry
- * lookups) can read the live set without re-parsing bulletin-deploy's bundled
- * environments.json.
- */
-export interface DotnsContracts {
-    REGISTRAR: string;
-    REGISTRAR_CONTROLLER: string;
-    REGISTRY: string;
-    RESOLVER: string;
-    CONTENT_RESOLVER: string;
-    REVERSE_RESOLVER: string;
-    POP_RULES: string;
-    STORE_FACTORY: string;
-}
-
 export interface ChainConfig {
     /** Env identifier — passes straight through to bulletin-deploy's `deploy({ env })`. */
     env: Env;
@@ -83,14 +64,12 @@ export interface ChainConfig {
     autoAccountMapping: boolean;
     /** True when `authorize_account` takes the v2 `{who, transactions, bytes}` signature. */
     bulletinAuthorizeV2: boolean;
-    /** DotNS contract addresses. null when bulletin-deploy/dotns-cli has hardcoded defaults. */
-    dotnsContracts: DotnsContracts | null;
     /** Public faucet URL, or null when allowances replace the funder flow. */
     faucetUrl: string | null;
 }
 
-// Paseo Next v2 — the active env. Source for endpoints + DotNS addresses:
-// bulletin-deploy/assets/environments.json (v2 entry).
+// Paseo Next v2 — the active env. DotNS contracts are owned by
+// bulletin-deploy's environment catalog and keyed by `env`.
 const PASEO_NEXT_V2: ChainConfig = {
     env: "paseo-next-v2",
     network: "testnet",
@@ -99,21 +78,11 @@ const PASEO_NEXT_V2: ChainConfig = {
     bulletinRpc: "wss://paseo-bulletin-next-rpc.polkadot.io",
     bulletinRpcFallbacks: [],
     peopleEndpoints: ["wss://paseo-people-next-system-rpc.polkadot.io"],
-    bulletinGateway: "https://paseo-bulletin-next-ipfs.polkadot.io/",
+    bulletinGateway: "https://paseo-bulletin-next-ipfs.polkadot.io/ipfs/",
     identityBackendUrl: "https://identity-backend-next.parity-testnet.parity.io",
     appViewerOrigin: "https://dot.li",
     autoAccountMapping: true,
     bulletinAuthorizeV2: true,
-    dotnsContracts: {
-        REGISTRAR: "0xE67B22B285912FFfaE23BdfAc8C80c779d99B3e0",
-        REGISTRAR_CONTROLLER: "0x8403e49Ec12F4EA5788f7bc0C0c2F649205774cC",
-        REGISTRY: "0xDeFE1AAE21eC2455bd04b213a51C16d4b426c7ef",
-        RESOLVER: "0xB436A271Beff1DBa6abDf2dbCc7E6d723d505EE6",
-        CONTENT_RESOLVER: "0xBcFa907Ff85dFc62a21b41d48F23D7A73aC42914",
-        REVERSE_RESOLVER: "0x4Ca32Dd0233D8c1B1709e20D9E4edBF2a77D21c3",
-        POP_RULES: "0xd3F059FA65dA566B294b5d755a06054d4bE7ce7C",
-        STORE_FACTORY: "0x4f1885fB6e0b154dCf9C2A8661e578B94aD50775",
-    },
     faucetUrl: null,
 };
 
@@ -179,9 +148,6 @@ export function getNetworkLabel(env: Env = DEFAULT_ENV): string {
     }
 }
 
-/** CDM meta-registry contract address, sourced from `@dotdm/contracts`. */
-export const CDM_REGISTRY_ADDRESS = REGISTRY_ADDRESS;
-
 /** Identifier the terminal adapter reports during SSO. Kept stable so mobile pairings persist across releases. */
 export const DAPP_ID = "dot-cli";
 

src/config.ts

@@ -40,12 +40,12 @@ describe("bulletinGatewayUrl", () => {
 describe("getBulletinGateway", () => {
     it("returns the paseo-next-v2 gateway by default", () => {
         // Defaults to DEFAULT_ENV (paseo-next-v2); no env arg required.
-        expect(getBulletinGateway()).toBe("https://paseo-bulletin-next-ipfs.polkadot.io/");
+        expect(getBulletinGateway()).toBe("https://paseo-bulletin-next-ipfs.polkadot.io/ipfs/");
     });
 
     it("returns the same URL when explicitly asked for paseo-next-v2", () => {
         expect(getBulletinGateway("paseo-next-v2")).toBe(
-            "https://paseo-bulletin-next-ipfs.polkadot.io/",
+            "https://paseo-bulletin-next-ipfs.polkadot.io/ipfs/",
         );
     });
 });

src/utils/bulletinGateway.test.ts

@@ -15,7 +15,7 @@
 
 import { describe, expect, it, beforeEach, vi } from "vitest";
 import type { CdmJson } from "@parity/product-sdk-contracts";
-import { CDM_REGISTRY_ADDRESS } from "../config.js";
+import { REGISTRY_ADDRESS } from "@dotdm/contracts";
 
 const { createContractFromClientMock, getAddressQueryMock } = vi.hoisted(() => ({
     createContractFromClientMock: vi.fn(),
@@ -26,6 +26,10 @@ vi.mock("@parity/product-sdk-contracts", () => ({
     createContractFromClient: (...args: unknown[]) => createContractFromClientMock(...args),
 }));
 
+vi.mock("@parity/product-sdk-descriptors/paseo-asset-hub", () => ({
+    paseo_asset_hub: { genesis: "0xasset" },
+}));
+
 import {
     PLAYGROUND_REGISTRY_CONTRACT,
     resolveLiveContractAddresses,
@@ -35,6 +39,7 @@ import {
 
 const snapshotAddress = "0x1111111111111111111111111111111111111111";
 const liveAddress = "0x2222222222222222222222222222222222222222";
+const targetRegistryAddress = "0x5555555555555555555555555555555555555555";
 
 /**
  * Mock `Weight` for `QueryResult.gasRequired` — required (non-optional) on
@@ -50,6 +55,7 @@ function manifest(): CdmJson {
             target1: {
                 "asset-hub": "wss://asset-hub.example",
                 bulletin: "https://bulletin.example/ipfs",
+                registry: targetRegistryAddress,
             },
         },
         dependencies: {
@@ -73,7 +79,7 @@ function manifest(): CdmJson {
                 },
             },
         },
-    };
+    } as CdmJson;
 }
 
 beforeEach(() => {
@@ -85,22 +91,25 @@ beforeEach(() => {
 });
 
 describe("resolveLiveContractAddresses", () => {
-    it("queries the fixed CDM registry for requested libraries", async () => {
+    it("queries the configured CDM registry for requested libraries", async () => {
         getAddressQueryMock.mockResolvedValue({
             success: true,
             value: { isSome: true, value: liveAddress },
             gasRequired: OK_WEIGHT,
         });
 
         const assetHub = {} as any;
-        const addresses = await resolveLiveContractAddresses(assetHub, [
-            PLAYGROUND_REGISTRY_CONTRACT,
-        ]);
+        const addresses = await resolveLiveContractAddresses(
+            assetHub,
+            [PLAYGROUND_REGISTRY_CONTRACT],
+            { registryAddress: targetRegistryAddress },
+        );
 
         expect(addresses).toEqual({ [PLAYGROUND_REGISTRY_CONTRACT]: liveAddress });
         expect(createContractFromClientMock).toHaveBeenCalledWith(
             assetHub,
-            CDM_REGISTRY_ADDRESS,
+            { genesis: "0xasset" },
+            targetRegistryAddress,
             expect.arrayContaining([
                 expect.objectContaining({ name: "getAddress", type: "function" }),
             ]),
@@ -120,11 +129,13 @@ describe("resolveLiveContractAddresses", () => {
         const origin = "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY";
         await resolveLiveContractAddresses(assetHub, [PLAYGROUND_REGISTRY_CONTRACT], {
             defaultOrigin: origin,
+            registryAddress: targetRegistryAddress,
         });
 
         expect(createContractFromClientMock).toHaveBeenCalledWith(
             assetHub,
-            CDM_REGISTRY_ADDRESS,
+            { genesis: "0xasset" },
+            targetRegistryAddress,
             expect.any(Array),
             expect.objectContaining({ defaultOrigin: origin }),
         );
@@ -138,9 +149,29 @@ describe("resolveLiveContractAddresses", () => {
         });
 
         await expect(
-            resolveLiveContractAddresses({} as any, [PLAYGROUND_REGISTRY_CONTRACT]),
+            resolveLiveContractAddresses({} as any, [PLAYGROUND_REGISTRY_CONTRACT], {
+                registryAddress: targetRegistryAddress,
+            }),
         ).resolves.toEqual({});
     });
+
+    it("falls back to CDM's package registry address when no registry is supplied", async () => {
+        getAddressQueryMock.mockResolvedValue({
+            success: true,
+            value: { isSome: true, value: liveAddress },
+            gasRequired: OK_WEIGHT,
+        });
+
+        await resolveLiveContractAddresses({} as any, [PLAYGROUND_REGISTRY_CONTRACT]);
+
+        expect(createContractFromClientMock).toHaveBeenCalledWith(
+            {},
+            { genesis: "0xasset" },
+            REGISTRY_ADDRESS,
+            expect.any(Array),
+            expect.any(Object),
+        );
+    });
 });
 
 describe("withLiveContractAddresses", () => {
@@ -200,7 +231,8 @@ describe("withLiveContractAddresses", () => {
 
         expect(createContractFromClientMock).toHaveBeenCalledWith(
             assetHub,
-            CDM_REGISTRY_ADDRESS,
+            { genesis: "0xasset" },
+            targetRegistryAddress,
             expect.any(Array),
             expect.objectContaining({ defaultOrigin: origin }),
         );
@@ -224,7 +256,8 @@ describe("withLiveContractAddresses", () => {
 
         expect(createContractFromClientMock).toHaveBeenCalledWith(
             assetHub,
-            CDM_REGISTRY_ADDRESS,
+            { genesis: "0xasset" },
+            targetRegistryAddress,
             expect.any(Array),
             expect.objectContaining({ defaultOrigin: origin }),
         );