fix: env vars in config

Author: prestwich

src/config.rs

@@ -75,8 +75,8 @@ pub struct BuilderConfig {
     )]
     pub quincey_url: Cow<'static, str>,
     /// Port for the Builder server.
-    #[from_env(var = "BUILDER_PORT", desc = "Port for the Builder server")]
-    pub builder_port: u16,
+    #[from_env(var = "BUILDER_PORT", desc = "Port for the Builder server", optional)]
+    pub builder_port: Option<u16>,
     /// Key to access Sequencer Wallet - AWS Key ID _OR_ local private key.
     /// Set IFF using local Sequencer signing instead of remote Quincey signing.
     #[from_env(
@@ -119,30 +119,30 @@ pub struct BuilderConfig {
     pub tx_pool_url: Cow<'static, str>,
     /// Duration in seconds transactions can live in the tx-pool cache.
     #[from_env(
-        var = "AUTH_TOKEN_REFRESH_INTERVAL",
+        var = "TX_POOL_CACHE_DURATION",
         desc = "Duration in seconds transactions can live in the tx-pool cache"
     )]
     pub tx_pool_cache_duration: u64,
     /// OAuth client ID for the builder.
-    #[from_env(var = "TX_POOL_CACHE_DURATION", desc = "OAuth client ID for the builder")]
+    #[from_env(var = "OAUTH_CLIENT_ID", desc = "OAuth client ID for the builder")]
     pub oauth_client_id: String,
     /// OAuth client secret for the builder.
-    #[from_env(var = "OAUTH_CLIENT_ID", desc = "OAuth client secret for the builder")]
+    #[from_env(var = "OAUTH_CLIENT_SECRET", desc = "OAuth client secret for the builder")]
     pub oauth_client_secret: String,
     /// OAuth authenticate URL for the builder for performing OAuth logins.
     #[from_env(
-        var = "OAUTH_CLIENT_SECRET",
+        var = "OAUTH_AUTHENTICATE_URL",
         desc = "OAuth authenticate URL for the builder for performing OAuth logins"
     )]
     pub oauth_authenticate_url: String,
     /// OAuth token URL for the builder to get an OAuth2 access token
     #[from_env(
-        var = "OAUTH_AUTHENTICATE_URL",
+        var = "OAUTH_TOKEN_URL",
         desc = "OAuth token URL for the builder to get an OAuth2 access token"
     )]
     pub oauth_token_url: String,
     /// The oauth token refresh interval in seconds.
-    #[from_env(var = "OAUTH_TOKEN_URL", desc = "The oauth token refresh interval in seconds")]
+    #[from_env(var = "CONCURRENCY_LIMIT", desc = "The oauth token refresh interval in seconds")]
     pub oauth_token_refresh_interval: u64,
     /// The max number of simultaneous block simulations to run.
     #[from_env(