Removing the aud claim (#35)

* fix: no need for aud anymore

* fix: pin zenith to v0.10.1

* chore: fmt

Author: rswanson

Cargo.toml

@@ -18,7 +18,7 @@ name = "zenith-builder-example"
 path = "bin/builder.rs"
 
 [dependencies]
-zenith-types = { git = "https://github.com/init4tech/zenith-rs", branch = "main" }
+zenith-types = { git = "https://github.com/init4tech/zenith-rs", tag = "v0.10.1" }
 
 alloy-primitives = { version = "=0.8.8", features = ["serde", "tiny-keccak"] }
 alloy-sol-types = { version = "=0.8.8", features = ["json"] }

src/config.rs

@@ -33,7 +33,6 @@ const OAUTH_CLIENT_ID: &str = "OAUTH_CLIENT_ID";
 const OAUTH_CLIENT_SECRET: &str = "OAUTH_CLIENT_SECRET";
 const OAUTH_AUTHENTICATE_URL: &str = "OAUTH_AUTHENTICATE_URL";
 const OAUTH_TOKEN_URL: &str = "OAUTH_TOKEN_URL";
-const OAUTH_AUDIENCE: &str = "OAUTH_AUDIENCE";
 
 /// Configuration for a builder running a specific rollup on a specific host
 /// chain.
@@ -84,8 +83,6 @@ pub struct BuilderConfig {
     pub oauth_authenticate_url: String,
     /// OAuth token URL for the builder to get an OAuth2 access token
     pub oauth_token_url: String,
-    /// OAuth audience for the builder.
-    pub oauth_audience: String,
     /// The oauth token refresh interval in seconds.
     pub oauth_token_refresh_interval: u64,
 }
@@ -176,7 +173,6 @@ impl BuilderConfig {
             oauth_client_secret: load_string(OAUTH_CLIENT_SECRET)?,
             oauth_authenticate_url: load_string(OAUTH_AUTHENTICATE_URL)?,
             oauth_token_url: load_string(OAUTH_TOKEN_URL)?,
-            oauth_audience: load_string(OAUTH_AUDIENCE)?,
             oauth_token_refresh_interval: load_u64(AUTH_TOKEN_REFRESH_INTERVAL)?,
         })
     }

src/tasks/oauth.rs

@@ -10,8 +10,6 @@ use oauth2::{
 };
 use tokio::{sync::RwLock, task::JoinHandle};
 
-const OAUTH_AUDIENCE_CLAIM: &str = "audience";
-
 type Token = StandardTokenResponse<EmptyExtraTokenFields, BasicTokenType>;
 
 /// A self-refreshing, periodically fetching authenticator for the block builder.
@@ -91,10 +89,7 @@ impl Authenticator {
             Some(TokenUrl::new(config.oauth_token_url.clone())?),
         );
 
-        let token_result = client
-            .exchange_client_credentials()
-            .add_extra_param(OAUTH_AUDIENCE_CLAIM, config.oauth_audience.clone())
-            .request(http_client)?;
+        let token_result = client.exchange_client_credentials().request(http_client)?;
 
         Ok(token_result)
     }
@@ -166,7 +161,6 @@ mod tests {
             oauth_client_secret: "some_client_secret".into(),
             oauth_authenticate_url: "http://localhost:9000".into(),
             oauth_token_url: "http://localhost:9000".into(),
-            oauth_audience: "https://transactions.holesky.signet.sh".into(),
             tx_broadcast_urls: vec!["http://localhost:9000".into()],
             oauth_token_refresh_interval: 300, // 5 minutes
         };

tests/bundle_poller_test.rs

@@ -39,7 +39,6 @@ mod tests {
             oauth_client_secret: "some_client_secret".into(),
             oauth_authenticate_url: "http://localhost:8080".into(),
             oauth_token_url: "http://localhost:8080".into(),
-            oauth_audience: "https://transactions.holesky.signet.sh".into(),
             tx_broadcast_urls: vec!["http://localhost:9000".into()],
             oauth_token_refresh_interval: 300, // 5 minutes
         };

tests/tx_poller_test.rs

@@ -86,7 +86,6 @@ mod tests {
             oauth_client_secret: "some_client_secret".into(),
             oauth_authenticate_url: "http://localhost:8080".into(),
             oauth_token_url: "http://localhost:8080".into(),
-            oauth_audience: "https://transactions.holesky.signet.sh".into(),
             oauth_token_refresh_interval: 300, // 5 minutes
         };
         Ok(config)