updated to use throttled provider

Cargo.toml

@@ -29,6 +29,9 @@ thiserror = "1.0.49"
 tokio = { version = "1.32.0", features = ["sync", "macros"] }
 toml = "0.8.8"
 tracing = "0.1.37"
+governor = "0.6.0"
+url = "2.4.1"
+
 
 [dev-dependencies]
 reqwest = { version = "0.11.22", features = ["json"] }

bin/tree_availability_service.rs

@@ -1,14 +1,18 @@
 use std::sync::Arc;
+use std::time::Duration;
 
 use clap::Parser;
 use common::metrics::init_statsd_exporter;
 use common::shutdown_tracer_provider;
 use common::tracing::{init_datadog_subscriber, init_subscriber};
 use ethers::providers::{Http, Provider};
 use ethers::types::H160;
+use ethers_throttle::ThrottledProvider;
 use futures::stream::FuturesUnordered;
 use futures::StreamExt;
+use governor::Jitter;
 use tracing::Level;
+use url::Url;
 use world_tree::tree::service::TreeAvailabilityService;
 
 #[derive(Parser, Debug)]
@@ -52,8 +56,14 @@ struct Opts {
     port: u16,
     #[clap(long, help = "Enable datadog backend for instrumentation")]
     datadog: bool,
-    #[clap(long, help = "Request per minute limit for rpc endpoint")]
-    throttle: bool,
+
+    #[clap(
+        short,
+        long,
+        help = "Request per minute limit for rpc endpoint",
+        default_value = "0"
+    )]
+    throttle: u32,
 }
 
 const SERVICE_NAME: &str = "tree-availability-service";
@@ -71,11 +81,16 @@ pub async fn main() -> eyre::Result<()> {
         init_subscriber(Level::INFO);
     }
 
-    let middleware = if opts.throttle {
-        Arc::new(Provider::<Http>::try_from(opts.rpc_endpoint)?)
-    } else {
-        Arc::new(Provider::<Http>::try_from(opts.rpc_endpoint)?)
-    };
+    let http_provider = Http::new(Url::parse(&opts.rpc_endpoint)?);
+    let throttled_http_provider = ThrottledProvider::new(
+        http_provider,
+        opts.throttle,
+        Some(Jitter::new(
+            Duration::from_millis(10),
+            Duration::from_millis(100),
+        )),
+    );
+    let middleware = Arc::new(Provider::new(throttled_http_provider));
 
     let handles = TreeAvailabilityService::new(
         opts.tree_depth,

crates/ethers-throttle/src/lib.rs

@@ -29,17 +29,17 @@ impl<P: JsonRpcClient> ThrottledProvider<P> {
         provider: P,
         requests_per_second: u32,
         jitter: Option<Jitter>,
-    ) -> Result<Self, ProviderError> {
+    ) -> Self {
         let throttle = Arc::new(RateLimiter::direct(Quota::per_second(
             NonZeroU32::new(requests_per_second)
                 .expect("Could not initialize NonZeroU32"),
         )));
 
-        Ok(ThrottledProvider {
+        ThrottledProvider {
             throttle,
             jitter,
             inner: provider,
-        })
+        }
     }
 }