chore: merge staging

.github/workflows/main.yml

@@ -2,40 +2,55 @@ name: CI
 
 on:
   push:
-    branches: [master]
+    branches: [staging, mainnet]
   pull_request:
 
 jobs:
+  wiki_address_check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Use Bun 1.1.13
+        uses: oven-sh/setup-bun@v1
+        with:
+          bun-version: 1.1.13
+
+      - run: bun install --frozen-lockfile
+
+      - name: Run wikiCheck
+        run: bun run wikiCheck
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - name: Use Node.js 16
-        uses: actions/setup-node@v3
+      - name: Use Bun 1.1.13
+        uses: oven-sh/setup-bun@v1
         with:
-          node-version: 16
-          cache: 'yarn'
+          bun-version: 1.1.13
 
-      - run: yarn install --frozen-lockfile
+      - run: bun install --frozen-lockfile
 
-      - name: Run test
-        run: yarn test
+      - name: Run tests
+        run: bun run test:parallel
 
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - name: Use Node.js 16
-        uses: actions/setup-node@v3
+      - name: Use Bun 1.1.13
+        uses: oven-sh/setup-bun@v1
         with:
-          node-version: 16
-          cache: 'yarn'
+          bun-version: 1.1.13
+
+      - run: bun install --frozen-lockfile
 
-      - run: yarn install --frozen-lockfile
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
 
       - name: Run deploy
-        run: yarn test:deploy
+        run: bun run 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 .
+bun run 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
+bun i
 ```
 
 ### How to run tests
 
 ```
-yarn test
+bun run test
 ```
 
 ### How to publish
 
 ```
