feat(wip): move to pnpm, install missing deps, update ci, remove oz test-helpers

.github/workflows/main.yml

@@ -9,33 +9,33 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Use Node.js 16
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 16
-          cache: 'yarn'
+          cache: 'pnpm'
 
-      - run: yarn install --frozen-lockfile
+      - run: pnpm install
 
       - name: Run test
-        run: yarn test
+        run: pnpm test
 
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Use Node.js 16
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 16
-          cache: 'yarn'
+          cache: 'pnpm'
 
-      - run: yarn install --frozen-lockfile
+      - run: pnpm install
 
       - name: Run deploy
-        run: yarn test:deploy
+        run: pnpm test:deploy
         env:
           BATCH_GATEWAY_URLS: '["https://universal-offchain-unwrapper.ens-cf.workers.dev/"]'

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-yarn format && git add .
+pnpm format && git add .

README.md

@@ -152,19 +152,19 @@ This repo runs a husky precommit to prettify all contract files to keep them con
 ```
 git clone https://github.com/ensdomains/ens-contracts
 cd ens-contracts
-yarn
+pnpm i
 ```
 
 ### How to run tests
 
 ```
-yarn test
+pnpm test
 ```
 
 ### How to publish
 
 ```
-yarn pub
+pnpm pub
 ```
 
 ### Release flow

contracts/wrapper/README.md

@@ -442,13 +442,13 @@ RESOLVER_ADDRESS=
 
 ### Run deploy script
 
-`yarn deploy:rinkeby` will deploy to rinkeby and verify its source code
+`pnpm deploy:rinkeby` will deploy to rinkeby and verify its source code
 
 NOTE: If you want to override the default metadata url, set `METADATA_HOST=` to `.env`
 
 ```
-$yarn deploy:rinkeby
-yarn run v1.22.10
+$ pnpm deploy:rinkeby
+pnpm run v1.22.10
 $ npx hardhat run --network rinkeby scripts/deploy.js
 Deploying contracts to rinkeby with the account:0x97bA55F61345665cF08c4233b9D6E61051A43B18
 Account balance: 1934772596667918724 true
@@ -472,11 +472,11 @@ After running the script it sets addresses to `.env`. If you want to redeploy so
 
 1. Register a name using the account you used to deploy the contract
 2. Set the label (`matoken` for `matoken.eth`) to `SEED_NAME=` on `.env`
-3. Run `yarn seed:rinkeby`
+3. Run `pnpm seed:rinkeby`
 
 ```
