Merge remote-tracking branch 'upstream/main'

Author: kunstmusik

.github/actions/setup-playwright/action.yml

@@ -0,0 +1,8 @@
+name: "Setup Playwright"
+description: "Setup Playwright with pnpm (should already be installed)"
+runs:
+  using: "composite"
+  steps:
+    - name: Install Playwright
+      shell: bash
+      run: pnpm exec playwright install --with-deps chromium 

.github/actions/setup/action.yml

@@ -0,0 +1,23 @@
+name: 'Setup Environment'
+description: 'Sets up Node.js and pnpm'
+runs:
+  using: composite
+  steps:
+    - name: Install pnpm
+      uses: pnpm/action-setup@v4
+      with:
+        version: 9.3.0
+
+    - name: Install Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: 20
+        cache: 'pnpm'
+
+    - name: Install dependencies
+      shell: bash
+      run: pnpm install --frozen-lockfile
+
+    - name: Install Playwright Browsers and Dependencies
+      shell: bash
+      run: pnpm exec playwright install --with-deps

.github/workflows/pages-deployment.yaml

@@ -18,6 +18,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Update apt-get
+        run: sudo apt-get update
+
       - name: Install Misc. Deps
         run: sudo apt-get install -y libcairo2-dev libjpeg8-dev libpango1.0-dev libgif-dev build-essential g++
 

.github/workflows/test.yaml

@@ -7,53 +7,27 @@ env:
 
 jobs:
   coverage:
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     steps:
       - uses: actions/checkout@v4
-
-      - name: Install corepack
-        run: npm i -g corepack
-
-      - name: Install pnpm
-        run: npm i -g --force corepack && corepack enable pnpm
-
-      - name: Install Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          cache: 'pnpm'
-
-      - run: pnpm install --frozen-lockfile
+      - uses: ./.github/actions/setup
 
       - name: Get contract addresses
         run: 'parallel --lb --halt now,success=1,fail=1 ::: \
-          "pnpm tenv start --no-graph --no-scripts --no-build --exit-after-deploy" \
+          "pnpm tenv start --no-ensnode --no-scripts --no-build --exit-after-deploy --verbosity 1" \
           "pnpm wait-on ./.env.local"'
 
       - run: pnpm test:coverage
 
   build-stateless:
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     steps:
       - uses: actions/checkout@v4
-
-      - name: Install corepack
-        run: npm i -g corepack
-
-      - name: Install pnpm
-        run: npm i -g --force corepack && corepack enable pnpm
-
-      - name: Install Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          cache: 'pnpm'
-
-      - run: pnpm install --frozen-lockfile
+      - uses: ./.github/actions/setup
 
       - name: Get contract addresses
         run: 'parallel --lb --halt now,success=1,fail=1 ::: \
-          "pnpm tenv start --no-graph --no-scripts --no-build --exit-after-deploy" \
+          "pnpm tenv start --no-ensnode --no-scripts --no-build --exit-after-deploy --verbosity 1" \
           "pnpm wait-on ./.env.local"'
 
       - name: Build stateless and export
@@ -69,23 +43,10 @@ jobs:
           path: stateless-build.tar
 
   build-stateful:
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     steps:
       - uses: actions/checkout@v4
-
-      - name: Install corepack
-        run: npm i -g corepack
-
-      - name: Install pnpm
-        run: npm i -g --force corepack && corepack enable pnpm
-
-      - name: Install Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          cache: 'pnpm'
-
-      - run: pnpm install --frozen-lockfile
+      - uses: ./.github/actions/setup
 
       - name: Build stateful and export
         run: pnpm build && pnpm export
@@ -103,7 +64,7 @@ jobs:
     name: stateless (${{matrix.shard}})
     needs: build-stateless
     timeout-minutes: 20
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     strategy:
       matrix:
         shard:
@@ -140,20 +101,8 @@ jobs:
           ]
     steps:
       - uses: actions/checkout@v4
-
-      - name: Install corepack
-        run: npm i -g corepack
-
-      - name: Install pnpm
-        run: npm i -g --force corepack && corepack enable pnpm
-
-      - name: Install Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          cache: 'pnpm'
-
-      - run: pnpm install --frozen-lockfile
+      - uses: ./.github/actions/setup
+      - uses: ./.github/actions/setup-playwright
 
       - run: pnpm rebuild -r
 
@@ -167,9 +116,6 @@ jobs:
       - name: Untar files
         run: tar -xvf stateless-build.tar
 
-      - name: Install playwright
-        run: pnpm playwright install chromium
-
       - name: Run tests
         run: |
           PLAYWRIGHT_SHARD=${{matrix.shard}} PLAYWRIGHT_TOTAL=${{strategy.job-total}} pnpm e2e:ci --no-build
