fix log datasets aliases and null calls (#134)

crates/cli/src/args.rs

@@ -262,10 +262,10 @@ impl Args {
     pub(crate) fn merge_with_precedence(self, other: Args) -> Self {
         let default_struct = Args::default();
 
-        let mut s1_value: Value = serde_json::to_value(&self).expect("Failed to serialize to JSON");
-        let s2_value: Value = serde_json::to_value(&other).expect("Failed to serialize to JSON");
+        let mut s1_value: Value = serde_json::to_value(self).expect("Failed to serialize to JSON");
+        let s2_value: Value = serde_json::to_value(other).expect("Failed to serialize to JSON");
         let default_value: Value =
-            serde_json::to_value(&default_struct).expect("Failed to serialize to JSON");
+            serde_json::to_value(default_struct).expect("Failed to serialize to JSON");
 
         if let (Value::Object(s1_map), Value::Object(s2_map), Value::Object(default_map)) =
             (&mut s1_value, &s2_value, &default_value)

crates/cli/src/parse/query.rs

@@ -39,10 +39,12 @@ fn find_arg_aliases(args: &Args, schemas: &Schemas) -> Vec<(Dim, Dim)> {
         if aliases.is_empty() {
             continue
         }
-        for dim in datatype.required_parameters() {
-            if args.dim_is_none(&dim) {
+        for dim in
+            datatype.required_parameters().iter().chain(datatype.optional_parameters().iter())
+        {
+            if args.dim_is_none(dim) {
                 for (k, v) in aliases.iter() {
-                    if v == &dim && args.dim_is_some(k) {
+                    if v == dim && args.dim_is_some(k) {
                         swaps.push((*k, *v));
                     }
                 }

crates/freeze/src/datasets/erc20_transfers.rs

@@ -21,12 +21,16 @@ pub struct Erc20Transfers {
 #[async_trait::async_trait]
 impl Dataset for Erc20Transfers {
     fn optional_parameters() -> Vec<Dim> {
-        vec![Dim::Contract, Dim::Topic0, Dim::Topic1, Dim::Topic2, Dim::FromAddress, Dim::ToAddress]
+        vec![Dim::Address, Dim::Topic0, Dim::Topic1, Dim::Topic2, Dim::FromAddress, Dim::ToAddress]
     }
 
     fn use_block_ranges() -> bool {
         true
     }
+
+    fn arg_aliases() -> Option<std::collections::HashMap<Dim, Dim>> {
+        Some([(Dim::Contract, Dim::Address)].into_iter().collect())
+    }
 }
 
 #[async_trait::async_trait]

crates/freeze/src/datasets/erc721_metadata.rs

@@ -38,13 +38,21 @@ impl CollectByBlock for Erc721Metadata {
 
         // name
         let call_data = FUNCTION_ERC20_NAME.clone();
-        let output = source.fetcher.call2(address, call_data, block_number).await?;
-        let name = String::from_utf8(output.to_vec()).ok().map(|s| remove_control_characters(&s));
+        let name = match source.fetcher.call2(address, call_data, block_number).await {
+            Ok(output) => {
+                String::from_utf8(output.to_vec()).ok().map(|s| remove_control_characters(&s))
+            }
+            Err(_) => None,
+        };
 
         // symbol
         let call_data = FUNCTION_ERC20_SYMBOL.clone();
-        let output = source.fetcher.call2(address, call_data, block_number).await?;
-        let symbol = String::from_utf8(output.to_vec()).ok().map(|s| remove_control_characters(&s));
+        let symbol = match source.fetcher.call2(address, call_data, block_number).await {
+            Ok(output) => {
+                String::from_utf8(output.to_vec()).ok().map(|s| remove_control_characters(&s))
+            }
+            Err(_) => None,
+        };
 
         Ok((request.block_number()? as u32, request.address()?, name, symbol))
     }

crates/freeze/src/datasets/erc721_transfers.rs

@@ -21,12 +21,16 @@ pub struct Erc721Transfers {
 #[async_trait::async_trait]
 impl Dataset for Erc721Transfers {
     fn optional_parameters() -> Vec<Dim> {
-        vec![Dim::Contract, Dim::FromAddress, Dim::ToAddress]
+        vec![Dim::Address, Dim::FromAddress, Dim::ToAddress]
     }
 
     fn use_block_ranges() -> bool {
         true
     }
+
+    fn arg_aliases() -> Option<std::collections::HashMap<Dim, Dim>> {
+        Some([(Dim::Contract, Dim::Address)].into_iter().collect())
+    }
 }
 
 #[async_trait::async_trait]

crates/freeze/src/datasets/logs.rs

@@ -28,12 +28,16 @@ impl Dataset for Logs {
     }
 
     fn optional_parameters() -> Vec<Dim> {
-        vec![Dim::Contract, Dim::Topic0, Dim::Topic1, Dim::Topic2, Dim::Topic3]
+        vec![Dim::Address, Dim::Topic0, Dim::Topic1, Dim::Topic2, Dim::Topic3]
     }
 
     fn use_block_ranges() -> bool {
         true
     }
+
+    fn arg_aliases() -> Option<std::collections::HashMap<Dim, Dim>> {
+        Some([(Dim::Contract, Dim::Address)].into_iter().collect())
+    }
 }
 
 #[async_trait::async_trait]

crates/freeze/src/types/chunks/subchunks.rs

@@ -43,7 +43,7 @@ impl Subchunk for Vec<BlockChunk> {
 }
 
 fn to_single_chunk(chunks: &Vec<BlockChunk>) -> BlockChunk {
-    match (chunks.len(), chunks.get(0)) {
+    match (chunks.len(), chunks.first()) {
         (1, Some(chunk)) => chunk.clone(),
         _ => {
             let numbers = chunks.iter().flat_map(|x| x.values()).collect();