refactor: add recommended_fillers in superalloy

Author: azixus

bin/onlyswaps-solver/Cargo.toml

@@ -20,6 +20,6 @@ serde = { workspace = true, features = ["derive"] }
 serde_json.workspace = true
 speculoos = "0.13.0"
 shellexpand = "3.1.1"
-superalloy = { workspace = true, features = ["fillers"] }
+superalloy.workspace = true
 tokio = { workspace = true, features = ["rt-multi-thread", "signal"] }
-tracing.workspace = true
+tracing.workspace = true

bin/onlyswaps-solver/src/network.rs

@@ -3,7 +3,6 @@ use crate::model::{BlockEvent, ChainState, Transfer};
 use crate::solver::ChainStateProvider;
 use alloy::network::EthereumWallet;
 use alloy::primitives::{Address, U256};
-use alloy::providers::fillers::{BlobGasFiller, ChainIdFiller};
 use alloy::providers::{DynProvider, Provider, ProviderBuilder, WsConnect};
 use alloy::signers::local::PrivateKeySigner;
 use async_trait::async_trait;
@@ -17,7 +16,7 @@ use itertools::Itertools;
 use std::collections::HashMap;
 use std::pin::Pin;
 use std::str::FromStr;
-use superalloy::fillers::GasBufferFiller;
+use superalloy::provider::recommended_fillers;
 
 pub(crate) struct Network<P> {
     pub chain_id: u64,
@@ -52,10 +51,7 @@ impl Network<DynProvider> {
         let url = config.rpc_url.clone();
         let chain_id = config.chain_id;
         let provider = ProviderBuilder::default()
-            .filler(ChainIdFiller::default())
-            .with_simple_nonce_management()
-            .filler(BlobGasFiller)
-            .filler(GasBufferFiller::new(config.tx_gas_buffer))
+            .filler(recommended_fillers(config.tx_gas_buffer))
             .wallet(EthereumWallet::new(signer.clone()))
             .connect_ws(WsConnect::new(url))
             .await?

crates/superalloy/Cargo.toml

@@ -3,9 +3,6 @@ name = "superalloy"
 version.workspace = true
 edition.workspace = true
 
-[features]
-fillers = []
-
 [dependencies]
 # blockchain
 alloy = { workspace = true, features = ["default", "provider-ws"] }

crates/superalloy/src/provider.rs

@@ -2,10 +2,11 @@ mod multi;
 
 pub use multi::*;
 
+use crate::fillers::GasBufferFiller;
 use crate::retry::{RetryStrategy, with_retry};
 use alloy::consensus::BlockHeader;
 use alloy::providers::fillers::{
-    BlobGasFiller, ChainIdFiller, FillProvider, GasFiller, JoinFill, NonceFiller,
+    BlobGasFiller, ChainIdFiller, FillProvider, JoinFill, NonceFiller, SimpleNonceManager,
 };
 use alloy::providers::{Identity, Provider, ProviderBuilder, RootProvider, WsConnect};
 use alloy::transports::http::reqwest;
@@ -28,20 +29,29 @@ pub enum CreateProviderError {
     UnsupportedScheme,
 }
 
-pub type RecommendedProvider = FillProvider<
-    JoinFill<
-        Identity,
-        JoinFill<GasFiller, JoinFill<BlobGasFiller, JoinFill<NonceFiller, ChainIdFiller>>>,
-    >,
-    RootProvider,
+pub type RecommendedProvider = FillProvider<JoinFill<Identity, RecommendedFillers>, RootProvider>;
+
+pub type RecommendedFillers = JoinFill<
+    NonceFiller<SimpleNonceManager>,
+    JoinFill<ChainIdFiller, JoinFill<BlobGasFiller, GasBufferFiller>>,
 >;
 
+pub fn recommended_fillers(tx_gas_buffer: u16) -> RecommendedFillers {
+    JoinFill::new(
+        NonceFiller::new(SimpleNonceManager::default()),
+        JoinFill::new(
+            ChainIdFiller::default(),
+            JoinFill::new(BlobGasFiller, GasBufferFiller::new(tx_gas_buffer)),
+        ),
+    )
+}
+
 /// Creates a http / websocket provider based on the rpc url provided.
 pub async fn create_provider_with_retry(
     rpc_url: reqwest::Url,
     retry_strategy: RetryStrategy,
 ) -> Result<RecommendedProvider, CreateProviderError> {
-    let build_provider = || ProviderBuilder::default().with_recommended_fillers();
+    let build_provider = || ProviderBuilder::default().filler(recommended_fillers(100));
 
     match rpc_url.scheme() {
         "http" | "https" => {