@@ -186,28 +132,14 @@ jobs:
     name: stateful (${{matrix.shard}})
     needs: build-stateful
     timeout-minutes: 10
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     strategy:
       matrix:
         shard: [1, 2, 3]
-
     steps:
       - uses: actions/checkout@v4
-      - run: ./scripts/check-chrome.sh
-
-      - name: Install corepack
-        run: npm i -g corepack
-
-      - name: Install pnpm
-        run: npm i -g --force corepack && corepack enable pnpm
-
-      - name: Install Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          cache: 'pnpm'
-
-      - run: pnpm install --frozen-lockfile
+      - uses: ./.github/actions/setup
+      - uses: ./.github/actions/setup-playwright
 
       - run: pnpm rebuild -r
 
@@ -220,16 +152,12 @@ jobs:
       - name: Untar files
         run: tar -xvf stateful-build.tar
 
-      - name: Install playwright
-        run: pnpm playwright install chromium
-
       - name: Run tests
         run: |
           parallel --lb --halt now,success=1,fail=1 ::: \
           "pnpm wrangle" \
-          "pnpm wait-on http://127.0.0.1:8788 && pnpm playwright test --shard=${{matrix.shard}}/${{strategy.job-total}} --project=stateful"
+          "pnpm wait-on http://127.0.0.1:8788 && npx playwright test --shard=${{matrix.shard}}/${{strategy.job-total}} --project=stateful"
         env:
-          NEXT_PUBLIC_CHAIN_NAME: holesky
           SECRET_WORDS: ${{ secrets.SECRET_WORDS }}
 
       - uses: actions/upload-artifact@v4

archive.tar.gz

