Merge branch 'main' of https://github.com/ensdomains/ens-app-v3 into unused-deps

Author: v1rtl

.github/workflows/pages-deployment.yaml

@@ -3,7 +3,7 @@ name: Cloudflare Pages
 env:
   SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
   NEXT_PUBLIC_INTERCOM_ID: re9q5yti
-  NEXT_PUBLIC_PARA_API_KEY_PROD: ${{ secrets.PARA_API_KEY_PROD }}
+  NEXT_PUBLIC_PARA_API_KEY_PROD: ${{ github.ref == 'refs/heads/main' && secrets.NEXT_PUBLIC_PARA_API_KEY_PROD || '' }}
   NEXT_PUBLIC_DRPC_KEY: AnmpasF2C0JBqeAEzxVO8aTteiMlrW4R75hpDonbV6cR
 
 on: [push]

CODEOWNERS

@@ -1 +1 @@
-* @sugh01
+* @sugh01 @laurgk

e2e/specs/stateful/dnsclaim.spec.ts

@@ -31,8 +31,7 @@ test.describe('Import DNSSEC name', () => {
     await expect(page.getByTestId('import-next-button')).toBeDisabled()
   })
 
-  // TODO: this is failing because stateful tests are still on goerli, we should switch to sepolia/holesky
-  test.skip('should not allow the user to proceed if they have not set the correct TXT record - offchain', async ({
+  test('should not allow the user to proceed if they have not set the correct TXT record - offchain', async ({
     page,
     login,
   }) => {
@@ -43,10 +42,10 @@ test.describe('Import DNSSEC name', () => {
     await page.getByTestId('import-next-button').click()
     await expect(page.getByTestId('import-heading')).toContainText('Verify Ownership')
     await expect(page.getByTestId('status-checker-message')).toContainText('No record found')
-    await expect(page.getByTestId('import-next-button')).toBeDisabled()
+    await expect(page.getByTestId('offchain-claim')).toBeDisabled()
   })
 
-  test('should not allow the use to proceed if they have not set the correct subdomain with the correct info', async ({
+  test('should not allow the user to proceed if they have not set the correct subdomain with the correct info', async ({
     page,
     login,
   }) => {
@@ -60,7 +59,8 @@ test.describe('Import DNSSEC name', () => {
     await expect(page.getByTestId('import-next-button')).toBeDisabled()
   })
 
-  test('should resolve .pw domains', async ({ page, login }) => {
+  test.skip('should resolve .pw domains', async ({ page, login }) => {
+    // pw domain does not resolve on localhost
     await page.goto('/test.pw?chain=holesky')
     await login.connect()
 

e2e/specs/stateless/settings.spec.ts

@@ -125,6 +125,7 @@ test.describe('Select Primary Name', () => {
     login,
     makeName,
     makePageObject,
+    accounts,
   }) => {
     test.slow()
 
@@ -141,6 +142,7 @@ test.describe('Select Primary Name', () => {
     const settingsPage = makePageObject('SettingsPage')
     const selectPrimaryNameModal = makePageObject('SelectPrimaryNameModal')
     await settingsPage.goto()
+    await expect(settingsPage.walletAddress).toHaveText(new RegExp(accounts.getAddress('user')))
     await settingsPage.choosePrimaryNameButton.click()
     await selectPrimaryNameModal.waitForPageLoad()
     const nameWithoutSuffix = name.slice(0, -4)

e2e/specs/stateless/wrapName.spec.ts

@@ -265,13 +265,16 @@ test('should calculate needed steps without localstorage', async ({
 
   await page.waitForTimeout(10000)
 
-  await page.evaluate(() => localStorage.clear())
+  await page.evaluate(() => window.localStorage.clear())
+  await page.evaluate(() => window.sessionStorage.clear())
   await page.reload()
   await login.reconnect()
 
   await morePage.wrapButton.click()
 
-  await expect(page.getByTestId('display-item-Step 1-normal')).toContainText('Migrate profile')
+  await expect(page.getByTestId('display-item-Step 1-normal')).toContainText('Migrate profile', {
+    timeout: 10000,
+  })
   await expect(page.getByTestId('display-item-Step 2-normal')).toContainText('Wrap name')
 
   await transactionModal.introButton.click()
@@ -287,7 +290,10 @@ test('should calculate needed steps without localstorage', async ({
   await transactionModal.introButton.click()
   await transactionModal.confirm()
   await transactionModal.complete()
-  await expect(page.getByTestId('namewrapper-status')).not.toContainText('Unwrapped')
+
+  await expect(page.getByTestId('namewrapper-status')).not.toContainText('Unwrapped', {
+    timeout: 10000,
+  })
 
   await profilePage.goto(subname)
   await expect(profilePage.record('text', 'description')).toHaveText('test')

functions/_middleware.ts

@@ -52,7 +52,7 @@ const staticHandler: PagesFunction = async ({ request, next, env }) => {
   return next()
 }
 
-const firefoxRewrite: PagesFunction = async ({ request, next }) => {
+const cspRewrite: PagesFunction = async ({ request, next }) => {
   const userAgent = request.headers.get('user-agent')?.toLowerCase()
   const response = await next()
 
@@ -64,6 +64,12 @@ const firefoxRewrite: PagesFunction = async ({ request, next }) => {
       .transform(response)
   }
 
+  // safari CSP exception
+  if (userAgent?.includes('safari/') && userAgent.includes('version/')) {
+    response.headers.set('Content-Security-Policy', cspOnlyFrameAncestors)
+    return response
+  }
+
   // default headers
   response.headers.set('Content-Security-Policy', cspWithFrameAncestors)
   return response
@@ -166,4 +172,4 @@ const pathRewriter: PagesFunction = async ({ request, next }) => {
   return next()
 }
 
-export const onRequest = [staticHandler, firefoxRewrite, pathRewriter]
+export const onRequest = [staticHandler, cspRewrite, pathRewriter]

next.config.mjs

@@ -7,7 +7,6 @@ import { execSync } from 'child_process'
 import path, { dirname } from 'path'
 import { fileURLToPath } from 'url'
 
-import { withSentryConfig } from '@sentry/nextjs'
 import StylelintPlugin from 'stylelint-webpack-plugin'
 
 const __dirname = dirname(fileURLToPath(import.meta.url))
@@ -255,12 +254,4 @@ if (process.env.ANALYZE) {
   plugins.push(withBundleAnalyzer({ enabled: true }))
 }
 
-if (process.env.CI && process.env.NODE_ENV === 'production' && !process.env.NEXT_PUBLIC_IPFS) {
-  plugins.push((config) =>
-    withSentryConfig(config, {
-      silent: false,
-    }),
-  )
-}
-
 export default plugins.reduce((acc, next) => next(acc), nextConfig)

next.config.wizardcopy.js

@@ -6,6 +6,8 @@
     "dev:holesky": "NEXT_PUBLIC_CHAIN_NAME=holesky pnpm dev",
     "dev:sepolia": "NEXT_PUBLIC_CHAIN_NAME=sepolia pnpm dev",
     "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: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",
@@ -54,19 +56,18 @@
     "@ensdomains/ens-test-env": "0.6.0",
     "@ensdomains/ensjs": "4.0.3-alpha.12",
     "@ensdomains/thorin": "1.0.0-beta.26",
-    "@getpara/rainbowkit": "1.2.0-dev.6",
-    "@getpara/rainbowkit-wallet": "1.2.0-dev.5",
     "@metamask/post-message-stream": "^6.1.2",
     "@metamask/providers": "^14.0.2",
     "@noble/hashes": "^1.3.2",
-    "@sentry/nextjs": "7.43.x",
     "@splidejs/react-splide": "^0.7.12",
     "@svgr/webpack": "^8.1.0",
     "@tanstack/query-persist-client-core": "5.22.2",
     "@tanstack/query-sync-storage-persister": "5.22.2",
     "@tanstack/react-query": "5.22.2",
     "@tanstack/react-query-devtools": "^5.59.0",
     "@tanstack/react-query-persist-client": "5.22.2",
+    "@getpara/rainbowkit": "1.3.0",
+    "@getpara/rainbowkit-wallet": "1.3.0",
     "@wagmi/core": "2.13.3",
     "calendar-link": "^2.8.0",
     "dequal": "2.0.3",
@@ -81,6 +82,7 @@
     "markdown-to-jsx": "^7.7.3",
     "next": "13.5.8",
     "node-fetch": "^3.3.2",
+    "node-forge": "1.3.1",
     "posthog-js": "^1.217.0",
     "react": "*",
     "react-confetti": "6.1.0",
@@ -175,7 +177,6 @@
   },
   "pnpm": {
     "overrides": {
-      "@getpara/react-sdk": "1.6.1-dev.0",
       "@nomiclabs/hardhat-ethers": "npm:hardhat-deploy-ethers@0.3.0-beta.13",
       "@wagmi/core": "2.13.3",
       "@walletconnect/ethereum-provider": "2.11.1",

package.json

@@ -28,7 +28,7 @@ export class Login {
     /**
      * TEMP FIX
      * A bug in rainbow kit needs time to load the provider. Could be fixed in version 1.0.4
-     * Also throws eror with walletconnect if not enough time has passed.
+     * Also throws error with walletconnect if not enough time has passed.
      */
   }