Introduce CCIP urls in response (#30)

Antony1060 · web-flow · commit b293ccb9ac00 · 2023-12-06T11:53:11.000Z
diff --git a/server/Cargo.lock b/server/Cargo.lock
diff --git a/server/Cargo.toml b/server/Cargo.toml
@@ -30,7 +30,7 @@ utoipa = { version = "4.1.0", features = ["axum_extras"] }
 utoipa-swagger-ui = { version = "4.0.0", features = ["axum"] }
 redis = { version = "0.23.0", features = ["connection-manager", "tokio-comp"] }
 ethers-ccip-read = { git = "https://github.com/ensdomains/ethers-ccip-read", branch = "main" }
-tower-http = { version = "0.4.1", features = ["cors", "tracing", "trace"] }
+tower-http = { version = "0.4.4", features = ["cors", "tracing", "trace"] }
 rand = "0.8.5"
 chrono = "0.4.31"
 ethers-contract = "2.0.9"
diff --git a/shared/Cargo.lock b/shared/Cargo.lock
diff --git a/shared/src/models/multicoin/decoding/binance.rs b/shared/src/models/multicoin/decoding/binance.rs
@@ -12,5 +12,3 @@ impl MulticoinDecoder for BinanceDecoder {
         })
     }
 }
-
-// TODO: tests
diff --git a/shared/src/models/multicoin/decoding/bitcoin_cash.rs b/shared/src/models/multicoin/decoding/bitcoin_cash.rs
@@ -1,4 +1,4 @@
-use super::{MulticoinDecoder, MulticoinDecoderError, p2pkh::P2PKHDecoder, p2sh::P2SHDecoder};
+use super::{p2pkh::P2PKHDecoder, p2sh::P2SHDecoder, MulticoinDecoder, MulticoinDecoderError};
 
 pub struct BitcoinCashDecoder {}
 
@@ -15,5 +15,3 @@ impl MulticoinDecoder for BitcoinCashDecoder {
         Err(MulticoinDecoderError::InvalidStructure(String::new()))
     }
 }
-
-// TODO: tests
diff --git a/shared/src/models/multicoin/decoding/dogecoin.rs b/shared/src/models/multicoin/decoding/dogecoin.rs
@@ -11,5 +11,3 @@ impl MulticoinDecoder for DogecoinDecoder {
         }
     }
 }
-
-// TODO: tests
diff --git a/shared/src/models/multicoin/decoding/hedera.rs b/shared/src/models/multicoin/decoding/hedera.rs
@@ -15,5 +15,3 @@ impl MulticoinDecoder for HederaDecoder {
         Ok(format!("{shard}.{realm}.{account}"))
     }
 }
-
-// TODO: tests
diff --git a/shared/src/models/multicoin/decoding/litecoin.rs b/shared/src/models/multicoin/decoding/litecoin.rs
@@ -27,5 +27,3 @@ impl MulticoinDecoder for LitecoinDecoder {
         Err(MulticoinDecoderError::InvalidStructure(String::new()))
     }
 }
-
-// TODO: tests
diff --git a/shared/src/models/multicoin/decoding/monacoin.rs b/shared/src/models/multicoin/decoding/monacoin.rs
@@ -11,5 +11,3 @@ impl MulticoinDecoder for MonacoinDecoder {
         }
     }
 }
-
-// TODO: tests
diff --git a/shared/src/models/multicoin/decoding/monero.rs b/shared/src/models/multicoin/decoding/monero.rs
@@ -8,5 +8,3 @@ impl MulticoinDecoder for MoneroDecoder {
         Err(MulticoinDecoderError::NotSupported)
     }
 }
-
-// TODO: tests
diff --git a/shared/src/models/multicoin/decoding/polkadot.rs b/shared/src/models/multicoin/decoding/polkadot.rs
@@ -17,5 +17,3 @@ impl MulticoinDecoder for PolkadotDecoder {
             .into_string())
     }
 }
-
-// TODO: tests
diff --git a/shared/src/models/multicoin/decoding/ripple.rs b/shared/src/models/multicoin/decoding/ripple.rs
@@ -16,5 +16,3 @@ impl MulticoinDecoder for RippleDecoder {
             .into_string())
     }
 }
-
-// TODO: tests
diff --git a/shared/src/models/multicoin/decoding/solana.rs b/shared/src/models/multicoin/decoding/solana.rs
@@ -7,5 +7,3 @@ impl MulticoinDecoder for SolanaDecoder {
         Ok(bs58::encode(data).into_string())
     }
 }
