Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ability to resolve ENS and Unstoppable domains to ethereum address #10447

Merged
merged 4 commits into from
Oct 14, 2021
Merged

Add ability to resolve ENS and Unstoppable domains to ethereum address #10447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a587f84
Refactor UD/ENS methods in eth_json_rpc_controller
yrliou Oct 8, 2021
2a9ef5b
Add EnsGetEthAddr and UnstoppableDomainsGetEthAddr
yrliou Oct 9, 2021
98108bd
Tests
yrliou Oct 11, 2021
b35edba
Add tests in eth_data_builder_unittest
yrliou Oct 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions browser/decentralized_dns/test/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ source_set("unit_tests") {
"//base",
"//base/test:test_support",
"//brave/browser/net",
"//brave/components/brave_wallet/browser",
"//brave/components/decentralized_dns",
"//brave/components/tor/buildflags",
"//chrome/test:test_support",
Expand Down
64 changes: 17 additions & 47 deletions browser/net/decentralized_dns_network_delegate_helper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
#include <vector>

#include "brave/browser/brave_wallet/rpc_controller_factory.h"
#include "brave/components/brave_wallet/browser/brave_wallet_utils.h"
#include "brave/components/brave_wallet/browser/eth_data_builder.h"
#include "brave/components/brave_wallet/browser/eth_json_rpc_controller.h"
#include "brave/components/brave_wallet/common/brave_wallet.mojom.h"
#include "brave/components/decentralized_dns/constants.h"
Expand Down Expand Up @@ -38,12 +36,9 @@ int OnBeforeURLRequest_DecentralizedDnsPreRedirectWork(
return net::OK;
}

auto pending =
brave_wallet::RpcControllerFactory::GetForContext(ctx->browser_context);

mojo::Remote<brave_wallet::mojom::EthJsonRpcController> rpc_controller;
rpc_controller.Bind(std::move(pending));

auto* rpc_controller =
brave_wallet::RpcControllerFactory::GetControllerForContext(
ctx->browser_context);
if (!rpc_controller)
return net::OK;

Expand All @@ -52,27 +47,18 @@ int OnBeforeURLRequest_DecentralizedDnsPreRedirectWork(
g_browser_process->local_state())) {
auto keys = std::vector<std::string>(std::begin(kRecordKeys),
std::end(kRecordKeys));
std::string data;
if (!brave_wallet::unstoppable_domains::GetMany(
keys, ctx->request_url.host(), &data))
return net::OK;

rpc_controller->UnstoppableDomainsProxyReaderGetMany(
kProxyReaderContractAddress, ctx->request_url.host(), keys,
base::BindOnce(&OnBeforeURLRequest_DecentralizedDnsRedirectWork,
brave_wallet::mojom::kMainnetChainId, ctx->request_url.host(), keys,
base::BindOnce(&OnBeforeURLRequest_UnstoppableDomainsRedirectWork,
next_callback, ctx));

return net::ERR_IO_PENDING;
}

if (IsENSTLD(ctx->request_url) &&
IsENSResolveMethodEthereum(g_browser_process->local_state())) {
std::string data;
if (!brave_wallet::ens::GetResolverAddress(ctx->request_url.host(), &data))
return net::OK;

rpc_controller->EnsProxyReaderGetResolverAddress(
kEnsRegistryContractAddress, ctx->request_url.host(),
rpc_controller->EnsResolverGetContentHash(
brave_wallet::mojom::kMainnetChainId, ctx->request_url.host(),
base::BindOnce(&OnBeforeURLRequest_EnsRedirectWork, next_callback,
ctx));

Expand All @@ -86,22 +72,14 @@ void OnBeforeURLRequest_EnsRedirectWork(
const brave::ResponseCallback& next_callback,
std::shared_ptr<brave::BraveRequestInfo> ctx,
bool success,
const std::string& result) {
const std::string& content_hash) {
if (!success) {
if (!next_callback.is_null())
next_callback.Run();
return;
}
size_t offset = 2 /* len of "0x" */ + 64 /* len of offset to array */;
std::string contenthash;
if (offset > result.size() ||
!brave_wallet::DecodeString(offset, result, &contenthash)) {
if (!next_callback.is_null())
next_callback.Run();
return;
}

GURL ipfs_uri = ipfs::ContentHashToCIDv1URL(contenthash);
GURL ipfs_uri = ipfs::ContentHashToCIDv1URL(content_hash);
if (ipfs_uri.is_valid()) {
ctx->new_url_spec = ipfs_uri.spec();
}
Expand All @@ -110,21 +88,13 @@ void OnBeforeURLRequest_EnsRedirectWork(
next_callback.Run();
}

void OnBeforeURLRequest_DecentralizedDnsRedirectWork(
void OnBeforeURLRequest_UnstoppableDomainsRedirectWork(
const brave::ResponseCallback& next_callback,
std::shared_ptr<brave::BraveRequestInfo> ctx,
bool success,
const std::string& result) {
if (!success) {
if (!next_callback.is_null())
next_callback.Run();
return;
}

std::vector<std::string> output;
size_t offset = 2 /* len of "0x" */ + 64 /* len of offset to array */;
if (offset > result.size() ||
!brave_wallet::DecodeStringArray(result.substr(offset), &output)) {
const std::vector<std::string>& values) {
if (!success ||
values.size() != static_cast<size_t>(RecordKeys::MAX_RECORD_KEY) + 1) {
if (!next_callback.is_null())
next_callback.Run();
return;
Expand All @@ -137,14 +107,14 @@ void OnBeforeURLRequest_DecentralizedDnsRedirectWork(
//
// TODO(jocelyn): Do not fallback to the set redirect URL if dns.A or
// dns.AAAA is not empty once we support the classical DNS records case.
std::string ipfs_uri = GetValue(output, RecordKeys::DWEB_IPFS_HASH);
std::string ipfs_uri = GetValue(values, RecordKeys::DWEB_IPFS_HASH);
if (ipfs_uri.empty()) { // Try legacy value.
ipfs_uri = GetValue(output, RecordKeys::IPFS_HTML_VALUE);
ipfs_uri = GetValue(values, RecordKeys::IPFS_HTML_VALUE);
}

std::string fallback_url = GetValue(output, RecordKeys::BROWSER_REDIRECT_URL);
std::string fallback_url = GetValue(values, RecordKeys::BROWSER_REDIRECT_URL);
if (fallback_url.empty()) { // Try legacy value.
fallback_url = GetValue(output, RecordKeys::IPFS_REDIRECT_DOMAIN_VALUE);
fallback_url = GetValue(values, RecordKeys::IPFS_REDIRECT_DOMAIN_VALUE);
}

if (!ipfs_uri.empty()) {
Expand Down
7 changes: 4 additions & 3 deletions browser/net/decentralized_dns_network_delegate_helper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

#include <memory>
#include <string>
#include <vector>

#include "brave/browser/net/url_context.h"
#include "net/base/completion_once_callback.h"
Expand All @@ -20,17 +21,17 @@ int OnBeforeURLRequest_DecentralizedDnsPreRedirectWork(
const brave::ResponseCallback& next_callback,
std::shared_ptr<brave::BraveRequestInfo> ctx);

void OnBeforeURLRequest_DecentralizedDnsRedirectWork(
void OnBeforeURLRequest_UnstoppableDomainsRedirectWork(
const brave::ResponseCallback& next_callback,
std::shared_ptr<brave::BraveRequestInfo> ctx,
bool success,
const std::string& result);
const std::vector<std::string>& values);

void OnBeforeURLRequest_EnsRedirectWork(
const brave::ResponseCallback& next_callback,
std::shared_ptr<brave::BraveRequestInfo> ctx,
bool success,
const std::string& ipfs_uri);
const std::string& content_hash);

} // namespace decentralized_dns

Expand Down
Loading