Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/ensdomains/ens-app-v3 into …
Browse files Browse the repository at this point in the history 
…thorin-v1
  • Loading branch information
@talentlessguy
talentlessguy committed Dec 3, 2024
2 parents 206f3cf + e648cea commit a45c0d8
Show file tree
Hide file tree
Showing 5 changed files with 777 additions and 1,844 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pages-deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Cloudflare Pages
env:
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
NEXT_PUBLIC_INTERCOM_ID: re9q5yti
NEXT_PUBLIC_DRPC_KEY: ${{ github.ref == 'refs/heads/main' && AnmpasF2C0JBqeAEzxVO8aTteiMlrW4R75hpDonbV6cR || '' }}
NEXT_PUBLIC_DRPC_KEY: AnmpasF2C0JBqeAEzxVO8aTteiMlrW4R75hpDonbV6cR

on: [push]
jobs:
Expand Down
6 changes: 3 additions & 3 deletions deploy/00_deploy_bulk_renewal.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable import/no-extraneous-dependencies */
import { Interface } from '@ethersproject/abi'
import { utils } from 'ethers'
import { ethers } from 'hardhat'
import { DeployFunction } from 'hardhat-deploy/types'
import { HardhatRuntimeEnvironment } from 'hardhat/types'
Expand Down Expand Up @@ -49,15 +49,15 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
console.log('Set interface implementor of eth tld for bulk renewal')
const tx2 = await resolver.setInterface(
ethers.utils.namehash('eth'),
computeInterfaceId(new Interface(bulkRenewal.abi)),
computeInterfaceId(new utils.Interface(bulkRenewal.abi)),
bulkRenewal.address,
)
await tx2.wait()

console.log('Set interface implementor of eth tld for registrar controller')
const tx3 = await resolver.setInterface(
ethers.utils.namehash('eth'),
computeInterfaceId(new Interface(controllerArtifact.abi)),
computeInterfaceId(new utils.Interface(controllerArtifact.abi)),
controller.address,
)
await tx3.wait()
Expand Down
9 changes: 4 additions & 5 deletions e2e/specs/stateless/registerName.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,11 +204,10 @@ test.describe.serial('normal registration', () => {
})

await test.step('should be able to start registration step', async () => {
await expect(
page.getByText(
'Your name is not registered until you’ve completed the second transaction. You have 23 hours remaining to complete it.',
),
).toBeVisible()
await expect(page.getByTestId('transactions-subheading')).toBeVisible()
await expect(page.getByTestId('transactions-subheading')).toHaveText(
/Your name is not registered until you’ve completed the second transaction. You have (23 hours|1 day) remaining to complete it./,
)
await page.getByTestId('finish-button').click()
})

