Merge pull request ensdomains#603 from ensdomains/viem-test

.env

@@ -15,4 +15,5 @@ NETWORK=mainnet
 ARCHIVE_URL=https://storage.googleapis.com/ens-manager-build-data
 
 TRANSACTION_WAIT_TIME=5000
-STABLE_MODE=500
+STABLE_MODE=500
+BATCH_GATEWAY_URLS='["https://ccip-v2.ens.xyz/"]'

.eslintrc.json

@@ -7,26 +7,31 @@
     "prettier",
     "plugin:prettier/recommended"
   ],
-  "plugins": ["testing-library", "@typescript-eslint", "prettier", "jest"],
+  "plugins": ["testing-library", "@typescript-eslint", "prettier", "vitest"],
   "parser": "@typescript-eslint/parser",
   "overrides": [
     {
       "files": ["src/**/*.test.[jt]sx?"],
-      "env": { "jest/globals": true },
-      "globals": {
-        "context": "readonly"
-      },
-      "plugins": ["jest"],
-      "extends": ["plugin:jest/recommended"],
-      "rules": {
-        "jest/expect-expect": "off"
+      "plugins": ["vitest"],
+      "extends": ["plugin:vitest/recommended"]
+    },
+    {
+      "files": ["functions/**/*"],
+      "parserOptions": {
+        "project": "./functions/tsconfig.json"
       }
     }
   ],
   "parserOptions": {
     "project": "./tsconfig.json"
   },
-  "ignorePatterns": ["next.config.js", "jest.config.js", "deploy/**/*", "src/**/*.test.tsx", "src/**/*.test.ts"],
+  "ignorePatterns": [
+    "next.config.js",
+    "deploy/**/*",
+    "src/**/*.test.tsx",
+    "src/**/*.test.ts",
+    "playwright/**/*.ts"
+  ],
   "rules": {
     "react/react-in-jsx-scope": "off",
     "react/jsx-props-no-spreading": "off",
@@ -51,7 +56,7 @@
       {
         "selector": "*[value=/\\b(0x)?[a-f0-9]{64}\\b/i]",
         "message": "No private keys allowed"
-      } 
+      }
     ],
     "prettier/prettier": "error",
     "import/prefer-default-export": "off",

.github/workflows/pages-deployment.yaml

@@ -32,18 +32,21 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: Install Misc. Deps
+        run: sudo apt-get install -y libcairo2-dev libjpeg8-dev libpango1.0-dev libgif-dev build-essential g++
+
       - name: Check Yalc
         if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' }}
         run: if [ ${{ needs.yalc_check.outputs.can_deploy }} != true ]; then exit 1; else exit 0; fi
 
       - uses: pnpm/[email protected]
         with:
-          version: 7.8.0
+          version: 8.11.0
 
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'pnpm'
 
       - run: pnpm install --frozen-lockfile
@@ -70,6 +73,7 @@ jobs:
           projectName: ens-app-v3
           directory: out
           gitHubToken: ${{ secrets.GITHUB_TOKEN }}
+          wranglerVersion: '3'
 
       - name: Submit sitemap
         if: ${{ github.ref == 'refs/heads/main' }}

.github/workflows/test.yaml

@@ -13,16 +13,21 @@ jobs:
 
       - uses: pnpm/[email protected]
         with:
-          version: 7.8.0
+          version: 8.11.0
 
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'pnpm'
 
       - run: pnpm install --frozen-lockfile
 
+      - name: Get contract addresses
+        run: 'parallel --lb --halt now,success=1,fail=1 ::: \
+          "pnpm tenv start -ng -ns -nb" \
+          "pnpm wait-on ./.env.local"'
+
       - run: pnpm test:coverage
 
   build-stateless:
@@ -32,12 +37,12 @@ jobs:
 
       - uses: pnpm/[email protected]
         with:
-          version: 7.8.0
+          version: 8.11.0
 
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'pnpm'
 
       - run: pnpm install --frozen-lockfile
@@ -66,12 +71,12 @@ jobs:
 
       - uses: pnpm/[email protected]
         with:
-          version: 7.8.0
+          version: 8.11.0
 
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'pnpm'
 
       - run: pnpm install --frozen-lockfile
@@ -95,18 +100,18 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        shard: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+        shard: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28]
     steps:
       - uses: actions/checkout@v3
 
       - uses: pnpm/[email protected]
         with:
-          version: 7.8.0
+          version: 8.11.0
 
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'pnpm'
 
       - run: pnpm install --frozen-lockfile
@@ -127,7 +132,7 @@ jobs:
 
       - name: Run tests
         run: |
-          PLAYWRIGHT_SHARD=${{matrix.shard}} PLAYWRIGHT_TOTAL=${{strategy.job-total}} pnpm e2e:ci -nb 
+          PLAYWRIGHT_SHARD=${{matrix.shard}} PLAYWRIGHT_TOTAL=${{strategy.job-total}} pnpm e2e:ci -nb
 
       - uses: actions/upload-artifact@v3
         if: always()
@@ -151,12 +156,12 @@ jobs:
 
       - uses: pnpm/[email protected]
         with:
-          version: 7.8.0
+          version: 8.11.0
 
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'pnpm'
 
       - run: pnpm install --frozen-lockfile
@@ -179,7 +184,7 @@ jobs:
         run: |
           parallel --lb --halt now,success=1,fail=1 ::: \
           "pnpm wrangle" \
