chore(deps): upgrade to latest alloy/sdk/trevm (#99)

Author: Evalir

Cargo.toml

@@ -25,17 +25,17 @@ path = "bin/submit_transaction.rs"
 integration = []
 
 [dependencies]
-init4-bin-base = { version = "0.3.4", features = ["perms"] }
+init4-bin-base = { version = "0.4.1", features = ["perms"] }
 
-signet-constants = { git = "https://github.com/init4tech/signet-sdk", rev = "b8251ff0fec7cb14ca87e6f95c14f56bc2593049" }
-signet-sim = { git = "https://github.com/init4tech/signet-sdk", rev = "b8251ff0fec7cb14ca87e6f95c14f56bc2593049" }
-signet-tx-cache = { git = "https://github.com/init4tech/signet-sdk", rev = "b8251ff0fec7cb14ca87e6f95c14f56bc2593049" }
-signet-types = { git = "https://github.com/init4tech/signet-sdk", rev = "b8251ff0fec7cb14ca87e6f95c14f56bc2593049" }
-signet-zenith = { git = "https://github.com/init4tech/signet-sdk", rev = "b8251ff0fec7cb14ca87e6f95c14f56bc2593049" }
+signet-constants = { git = "https://github.com/init4tech/signet-sdk", rev = "bd183b627dcb0eb682da801093b13f1f8311446b" }
+signet-sim = { git = "https://github.com/init4tech/signet-sdk", rev = "bd183b627dcb0eb682da801093b13f1f8311446b" }
+signet-tx-cache = { git = "https://github.com/init4tech/signet-sdk", rev = "bd183b627dcb0eb682da801093b13f1f8311446b" }
+signet-types = { git = "https://github.com/init4tech/signet-sdk", rev = "bd183b627dcb0eb682da801093b13f1f8311446b" }
+signet-zenith = { git = "https://github.com/init4tech/signet-sdk", rev = "bd183b627dcb0eb682da801093b13f1f8311446b" }
 
-trevm = { version = "0.20.10", features = ["concurrent-db", "test-utils"] }
+trevm = { version = "0.23.4", features = ["concurrent-db", "test-utils"] }
 
-alloy = { version = "0.12.6", features = [
+alloy = { version = "1.0.5", features = [
     "full",
     "json-rpc",
     "signer-aws",

bin/submit_transaction.rs

@@ -1,7 +1,10 @@
 use alloy::{
     network::{EthereumWallet, TransactionBuilder},
     primitives::{Address, U256},
-    providers::{Provider as _, ProviderBuilder, WalletProvider},
+    providers::{
+        Provider as _, ProviderBuilder, WalletProvider,
+        fillers::{BlobGasFiller, SimpleNonceManager},
+    },
     rpc::types::eth::TransactionRequest,
 };
 use builder::config::HostProvider;
@@ -31,7 +34,12 @@ impl Config {
     async fn provider(&self) -> HostProvider {
         let signer = self.kms_key_id.connect_remote().await.unwrap();
 
-        ProviderBuilder::new()
+        ProviderBuilder::new_with_network()
+            .disable_recommended_fillers()
+            .filler(BlobGasFiller)
+            .with_gas_estimation()
+            .with_nonce_management(SimpleNonceManager::default())
+            .fetch_chain_id()
             .wallet(EthereumWallet::from(signer))
             .connect(&self.rpc_url)
             .await

src/config.rs

@@ -13,7 +13,7 @@ use alloy::{
         Identity, ProviderBuilder, RootProvider,
         fillers::{
             BlobGasFiller, ChainIdFiller, FillProvider, GasFiller, JoinFill, NonceFiller,
-            WalletFiller,
+            SimpleNonceManager, WalletFiller,
         },
     },
 };
@@ -35,19 +35,21 @@ use trevm::revm::context::BlockEnv;
 pub type RuProvider = RootProvider<Ethereum>;
 
 /// A [`Zenith`] contract instance using [`Provider`] as the provider.
-pub type ZenithInstance<P = HostProvider> = Zenith::ZenithInstance<(), P, alloy::network::Ethereum>;
+pub type ZenithInstance<P = HostProvider> = Zenith::ZenithInstance<P, alloy::network::Ethereum>;
 
 /// Type alias for the provider used to build and submit blocks to the host.
 pub type HostProvider = FillProvider<
     JoinFill<
         JoinFill<
-            Identity,
-            JoinFill<GasFiller, JoinFill<BlobGasFiller, JoinFill<NonceFiller, ChainIdFiller>>>,
+            JoinFill<
+                JoinFill<JoinFill<Identity, BlobGasFiller>, GasFiller>,
+                NonceFiller<SimpleNonceManager>,
+            >,
+            ChainIdFiller,
         >,
         WalletFiller<EthereumWallet>,
     >,
     RootProvider,
-    Ethereum,
 >;
 
 /// Configuration for a builder running a specific rollup on a specific host
@@ -187,7 +189,12 @@ impl BuilderConfig {
     /// Connect to the Host rpc provider.
     pub async fn connect_host_provider(&self) -> eyre::Result<HostProvider> {
         let builder_signer = self.connect_builder_signer().await?;
-        ProviderBuilder::new()
+        ProviderBuilder::new_with_network()
+            .disable_recommended_fillers()
+            .filler(BlobGasFiller)
+            .with_gas_estimation()
+            .with_nonce_management(SimpleNonceManager::default())
+            .fetch_chain_id()
             .wallet(EthereumWallet::from(builder_signer))
             .connect(&self.host_rpc_url)
             .await

src/utils.rs

@@ -1,12 +1,12 @@
-use alloy::primitives::{B256, PrimitiveSignature};
+use alloy::primitives::{B256, Signature};
 
 /// Extracts the components of a signature.
 /// Currently alloy has no function for extracting the components of a signature.
 /// Returns a tuple of (v, r, s) where:
 /// - `v` is the recovery id
 /// - `r` is the r component of the signature
 /// - `s` is the s component of the signature
-pub fn extract_signature_components(sig: &PrimitiveSignature) -> (u8, B256, B256) {
+pub fn extract_signature_components(sig: &Signature) -> (u8, B256, B256) {
     let v = sig.as_bytes()[64];
     let r = sig.r().into();
     let s = sig.s().into();
@@ -23,7 +23,7 @@ mod tests {
         let r = U256::from(123456789);
         let s = U256::from(987654321);
         let y_parity = true;
-        let sig = PrimitiveSignature::new(r, s, y_parity);
+        let sig = Signature::new(r, s, y_parity);
         let (v, r_bytes, s_bytes) = extract_signature_components(&sig);
         assert_eq!(v, 28);
         assert_eq!(U256::from_be_bytes(r_bytes.0), r);