Expand Down
108 changes: 93 additions & 15 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@
"@tanstack/react-query-devtools": "^5.59.0",
"@tanstack/react-query-persist-client": "5.22.2",
"@wagmi/core": "2.13.3",
"@walletconnect/ethereum-provider": "^2.11.1",
"@walletconnect/modal": "^2.6.2",
"calendar-link": "^2.2.0",
"dns-packet": "^5.4.0",
"graphql-request": "5.1.0",
Expand All @@ -86,12 +84,11 @@
"markdown-to-jsx": "^7.1.7",
"next": "13.5.6",
"node-fetch": "^3.3.2",
"react": "^18.2.0",
"react": "*",
"react-confetti": "^6.1.0",
"react-dom": "^18.2.0",
"react-dom": "*",
"react-hook-form": "7.51.0",
"react-i18next": "^11.18.5",
"react-is": "^17.0.2",
"react-transition-state": "^1.1.5",
"react-use": "^17.4.0",
"react-use-error-boundary": "^3.0.0",
Expand All @@ -112,7 +109,6 @@
"@ensdomains/buffer": "^0.1.1",
"@ensdomains/ens-test-env": "0.5.0-beta.2",
"@ensdomains/headless-web3-provider": "^1.0.8",
"@ethersproject/abi": "^5.4.0",
"@ianvs/prettier-plugin-sort-imports": "^4.1.0",
"@next/bundle-analyzer": "^13.4.19",
"@nomiclabs/hardhat-ethers": "npm:hardhat-deploy-ethers@^0.3.0-beta.13",
Expand All @@ -127,10 +123,8 @@
"@types/node": "^18.7.13",
"@types/pako": "^2.0.0",
"@types/prettier": "^2.7.0",
"@types/puppeteer-core": "^5.4.0",
"@types/react": "^18.2.28",
"@types/react": "18.2.21",
"@types/react-dom": "^18.2.7",
"@types/react-is": "^17.0.3",
"@types/styled-components": "5.1.23",
"@types/ws": "^8.5.10",
"@typescript-eslint/eslint-plugin": "^6.7.4",
Expand Down Expand Up @@ -160,16 +154,14 @@
"hardhat-dependency-compiler": "^1.1.3",
"hardhat-deploy": "^0.11.12",
"husky": "^7.0.4",
"isows": "^1.0.3",
"jsdom": "^24.0.0",
"jsdom": "^24.1.0",
"knip": "^5.27.2",
"lokijs": "^1.5.12",
"msw": "^1.2.3",
"multiformats": "^12.0.1",
"next-compose-plugins": "^2.2.1",
"next-dev-https": "^0.1.2",
"next-router-mock": "^0.9.10",
"next-transpile-modules": "^9.1.0",
"pako": "^2.1.0",
"postcss-scss": "^4.0.4",
"prettier": "3.0.3",
Expand All @@ -194,14 +186,100 @@
},
"pnpm": {
"overrides": {
"wrtc": "https://registry.npmjs.org/@koush/wrtc/-/wrtc-0.5.2.tgz",
"bn.js": "npm:bn.js@^5.2.0",
"@nomiclabs/hardhat-ethers": "npm:[email protected]",
"@wagmi/core": "2.13.3",
"@walletconnect/ethereum-provider": "2.11.1",
"@walletconnect/modal": "2.6.2",
"aggregate-error": "npm:@socketregistry/aggregate-error@^1",
"array-buffer-byte-length": "npm:@socketregistry/array-buffer-byte-length@^1",
"array-flatten": "npm:@socketregistry/array-flatten@^1",
"array-includes": "npm:@socketregistry/array-includes@^1",
"array.prototype.findlast": "npm:@socketregistry/array.prototype.findlast@^1",
"array.prototype.findlastindex": "npm:@socketregistry/array.prototype.findlastindex@^1",
"array.prototype.flat": "npm:@socketregistry/array.prototype.flat@^1",
"array.prototype.flatmap": "npm:@socketregistry/array.prototype.flatmap@^1",
"array.prototype.toreversed": "npm:@socketregistry/array.prototype.toreversed@^1",
"array.prototype.tosorted": "npm:@socketregistry/array.prototype.tosorted@^1",
"arraybuffer.prototype.slice": "npm:@socketregistry/arraybuffer.prototype.slice@^1",
"available-typed-arrays": "npm:@socketregistry/available-typed-arrays@^1",
"bn.js": "npm:bn.js@^5.2.0",
"deep-equal": "npm:@socketregistry/deep-equal@^1",
"define-properties": "npm:@socketregistry/define-properties@^1",
"es-define-property": "npm:@socketregistry/es-define-property@^1",
"es-get-iterator": "npm:@socketregistry/es-get-iterator@^1",
"es-iterator-helpers": "npm:@socketregistry/es-iterator-helpers@^1",
"es-set-tostringtag": "npm:@socketregistry/es-set-tostringtag@^1",
"es6-symbol": "npm:@socketregistry/es6-symbol@^1",
"for-each": "npm:@socketregistry/for-each@^1",
"function-bind": "npm:@socketregistry/function-bind@^1",
"function.prototype.name": "npm:@socketregistry/function.prototype.name@^1",
"functions-have-names": "npm:@socketregistry/functions-have-names@^1",
"get-symbol-description": "npm:@socketregistry/get-symbol-description@^1",
"globalthis": "npm:@socketregistry/globalthis@^1",
"gopd": "npm:@socketregistry/gopd@^1",
"has-property-descriptors": "npm:@socketregistry/has-property-descriptors@^1",
"has-proto": "npm:@socketregistry/has-proto@^1",
"has-symbols": "npm:@socketregistry/has-symbols@^1",
"has-tostringtag": "npm:@socketregistry/has-tostringtag@^1",
"hasown": "npm:@socketregistry/hasown@^1",
"indent-string": "npm:@socketregistry/indent-string@^1",
"internal-slot": "npm:@socketregistry/internal-slot@^1",
"is-arguments": "npm:@socketregistry/is-arguments@^1",
"is-array-buffer": "npm:@socketregistry/is-array-buffer@^1",
"is-bigint": "npm:@socketregistry/is-bigint@^1",
"is-boolean-object": "npm:@socketregistry/is-boolean-object@^1",
"is-core-module": "npm:@socketregistry/is-core-module@^1",
"is-date-object": "npm:@socketregistry/is-date-object@^1",
"is-generator-function": "npm:@socketregistry/is-generator-function@^1",
"is-map": "npm:@socketregistry/is-map@^1",
"is-negative-zero": "npm:@socketregistry/is-negative-zero@^1",
"is-number-object": "npm:@socketregistry/is-number-object@^1",
"is-regex": "npm:@socketregistry/is-regex@^1",
"is-set": "npm:@socketregistry/is-set@^1",
"is-shared-array-buffer": "npm:@socketregistry/is-shared-array-buffer@^1",
"is-string": "npm:@socketregistry/is-string@^1",
"is-symbol": "npm:@socketregistry/is-symbol@^1",
"is-typed-array": "npm:@socketregistry/is-typed-array@^1",
"is-weakmap": "npm:@socketregistry/is-weakmap@^1",
"is-weakref": "npm:@socketregistry/is-weakref@^1",
"is-weakset": "npm:@socketregistry/is-weakset@^1",
"isarray": "npm:@socketregistry/isarray@^1",
"iterator.prototype": "npm:@socketregistry/iterator.prototype@^1",
"number-is-nan": "npm:@socketregistry/number-is-nan@^1",
"object-assign": "npm:@socketregistry/object-assign@^1",
"object-is": "npm:@socketregistry/object-is@^1",
"object-keys": "npm:@socketregistry/object-keys@^1",
"object.assign": "npm:@socketregistry/object.assign@^1",
"object.entries": "npm:@socketregistry/object.entries@^1",
"object.fromentries": "npm:@socketregistry/object.fromentries@^1",
"object.groupby": "npm:@socketregistry/object.groupby@^1",
"object.hasown": "npm:@socketregistry/object.hasown@^1",
"object.values": "npm:@socketregistry/object.values@^1",
"path-parse": "npm:@socketregistry/path-parse@^1",
"querystringify": "npm:@socketregistry/querystringify@^1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"@wagmi/core": "2.13.3"
"reflect.getprototypeof": "npm:@socketregistry/reflect.getprototypeof@^1",
"regexp.prototype.flags": "npm:@socketregistry/regexp.prototype.flags@^1",
"safe-array-concat": "npm:@socketregistry/safe-array-concat@^1",
"safe-buffer": "npm:@socketregistry/safe-buffer@^1",
"safe-regex-test": "npm:@socketregistry/safe-regex-test@^1",
"safer-buffer": "npm:@socketregistry/safer-buffer@^1",
"set-function-length": "npm:@socketregistry/set-function-length@^1",
"side-channel": "npm:@socketregistry/side-channel@^1",
"string.prototype.matchall": "npm:@socketregistry/string.prototype.matchall@^1",
"string.prototype.trim": "npm:@socketregistry/string.prototype.trim@^1",
"string.prototype.trimend": "npm:@socketregistry/string.prototype.trimend@^1",
"string.prototype.trimstart": "npm:@socketregistry/string.prototype.trimstart@^1",
"typed-array-buffer": "npm:@socketregistry/typed-array-buffer@^1",
"typed-array-byte-length": "npm:@socketregistry/typed-array-byte-length@^1",
"typed-array-byte-offset": "npm:@socketregistry/typed-array-byte-offset@^1",
"typed-array-length": "npm:@socketregistry/typed-array-length@^1",
"unbox-primitive": "npm:@socketregistry/unbox-primitive@^1",
"which-boxed-primitive": "npm:@socketregistry/which-boxed-primitive@^1",
"which-collection": "npm:@socketregistry/which-collection@^1",
"which-typed-array": "npm:@socketregistry/which-typed-array@^1",
"wrtc": "https://registry.npmjs.org/@koush/wrtc/-/wrtc-0.5.2.tgz"
},
"patchedDependencies": {
"[email protected]": "patches/[email protected]",
Expand Down
Loading

0 comments on commit a45c0d8

Please sign in to comment.