Skip to content

Commit e70c0a9

Browse files
committed
Names: normalize Basenames like ENS
Basenames hashed the name as typed, so a label registered with capitals or look-alike characters resolved separately from the real name. Base names now go through the ENS normalization: lowercased, and names that need punycode resolve as not found.
1 parent 6ffc3a1 commit e70c0a9

3 files changed

Lines changed: 7 additions & 2 deletions

File tree

‎core/crates/name_resolver/src/providers/basenames/provider.rs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ use primitives::{Chain, NameProvider};
66

77
use super::client::BasenamesClient;
88
use crate::model::NameQuery;
9+
use crate::providers::ens::ens_name;
910
use crate::resolver::NameResolver;
1011

1112
pub struct BasenamesProvider {
@@ -33,7 +34,10 @@ impl NameResolver for BasenamesProvider {
3334
}
3435

3536
async fn resolve(&self, query: &NameQuery, _chain: Chain) -> Result<Option<String>, Box<dyn Error + Send + Sync>> {
36-
let address = self.client.get_address(&query.domain).await?;
37+
let Some(name) = ens_name(query) else {
38+
return Ok(None);
39+
};
40+
let address = self.client.get_address(&name).await?;
3741
Ok((!address.is_zero()).then(|| address.to_string()))
3842
}
3943
}

‎core/crates/name_resolver/src/providers/ens/mod.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ mod testkit;
1111
pub use ccip::CcipClient;
1212
pub(crate) use name::namehash;
1313
pub use provider::EnsProvider;
14+
pub(crate) use provider::ens_name;

‎core/crates/name_resolver/src/providers/ens/provider.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ impl<C: Client + Clone> NameResolver for EnsProvider<C> {
5353
}
5454
}
5555

56-
fn ens_name(query: &NameQuery) -> Option<String> {
56+
pub(crate) fn ens_name(query: &NameQuery) -> Option<String> {
5757
query.ascii_domain().ok().filter(|name| !name.split('.').any(|label| label.starts_with("xn--")) && dns_encode(name).is_ok())
5858
}
5959

0 commit comments

Comments
 (0)