Update eip155 handling

Author: lucemans

packages/shared/src/models/eip155/mod.rs

@@ -229,4 +229,34 @@ mod tests {
 
         assert_eq!(data, "https://i.seadn.io/gae/hKHZTZSTmcznonu8I6xcVZio1IF76fq0XmcxnvUykC-FGuVJ75UPdLDlKJsfgVXH9wOSmkyHw0C39VAYtsGyxT7WNybjQ6s3fM3macE?w=500&auto=format".to_string());
     }
+
+    #[tokio::test]
+    async fn test_calldata_avatar_erc1155z() {
+        let provider = Provider::<Http>::try_from("https://rpc.ankr.com/eth")
+            .unwrap()
+            .wrap_into(|it| CCIPReadMiddleware::new(Arc::from(it)));
+
+        let state = LookupState {
+            rpc: Arc::new(provider),
+            opensea_api_key: "".to_string(),
+            ipfs_gateway: "https://ipfs.io/ipfs/".to_string(),
+            arweave_gateway: "https://arweave.net/".to_string(),
+        };
+
+        let data = resolve_eip155(
+            ChainId::Ethereum,
+            EIP155ContractType::ERC1155,
+            "0x495f947276749ce646f68ac8c248420045cb7b5e",
+            U256::from_dec_str("109791375735522898048150917964456965919994596086232976516654423066184641413121").unwrap(),
+            &state,
+        )
+        .await
+        .unwrap();
+
+        assert_eq!(
+            data,
+            "https://i.seadn.io/gae/Ra4OPR25gZ-_c7yasr7-vwUHxJp9SSn_w3angBICNK7qlUX63g0YlcFqQc5dVC47atikih_JkjMsfX4xE4KJURsbFcP-9y1cZWx4?w=500&auto=format"
+                .to_string()
+        );
+    }
 }

packages/shared/src/models/lookup/image.rs

@@ -20,7 +20,7 @@ lazy_static! {
     static ref ARWEAVE_REGEX: regex::Regex =
         regex::Regex::new(r"^ar://(.+)").expect("should be a valid regex");
     static ref EIP155_REGEX: regex::Regex =
-        regex::Regex::new(r"eip155:([0-9]+)/(erc1155|erc721):0x([0-9a-fA-F]{40})/([0-9]+)")
+        regex::Regex::new(r"(?i:eip155):([0-9]+)/(?i:(erc1155|erc721)):0x([0-9a-fA-F]{40})/([0-9]+)")
             .expect("should be a valid regex");
 }
 #[derive(Error, Debug)]
@@ -71,12 +71,15 @@ pub async fn decode(data: &[u8], state: &LookupState) -> Result<String, ENSLooku
         return Ok(value.to_string());
     };
 
+    info!("EIP155: {captures:?}");
+
     let (Some(chain_id), Some(contract_type), Some(contract_address), Some(token_id)) = (
         captures.get(1),
         captures.get(2),
         captures.get(3),
         captures.get(4),
     ) else {
+        info!("Failed to decode EIP155: {value}");
         return Err(ENSLookupError::AbiDecodeError);
     };
 
@@ -88,7 +91,7 @@ pub async fn decode(data: &[u8], state: &LookupState) -> Result<String, ENSLooku
     let token_id = U256::from_dec_str(token_id.as_str())
         .map_err(|err| ImageLookupError::FormatError(err.to_string()))?;
 
-    let contract_type = match contract_type.as_str() {
+    let contract_type = match contract_type.as_str().to_lowercase().as_str() {
         "erc721" => EIP155ContractType::ERC721,
         "erc1155" => EIP155ContractType::ERC1155,
         _ => return Err(ImageLookupError::FormatError("invalid contract type".to_string()).into()),