Skip to content

Commit

Permalink
Merge pull request #292 from ensdomains/feat/universal-resolver-result
Browse files Browse the repository at this point in the history 
feat: universal resolver safe calls + success var return
  • Loading branch information
@TateB
TateB authored Dec 7, 2023
2 parents 5ae0cd7 + 6117475 commit 242c27e
Show file tree
Hide file tree
Showing 8 changed files with 682 additions and 130 deletions.
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@ yarn pub
5. Create a "Release Candidate" [release](https://docs.github.com/en/repositories/releasing-projects-on-github/about-releases) on GitHub. This will be of the form `v1.2.3-RC0`. This tagged commit is now subject to our bug bounty.
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.
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.
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`.
Expand Down
18 changes: 17 additions & 1 deletion contracts/utils/LowLevelCallUtils.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,30 @@ library LowLevelCallUtils {
function functionStaticCall(
address target,
bytes memory data
) internal view returns (bool success) {
return functionStaticCall(target, data, gasleft());
}

/**
* @dev Makes a static call to the specified `target` with `data` using `gasLimit`. Return data can be fetched with
* `returnDataSize` and `readReturnData`.
* @param target The address to staticcall.
* @param data The data to pass to the call.
* @param gasLimit The gas limit to use for the call.
* @return success True if the call succeeded, or false if it reverts.
*/
function functionStaticCall(
address target,
bytes memory data,
uint256 gasLimit
) internal view returns (bool success) {
require(
target.isContract(),
"LowLevelCallUtils: static call to non-contract"
);
assembly {
success := staticcall(
gas(),
gasLimit,
target,
add(data, 32),
mload(data),
Expand Down
174 changes: 134 additions & 40 deletions contracts/utils/UniversalResolver.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,17 @@ error ResolverNotFound();

error ResolverWildcardNotSupported();

error ResolverNotContract();

error ResolverError(bytes returnData);

error HttpError(HttpErrorItem[] errors);

struct HttpErrorItem {
uint16 status;
string message;
}

struct MulticallData {
bytes name;
bytes[] data;
Expand All @@ -35,6 +46,11 @@ struct MulticallData {
bool[] failures;
}

struct MulticallChecks {
bool isCallback;
bool hasExtendedResolver;
}

struct OffchainLookupCallData {
address sender;
string[] urls;
Expand All @@ -46,6 +62,11 @@ struct OffchainLookupExtraData {
bytes data;
}

struct Result {
bool success;
bytes returnData;
}

interface BatchGateway {
function query(
OffchainLookupCallData[] memory data
Expand Down Expand Up @@ -97,7 +118,7 @@ contract UniversalResolver is ERC165, Ownable {
function resolve(
bytes calldata name,
bytes[] memory data
) external view returns (bytes[] memory, address) {
) external view returns (Result[] memory, address) {
return resolve(name, data, batchGatewayURLs);
}

Expand All @@ -120,7 +141,7 @@ contract UniversalResolver is ERC165, Ownable {
bytes calldata name,
bytes[] memory data,
string[] memory gateways
) public view returns (bytes[] memory, address) {
) public view returns (Result[] memory, address) {
return
_resolve(name, data, gateways, this.resolveCallback.selector, "");
}
Expand All @@ -134,14 +155,19 @@ contract UniversalResolver is ERC165, Ownable {
) public view returns (bytes memory, address) {
bytes[] memory dataArr = new bytes[](1);
dataArr[0] = data;
(bytes[] memory results, address resolver) = _resolve(
(Result[] memory results, address resolver) = _resolve(
name,
dataArr,
gateways,
callbackFunction,
metaData
);
return (results[0], resolver);

Result memory result = results[0];

_checkResolveSingle(result);

return (result.returnData, resolver);
}

function _resolve(
Expand All @@ -150,13 +176,17 @@ contract UniversalResolver is ERC165, Ownable {
string[] memory gateways,
bytes4 callbackFunction,
bytes memory metaData
) internal view returns (bytes[] memory results, address resolverAddress) {
) internal view returns (Result[] memory results, address resolverAddress) {
(Resolver resolver, , uint256 finalOffset) = findResolver(name);
resolverAddress = address(resolver);
if (resolverAddress == address(0)) {
revert ResolverNotFound();
}

if (!resolverAddress.isContract()) {
revert ResolverNotContract();
}

bool isWildcard = finalOffset != 0;

results = _multicall(
Expand Down Expand Up @@ -193,7 +223,7 @@ contract UniversalResolver is ERC165, Ownable {
reverseName.namehash(0)
);
(
bytes memory resolvedReverseData,
bytes memory reverseResolvedData,
address reverseResolverAddress
) = _resolveSingle(
reverseName,
Expand All @@ -205,7 +235,7 @@ contract UniversalResolver is ERC165, Ownable {

return
getForwardDataFromReverse(
resolvedReverseData,
reverseResolvedData,
reverseResolverAddress,
gateways
);
Expand Down Expand Up @@ -249,19 +279,23 @@ contract UniversalResolver is ERC165, Ownable {
bytes calldata response,
bytes calldata extraData
) external view returns (bytes memory, address) {
(bytes[] memory results, address resolver, , ) = _resolveCallback(
(Result[] memory results, address resolver, , ) = _resolveCallback(
response,
extraData,
this.resolveSingleCallback.selector
);
return (results[0], resolver);
Result memory result = results[0];

_checkResolveSingle(result);

return (result.returnData, resolver);
}

function resolveCallback(
bytes calldata response,
bytes calldata extraData
) external view returns (bytes[] memory, address) {
(bytes[] memory results, address resolver, , ) = _resolveCallback(
) external view returns (Result[] memory, address) {
(Result[] memory results, address resolver, , ) = _resolveCallback(
response,
extraData,
this.resolveCallback.selector
Expand All @@ -274,7 +308,7 @@ contract UniversalResolver is ERC165, Ownable {
bytes calldata extraData
) external view returns (string memory, address, address, address) {
(
bytes[] memory resolvedData,
Result[] memory results,
address resolverAddress,
string[] memory gateways,
bytes memory metaData
Expand All @@ -284,10 +318,16 @@ contract UniversalResolver is ERC165, Ownable {
this.reverseCallback.selector
);

Result memory result = results[0];

if (!result.success) {
revert ResolverError(result.returnData);
}

if (metaData.length > 0) {
(string memory resolvedName, address reverseResolverAddress) = abi
.decode(metaData, (string, address));
address resolvedAddress = abi.decode(resolvedData[0], (address));
address resolvedAddress = abi.decode(result.returnData, (address));
return (
resolvedName,
resolvedAddress,
Expand All @@ -298,7 +338,7 @@ contract UniversalResolver is ERC165, Ownable {

return
getForwardDataFromReverse(
resolvedData[0],
result.returnData,
resolverAddress,
gateways
);
Expand All @@ -319,7 +359,7 @@ contract UniversalResolver is ERC165, Ownable {
)
internal
view
returns (bytes[] memory, address, string[] memory, bytes memory)
returns (Result[] memory, address, string[] memory, bytes memory)
{
MulticallData memory multicallData;
multicallData.callbackFunction = callbackFunction;
Expand Down Expand Up @@ -381,7 +421,8 @@ contract UniversalResolver is ERC165, Ownable {
*/
function callWithOffchainLookupPropagation(
address target,
bytes memory data
bytes memory data,
bool isSafe
)
internal
view
Expand All @@ -392,7 +433,11 @@ contract UniversalResolver is ERC165, Ownable {
bool result
)
{
result = LowLevelCallUtils.functionStaticCall(address(target), data);
if (isSafe) {
result = LowLevelCallUtils.functionStaticCall(target, data);
} else {
result = LowLevelCallUtils.functionStaticCall(target, data, 50000);
}
uint256 size = LowLevelCallUtils.returnDataSize();

if (result) {
Expand Down Expand Up @@ -499,56 +544,105 @@ contract UniversalResolver is ERC165, Ownable {
return (parentresolver, node, parentoffset);
}

function _hasExtendedResolver(
address resolver
function _checkInterface(
address resolver,
bytes4 interfaceId
) internal view returns (bool) {
try
Resolver(resolver).supportsInterface{gas: 50000}(
type(IExtendedResolver).interfaceId
)
Resolver(resolver).supportsInterface{gas: 50000}(interfaceId)
returns (bool supported) {
return supported;
} catch {
return false;
}
}

function _checkSafetyAndItem(
bytes memory name,
bytes memory item,
address resolver,
MulticallChecks memory multicallChecks
) internal view returns (bool, bytes memory) {
if (!multicallChecks.isCallback) {
if (multicallChecks.hasExtendedResolver) {
return (
true,
abi.encodeCall(IExtendedResolver.resolve, (name, item))
);
}
return (_checkInterface(resolver, bytes4(item)), item);
}
return (true, item);
}

function _checkMulticall(
MulticallData memory multicallData
) internal view returns (MulticallChecks memory) {
bool isCallback = multicallData.name.length == 0;
bool hasExtendedResolver = _checkInterface(
multicallData.resolver,
type(IExtendedResolver).interfaceId
);

if (multicallData.isWildcard && !hasExtendedResolver) {
revert ResolverWildcardNotSupported();
}

return MulticallChecks(isCallback, hasExtendedResolver);
}

function _checkResolveSingle(Result memory result) internal pure {
if (!result.success) {
if (bytes4(result.returnData) == HttpError.selector) {
(, HttpErrorItem[] memory errors) = abi.decode(
result.returnData,
(bytes4, HttpErrorItem[])
);
revert HttpError(errors);
}
revert ResolverError(result.returnData);
}
}

function _multicall(
MulticallData memory multicallData
) internal view returns (bytes[] memory results) {
) internal view returns (Result[] memory results) {
uint256 length = multicallData.data.length;
uint256 offchainCount = 0;
OffchainLookupCallData[]
memory callDatas = new OffchainLookupCallData[](length);
OffchainLookupExtraData[]
memory extraDatas = new OffchainLookupExtraData[](length);
results = new bytes[](length);
bool isCallback = multicallData.name.length == 0;
bool hasExtendedResolver = _hasExtendedResolver(multicallData.resolver);

if (multicallData.isWildcard && !hasExtendedResolver) {
revert ResolverWildcardNotSupported();
}
results = new Result[](length);
MulticallChecks memory multicallChecks = _checkMulticall(multicallData);

for (uint256 i = 0; i < length; i++) {
bytes memory item = multicallData.data[i];
bool failure = multicallData.failures[i];

if (failure) {
results[i] = item;
results[i] = Result(false, item);
continue;
}
if (!isCallback && hasExtendedResolver) {
item = abi.encodeCall(
IExtendedResolver.resolve,
(multicallData.name, item)
);
}

bool isSafe = false;
(isSafe, item) = _checkSafetyAndItem(
multicallData.name,
item,
multicallData.resolver,
multicallChecks
);

(
bool offchain,
bytes memory returnData,
OffchainLookupExtraData memory extraData,
bool success
) = callWithOffchainLookupPropagation(multicallData.resolver, item);
) = callWithOffchainLookupPropagation(
multicallData.resolver,
item,
isSafe
);

if (offchain) {
callDatas[offchainCount] = abi.decode(
Expand All @@ -560,11 +654,11 @@ contract UniversalResolver is ERC165, Ownable {
continue;
}

if (success && hasExtendedResolver) {
if (success && multicallChecks.hasExtendedResolver) {
// if this is a successful resolve() call, unwrap the result
returnData = abi.decode(returnData, (bytes));
}
results[i] = returnData;
results[i] = Result(success, returnData);
extraDatas[i].data = multicallData.data[i];
}

Expand Down
Loading

0 comments on commit 242c27e

Please sign in to comment.