Skip to content

Commit

Permalink
Merge pull request #331 from ensdomains/feature/better-offchain-dns
Browse files Browse the repository at this point in the history
Rewrite ExtendedDNSResolver to support more record types
  • Loading branch information
Arachnid committed May 1, 2024
2 parents c15e4af + d3d6b70 commit 8e8cf71
Show file tree
Hide file tree
Showing 39 changed files with 832 additions and 1,434 deletions.
2 changes: 1 addition & 1 deletion contracts/dnsregistrar/DNSClaimChecker.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
2 changes: 1 addition & 1 deletion contracts/dnsregistrar/DNSRegistrar.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion contracts/dnsregistrar/OffchainDNSResolver.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion contracts/dnsregistrar/RecordParser.sol
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion contracts/dnsregistrar/TLDPublicSuffixList.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pragma solidity ^0.8.4;

import "../dnssec-oracle/BytesUtils.sol";
import "../utils/BytesUtils.sol";
import "./PublicSuffixList.sol";

/**
Expand Down
2 changes: 1 addition & 1 deletion contracts/dnsregistrar/mocks/DummyParser.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pragma solidity ^0.8.4;

import "../../dnssec-oracle/BytesUtils.sol";
import "../../utils/BytesUtils.sol";
import "../RecordParser.sol";

contract DummyParser {
Expand Down
2 changes: 1 addition & 1 deletion contracts/dnssec-oracle/DNSSECImpl.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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";

/*
Expand Down
2 changes: 1 addition & 1 deletion contracts/dnssec-oracle/RRUtils.sol
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//SPDX-License-Identifier: MIT
pragma solidity ^0.8.4;

import "./BytesUtils.sol";
import "../utils/BytesUtils.sol";
import "@ensdomains/buffer/contracts/Buffer.sol";

/**
Expand Down
2 changes: 1 addition & 1 deletion contracts/dnssec-oracle/algorithms/P256SHA256Algorithm.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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 *;
Expand Down
2 changes: 1 addition & 1 deletion contracts/dnssec-oracle/algorithms/RSASHA1Algorithm.sol
Original file line number Diff line number Diff line change
@@ -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";

/**
Expand Down
2 changes: 1 addition & 1 deletion contracts/dnssec-oracle/algorithms/RSASHA256Algorithm.sol
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion contracts/dnssec-oracle/algorithms/RSAVerify.sol
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pragma solidity ^0.8.4;

import "../BytesUtils.sol";
import "./ModexpPrecompile.sol";
import "../../utils/BytesUtils.sol";

library RSAVerify {
/**
Expand Down
2 changes: 1 addition & 1 deletion contracts/dnssec-oracle/digests/SHA1Digest.sol
Original file line number Diff line number Diff line change
@@ -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";

/**
Expand Down
2 changes: 1 addition & 1 deletion contracts/dnssec-oracle/digests/SHA256Digest.sol
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion contracts/ethregistrar/ETHRegistrarController.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion contracts/ethregistrar/StablePriceOracle.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
32 changes: 0 additions & 32 deletions contracts/ethregistrar/StringUtils.sol

This file was deleted.

0 comments on commit 8e8cf71

Please sign in to comment.