update risc0 to 2.0, alloy to 1.0

Author: austinabell

Cargo.lock

@@ -4,9 +4,9 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-alloy = { version = "0.3.1", features = ["node-bindings", "network", "providers", "transports", "signer-local", "rpc-types"] }
-alloy-contract = "0.3.1"
-alloy-sol-types = { version = "0.8.2", features = ["json"] }
+alloy = { version = "1.0.3", features = ["node-bindings", "network", "providers", "transports", "signer-local"] }
+alloy-sol-types = "1.1.0"
+alloy-contract = "1.0.3"
 anyhow = "1.0"
 bincode = "1.3.3"
 blobstream0-core = { path = "../core" }

cli/Cargo.toml

@@ -19,7 +19,7 @@ use alloy::{
         fillers::{FillerControlFlow, TxFiller},
         Provider, SendableTx,
     },
-    transports::{Transport, TransportResult},
+    transports::TransportResult,
 };
 
 #[derive(Clone, Copy, Debug, Default)]
@@ -45,14 +45,13 @@ impl<N: Network> TxFiller<N> for FireblocksFiller {
         }
     }
 
-    async fn prepare<P, T>(
+    async fn prepare<P>(
         &self,
         _provider: &P,
         _tx: &<N as Network>::TransactionRequest,
     ) -> TransportResult<Self::Fillable>
     where
-        P: Provider<T, N>,
-        T: Transport + Clone,
+        P: Provider<N>,
     {
         Ok(())
     }

cli/src/fireblocks.rs

@@ -63,7 +63,7 @@ macro_rules! setup_provider {
             .filler(crate::fireblocks::FireblocksFiller {
                 sender: fireblocks_address,
             })
-            .on_http($cli.eth_rpc.parse()?);
+            .connect_http($cli.eth_rpc.parse()?);
         (provider, fireblocks_address)
     }};
 }
@@ -74,9 +74,8 @@ macro_rules! setup_provider {
         let signer: alloy::signers::local::PrivateKeySigner = $cli.private_key_hex.parse()?;
         let signer_address = signer.address();
         let provider = ProviderBuilder::new()
-            .with_recommended_fillers()
             .wallet(alloy::network::EthereumWallet::from(signer))
-            .on_http($cli.eth_rpc.parse()?);
+            .connect_http($cli.eth_rpc.parse()?);
         (provider, signer_address)
     }};
 }

cli/src/main.rs

@@ -16,23 +16,23 @@ use std::future::Future;
 use std::sync::Arc;
 use std::time::{Duration, Instant};
 
-use alloy::{network::Network, primitives::FixedBytes, providers::Provider, transports::Transport};
+use alloy::{network::Network, primitives::FixedBytes, providers::Provider};
 use anyhow::Context;
 use blobstream0_core::{post_batch, prove_block_range};
 use blobstream0_primitives::IBlobstream::IBlobstreamInstance;
 use rand::Rng;
 use tendermint_rpc::{Client, HttpClient};
 use tokio::task::JoinError;
 
