From 43ae37df2076a089bfd277ea1bab74a6d91134c9 Mon Sep 17 00:00:00 2001
From: Serhii <17529954+serhii-bor@users.noreply.github.com>
Date: Fri, 7 Aug 2026 23:19:01 +0300
Subject: [PATCH] fix ens resolution to use resolver from registry (#3453)

* fix ens resolution to use resolver from registry

* minor fix
---
 .../ens/ens_address_provider.dart             |  3 +-
 lib/core/address_resolver/ens/ens_record.dart | 47 ++++++++++++-------
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/lib/core/address_resolver/ens/ens_address_provider.dart b/lib/core/address_resolver/ens/ens_address_provider.dart
index b0a365d07..1558ae27f 100644
--- a/lib/core/address_resolver/ens/ens_address_provider.dart
+++ b/lib/core/address_resolver/ens/ens_address_provider.dart
@@ -11,8 +11,7 @@ class EnsAddressProvider extends AddressLookupProvider {
   AddressSource get source => AddressSource.ens;
 
   @override
-  List<CryptoCurrency> get supportedCurrencies =>
-      [CryptoCurrency.xmr, CryptoCurrency.btc, CryptoCurrency.eth];
+  List<CryptoCurrency> get supportedCurrencies => [CryptoCurrency.eth];
 
   @override
   bool isEnabled(SettingsStore settingsStore) => settingsStore.lookupsENS;
diff --git a/lib/core/address_resolver/ens/ens_record.dart b/lib/core/address_resolver/ens/ens_record.dart
index 72b87cedf..331deaccf 100644
--- a/lib/core/address_resolver/ens/ens_record.dart
+++ b/lib/core/address_resolver/ens/ens_record.dart
@@ -1,11 +1,11 @@
-import 'package:cake_wallet/evm/evm.dart';
-import 'package:cw_core/crypto_currency.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
-import 'package:cw_core/utils/print_verbose.dart';
-import 'package:cw_core/wallet_base.dart';
-import 'package:cw_core/wallet_type.dart';
-import 'package:ens_dart/ens_dart.dart';
-import 'package:web3dart/web3dart.dart';
+import "package:cake_wallet/evm/evm.dart";
+import "package:cw_core/crypto_currency.dart";
+import "package:cw_core/utils/print_verbose.dart";
+import "package:cw_core/utils/proxy_wrapper.dart";
+import "package:cw_core/wallet_base.dart";
+import "package:cw_core/wallet_type.dart";
+import "package:ens_dart/ens_dart.dart";
+import "package:web3dart/web3dart.dart";
 
 class EnsRecord {
   static Future<String> fetchEnsAddress(
@@ -20,36 +20,49 @@ class EnsRecord {
     }
 
     _client ??= Web3Client(
-      'https://ethereum-rpc.publicnode.com',
+      "https://ethereum-rpc.publicnode.com",
       ProxyWrapper().getHttpIOClient(),
     );
 
-    final ens = Ens(client: _client);
+    final registryEns = Ens(client: _client).withName(name);
     final coinType = getEnsCoinType(cur);
 
     if (coinType == null) {
-      printV('Unsupported currency for ENS: $cur');
-      return '';
+      printV("Unsupported currency for ENS: $cur");
+      return "";
     }
 
     try {
-      if (coinType == CoinType.ETH || coinType == CoinType.MATIC) {
-        return (await ens.withName(name).getAddress()).hex;
+      // Check if the ENS name has its resolver set. If not, return an empty string.
+      final resolverAddress = await registryEns.getResolverAddress(registryEns.nodeHash);
+
+      if (isZeroAddress(resolverAddress)) {
+        printV("No resolver set for ENS name: $name");
+        return "";
+      }
+
+      final resolverEns = Ens(client: _client,address: resolverAddress).withName(name);
+
+      if (coinType == CoinType.ETH) {
+        return (await resolverEns.getAddress()).hex;
       } else {
-        return await ens.withName(name).getCoinAddress(coinType);
+        return await resolverEns.getCoinAddress(coinType);
       }
     } catch (e) {
       printV(e);
-      return '';
+      return "";
     }
   }
 
+  static bool isZeroAddress(EthereumAddress address) =>
+      address.addressBytes.every((byte) => byte == 0);
+
   static CoinType? getEnsCoinType(CryptoCurrency cur) => switch (cur) {
         CryptoCurrency.xmr => CoinType.XMR,
         CryptoCurrency.btc => CoinType.BTC,
         CryptoCurrency.ltc => CoinType.LTC,
         CryptoCurrency.eth => CoinType.ETH,
-        CryptoCurrency.matic => CoinType.MATIC,
+        CryptoCurrency.maticpoly => CoinType.MATIC,
         _ => null,
       };
 }