chore(config): fallback to FromEnv for the SlotCalculator instead of using FromEnvVar (#149)

Author: Evalir

README.md

@@ -71,32 +71,32 @@ Finally, if it's non-empty, the submit task attempts to get a signature for the
 
 The Builder is configured via environment variables. The following values are supported for configuration.
 
-| Key                           | Required | Description                                                         |
-| ----------------------------- | -------- | ------------------------------------------------------------------- |
-| `HOST_CHAIN_ID`               | Yes      | Host-chain ID (e.g. `3151908`)                                      |
-| `RU_CHAIN_ID`                 | Yes      | Rollup-chain ID (e.g. `14174`)                                      |
-| `HOST_RPC_URL`                | Yes      | RPC endpoint for the host chain                                     |
-| `ROLLUP_RPC_URL`              | Yes      | RPC endpoint for the rollup chain                                   |
-| `TX_POOL_URL`                 | Yes      | Transaction pool URL (must end with `/`)                            |
-| `TX_BROADCAST_URLS`           | No       | Additional endpoints for blob txs (comma-separated, slash required) |
-| `ZENITH_ADDRESS`              | Yes      | Zenith contract address                                             |
-| `BUILDER_HELPER_ADDRESS`      | Yes      | Builder helper contract address                                     |
-| `QUINCEY_URL`                 | Yes      | Remote sequencer signing endpoint                                   |
-| `BUILDER_PORT`                | Yes      | HTTP port for the Builder (default: `8080`)                         |
-| `SEQUENCER_KEY`               | Yes      | AWS KMS key ID _or_ local private key for sequencer signing         |
-| `BUILDER_KEY`                 | Yes      | AWS KMS key ID _or_ local private key for builder signing           |
-| `BUILDER_REWARDS_ADDRESS`     | Yes      | Address receiving builder rewards                                   |
-| `ROLLUP_BLOCK_GAS_LIMIT`      | No       | Override for block gas limit                                        |
-| `CONCURRENCY_LIMIT`           | No       | Max concurrent tasks the simulator uses                             |
-| `OAUTH_CLIENT_ID`             | Yes      | Oauth client ID for the builder                                     |
-| `OAUTH_CLIENT_SECRET`         | Yes      | Oauth client secret for the builder                                 |
-| `OAUTH_AUTHENTICATE_URL`      | Yes      | Oauth authenticate URL for the builder for performing OAuth logins  |
-| `OAUTH_TOKEN_URL`             | Yes      | Oauth token URL for the builder to get an Oauth2 access token       |
-| `AUTH_TOKEN_REFRESH_INTERVAL` | Yes      | The OAuth token refresh interval in seconds.                        |
-| `CHAIN_NAME`                  | Yes      | The chain name ("pecorino", or the corresponding name)              |
-| `SLOT_OFFSET`                 | Yes      | Slot timing offset in seconds. Optional if `CHAIN_NAME` is present  |
-| `SLOT_DURATION`               | Yes      | Slot duration in seconds. Optional if `CHAIN_NAME` is present       |
-| `START_TIMESTAMP`             | Yes      | UNIX timestamp for slot 0. Optional if `CHAIN_NAME` is present      |
+| Key                           | Required | Description                                                             |
+| ----------------------------- | -------- | ----------------------------------------------------------------------- |
+| `HOST_CHAIN_ID`               | Yes      | Host-chain ID (e.g. `3151908`)                                          |
+| `RU_CHAIN_ID`                 | Yes      | Rollup-chain ID (e.g. `14174`)                                          |
+| `HOST_RPC_URL`                | Yes      | RPC endpoint for the host chain                                         |
+| `ROLLUP_RPC_URL`              | Yes      | RPC endpoint for the rollup chain                                       |
+| `TX_POOL_URL`                 | Yes      | Transaction pool URL (must end with `/`)                                |
+| `TX_BROADCAST_URLS`           | No       | Additional endpoints for blob txs (comma-separated, slash required)     |
+| `ZENITH_ADDRESS`              | Yes      | Zenith contract address                                                 |
+| `BUILDER_HELPER_ADDRESS`      | Yes      | Builder helper contract address                                         |
+| `QUINCEY_URL`                 | Yes      | Remote sequencer signing endpoint                                       |
+| `BUILDER_PORT`                | Yes      | HTTP port for the Builder (default: `8080`)                             |
+| `SEQUENCER_KEY`               | Yes      | AWS KMS key ID _or_ local private key for sequencer signing             |
+| `BUILDER_KEY`                 | Yes      | AWS KMS key ID _or_ local private key for builder signing               |
+| `BUILDER_REWARDS_ADDRESS`     | Yes      | Address receiving builder rewards                                       |
+| `ROLLUP_BLOCK_GAS_LIMIT`      | No       | Override for block gas limit                                            |
+| `CONCURRENCY_LIMIT`           | No       | Max concurrent tasks the simulator uses                                 |
+| `OAUTH_CLIENT_ID`             | Yes      | Oauth client ID for the builder                                         |
+| `OAUTH_CLIENT_SECRET`         | Yes      | Oauth client secret for the builder                                     |
+| `OAUTH_AUTHENTICATE_URL`      | Yes      | Oauth authenticate URL for the builder for performing OAuth logins      |
+| `OAUTH_TOKEN_URL`             | Yes      | Oauth token URL for the builder to get an Oauth2 access token           |
+| `AUTH_TOKEN_REFRESH_INTERVAL` | Yes      | The OAuth token refresh interval in seconds.                            |
+| `CHAIN_NAME`                  | No       | The chain name ("pecorino", or the corresponding name)                  |
+| `SLOT_OFFSET`                 | No       | Slot timing offset in seconds. Required if `CHAIN_NAME` is not present  |
+| `SLOT_DURATION`               | No       | Slot duration in seconds. Optional if `CHAIN_NAME` is not present       |
+| `START_TIMESTAMP`             | No       | UNIX timestamp for slot 0. Optional if `CHAIN_NAME` is not present      |
 
 ---
 

src/config.rs

@@ -154,7 +154,6 @@ pub struct BuilderConfig {
     pub concurrency_limit: Option<usize>,
 
     /// The slot calculator for the builder.
-    #[from_env(var = "CHAIN_NAME", desc = "The slot calculator for the builder")]
     pub slot_calculator: SlotCalculator,
 }