fix(bens): fix skipping check of existing domains (#998)

blockscout-ens/bens-logic/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 tokio = { version = "1.23", features = [ "rt-multi-thread", "macros" ] }
-alloy-ccip-read = "0.1.1"
+alloy-ccip-read = "0.1.2"
 anyhow = "1"
 hex = "0.4"
 chrono = "0.4"

blockscout-ens/bens-logic/src/subgraph/domain_tokens.rs

@@ -7,9 +7,10 @@ use std::str::FromStr;
 
 #[tracing::instrument(
     level = "info",
-    skip(domain),
+    skip_all,
     fields(
         domain_name = domain.name,
+        native_token_contract = ?name.deployed_protocol.protocol.info.native_token_contract,
     ),
     err,
 )]

blockscout-ens/bens-logic/src/subgraph/ens/ccip_read.rs

@@ -17,6 +17,7 @@ pub struct DomainInfoFromCcipRead {
     pub addr: Address,
     pub resolver_address: Address,
     pub stored_offchain: bool,
+    pub resolved_with_wildcard: bool,
 }
 
 #[instrument(
@@ -42,6 +43,7 @@ pub async fn call_to_resolver(
         resolver_address,
         name: name.inner.name.clone(),
         stored_offchain: result.ccip_read_used,
+        resolved_with_wildcard: result.wildcard_used,
     })
 }
 

blockscout-ens/bens-logic/src/subgraph/ens/wildcard.rs

@@ -21,7 +21,7 @@ use std::str::FromStr;
     convert = r#"{
             from_user.inner.id.to_string()
         }"#,
-    time = 3600, // 60 * 60 seconds = 1 hour
+    time = 14400, // 4 * 60 * 60 seconds = 4 hours
     size = 500,
     sync_writes = true,
     with_cached_flag = true,
@@ -56,38 +56,21 @@ async fn try_wildcard_resolution(
     let Some((resolver_address, maybe_existing_domain)) = any_resolver(db, from_user).await? else {
         return Ok(None);
     };
-
-    let maybe_found_domain = maybe_existing_domain.and_then(|domain| {
-        if domain.id == from_user.inner.id {
-            Some(domain)
-        } else {
-            None
-        }
-    });
-
-    if let Some(domain) = &maybe_found_domain {
-        if !domain.resolved_with_wildcard {
-            // we found domain that resolved by graph node already, skip it
-            return Ok(None);
-        } else {
-            // domain is resolved with wildcard, so we need to recheck it
-            tracing::info!(
-                domain_id = domain.id,
-                domain_name = domain.name,
-                "found domain with wildcard-resolution, rechecking it"
-            )
-        }
-    };
-
     let result = ccip_read::call_to_resolver(from_user, resolver_address)
         .await
         .context("resolve using ccip call")?;
-
     if !result.addr.is_zero() {
+        let maybe_domain_to_update = maybe_existing_domain.and_then(|domain| {
+            if domain.id == from_user.inner.id {
+                Some(domain)
+            } else {
+                None
+            }
+        });
         Ok(Some(creation_domain_from_rpc_resolution(
             from_user,
             result,
-            maybe_found_domain,
+            maybe_domain_to_update,
         )))
     } else {
         Ok(None)
@@ -179,7 +162,7 @@ fn creation_domain_from_rpc_resolution(
         resolver: Some(resolver.to_string()),
         is_migrated: true,
         stored_offchain: ccip_read_info.stored_offchain,
-        resolved_with_wildcard: true,
+        resolved_with_wildcard: ccip_read_info.resolved_with_wildcard,
         created_at: now.timestamp().into(),
         owner: Address::ZERO.to_string(),
         wrapped_owner: None,

blockscout-ens/bens-logic/src/subgraph/patcher.rs

@@ -26,13 +26,7 @@ impl SubgraphPatcher {
     ) -> Result<(), anyhow::Error> {
         let protocol = from_user.deployed_protocol.protocol;
         let level = from_user.inner.level();
-        let range = if from_user.tld_is_native() {
-            // sub.domain.eth
-            3..=MAX_LEVEL
-        } else {
-            // any_domains.xyz
-            2..=MAX_LEVEL
-        };
+        let range = 2..=MAX_LEVEL;
         let level_is_fine = range.contains(&level);
         if protocol.info.try_offchain_resolve && level_is_fine {
             offchain_resolve(db, from_user).await?

blockscout-ens/bens-logic/src/subgraph/sql/create.rs

@@ -69,11 +69,15 @@ async fn update_domain(
         r#"
         UPDATE {schema}.domain
         SET
-            resolved_address = $1
-        WHERE vid = $2
+            resolved_address = $1,
+            stored_offchain = $2,
+            resolved_with_wildcard = $3
+        WHERE vid = $4
         "#
     ))
     .bind(&domain.resolved_address)
+    .bind(domain.stored_offchain)
+    .bind(domain.resolved_with_wildcard)
     .bind(vid)
     .execute(pool)
     .await?;

blockscout-ens/bens-server/src/server.rs

@@ -63,6 +63,7 @@ pub async fn run(settings: Settings) -> Result<(), anyhow::Error> {
             .context("database connect")?,
     );
     if settings.database.run_migrations {
+        tracing::info!("running migrations");
         bens_logic::migrations::run(&pool).await?;
     }
     let networks = settings