-          "pnpm wait-on http://localhost:8788 && npx 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_GRAPH_URI: https://api.thegraph.com/subgraphs/name/tateb/enssubdomaincount
           SECRET_WORDS: ${{ secrets.SECRET_WORDS }}

.gitignore

@@ -44,6 +44,9 @@ tsconfig.tsbuildinfo
 !.yarn/sdks
 !.yarn/versions
 
+# wrangler
+.wrangler/
+
 # jest coverage
 /coverage
 
@@ -64,8 +67,11 @@ tsconfig.tsbuildinfo
 # hardhat
 /cache
 /artifacts
+/typings-custom/generated
 
 # Sentry
 .sentryclirc
 
-.dev.vars
+.dev.vars
+
+*yalc*

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-pnpm lint && git add package.json
+# pnpm lint && git add package.json

.prettierrc.json

@@ -6,8 +6,16 @@
   "singleQuote": true,
   "tabWidth": 2,
   "trailingComma": "all",
-  "importOrder": ["@app/test-utils", "<THIRD_PARTY_MODULES>", "^@ensdomains/(.*)$", "^@app/(.*)$", "^[./]"],
-  "importOrderSeparation": true,
-  "importOrderSortSpecifiers": true,
-  "plugins": ["@trivago/prettier-plugin-sort-imports"]
+  "importOrder": [
+    "@app/test-utils",
+    "",
+    "<THIRD_PARTY_MODULES>",
+    "",
+    "^@ensdomains/(.*)$",
+    "",
+    "^@app/(.*)$",
+    "",
+    "^[./]"
+  ],
+  "plugins": ["@ianvs/prettier-plugin-sort-imports"]
 }

.vscode/settings.json

@@ -3,7 +3,7 @@
     "**/.yarn": true,
     "**/.pnp.*": true
   },
-  "typescript.tsdk": "node_modules/typescript/lib",
+  "typescript.tsdk": "./node_modules/typescript/lib",
   "typescript.enablePromptUseWorkspaceTsdk": true,
   "eslint.format.enable": true,
   "editor.codeActionsOnSave": {
@@ -13,9 +13,11 @@
   "stylelint.configFile": ".stylelintrc.json",
   "stylelint.validate": ["css", "typescriptreact"],
   "editor.defaultFormatter": "esbenp.prettier-vscode",
-  "prettier.prettierPath": "node_modules/prettier/index.js",
+  "prettier.prettierPath": "./node_modules/prettier/index.cjs",
+  "prettier.configPath": "./.prettierrc.json",
   "[svg]": {
     "editor.defaultFormatter": "jock.svg"
   },
-  "jest.jestCommandLine": "pnpm run test"
+  "jest.jestCommandLine": "pnpm run test",
+  "cSpell.words": ["ensjs"]
 }

deploy/00_deploy_bulk_renewal.ts

@@ -3,14 +3,13 @@ import { Interface } from '@ethersproject/abi'
 import { ethers } from 'hardhat'
 import { DeployFunction } from 'hardhat-deploy/types'
 import { HardhatRuntimeEnvironment } from 'hardhat/types'
-
-import { namehash } from '@ensdomains/ensjs/utils/normalise'
+import { namehash } from 'viem'
 
 const { makeInterfaceId } = require('@openzeppelin/test-helpers')
 
-function computeInterfaceId(iface: Interface) {
+function computeInterfaceId(iface: any): any {
   return makeInterfaceId.ERC165(
-    Object.values(iface.functions).map((frag) => frag.format('sighash')),
+    Object.values(iface.functions).map((frag: any) => frag.format('sighash')),
   )
 }
 

deploy/00_get_registration_gas_values.ts

@@ -6,7 +6,7 @@ import { ethers } from 'hardhat'
 import { DeployFunction } from 'hardhat-deploy/types'
 import { HardhatRuntimeEnvironment } from 'hardhat/types'
 
-import { namehash } from '@ensdomains/ensjs/utils/normalise'
+import { namehash } from 'viem'
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   if (!hre.network.tags.generate) {

deploy/00_legacy_registry.ts

@@ -3,8 +3,7 @@ import { ethers } from 'hardhat'
 import { DeployFunction } from 'hardhat-deploy/types'
 import { HardhatRuntimeEnvironment } from 'hardhat/types'
 
-import { labelhash } from '@ensdomains/ensjs/utils/labels'
-import { namehash } from '@ensdomains/ensjs/utils/normalise'
+import { namehash, labelhash } from 'viem'
 
 const ZERO_HASH = '0x0000000000000000000000000000000000000000000000000000000000000000'
 

deploy/00_migrate_legacy_records.ts

@@ -5,7 +5,7 @@ import { ethers } from 'hardhat'
 import { DeployFunction } from 'hardhat-deploy/types'
 import { HardhatRuntimeEnvironment } from 'hardhat/types'
 
-import { namehash } from '@ensdomains/ensjs/utils/normalise'
+import { namehash } from 'viem'
 
 const names = [
   {

deploy/00_register_contracts.ts

@@ -5,7 +5,7 @@ import { ethers } from 'hardhat'
 import { DeployFunction } from 'hardhat-deploy/types'
 import { HardhatRuntimeEnvironment } from 'hardhat/types'
 
-import { namehash } from '@ensdomains/ensjs/utils/normalise'
+import { namehash } from 'viem'
 
 const names = [
   {