Merge branch 'staging' into mainnet

ensdomains · Jul 19, 2024 · 7becdfd · 7becdfd
2 parents b2942ee + 3c96089
commit 7becdfd
Show file tree

Hide file tree

Showing 199 changed files with 24,569 additions and 30,274 deletions.
diff --git a/.github/workflows/main.yml b/.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/"]'
diff --git a/bun.lockb b/bun.lockb
diff --git a/contracts/dnsregistrar/DNSClaimChecker.sol b/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";
 

diff --git a/contracts/dnsregistrar/DNSRegistrar.sol b/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";

diff --git a/contracts/dnsregistrar/OffchainDNSResolver.sol b/contracts/dnsregistrar/OffchainDNSResolver.sol
@@ -5,11 +5,11 @@ 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";

diff --git a/contracts/dnsregistrar/RecordParser.sol b/contracts/dnsregistrar/RecordParser.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.11;
 
-import "../dnssec-oracle/BytesUtils.sol";
+import "../utils/BytesUtils.sol";
 
 library RecordParser {
     using BytesUtils for bytes;

diff --git a/contracts/dnsregistrar/TLDPublicSuffixList.sol b/contracts/dnsregistrar/TLDPublicSuffixList.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.8.4;
 
-import "../dnssec-oracle/BytesUtils.sol";
+import "../utils/BytesUtils.sol";
 import "./PublicSuffixList.sol";
 
 /**

diff --git a/contracts/dnsregistrar/mocks/DummyParser.sol b/contracts/dnsregistrar/mocks/DummyParser.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.8.4;
 
-import "../../dnssec-oracle/BytesUtils.sol";
+import "../../utils/BytesUtils.sol";
 import "../RecordParser.sol";
 
 contract DummyParser {

diff --git a/contracts/dnssec-oracle/DNSSECImpl.sol b/contracts/dnssec-oracle/DNSSECImpl.sol
@@ -3,11 +3,11 @@ pragma solidity ^0.8.4;
 pragma experimental ABIEncoderV2;
 
 import "./Owned.sol";
-import "./BytesUtils.sol";
 import "./RRUtils.sol";
 import "./DNSSEC.sol";
 import "./algorithms/Algorithm.sol";
 import "./digests/Digest.sol";
+import "../utils/BytesUtils.sol";
 import "@ensdomains/buffer/contracts/Buffer.sol";
 
 /*

diff --git a/contracts/dnssec-oracle/RRUtils.sol b/contracts/dnssec-oracle/RRUtils.sol
@@ -1,6 +1,7 @@
+//SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-import "./BytesUtils.sol";
+import "../utils/BytesUtils.sol";
 import "@ensdomains/buffer/contracts/Buffer.sol";
 
 /**

diff --git a/contracts/dnssec-oracle/algorithms/P256SHA256Algorithm.sol b/contracts/dnssec-oracle/algorithms/P256SHA256Algorithm.sol
@@ -2,7 +2,7 @@ pragma solidity ^0.8.4;
 
 import "./Algorithm.sol";
 import "./EllipticCurve.sol";
-import "../BytesUtils.sol";
+import "../../utils/BytesUtils.sol";
 
 contract P256SHA256Algorithm is Algorithm, EllipticCurve {
     using BytesUtils for *;

diff --git a/contracts/dnssec-oracle/algorithms/RSASHA1Algorithm.sol b/contracts/dnssec-oracle/algorithms/RSASHA1Algorithm.sol
@@ -1,8 +1,8 @@
 pragma solidity ^0.8.4;
 
 import "./Algorithm.sol";
-import "../BytesUtils.sol";
 import "./RSAVerify.sol";
+import "../../utils/BytesUtils.sol";
 import "@ensdomains/solsha1/contracts/SHA1.sol";
 
 /**

diff --git a/contracts/dnssec-oracle/algorithms/RSASHA256Algorithm.sol b/contracts/dnssec-oracle/algorithms/RSASHA256Algorithm.sol
@@ -1,8 +1,8 @@
 pragma solidity ^0.8.4;
 
 import "./Algorithm.sol";
-import "../BytesUtils.sol";
 import "./RSAVerify.sol";
+import "../../utils/BytesUtils.sol";
 
 /**
  * @dev Implements the DNSSEC RSASHA256 algorithm.

diff --git a/contracts/dnssec-oracle/algorithms/RSAVerify.sol b/contracts/dnssec-oracle/algorithms/RSAVerify.sol
@@ -1,7 +1,7 @@
 pragma solidity ^0.8.4;
 
-import "../BytesUtils.sol";
 import "./ModexpPrecompile.sol";
+import "../../utils/BytesUtils.sol";
 
 library RSAVerify {
     /**

diff --git a/contracts/dnssec-oracle/digests/SHA1Digest.sol b/contracts/dnssec-oracle/digests/SHA1Digest.sol
@@ -1,7 +1,7 @@
 pragma solidity ^0.8.4;
 
 import "./Digest.sol";
-import "../BytesUtils.sol";
+import "../../utils/BytesUtils.sol";
 import "@ensdomains/solsha1/contracts/SHA1.sol";
 
 /**

diff --git a/contracts/dnssec-oracle/digests/SHA256Digest.sol b/contracts/dnssec-oracle/digests/SHA256Digest.sol
@@ -1,7 +1,7 @@
 pragma solidity ^0.8.4;
 
 import "./Digest.sol";
-import "../BytesUtils.sol";
+import "../../utils/BytesUtils.sol";
 
 /**
  * @dev Implements the DNSSEC SHA256 digest.

diff --git a/contracts/ethregistrar/ETHRegistrarController.sol b/contracts/ethregistrar/ETHRegistrarController.sol
@@ -2,7 +2,7 @@
 pragma solidity ~0.8.17;
 
 import {BaseRegistrarImplementation} from "./BaseRegistrarImplementation.sol";
-import {StringUtils} from "./StringUtils.sol";
+import {StringUtils} from "../utils/StringUtils.sol";
 import {Resolver} from "../resolvers/Resolver.sol";
 import {ENS} from "../registry/ENS.sol";
 import {ReverseRegistrar} from "../reverseRegistrar/ReverseRegistrar.sol";

diff --git a/contracts/ethregistrar/StablePriceOracle.sol b/contracts/ethregistrar/StablePriceOracle.sol
@@ -2,7 +2,7 @@
 pragma solidity ~0.8.17;
 
 import "./IPriceOracle.sol";
-import "./StringUtils.sol";
+import "../utils/StringUtils.sol";
 import "@openzeppelin/contracts/access/Ownable.sol";
 import "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 

diff --git a/contracts/ethregistrar/StringUtils.sol b/contracts/ethregistrar/StringUtils.sol
diff --git a/contracts/registry/ENS.sol b/contracts/registry/ENS.sol
@@ -1,3 +1,4 @@
+//SPDX-License-Identifier: MIT
 pragma solidity >=0.8.4;
 
 interface ENS {

diff --git a/contracts/resolvers/OwnedResolver.sol b/contracts/resolvers/OwnedResolver.sol
@@ -1,3 +1,4 @@
+//SPDX-License-Identifier: MIT
 pragma solidity >=0.8.4;
 import "@openzeppelin/contracts/access/Ownable.sol";
 import "./profiles/ABIResolver.sol";