-yarn pub
+bun run pub
 ```
 
 ## How to deploy l2 contracts
@@ -202,6 +202,16 @@ const l2resolverAddress = await l2Factory.predictAddress(ETH_ADDRESS)
 
 ## Release flow
 
+### Deployment
+
+```
+NODE_OPTIONS='--experimental-loader ts-node/esm/transpile-only' bun run hardhat --network <network_name> deploy
+```
+
+Full list of available networks for deployment is [here](hardhat.config.cts#L38).
+
+### Release flow
+
 1. Create a `feature` branch from `staging` branch
 2. Make code updates
 3. Ensure you are synced up with `staging`
@@ -210,11 +220,20 @@ const l2resolverAddress = await l2Factory.predictAddress(ETH_ADDRESS)
 6. Have the tagged commit audited if necessary
 7. If changes are required, make the changes and then once ready for review create another GitHub release with an incremented RC value `v1.2.3-RC0` -> `v.1.2.3-RC1`. Repeat as necessary.
 8. Deploy to testnet. Open a pull request to merge the deploy artifacts into
-   the `feature` branch. Get someone to review and approve the deployment and then merge. You now MUST merge this branch into `staging` branch.
-9. Create GitHub release of the form `v1.2.3-testnet` from the commit that has the new deployment artifacts.
+   the `feature` branch. Create GitHub release of the form `v1.2.3-testnet` from the commit that has the new deployment artifacts.
+9. Get someone to review and approve the deployment and then merge. You now MUST merge this branch into `staging` branch.
 10. If any further changes are needed, you can either make them on the existing feature branch that is in sync or create a new branch, and follow steps 1 -> 9. Repeat as necessary.
-11. Make Deployment to mainnet from `staging`. Commit build artifacts. You now MUST merge this branch into `main`.
-12. Create GitHub release of the form `v1.2.3-mainnet` from the commit that has the new deployment artifacts.
+11. Make a deployment to ethereum mainnet from `staging`. Create a GitHub release of the form `v1.2.3` from the commit that has the new deployment artifacts.
+12. Open a PR to merge into `main`. Have it reviewed and merged.
+
+### Cherry-picked release flow
+
+Certain changes can be released in isolation via cherry-picking, although ideally we would always release from `staging`.
+
+1. Create a new branch from `mainnet`.
+2. Cherry-pick from `staging` into new branch.
+3. Deploy to ethereum mainnet, tag the commit that has deployment artifacts and create a release.
+4. Merge into `mainnet`.
 
 ### Emergency release process
 
@@ -224,7 +243,8 @@ const l2resolverAddress = await l2Factory.predictAddress(ETH_ADDRESS)
 
 ### Notes
 
-- `staging` branch and `main` branch should start off in sync
+- Deployed code should always match source code in mainnet releases. This may not be the case for `staging`.
+- `staging` branch and `main` branch should start in sync
 - `staging` is intended to be a practice `main`. Only code that is intended to be released to `main` can be merged to `staging`. Consequently:
   - Feature branches will be long-lived
   - Feature branches must be kept in sync with `staging`
@@ -233,4 +253,4 @@ const l2resolverAddress = await l2Factory.predictAddress(ETH_ADDRESS)
 - It is preferable to not edit the same file on different feature branches.
 - Code on `staging` and `main` will always be a subset of what is deployed, as smart contracts cannot be undeployed.
 - Release candidates, `staging` and `main` branch are subject to our bug bounty
-- Releases follow semantic versioning and should contain a description of changes with developers being the intended audience
+- Releases follow semantic versioning and releases should contain a description of changes with developers being the intended audience

contracts/dnsregistrar/DNSClaimChecker.sol

@@ -2,8 +2,8 @@
 pragma solidity ^0.8.4;
 
 import "../dnssec-oracle/DNSSEC.sol";
-import "../dnssec-oracle/BytesUtils.sol";
 import "../dnssec-oracle/RRUtils.sol";
+import "../utils/BytesUtils.sol";
 import "../utils/HexUtils.sol";
 import "@ensdomains/buffer/contracts/Buffer.sol";
 

contracts/dnsregistrar/DNSRegistrar.sol

@@ -4,12 +4,12 @@ pragma solidity ^0.8.4;
 
 import "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 import "@ensdomains/buffer/contracts/Buffer.sol";
-import "../dnssec-oracle/BytesUtils.sol";
 import "../dnssec-oracle/DNSSEC.sol";
 import "../dnssec-oracle/RRUtils.sol";
 import "../registry/ENSRegistry.sol";
 import "../root/Root.sol";
 import "../resolvers/profiles/AddrResolver.sol";
+import "../utils/BytesUtils.sol";
 import "./DNSClaimChecker.sol";
 import "./PublicSuffixList.sol";
 import "./IDNSRegistrar.sol";

contracts/dnsregistrar/OffchainDNSResolver.sol

@@ -5,12 +5,16 @@ import "../../contracts/resolvers/profiles/IAddrResolver.sol";
 import "../../contracts/resolvers/profiles/IExtendedResolver.sol";
 import "../../contracts/resolvers/profiles/IExtendedDNSResolver.sol";
 import "@openzeppelin/contracts/utils/introspection/ERC165.sol";
-import "../dnssec-oracle/BytesUtils.sol";
 import "../dnssec-oracle/DNSSEC.sol";
 import "../dnssec-oracle/RRUtils.sol";
 import "../registry/ENSRegistry.sol";
 import "../utils/HexUtils.sol";
+import "../utils/BytesUtils.sol";
 
+import {Address} from "@openzeppelin/contracts/utils/Address.sol";
+import {LowLevelCallUtils} from "../utils/LowLevelCallUtils.sol";
+
+error InvalidOperation();
 error OffchainLookup(
     address sender,
     string[] urls,
@@ -29,8 +33,9 @@ interface IDNSGateway {
 uint16 constant CLASS_INET = 1;
 uint16 constant TYPE_TXT = 16;
 
-contract OffchainDNSResolver is IExtendedResolver {
+contract OffchainDNSResolver is IExtendedResolver, IERC165 {
     using RRUtils for *;
+    using Address for address;
     using BytesUtils for bytes;
     using HexUtils for bytes;
 
@@ -46,30 +51,46 @@ contract OffchainDNSResolver is IExtendedResolver {
         gatewayURL = _gatewayURL;
     }
 
+    function supportsInterface(
+        bytes4 interfaceId
+    ) external pure override returns (bool) {
+        return interfaceId == type(IExtendedResolver).interfaceId;
+    }
+
     function resolve(
         bytes calldata name,
         bytes calldata data
     ) external view returns (bytes memory) {
-        string[] memory urls = new string[](1);
-        urls[0] = gatewayURL;
-
-        revert OffchainLookup(
-            address(this),
-            urls,
-            abi.encodeCall(IDNSGateway.resolve, (name, TYPE_TXT)),
-            OffchainDNSResolver.resolveCallback.selector,
-            abi.encode(name, data)
-        );
+        revertWithDefaultOffchainLookup(name, data);
     }
 
     function resolveCallback(
         bytes calldata response,
         bytes calldata extraData
     ) external view returns (bytes memory) {
-        (bytes memory name, bytes memory query) = abi.decode(
+        (bytes memory name, bytes memory query, bytes4 selector) = abi.decode(
             extraData,
-            (bytes, bytes)
+            (bytes, bytes, bytes4)
         );
+
+        if (selector != bytes4(0)) {
+            (bytes memory targetData, address targetResolver) = abi.decode(
+                query,
+                (bytes, address)
+            );
+            return
+                callWithOffchainLookupPropagation(
+                    targetResolver,
+                    name,
+                    query,
+                    abi.encodeWithSelector(
+                        selector,
+                        response,
+                        abi.encode(targetData, address(this))
+                    )
+                );
+        }
+
         DNSSEC.RRSetWithSignature[] memory rrsets = abi.decode(
             response,
             (DNSSEC.RRSetWithSignature[])
@@ -106,17 +127,30 @@ contract OffchainDNSResolver is IExtendedResolver {
                     )
                 ) {
                     return
-                        IExtendedDNSResolver(dnsresolver).resolve(
+                        callWithOffchainLookupPropagation(
+                            dnsresolver,
                             name,
                             query,
-                            context
+                            abi.encodeCall(
+                                IExtendedDNSResolver.resolve,
+                                (name, query, context)
+                            )
                         );
                 } else if (
                     IERC165(dnsresolver).supportsInterface(
                         IExtendedResolver.resolve.selector
                     )
                 ) {
-                    return IExtendedResolver(dnsresolver).resolve(name, query);
+                    return
+                        callWithOffchainLookupPropagation(
+                            dnsresolver,
+                            name,
+                            query,
+                            abi.encodeCall(
+                                IExtendedResolver.resolve,
+                                (name, query)
+                            )
+                        );
                 } else {
                     (bool ok, bytes memory ret) = address(dnsresolver)
                         .staticcall(query);
@@ -223,4 +257,80 @@ contract OffchainDNSResolver is IExtendedResolver {
                 abi.encodePacked(parentNode, name.keccak(idx, separator - idx))
             );
     }
+
+    function callWithOffchainLookupPropagation(
+        address target,
+        bytes memory name,
+        bytes memory innerdata,
+        bytes memory data
+    ) internal view returns (bytes memory) {
+        if (!target.isContract()) {
+            revertWithDefaultOffchainLookup(name, innerdata);
+        }
+
+        bool result = LowLevelCallUtils.functionStaticCall(
+            address(target),
+            data
+        );
+        uint256 size = LowLevelCallUtils.returnDataSize();
+        if (result) {
+            bytes memory returnData = LowLevelCallUtils.readReturnData(0, size);
+            return abi.decode(returnData, (bytes));
+        }
+        // Failure
+        if (size >= 4) {
+            bytes memory errorId = LowLevelCallUtils.readReturnData(0, 4);
+            if (bytes4(errorId) == OffchainLookup.selector) {
+                // Offchain lookup. Decode the revert message and create our own that nests it.
+                bytes memory revertData = LowLevelCallUtils.readReturnData(
+                    4,
+                    size - 4
+                );
+                handleOffchainLookupError(revertData, target, name);
+            }
+        }
+        LowLevelCallUtils.propagateRevert();
+    }
+
+    function revertWithDefaultOffchainLookup(
+        bytes memory name,
+        bytes memory data
+    ) internal view {
+        string[] memory urls = new string[](1);
+        urls[0] = gatewayURL;
+
+        revert OffchainLookup(
+            address(this),
+            urls,
+            abi.encodeCall(IDNSGateway.resolve, (name, TYPE_TXT)),
+            OffchainDNSResolver.resolveCallback.selector,
+            abi.encode(name, data, bytes4(0))
+        );
+    }
+
+    function handleOffchainLookupError(
+        bytes memory returnData,
+        address target,
+        bytes memory name
+    ) internal view {
+        (
+            address sender,
+            string[] memory urls,
+            bytes memory callData,
+            bytes4 innerCallbackFunction,
+            bytes memory extraData
+        ) = abi.decode(returnData, (address, string[], bytes, bytes4, bytes));
+
+        if (sender != target) {
+            revert InvalidOperation();
+        }
+
+        revert OffchainLookup(
+            address(this),
+            urls,
+            callData,
+            OffchainDNSResolver.resolveCallback.selector,
+            abi.encode(name, extraData, innerCallbackFunction)
+        );
+    }
 }