-~/.../ens/name-wrapper (seed)$yarn seed:rinkeby
-yarn run v1.22.10
+~/.../ens/name-wrapper (seed)$pnpm seed:rinkeby
+pnpm run v1.22.10
 $ npx hardhat run --network rinkeby scripts/seed.js
 Account balance: 1925134991223891632
 {

deploy/ethregistrar/00_deploy_base_registrar_implementation.ts

@@ -1,8 +1,7 @@
-import namehash from 'eth-ens-namehash'
+import namehash from '@ensdomains/eth-ens-namehash'
 import { ethers } from 'hardhat'
 import { DeployFunction } from 'hardhat-deploy/types'
 import { HardhatRuntimeEnvironment } from 'hardhat/types'
-import { keccak256 } from 'js-sha3'
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const { getNamedAccounts, deployments, network } = hre

deploy/ethregistrar/00_setup_base_registrar.ts

@@ -1,4 +1,3 @@
-import namehash from 'eth-ens-namehash'
 import { ethers } from 'hardhat'
 import { DeployFunction } from 'hardhat-deploy/types'
 import { HardhatRuntimeEnvironment } from 'hardhat/types'

deploy/ethregistrar/03_deploy_eth_registrar_controller.ts

@@ -2,11 +2,10 @@ import { Interface } from 'ethers/lib/utils'
 import { ethers } from 'hardhat'
 import { DeployFunction } from 'hardhat-deploy/types'
 import { HardhatRuntimeEnvironment } from 'hardhat/types'
-
-const { makeInterfaceId } = require('@openzeppelin/test-helpers')
+import { makeInterfaceId } from '../utils/solidity'
 
 function computeInterfaceId(iface: Interface) {
-  return makeInterfaceId.ERC165(
+  return makeInterfaceId(
     Object.values(iface.functions).map((frag) => frag.format('sighash')),
   )
 }

deploy/ethregistrar/04_deploy_bulk_renewal.ts

@@ -2,11 +2,10 @@ import { Interface } from 'ethers/lib/utils'
 import { ethers } from 'hardhat'
 import { DeployFunction } from 'hardhat-deploy/types'
 import { HardhatRuntimeEnvironment } from 'hardhat/types'
-
-const { makeInterfaceId } = require('@openzeppelin/test-helpers')
+import { makeInterfaceId } from '../utils/solidity'
 
 function computeInterfaceId(iface: Interface) {
-  return makeInterfaceId.ERC165(
+  return makeInterfaceId(
     Object.values(iface.functions).map((frag) => frag.format('sighash')),
   )
 }

deploy/utils/solidity.ts

@@ -0,0 +1,19 @@
+import { utils } from 'ethers'
+
+export function makeInterfaceId(functionSignatures: string[] = []) {
+  const INTERFACE_ID_LENGTH = 4
+
+  const interfaceIdBuffer = functionSignatures
+    .map((signature) => utils.keccak256(signature)) // keccak256
+    .map(
+      (h) => Buffer.from(h.substring(2), 'hex').subarray(0, 4), // bytes4()
+    )
+    .reduce((memo, bytes) => {
+      for (let i = 0; i < INTERFACE_ID_LENGTH; i++) {
+        memo[i] = memo[i] ^ bytes[i] // xor
+      }
+      return memo
+    }, Buffer.alloc(INTERFACE_ID_LENGTH))
+
+  return `0x${interfaceIdBuffer.toString('hex')}`
+}

deploy/wrapper/01_deploy_name_wrapper.ts

@@ -2,11 +2,10 @@ import { Interface } from 'ethers/lib/utils'
 import { ethers } from 'hardhat'
 import { DeployFunction } from 'hardhat-deploy/types'
 import { HardhatRuntimeEnvironment } from 'hardhat/types'
-
-const { makeInterfaceId } = require('@openzeppelin/test-helpers')
+import { makeInterfaceId } from '../utils/solidity'
 
 function computeInterfaceId(iface: Interface) {
-  return makeInterfaceId.ERC165(
+  return makeInterfaceId(
     Object.values(iface.functions).map((frag) => frag.format('sighash')),
   )
 }

package.json

@@ -9,8 +9,8 @@
     "lint": "hardhat check",
     "build": "rm -rf ./build/deploy ./build/hardhat.config.js && hardhat compile && tsc",
     "format": "prettier --write .",
-    "prepublishOnly": "yarn build",
-    "pub": "yarn publish --access public",
+    "prepublishOnly": "pnpm build",
+    "pub": "pnpm publish --access public",
     "prepare": "husky install"
   },
   "files": [
@@ -29,33 +29,34 @@
     "@nomiclabs/hardhat-truffle5": "^2.0.0",
     "@nomiclabs/hardhat-waffle": "^2.0.1",
     "@nomiclabs/hardhat-web3": "^2.0.0",
-    "@openzeppelin/test-helpers": "^0.5.11",
     "@types/mocha": "^9.1.1",
     "@types/node": "^18.0.0",
     "chai": "^4.3.4",
     "dotenv": "^10.0.0",
     "elliptic-solidity": "^1.0.0",
     "envfile": "^6.17.0",
     "ethereum-waffle": "^3.3.0",
-    "ethers": "^5.6.1",
+    "ethers": "^5.7.2",
     "hardhat": "^2.9.9",
     "hardhat-abi-exporter": "^2.9.0",
     "hardhat-contract-sizer": "^2.6.1",
-    "hardhat-deploy": "^0.11.10",
+    "hardhat-deploy": "^0.12.1",
     "hardhat-gas-reporter": "^1.0.4",
     "husky": "^8.0.0",
     "prettier": "^2.6.2",
     "prettier-plugin-solidity": "^1.0.0-beta.24",
     "rfc4648": "^1.5.0",
     "ts-node": "^10.8.1",
-    "typescript": "^4.7.3"
+    "typescript": "^4.7.3",
+    "web3": "^1.2.11"
   },
   "resolutions": {
     "ethereum-ens": "0.8.0",
     "js-sha3": "0.8.0"
   },
   "dependencies": {
     "@ensdomains/buffer": "^0.1.1",
+    "@ensdomains/eth-ens-namehash": "^2.0.15",
     "@ensdomains/solsha1": "0.0.3",
     "@openzeppelin/contracts": "^4.1.0",
     "dns-packet": "^5.3.0"