Merge branch 'main' into fet-1546

ensdomains · Sep 11, 2024 · 3c94a64 · 3c94a64
2 parents cb1f2f9 + 1c7adff
commit 3c94a64
Show file tree

Hide file tree

Showing 30 changed files with 841 additions and 387 deletions.
diff --git a/.github/workflows/pages-deployment.yaml b/.github/workflows/pages-deployment.yaml
@@ -66,6 +66,8 @@ jobs:
         run: |
           mkdir -p ./out/sitemaps
           pnpm generate:sitemaps
+        env:
+          SITEMAP_GRAPH_KEY: ${{ secrets.SITEMAP_GRAPH_KEY }}
 
       - name: Publish
         uses: cloudflare/pages-action@v1

diff --git a/e2e/specs/stateless/wrapName.spec.ts b/e2e/specs/stateless/wrapName.spec.ts
@@ -48,6 +48,9 @@ test('should not show wrap notification if the name is already wrapped', async (
 
   await page.waitForTimeout(3000)
   await expect(morePage.wrapButton).not.toBeVisible()
+
+  await expect(morePage.pccStatus).toBeVisible()
+  await expect(morePage.nameWrapperStatus).toHaveText('Wrapped')
 })
 
 test('should show wrap button on unwrapped name', async ({ login, makeName, makePageObject }) => {
@@ -255,7 +258,7 @@ test('should calculate needed steps without localstorage', async ({
   await login.connect()
 
   await page.pause()
-  await expect(page.getByTestId('name-details-text-wrapper')).toContainText('unwrapped')
+  await expect(page.getByTestId('namewrapper-status')).toContainText('Unwrapped')
 
   await morePage.wrapButton.click()
   await page.pause()
@@ -291,8 +294,187 @@ test('should calculate needed steps without localstorage', async ({
   await transactionModal.introButton.click()
   await transactionModal.confirm()
   await transactionModal.complete()
-  await expect(page.getByTestId('name-details-text-wrapper')).not.toContainText('unwrapped')
+  await expect(page.getByTestId('namewrapper-status')).not.toContainText('Unwrapped')
 
   await profilePage.goto(subname)
   await expect(profilePage.record('text', 'description')).toHaveText('test')
 })
+
+test('Wrapped, emancipated, 2LD', async ({ login, makeName, makePageObject }) => {
+  const name = await makeName({
+    label: 'wrapped',
+    type: 'wrapped',
+    owner: 'user',
+  })
+
+  const morePage = makePageObject('MorePage')
+  await morePage.goto(name)
+
+  await login.connect()
+
+  await expect(morePage.wrapButton).not.toBeVisible()
+  await expect(morePage.unwrapButton).toBeVisible()
+  await expect(morePage.nameWrapperStatus).toContainText('Wrapped')
+  await expect(morePage.pccStatus).toContainText('Not parent-controllable')
+  await expect(morePage.nameWrapperCheckIcon).toBeVisible()
+  await expect(morePage.npcIcon).toBeVisible()
+})
+
+test('Wrapped, locked, 2LD', async ({ login, makeName, makePageObject }) => {
+  const name = await makeName({
+    label: 'wrapped',
+    type: 'wrapped',
+    owner: 'user',
+    fuses: {
+      named: ['CANNOT_UNWRAP'],
+    },
+  })
+
+  const morePage = makePageObject('MorePage')
+  await morePage.goto(name)
+
+  await login.connect()
+
+  await expect(morePage.wrapButton).not.toBeVisible()
+  await expect(morePage.unwrapButtonDisabled).toBeVisible()
+  await expect(morePage.nameWrapperStatus).toContainText('Wrapped')
+  await expect(morePage.pccStatus).toContainText('Not parent-controllable')
+  await expect(morePage.nameWrapperLockIcon).toBeVisible()
+  await expect(morePage.npcIcon).toBeVisible()
+})
+
+test('Wrapped, not-emancipated (PCC), 3LD', async ({ login, makeName, makePageObject }) => {
+  const name = await makeName({
+    label: 'wrapped',
+    type: 'wrapped',
+    owner: 'user',
+    subnames: [
+      {
+        label: 'test',
+        owner: 'user',
+      },
+    ],
+  })
+
+  const morePage = makePageObject('MorePage')
+  await morePage.goto(`test.${name}`)
+
+  await login.connect()
+
+  await expect(morePage.unwrapButton).toBeVisible()
+  await expect(morePage.nameWrapperStatus).toContainText('Wrapped')
+  await expect(morePage.pccStatus).toContainText('Parent-controllable')
+  await expect(morePage.nameWrapperCheckIcon).toBeVisible()
+  await expect(morePage.nameWrapperLockIcon).not.toBeVisible()
+  await expect(morePage.pccIcon).toBeVisible()
+  await expect(morePage.nameWrapperLockIcon).not.toBeVisible()
+})
+
+test('Wrapped, emancipated(NPC), 3LD', async ({ login, makeName, makePageObject }) => {
+  const name = await makeName({
+    label: 'wrapped',
+    type: 'wrapped',
+    owner: 'user',
+    fuses: {
+      named: ['CANNOT_UNWRAP'],
+    },
+    subnames: [
+      {
+        label: 'test',
+        owner: 'user',
+        fuses: {
+          parent: {
+            named: ['PARENT_CANNOT_CONTROL'],
+          },
+        },
+      },
+    ],
+  })
+
+  const morePage = makePageObject('MorePage')
+  await morePage.goto(`test.${name}`)
+
+  await login.connect()
+
+  await expect(morePage.unwrapButton).toBeVisible()
+  await expect(morePage.nameWrapperStatus).toContainText('Wrapped')
+  await expect(morePage.pccStatus).toContainText('Not parent-controllable')
+  await expect(morePage.nameWrapperCheckIcon).toBeVisible()
+  await expect(morePage.npcIcon).toBeVisible()
+  await expect(morePage.nameWrapperLockIcon).not.toBeVisible()
+})
+
+test('Wrapped, emancipated(NPC), Locked, 3LD', async ({ login, makeName, makePageObject }) => {
+  const name = await makeName({
+    label: 'wrapped',
+    type: 'wrapped',
+    owner: 'user',
+    fuses: {
+      named: ['CANNOT_UNWRAP'],
+    },
+    subnames: [
+      {
+        label: 'test',
+        owner: 'user',
+        fuses: {
+          parent: {
+            named: ['PARENT_CANNOT_CONTROL'],
+          },
+          child: {
+            named: ['CANNOT_UNWRAP'],
+          },
+        },
+      },
+    ],
+  })
+
+  const morePage = makePageObject('MorePage')
+  await morePage.goto(`test.${name}`)
+
+  await login.connect()
+
+  await expect(morePage.nameWrapperStatus).toContainText('Wrapped')
+  await expect(morePage.pccStatus).toContainText('Not parent-controllable')
+  await expect(morePage.nameWrapperLockIcon).toBeVisible()
+  await expect(morePage.npcIcon).toBeVisible()
+  await expect(morePage.unwrapButtonDisabled).toBeVisible()
+})
+
+test('Wrapped, emancipated(NPC), 3LD Manager', async ({ login, makeName, makePageObject }) => {
+  const name = await makeName({
+    label: 'wrapped',
+    type: 'wrapped',
+    owner: 'user2',
+    fuses: {
+      named: ['CANNOT_UNWRAP'],
+    },
+    subnames: [
+      {
+        label: 'test',
+        owner: 'user',
+        fuses: {
+          parent: {
+            named: ['PARENT_CANNOT_CONTROL'],
+          },
+        },
+      },
+    ],
+  })
+
+  const morePage = makePageObject('MorePage')
+  const transactionModal = makePageObject('TransactionModal')
+  await morePage.goto(`test.${name}`)
+
+  await login.connect()
+
+  await expect(morePage.unwrapButton).toBeVisible()
+  await expect(morePage.nameWrapperStatus).toContainText('Wrapped')
+  await expect(morePage.pccStatus).toContainText('Not parent-controllable')
+  await expect(morePage.nameWrapperCheckIcon).toBeVisible()
+  await expect(morePage.npcIcon).toBeVisible()
+  await expect(morePage.nameWrapperLockIcon).not.toBeVisible()
+
+  await morePage.unwrapButton.click()
+  await transactionModal.autoComplete()
+  await expect(morePage.wrapButton).toBeVisible()
+})
diff --git a/functions/_middleware.ts b/functions/_middleware.ts
@@ -69,7 +69,7 @@ const firefoxRewrite: PagesFunction = async ({ request, next }) => {
   // default headers
   response.headers.set(
     'Content-Security-Policy',
-    "worker-src 'self'; script-src 'self' 'sha256-UyYcl+sKCF/ROFZPHBlozJrndwfNiC5KT5ZZfup/pPc=' https://*.googletagmanager.com plausible.io static.cloudflareinsights.com *.ens-app-v3.pages.dev https://app.intercom.io https://widget.intercom.io https://js.intercomcdn.com 'wasm-unsafe-eval'; frame-ancestors 'self' https://app.safe.global;",
+    "worker-src 'self'; script-src 'self' 'sha256-UyYcl+sKCF/ROFZPHBlozJrndwfNiC5KT5ZZfup/pPc=' plausible.io static.cloudflareinsights.com *.ens-app-v3.pages.dev https://app.intercom.io https://widget.intercom.io https://js.intercomcdn.com 'wasm-unsafe-eval'; frame-ancestors 'self' https://app.safe.global;",
   )
   return response
 }

diff --git a/playwright/pageObjects/morePage.ts b/playwright/pageObjects/morePage.ts
@@ -20,6 +20,20 @@ export class MorePage {
 
   readonly unwrapButton: Locator
 
+  readonly pccStatus: Locator
+
+  readonly nameWrapperStatus: Locator
+
+  readonly unwrapButtonDisabled: Locator
+
+  readonly nameWrapperLockIcon: Locator
+
+  readonly nameWrapperCheckIcon: Locator
+
+  readonly npcIcon: Locator
+
+  readonly pccIcon: Locator
+
   constructor(page: Page) {
     this.page = page
     this.getSendNameButton = this.page.getByTestId('send-name-button')
@@ -30,6 +44,13 @@ export class MorePage {
     this.resolver = this.page.getByTestId('name-details-text')
     this.wrapButton = this.page.getByTestId('wrap-name-btn')
     this.unwrapButton = this.page.getByTestId('unwrap-name-btn')
+    this.pccStatus = this.page.getByTestId('pcc-status')
+    this.nameWrapperStatus = this.page.getByTestId('namewrapper-status')
+    this.unwrapButtonDisabled = this.page.getByTestId('cannot-unwrap-disabled-button')
+    this.nameWrapperLockIcon = this.page.getByTestId('namewrapper-lock-icon')
+    this.nameWrapperCheckIcon = this.page.getByTestId('namewrapper-check-icon')
+    this.npcIcon = this.page.getByTestId('npc-icon')
+    this.pccIcon = this.page.getByTestId('pcc-icon')
   }
 
   async goto(name: string) {