@@ -21,7 +21,7 @@ test.describe('Import DNSSEC name', () => {
     page,
     login,
   }) => {
-    await page.goto('/noenssubdomain.com?chain=holesky')
+    await page.goto('/setupu.xyz?chain=holesky')
     await login.connect()
 
     await page.getByTestId('onchain-radio').click()
@@ -35,7 +35,7 @@ test.describe('Import DNSSEC name', () => {
     page,
     login,
   }) => {
-    await page.goto('/noenssubdomain.com?chain=holesky')
+    await page.goto('/setupu.xyz?chain=holesky')
     await login.connect()
 
     await page.getByTestId('offchain-radio').click()
@@ -45,7 +45,7 @@ test.describe('Import DNSSEC name', () => {
     await expect(page.getByTestId('offchain-claim')).toBeDisabled()
   })
 
-  test('should not allow the user to proceed if they have not set the correct subdomain with the correct info', async ({
+  test.skip('should not allow the user to proceed if they have not set the correct subdomain with the correct info', async ({
     page,
     login,
   }) => {

e2e/specs/stateful/dnsclaim.spec.ts

@@ -740,6 +740,9 @@ test('should handle URL-based renew for disconnected users', async ({ page, make
     owner: 'user',
   })
 
+  await page.goto(`/${name}?tab=ownership`)
+  await expect(page.getByText('Extend')).not.toBeVisible()
+
   await page.goto(`/${name}?renew=94608000`)
   await expect(page.getByText('Connect a wallet')).toBeVisible()
 })

e2e/specs/stateless/extendNames.spec.ts

@@ -8,21 +8,22 @@
     "dev:https": "next dev --experimental-https --port 443",
     "dev:https:holesky": "NEXT_PUBLIC_CHAIN_NAME=holesky pnpm dev:https",
     "dev:https:sepolia": "NEXT_PUBLIC_CHAIN_NAME=sepolia pnpm dev:https",
+    "dev:https:mainnet": "NEXT_PUBLIC_CHAIN_NAME=mainnet pnpm dev:https",
     "dev:nlocal": "NEXT_PUBLIC_PROVIDER=http://localhost:8545 NEXT_PUBLIC_AVUP_ENDPOINT=http://localhost:8787 pnpm dev",
     "dev:localname": "NEXT_PUBLIC_PROVIDER=\"http://$(\"hostname\"):8545\" && NEXT_PUBLIC_AVUP_ENDPOINT=\"http://$(\"hostname\"):8787\" && NEXT_PUBLIC_GRAPH_URI=\"http://$(\"hostname\"):8000/subgraphs/name/graphprotocol/ens\" && pnpm dev",
-    "dev:glocal": "SWC_CACHE=false rm -rf .next && NEXT_PUBLIC_GRAPH_URI=http://localhost:8000/subgraphs/name/graphprotocol/ens NEXT_PUBLIC_ETH_NODE=anvil pnpm dev:nlocal",
+    "dev:glocal": "SWC_CACHE=false rm -rf .next && NEXT_PUBLIC_GRAPH_URI=http://localhost:42069/subgraph NEXT_PUBLIC_ETH_NODE=anvil pnpm dev:nlocal",
     "dev:gonline": "NEXT_PUBLIC_GRAPH_URI=https://api.studio.thegraph.com/query/49574/ensholesky/version/latest pnpm dev",
     "build": "next build",
     "build:preview": "NEXT_PUBLIC_ENSJS_DEBUG=true next build --profile",
     "build:local": "ANALYZE=true next build",
-    "build:glocal": "NEXT_PUBLIC_GRAPH_URI=http://localhost:8000/subgraphs/name/graphprotocol/ens NEXT_PUBLIC_PROVIDER=http://localhost:8545 NEXT_PUBLIC_ETH_NODE=anvil pnpm build",
+    "build:glocal": "NEXT_PUBLIC_GRAPH_URI=http://localhost:42069/subgraph NEXT_PUBLIC_PROVIDER=http://localhost:8545 NEXT_PUBLIC_ETH_NODE=anvil pnpm build",
     "build:localname": "NEXT_PUBLIC_PROVIDER=\"http://$(\"hostname\"):8545\" && NEXT_PUBLIC_GRAPH_URI=\"http://$(\"hostname\"):8000/subgraphs/name/graphprotocol/ens\" && pnpm build",
     "start": "next start",
     "buildandstart": "pnpm build && pnpm start",
     "buildandexport": "pnpm build && pnpm export",
     "buildandstart:glocal": "pnpm build:glocal && pnpm start",
     "tenv": "ens-test-env -a",
-    "denv": "pnpm tenv start --no-scripts --no-build --extra-time 12232000 --verbosity 1",
+    "denv": "pnpm tenv start --no-scripts --no-build --extra-time 11368000 --verbosity 1",
     "lint": "next lint && stylelint \"./src/**/*.tsx\"",
     "lint:types": "tsc --noEmit",
     "lint:fix": "next lint --fix",
@@ -36,7 +37,7 @@
     "e2e:install": "npx playwright install chromium",
     "e2e": "npx playwright test --project=stateless",
     "e2e:stateful": "playwright test --project=stateful",
-    "e2e:ci": "E2E=true CI=true STABLE_MODE=true SLOW_MODE=true pnpm tenv start --extra-time 11368000",
+    "e2e:ci": "E2E=true CI=true STABLE_MODE=true SLOW_MODE=true pnpm tenv start --extra-time 11368000 --verbosity 1",
     "postinstall": "husky install",
     "wrangle": "wrangler pages dev ./out --local --log-level none",
     "wrangle:dev": "wrangler pages dev ./next",
@@ -54,9 +55,9 @@
     "@ensdomains/address-encoder": "1.1.1",
     "@ensdomains/content-hash": "^3.0.0-beta.5",
     "@ensdomains/ens-contracts": "1.4.0-beta.2",
-    "@ensdomains/ens-test-env": "0.6.0",
+    "@ensdomains/ens-test-env": "1.0.1",
     "@ensdomains/ensjs": "4.0.3-alpha.12",
-    "@ensdomains/thorin": "1.0.0-beta.26",
+    "@ensdomains/thorin": "1.0.0-beta.28",
     "@getpara/rainbowkit": "1.3.0",
     "@getpara/rainbowkit-wallet": "1.3.0",
     "@metamask/post-message-stream": "^6.1.2",
@@ -287,8 +288,7 @@
       "node-forge@1.3.1": "patches/node-forge@1.3.1.patch",
       "react-confetti@6.1.0": "patches/react-confetti@6.1.0.patch",
       "hardhat-deploy@0.12.4": "patches/hardhat-deploy@0.12.4.patch",
-      "@nomicfoundation/hardhat-viem@2.0.3": "patches/@nomicfoundation%2Fhardhat-viem@2.0.3.patch",
-      "@ensdomains/ens-test-env@0.6.0": "patches/@ensdomains__ens-test-env@0.6.0.patch"
+      "@nomicfoundation/hardhat-viem@2.0.3": "patches/@nomicfoundation%2Fhardhat-viem@2.0.3.patch"
     }
   },
   "packageManager": "pnpm@9.3.0"

package.json

@@ -26,7 +26,7 @@ export const waitForSubgraph = () => async () => {
   const anvilBlockNumbers: number[] = []
   do {
     await new Promise((resolve) => setTimeout(resolve, 500))
-    const client = new GraphQLClient('http://localhost:8000/subgraphs/name/graphprotocol/ens')
+    const client = new GraphQLClient('http://localhost:42069/subgraph')
     const res = await client.request<{_meta: {block: {number: number}}}>(query)
 
     anvilBlockNumbers.push(res._meta.block.number)