fix(config): Fix parsing null values with units + other config fixes (#4168)

## What ❔

- Fixes parsing null values with units, such as `slow_time_limit_ms:
null`.
- Updates `smart-config` to a published version (0.2.0-pre).
- Adds a missing default for the `max_blocks_to_look_back` param.

## Why ❔

We want existing Era configs to be parseable.

## Is this a breaking change?

- [ ] Yes
- [x] No

## Operational changes

No operational changes.

## Checklist

- [x] PR title corresponds to the body of PR (we generate changelog
entries from PRs).
- [x] Tests for the changes have been added / updated.
- [x] Documentation comments have been added / updated.
- [x] Code has been formatted via `zkstack dev fmt` and `zkstack dev
lint`.

Author: slowli

core/Cargo.lock

@@ -217,8 +217,8 @@ trybuild = "1.0"
 # "Internal" dependencies
 vise = "0.3.1"
 vise-exporter = "0.3.1"
-smart-config = { version = "=0.1.0-pre", git = "https://github.com/matter-labs/smart-config.git", rev = "992f72e6540a116bf91bdc03151bf0067834dff0" }
-smart-config-commands = { version = "=0.1.0-pre", git = "https://github.com/matter-labs/smart-config.git", rev = "992f72e6540a116bf91bdc03151bf0067834dff0" }
+smart-config = "=0.2.0-pre"
+smart-config-commands = "=0.2.0-pre"
 foundry-compilers = { version = "0.11.6", git = "https://github.com/Moonsong-Labs/compilers.git", rev = "7c69695e5c75451f158dd2456bf8c94a7492ea0b" }
 
 # DA clients' dependencies

core/Cargo.toml

@@ -581,6 +581,20 @@ mod tests {
         assert_eq!(config, expected_config());
     }
 
+    #[test]
+    fn parsing_null_time_limits() {
+        let yaml = r#"
+          port: 3071
+          slow_time_limit_ms: null
+          hard_time_limit_ms: null
+        "#;
+        let yaml = Yaml::new("test.yml", serde_yaml::from_str(yaml).unwrap()).unwrap();
+
+        let config = test::<HealthCheckConfig>(yaml).unwrap();
+        assert_eq!(config.slow_time_limit, None);
+        assert_eq!(config.hard_time_limit, None);
+    }
+
     #[test]
     fn parsing_max_response_overrides() {
         let yaml = r#"

core/lib/config/src/configs/api.rs

@@ -7,7 +7,7 @@ use std::{
 use serde::{Deserialize, Serialize};
 use smart_config::{
     de,
-    de::{DeserializeContext, Entries, Qualified, Serde, WellKnown},
+    de::{DeserializeContext, Entries, Qualified, Serde, WellKnown, WellKnownOption},
     metadata::{BasicTypes, ParamMetadata, SizeUnit, TypeDescription},
     value::SecretString,
     ByteSize, DescribeConfig, DeserializeConfig, ErrorWithOrigin,
@@ -28,6 +28,8 @@ impl WellKnown for ValidatorPublicKey {
         Qualified::new(Serde![str], "has `validator:public:bls12_381:` prefix");
 }
 
+impl WellKnownOption for ValidatorPublicKey {}
+
 /// `zksync_consensus_crypto::TextFmt` representation of `zksync_consensus_roles::node::PublicKey`.
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
 #[serde(transparent)]

core/lib/config/src/configs/consensus.rs

@@ -1,8 +1,4 @@
-use serde::{Deserialize, Serialize};
-use smart_config::{
-    de::{Serde, WellKnown},
-    ConfigSchema, DescribeConfig, DeserializeConfig,
-};
+use smart_config::{ConfigSchema, DescribeConfig, DeserializeConfig};
 use zksync_basic_types::{Address, H256};
 
 use super::{
@@ -101,26 +97,25 @@ impl L2ContractsConfig {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Default, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, DescribeConfig, DeserializeConfig)]
+#[config(derive(Default))]
 pub struct Bridge {
-    #[serde(alias = "proxy_addr")]
+    /// Address of the bridge on L1.
+    #[config(alias = "proxy_addr")]
     pub l1_address: Option<Address>,
-    #[serde(alias = "addr")]
+    /// Address of the bridge on L2.
+    #[config(alias = "addr")]
     pub l2_address: Option<Address>,
 }
 
-impl WellKnown for Bridge {
-    type Deserializer = Serde![object];
-    const DE: Self::Deserializer = Serde![object];
-}
-
 #[derive(Debug, Clone, PartialEq, DescribeConfig, DeserializeConfig)]
+#[config(derive(Default))]
 pub struct BridgesConfig {
-    #[config(default, alias = "shared_bridge")]
+    #[config(nest, alias = "shared_bridge")]
     pub shared: Bridge,
-    #[config(default, alias = "erc20_bridge")]
+    #[config(nest, alias = "erc20_bridge")]
     pub erc20: Bridge,
-    #[config(default, alias = "weth_bridge")]
+    #[config(nest, alias = "weth_bridge")]
     pub weth: Bridge,
 }
 

core/lib/config/src/configs/contracts/chain.rs

@@ -34,13 +34,18 @@ pub struct AvailDefaultConfig {
     #[serde(default = "AvailDefaultConfig::default_dispatch_timeout")]
     pub dispatch_timeout: Duration,
     #[config(default_t = 5)]
+    #[serde(default = "AvailDefaultConfig::default_max_blocks_to_look_back")]
     pub max_blocks_to_look_back: usize,
 }
 
 impl AvailDefaultConfig {
     const fn default_dispatch_timeout() -> Duration {
         Duration::from_secs(180)
     }
+
+    const fn default_max_blocks_to_look_back() -> usize {
+        5
+    }
 }
 
 #[derive(Clone, Debug, PartialEq, Deserialize, DescribeConfig, DeserializeConfig)]

core/lib/config/src/configs/da_client/avail.rs

@@ -10,7 +10,7 @@ use serde::{
     Deserialize, Serialize,
 };
 use smart_config::{
-    de::{DeserializeContext, DeserializeParam, WellKnown},
+    de::{DeserializeContext, DeserializeParam, WellKnown, WellKnownOption},
     metadata::{BasicTypes, ParamMetadata},
     DescribeConfig, DeserializeConfig, ErrorWithOrigin,
 };
@@ -220,6 +220,8 @@ impl WellKnown for GenesisConfig {
     const DE: Self::Deserializer = GenesisConfigDeserializer;
 }
 
+impl WellKnownOption for GenesisConfig {}
+
 #[derive(Debug, Clone, PartialEq, DescribeConfig, DeserializeConfig)]
 pub struct GenesisConfigWrapper {
     /// Genesis configuration.

core/lib/config/src/configs/genesis.rs

@@ -18,7 +18,7 @@ where
     const EXPECTING: BasicTypes = <T::Deserializer>::EXPECTING.or(De::EXPECTING);
 
     fn describe(&self, description: &mut TypeDescription) {
-        self.0.describe(description);
+        T::DE.describe(description);
         description.set_fallback(&self.0);
     }
 

core/lib/config/src/utils.rs

@@ -65,7 +65,7 @@ tracing-subscriber = "0.3"
 tracing-test = "0.2.5"
 url = "2.5.2"
 vise = "0.3.1"
-smart-config = { version = "=0.1.0-pre", git = "https://github.com/matter-labs/smart-config.git", rev = "992f72e6540a116bf91bdc03151bf0067834dff0" }
+smart-config = "=0.2.0-pre"
 
 circuit_definitions = "=0.152.3"
 circuit_sequencer_api = "=0.152.3"