-pub(crate) struct BlobstreamService<T, P, N> {
-    contract: Arc<IBlobstreamInstance<T, P, N>>,
+pub(crate) struct BlobstreamService<P, N> {
+    contract: Arc<IBlobstreamInstance<P, N>>,
     tm_client: Arc<HttpClient>,
     batch_size: u64,
 }
 
-impl<T, P, N> BlobstreamService<T, P, N> {
+impl<P, N> BlobstreamService<P, N> {
     pub fn new(
-        contract: IBlobstreamInstance<T, P, N>,
+        contract: IBlobstreamInstance<P, N>,
         tm_client: HttpClient,
         batch_size: u64,
     ) -> Self {
@@ -44,10 +44,9 @@ impl<T, P, N> BlobstreamService<T, P, N> {
     }
 }
 
-impl<T, P, N> BlobstreamService<T, P, N>
+impl<P, N> BlobstreamService<P, N>
 where
-    T: Transport + Clone,
-    P: Provider<T, N> + 'static,
+    P: Provider<N> + 'static,
     N: Network,
 {
     async fn fetch_current_state(&self) -> Result<anyhow::Result<BlobstreamState>, JoinError> {
@@ -66,8 +65,8 @@ where
         let (height, hash, tm_height) = tokio::try_join!(height_task, hash_task, tm_height_task)?;
 
         let result = || {
-            let height = height?._0;
-            let eth_verified_hash = hash?._0;
+            let height = height?;
+            let eth_verified_hash = hash?;
             let tm_height = tm_height?.value();
             Ok(BlobstreamState {
                 eth_verified_height: height,

cli/src/service/blobstream.rs

@@ -14,7 +14,6 @@
 
 use alloy::network::Ethereum;
 use alloy::providers::Provider;
-use alloy::transports::http::Http;
 use alloy::{
     network::EthereumWallet,
     node_bindings::{Anvil, AnvilInstance},
@@ -67,11 +66,7 @@ struct DataRootInclusionResponse {
 
 async fn setup_test_environment() -> anyhow::Result<(
     AnvilInstance,
-    IBlobstreamInstance<
-        Http<reqwest::Client>,
-        impl Provider<Http<reqwest::Client>, Ethereum>,
-        Ethereum,
-    >,
+    IBlobstreamInstance<impl Provider<Ethereum>, Ethereum>,
 )> {
     // Set dev mode for test.
     std::env::set_var("RISC0_DEV_MODE", "true");
@@ -85,10 +80,7 @@ async fn setup_test_environment() -> anyhow::Result<(
 
     // Create a provider with the wallet.
     let rpc_url = anvil.endpoint().parse()?;
-    let provider = ProviderBuilder::new()
-        .with_recommended_fillers()
-        .wallet(wallet)
-        .on_http(rpc_url);
+    let provider = ProviderBuilder::new().wallet(wallet).connect_http(rpc_url);
 
     let verifier = MockVerifier::deploy(&provider, [0, 0, 0, 0].into()).await?;
 
@@ -137,7 +129,7 @@ async fn e2e_basic_range() -> anyhow::Result<()> {
     post_batch(&contract, &receipt).await?;
 
     let height = contract.latestHeight().call().await?;
-    assert_eq!(height._0, BATCH_END as u64 - 1);
+    assert_eq!(height, BATCH_END as u64 - 1);
 
     // Somewhat hacky to do this manually, seems no Rust tooling for this endpoint.
     let http_client = reqwest::Client::new();
@@ -184,7 +176,7 @@ async fn e2e_basic_range() -> anyhow::Result<()> {
         )
         .call()
         .await?;
-    assert!(is_valid._0);
+    assert!(is_valid);
 
     Ok(())
 }
@@ -202,7 +194,7 @@ async fn test_admin_functions() -> anyhow::Result<()> {
         .watch()
         .await?;
     let current_image_id = contract.imageId().call().await?;
-    assert_eq!(current_image_id._0, new_image_id);
+    assert_eq!(current_image_id, new_image_id);
 
     // Test adminSetVerifier
     let new_verifier = MockVerifier::deploy(contract.provider(), [1, 1, 1, 1].into()).await?;
@@ -213,7 +205,7 @@ async fn test_admin_functions() -> anyhow::Result<()> {
         .watch()
         .await?;
     let current_verifier = contract.verifier().call().await?;
-    assert_eq!(current_verifier._0, *new_verifier.address());
+    assert_eq!(current_verifier, *new_verifier.address());
 
     // Test adminSetTrustedState
     let new_trusted_hash = [2u8; 32];
@@ -226,8 +218,8 @@ async fn test_admin_functions() -> anyhow::Result<()> {
         .await?;
     let current_trusted_hash = contract.latestBlockHash().call().await?;
     let current_trusted_height = contract.latestHeight().call().await?;
-    assert_eq!(current_trusted_hash._0, new_trusted_hash);
-    assert_eq!(current_trusted_height._0, new_trusted_height);
+    assert_eq!(current_trusted_hash, new_trusted_hash);
+    assert_eq!(current_trusted_height, new_trusted_height);
 
     Ok(())
 }
@@ -270,7 +262,7 @@ async fn test_contract_upgrade() -> anyhow::Result<()> {
     post_batch(&contract, &receipt).await?;
 
     let height = contract.latestHeight().call().await?;
-    assert_eq!(height._0, BATCH_END as u64 - 1);
+    assert_eq!(height, BATCH_END as u64 - 1);
 
     Ok(())
 }
@@ -281,7 +273,7 @@ async fn test_ownership_transfer() -> anyhow::Result<()> {
 
     // Get the initial owner
     let initial_owner = contract.owner().call().await?;
-    assert_eq!(initial_owner._0, anvil.addresses()[0]);
+    assert_eq!(initial_owner, anvil.addresses()[0]);
 
     // Transfer ownership
     let new_owner = anvil.addresses()[1];
@@ -296,9 +288,8 @@ async fn test_ownership_transfer() -> anyhow::Result<()> {
     let new_owner_signer: PrivateKeySigner = anvil.keys()[1].clone().into();
     let new_owner_wallet = EthereumWallet::from(new_owner_signer);
     let new_owner_provider = ProviderBuilder::new()
-        .with_recommended_fillers()
         .wallet(new_owner_wallet)
-        .on_http(anvil.endpoint().parse()?);
+        .connect_http(anvil.endpoint().parse()?);
     let contract_as_new_owner = IBlobstream::new(contract.address().clone(), new_owner_provider);
     contract_as_new_owner
         .acceptOwnership()
@@ -309,7 +300,7 @@ async fn test_ownership_transfer() -> anyhow::Result<()> {
 
     // Verify the new owner
     let final_owner = contract.owner().call().await?;
-    assert_eq!(final_owner._0, new_owner);
+    assert_eq!(final_owner, new_owner);
 
     Ok(())
 }