-
-// TODO: tests
diff --git a/shared/src/models/multicoin/decoding/stellar.rs b/shared/src/models/multicoin/decoding/stellar.rs
@@ -19,5 +19,3 @@ impl MulticoinDecoder for StellarDecoder {
         Ok(base32::encode(Alphabet::RFC4648 { padding: false }, full.as_slice()))
     }
 }
-
-// TODO: tests
diff --git a/shared/src/models/multicoin/decoding/tezos.rs b/shared/src/models/multicoin/decoding/tezos.rs
@@ -43,5 +43,3 @@ impl MulticoinDecoder for TezosDecoder {
         )
     }
 }
-
-// TODO: tests
diff --git a/shared/src/models/profile/from_name.rs b/shared/src/models/profile/from_name.rs
@@ -97,7 +97,8 @@ impl Profile {
         // ens CCIP unwrapper is limited to 50 sub-requests, i.e. per request
         let calldata_chunks = calldata.chunks(50).collect::<Vec<_>>();
 
-        let (mut data, resolver) = resolve_universal(name, calldata_chunks[0], &rpc).await?;
+        let (mut data, resolver, ccip_urls) =
+            resolve_universal(name, calldata_chunks[0], &rpc).await?;
 
         for &chunk in &calldata_chunks[1..] {
             data = [data, resolve_universal(name, chunk, &rpc).await?.0].concat();
@@ -183,6 +184,7 @@ impl Profile {
             chains,
             fresh: chrono::offset::Utc::now().timestamp_millis(),
             resolver: EIP55Address(resolver),
+            ccip_urls,
             errors,
         };
 
diff --git a/shared/src/models/profile/mod.rs b/shared/src/models/profile/mod.rs
@@ -31,6 +31,8 @@ pub struct Profile {
     pub fresh: i64,
     // Resolver the information was fetched from
     pub resolver: EIP55Address,
+    #[serde(skip_serializing_if = "Vec::is_empty")]
+    pub ccip_urls: Vec<String>,
     // Errors encountered while fetching & decoding
     pub errors: BTreeMap<String, String>,
 }
diff --git a/shared/src/models/universal_resolver/mod.rs b/shared/src/models/universal_resolver/mod.rs
@@ -1,15 +1,19 @@
+use std::vec;
+
 use ethers::prelude::ProviderError::JsonRpcClientError;
 use ethers::{
-    providers::{namehash, Http, Middleware, Provider},
+    providers::{namehash, Http, Provider},
     types::{transaction::eip2718::TypedTransaction, Address, Bytes},
 };
-use ethers_ccip_read::{CCIPReadMiddleware, CCIPReadMiddlewareError};
+use ethers_ccip_read::{CCIPReadMiddleware, CCIPReadMiddlewareError, CCIPRequest};
 use ethers_contract::abigen;
+use ethers_core::abi;
 use ethers_core::abi::{ParamType, Token};
 use lazy_static::lazy_static;
 
 use crate::models::lookup::ENSLookup;
 use crate::utils::dns::dns_encode;
+use crate::utils::vec::dedup_ord;
 
 use super::profile::error::ProfileError;
 
@@ -34,7 +38,7 @@ pub async fn resolve_universal(
     name: &str,
     data: &[Box<dyn ENSLookup + Send + Sync>],
     provider: &CCIPReadMiddleware<Provider<Http>>,
-) -> Result<(Vec<Vec<u8>>, Address), ProfileError> {
+) -> Result<(Vec<Vec<u8>>, Address, Vec<String>), ProfileError> {
     let name_hash = namehash(name);
 
     // Prepare the variables
@@ -46,8 +50,7 @@ pub async fn resolve_universal(
         .map(Token::Bytes)
         .collect();
 
-    let encoded_data =
-        ethers_core::abi::encode(&[Token::Bytes(dns_encoded_node), Token::Array(wildcard_data)]);
+    let encoded_data = abi::encode(&[Token::Bytes(dns_encoded_node), Token::Array(wildcard_data)]);
 
     // resolve(bytes node, bytes[] data)
     let resolve_selector = hex_literal::hex!("206c74c9").to_vec();
@@ -63,8 +66,8 @@ pub async fn resolve_universal(
     typed_transaction.set_data(Bytes::from(transaction_data));
 
     // Call the transaction
-    let res = provider
-        .call(&typed_transaction, None)
+    let (res, ccip_requests) = provider
+        .call_ccip(&typed_transaction, None)
         .await
         .map_err(|err| {
             let CCIPReadMiddlewareError::MiddlewareError(provider_error) = err else {
@@ -116,9 +119,55 @@ pub async fn resolve_universal(
             .map(|t| t.into_bytes().expect("result[0] elements should be bytes"))
             .collect(),
         resolver,
+        dedup_ord(
+            &ccip_requests
+                .iter()
+                .flat_map(urls_from_request)
+                .collect::<Vec<_>>(),
+        ),
     ))
 }
 
+fn urls_from_request(request: &CCIPRequest) -> Vec<String> {
+    if request.calldata.len() < 4 {
+        return Vec::new();
+    }
+
+    let decoded = abi::decode(
+        &[ParamType::Array(Box::new(ParamType::Tuple(vec![
+            ParamType::Address,
+            ParamType::Array(Box::new(ParamType::String)),
+            ParamType::Bytes,
+        ])))],
+        &request.calldata[4..],
+    )
+    .unwrap_or_default();
+
+    let Some(Token::Array(requests)) = decoded.get(0) else {
+        return Vec::new();
+    };
+
+    requests
+        .iter()
+        .flat_map(|request| {
+            let Token::Tuple(request) = request else {
+                return Vec::new();
+            };
+
+            let Some(Token::Array(urls)) = request.get(1) else {
+                return Vec::new();
+            };
+
+            urls.iter()
+                .filter_map(|url| match url {
+                    Token::String(url) => Some(url.clone()),
+                    _ => None,
+                })
+                .collect::<Vec<_>>()
+        })
+        .collect()
+}
+
 #[cfg(test)]
 mod tests {
     use std::str::FromStr;
diff --git a/shared/src/utils/mod.rs b/shared/src/utils/mod.rs
@@ -1,3 +1,4 @@
-pub mod sha256;
-pub mod eip55;
 pub mod dns;
+pub mod eip55;
+pub mod sha256;
+pub mod vec;
diff --git a/shared/src/utils/vec.rs b/shared/src/utils/vec.rs
@@ -0,0 +1,11 @@
+use std::collections::HashSet;
+use std::hash::Hash;
+
+pub fn dedup_ord<T: Clone + Hash + Eq>(src: &[T]) -> Vec<T> {
+    let mut set = HashSet::new();
+
+    let mut copy = src.to_vec();
+    copy.retain(|item| set.insert(item.clone()));
+
+    copy
+}
diff --git a/worker/Cargo.lock b/worker/Cargo.lock

Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,3 @@ impl MulticoinDecoder for BinanceDecoder {`
`12`	`12`	`})`
`13`	`13`	`}`
`14`	`14`	`}`
`15`		`-`
`16`		`-// TODO: tests`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-use super::{MulticoinDecoder, MulticoinDecoderError, p2pkh::P2PKHDecoder, p2sh::P2SHDecoder};`
	`1`	`+use super::{p2pkh::P2PKHDecoder, p2sh::P2SHDecoder, MulticoinDecoder, MulticoinDecoderError};`
`2`	`2`
`3`	`3`	`pub struct BitcoinCashDecoder {}`
`4`	`4`
`@@ -15,5 +15,3 @@ impl MulticoinDecoder for BitcoinCashDecoder {`
`15`	`15`	`Err(MulticoinDecoderError::InvalidStructure(String::new()))`
`16`	`16`	`}`
`17`	`17`	`}`
`18`		`-`
`19`		`-// TODO: tests`
Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,3 @@ impl MulticoinDecoder for DogecoinDecoder {`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`	`}`
`14`		`-`
`15`		`-// TODO: tests`
Original file line number	Diff line number	Diff line change
`@@ -27,5 +27,3 @@ impl MulticoinDecoder for LitecoinDecoder {`
`27`	`27`	`Err(MulticoinDecoderError::InvalidStructure(String::new()))`
`28`	`28`	`}`
`29`	`29`	`}`
`30`		`-`
`31`		`-// TODO: tests`
Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,3 @@ impl MulticoinDecoder for MoneroDecoder {`
`8`	`8`	`Err(MulticoinDecoderError::NotSupported)`
`9`	`9`	`}`
`10`	`10`	`}`
`11`		`-`
`12`		`-// TODO: tests`