[Debt] Update to latest Alloy and remove patches from Cargo.toml + CI (…

…#41) * remove patches, update to 66fa192 * update rev pin * fix broken examples * remove patch, closes #25 * use RootProvider in specific cases, keeping examples as is
alloy-rs · Apr 1, 2024 · 49c40da · 49c40da
1 parent e87fcf5
commit 49c40da
Show file tree

Hide file tree

Showing 20 changed files with 46 additions and 71 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -73,22 +73,6 @@ jobs:
           sed -i 's/\(alloy-provider = { git = "https:\/\/github.com\/alloy-rs\/alloy", rev = "\)[^"]*/\1'"$latest_alloy_commit"'/' \
           examples/subscriptions/Cargo.toml
 
-          # Temporary patch until `patch` section in Alloy is removed
-          sed -i 's/\(alloy-core = { git = "https:\/\/github.com\/alloy-rs\/core", rev = "\)[^"]*/\1'"$latest_alloy_core_commit"'/' \
-          Cargo.toml
-          sed -i 's/\(alloy-dyn-abi = { git = "https:\/\/github.com\/alloy-rs\/core", rev = "\)[^"]*/\1'"$latest_alloy_core_commit"'/' \
-          Cargo.toml
-          sed -i 's/\(alloy-json-abi = { git = "https:\/\/github.com\/alloy-rs\/core", rev = "\)[^"]*/\1'"$latest_alloy_core_commit"'/' \
-          Cargo.toml
-          sed -i 's/\(alloy-primitives = { git = "https:\/\/github.com\/alloy-rs\/core", rev = "\)[^"]*/\1'"$latest_alloy_core_commit"'/' \
-          Cargo.toml
-          sed -i 's/\(alloy-sol-macro = { git = "https:\/\/github.com\/alloy-rs\/core", rev = "\)[^"]*/\1'"$latest_alloy_core_commit"'/' \
-          Cargo.toml
-          sed -i 's/\(alloy-sol-types = { git = "https:\/\/github.com\/alloy-rs\/core", rev = "\)[^"]*/\1'"$latest_alloy_core_commit"'/' \
-          Cargo.toml
-          sed -i 's/\(syn-solidity = { git = "https:\/\/github.com\/alloy-rs\/core", rev = "\)[^"]*/\1'"$latest_alloy_core_commit"'/' \
-          Cargo.toml
-
           # Update to the latest commit
           cargo update
 

diff --git a/Cargo.toml b/Cargo.toml
@@ -81,7 +81,7 @@ unnecessary_struct_initialization = "allow"
 use_self = "allow"
 
 [workspace.dependencies]
-alloy = { git = "https://github.com/alloy-rs/alloy", rev = "66fa192", features = [
+alloy = { git = "https://github.com/alloy-rs/alloy", rev = "8acf6af", features = [
     # "dyn-abi",
     # "json-abi",
     # "json",
@@ -123,12 +123,3 @@ tokio = "1"
 
 # misc
 eyre = "0.6.12"
-
-[patch.crates-io]
-alloy-core = { git = "https://github.com/alloy-rs/core", rev = "525a233" }
-alloy-dyn-abi = { git = "https://github.com/alloy-rs/core", rev = "525a233" }
-alloy-json-abi = { git = "https://github.com/alloy-rs/core", rev = "525a233" }
-alloy-primitives = { git = "https://github.com/alloy-rs/core", rev = "525a233" }
-alloy-sol-macro = { git = "https://github.com/alloy-rs/core", rev = "525a233" }
-alloy-sol-types = { git = "https://github.com/alloy-rs/core", rev = "525a233" }
-syn-solidity = { git = "https://github.com/alloy-rs/core", rev = "525a233" }
diff --git a/examples/providers/Cargo.toml b/examples/providers/Cargo.toml
@@ -15,21 +15,21 @@ workspace = true
 [dev-dependencies]
 alloy.workspace = true
 # Temp dependency fix to enable relevant features - Ref: https://github.com/alloy-rs/examples/pull/3#discussion_r1537842062
-alloy-rpc-client = { git = "https://github.com/alloy-rs/alloy", rev = "66fa192", features = [
+alloy-rpc-client = { git = "https://github.com/alloy-rs/alloy", rev = "8acf6af", features = [
     "pubsub",
     "ipc",
     "ws",
 ] }
-alloy-provider = { git = "https://github.com/alloy-rs/alloy", rev = "66fa192", features = [
+alloy-provider = { git = "https://github.com/alloy-rs/alloy", rev = "8acf6af", features = [
     "pubsub",
     "ws",
     "ipc",
 ] }
 
-alloy-network = { git = "https://github.com/alloy-rs/alloy", rev = "66fa192" }
+alloy-network = { git = "https://github.com/alloy-rs/alloy", rev = "8acf6af" }
 
-alloy-transport = { git = "https://github.com/alloy-rs/alloy", rev = "66fa192" }
-alloy-transport-ipc = { git = "https://github.com/alloy-rs/alloy", rev = "66fa192" }
+alloy-transport = { git = "https://github.com/alloy-rs/alloy", rev = "8acf6af" }
+alloy-transport-ipc = { git = "https://github.com/alloy-rs/alloy", rev = "8acf6af" }
 eyre.workspace = true
 futures-util = "0.3"
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
diff --git a/examples/providers/examples/connect_builtin.rs b/examples/providers/examples/connect_builtin.rs
@@ -16,15 +16,15 @@ async fn main() -> Result<()> {
 
     // Instantiate a HTTP transport provider by passing the http endpoint url
     let http_provider =
-        RootProvider::<Ethereum, BoxTransport>::connect_builtin(http.as_str()).await?;
+        RootProvider::<BoxTransport, Ethereum>::connect_builtin(http.as_str()).await?;
 
     // Get latest block number
     let block_number = http_provider.get_block_number().await?;
 
     println!("Latest block number: {block_number:?}");
 
     // This requires the `pubsub` and `ws` features to be enabled on alloy-provider
-    let ws_provider = RootProvider::<Ethereum, BoxTransport>::connect_builtin(ws.as_str()).await?;
+    let ws_provider = RootProvider::<BoxTransport, Ethereum>::connect_builtin(ws.as_str()).await?;
 
     let sub = ws_provider.subscribe_blocks().await?;
 
@@ -44,7 +44,7 @@ async fn main() -> Result<()> {
 
     // This requires the `pubsub` and `ipc` features to be enabled on alloy-provider
     // This would throw a runtime error if the ipc does not exist
-    let ipc_provider = RootProvider::<Ethereum, BoxTransport>::connect_builtin(ipc_path).await?;
+    let ipc_provider = RootProvider::<BoxTransport, Ethereum>::connect_builtin(ipc_path).await?;
 
     let _block_number = ipc_provider.get_block_number().await?;
 

diff --git a/examples/providers/examples/http.rs b/examples/providers/examples/http.rs
@@ -2,7 +2,7 @@
 
 use alloy::{
     network::Ethereum,
-    providers::{HttpProvider, Provider},
+    providers::{Provider, ReqwestProvider},
     rpc::client::RpcClient,
 };
 use eyre::Result;
@@ -15,9 +15,9 @@ async fn main() -> Result<()> {
     // Create the RPC client.
     let rpc_client = RpcClient::new_http(rpc_url);
 
-    // Provider can then be instantiated using the RPC client, HttpProvider is an alias
+    // Provider can then be instantiated using the RPC client, ReqwestProvider is an alias
     // RootProvider. RootProvider requires two generics N: Network and T: Transport
-    let provider = HttpProvider::<Ethereum>::new(rpc_client);
+    let provider = ReqwestProvider::<Ethereum>::new(rpc_client);
 
     // Get latest block number.
     let latest_block = provider.get_block_number().await?;

diff --git a/examples/providers/examples/ipc.rs b/examples/providers/examples/ipc.rs
@@ -18,7 +18,7 @@ async fn main() -> Result<()> {
     let ipc_client = RpcClient::connect_pubsub(ipc).await?;
 
     // Create the provider.
-    let provider = RootProvider::<Ethereum, _>::new(ipc_client);
+    let provider = RootProvider::<_, Ethereum>::new(ipc_client);
 
     let latest_block = provider.get_block_number().await?;
 

diff --git a/examples/providers/examples/ws.rs b/examples/providers/examples/ws.rs
@@ -20,7 +20,7 @@ async fn main() -> Result<()> {
     let rpc_client = RpcClient::connect_pubsub(ws_transport).await?;
 
     // Create the provider.
-    let provider = RootProvider::<Ethereum, _>::new(rpc_client);
+    let provider = RootProvider::<_, Ethereum>::new(rpc_client);
 
     // Subscribe to new blocks.
     let sub = provider.subscribe_blocks().await?;

diff --git a/examples/providers/examples/ws_with_auth.rs b/examples/providers/examples/ws_with_auth.rs
@@ -27,8 +27,8 @@ async fn main() -> Result<()> {
     let rpc_client_bearer = RpcClient::connect_pubsub(ws_transport_bearer).await?;
 
     // Create the provider.
-    let provider_basic = RootProvider::<Ethereum, _>::new(rpc_client_basic);
-    let provider_bearer = RootProvider::<Ethereum, _>::new(rpc_client_bearer);
+    let provider_basic = RootProvider::<_, Ethereum>::new(rpc_client_basic);
+    let provider_bearer = RootProvider::<_, Ethereum>::new(rpc_client_bearer);
 
     // Subscribe to new blocks.
     let sub_basic = provider_basic.subscribe_blocks();

diff --git a/examples/queries/examples/query_contract_storage.rs b/examples/queries/examples/query_contract_storage.rs
@@ -3,15 +3,15 @@
 use alloy::{
     network::Ethereum,
     primitives::{address, U256},
-    providers::{Provider, RootProvider},
+    providers::{Provider, ReqwestProvider},
 };
 use eyre::Result;
 
 #[tokio::main]
 async fn main() -> Result<()> {
     // Create a provider.
     let rpc_url = "https://eth.merkle.io".parse()?;
-    let provider = RootProvider::<Ethereum, _>::new_http(rpc_url);
+    let provider = ReqwestProvider::<Ethereum>::new_http(rpc_url);
 
     // Get storage slot 0 from the Uniswap V3 USDC-ETH pool on Ethereum mainnet.
     let pool_address = address!("88e6A0c2dDD26FEEb64F039a2c41296FcB3f5640");

diff --git a/examples/queries/examples/query_deployed_bytecode.rs b/examples/queries/examples/query_deployed_bytecode.rs
@@ -3,7 +3,7 @@
 use alloy::{
     network::Ethereum,
     primitives::address,
-    providers::{Provider, RootProvider},
+    providers::{Provider, ReqwestProvider},
     rpc::types::eth::{BlockId, BlockNumberOrTag},
 };
 use eyre::Result;
@@ -12,7 +12,7 @@ use eyre::Result;
 async fn main() -> Result<()> {
     // Create a provider.
     let rpc_url = "https://eth.merkle.io".parse()?;
-    let provider = RootProvider::<Ethereum, _>::new_http(rpc_url);
+    let provider = ReqwestProvider::<Ethereum>::new_http(rpc_url);
 
     // Get the bytecode of the Uniswap V3 USDC-ETH pool on Ethereum mainnet.
     let pool_address = address!("88e6A0c2dDD26FEEb64F039a2c41296FcB3f5640");

diff --git a/examples/queries/examples/query_logs.rs b/examples/queries/examples/query_logs.rs
@@ -3,7 +3,7 @@
 use alloy::{
     network::Ethereum,
     primitives::{address, b256},
-    providers::{Provider, RootProvider},
+    providers::{Provider, ReqwestProvider},
     rpc::types::eth::Filter,
 };
 use eyre::Result;
@@ -12,7 +12,7 @@ use eyre::Result;
 async fn main() -> Result<()> {
     // Create a provider.
     let rpc_url = "https://eth.merkle.io".parse()?;
-    let provider = RootProvider::<Ethereum, _>::new_http(rpc_url);
+    let provider = ReqwestProvider::<Ethereum>::new_http(rpc_url);
 
     // Get logs from the latest block
     let latest_block = provider.get_block_number().await?;

diff --git a/examples/subscriptions/Cargo.toml b/examples/subscriptions/Cargo.toml
@@ -15,11 +15,11 @@ workspace = true
 [dev-dependencies]
 alloy.workspace = true
 # Temp fix for enabling features. Ref: https://github.com/alloy-rs/examples/pull/3/#discussion_r1537842062
-alloy-rpc-client = { git = "https://github.com/alloy-rs/alloy", rev = "66fa192", features = [
+alloy-rpc-client = { git = "https://github.com/alloy-rs/alloy", rev = "8acf6af", features = [
     "pubsub",
     "ws",
 ] }
-alloy-provider = { git = "https://github.com/alloy-rs/alloy", rev = "66fa192", features = [
+alloy-provider = { git = "https://github.com/alloy-rs/alloy", rev = "8acf6af", features = [
     "pubsub",
 ] }
 # alloy-contract.workspace = true

diff --git a/examples/subscriptions/examples/event_multiplexer.rs b/examples/subscriptions/examples/event_multiplexer.rs
@@ -1,7 +1,7 @@
 //! Example of multiplexing the watching of event logs.
 
-use alloy::{network::Ethereum, node_bindings::Anvil, primitives::I256, sol, sol_types::SolEvent};
-use alloy_provider::RootProvider;
+use alloy::{node_bindings::Anvil, primitives::I256, sol, sol_types::SolEvent};
+use alloy_provider::ProviderBuilder;
 use alloy_rpc_client::{RpcClient, WsConnect};
 use eyre::Result;
 use futures_util::StreamExt;
@@ -44,7 +44,7 @@ async fn main() -> Result<()> {
 
     // Create a provider.
     let ws = WsConnect::new(anvil.ws_endpoint());
-    let provider = RootProvider::<Ethereum, _>::new(RpcClient::connect_pubsub(ws).await?);
+    let provider = ProviderBuilder::new().on_client(RpcClient::connect_pubsub(ws).await?);
 
     // Deploy the `EventExample` contract.
     let contract = EventMultiplexer::deploy(provider).await?;
@@ -102,7 +102,7 @@ async fn main() -> Result<()> {
             }
         };
 
-        let topic = &log.topics[0];
+        let topic = &log.topics()[0];
 
         if topic == add_log {
             println!("Received Add: {log:?}");

diff --git a/examples/subscriptions/examples/subscribe_blocks.rs b/examples/subscriptions/examples/subscribe_blocks.rs
@@ -1,7 +1,7 @@
 //! Example of subscribing to blocks and watching block headers by polling.
 
-use alloy::{network::Ethereum, node_bindings::Anvil};
-use alloy_provider::{Provider, RootProvider};
+use alloy::node_bindings::Anvil;
+use alloy_provider::{Provider, ProviderBuilder};
 use alloy_rpc_client::RpcClient;
 use eyre::Result;
 use futures_util::{stream, StreamExt};
@@ -14,7 +14,7 @@ async fn main() -> Result<()> {
 
     // Create a provider.
     let ws = alloy_rpc_client::WsConnect::new(anvil.ws_endpoint());
-    let provider = RootProvider::<Ethereum, _>::new(RpcClient::connect_pubsub(ws).await?);
+    let provider = ProviderBuilder::new().on_client(RpcClient::connect_pubsub(ws).await?);
 
     // Subscribe to blocks.
     let subscription = provider.subscribe_blocks().await?;

diff --git a/examples/subscriptions/examples/watch_contract_event.rs b/examples/subscriptions/examples/watch_contract_event.rs
@@ -1,7 +1,7 @@
 //! Example of subscribing to blocks and watching contract events by WebSocket subscription.
 
-use alloy::{network::Ethereum, node_bindings::Anvil, sol};
-use alloy_provider::RootProvider;
+use alloy::{node_bindings::Anvil, sol};
+use alloy_provider::ProviderBuilder;
 use alloy_rpc_client::RpcClient;
 use eyre::Result;
 use futures_util::StreamExt;
@@ -38,7 +38,7 @@ async fn main() -> Result<()> {
     // Create a WebSocket provider.
     let ws_rpc_url = anvil.ws_endpoint();
     let ws = alloy_rpc_client::WsConnect::new(ws_rpc_url);
-    let provider = RootProvider::<Ethereum, _>::new(RpcClient::connect_pubsub(ws).await?);
+    let provider = ProviderBuilder::new().on_client(RpcClient::connect_pubsub(ws).await?);
 
     // Deploy the `Counter` contract.
     let contract = Counter::deploy(provider.clone()).await?;

diff --git a/examples/transactions/examples/gas_price_usd.rs b/examples/transactions/examples/gas_price_usd.rs
@@ -4,7 +4,7 @@ use alloy::{
     network::Ethereum,
     node_bindings::Anvil,
     primitives::{address, utils::format_units, Address, Bytes, U256},
-    providers::{HttpProvider, Provider},
+    providers::{Provider, ReqwestProvider},
     rpc::types::eth::TransactionRequest,
     sol,
     sol_types::SolCall,
@@ -31,7 +31,7 @@ async fn main() -> Result<()> {
 
     // Create a provider.
     let rpc_url = anvil.endpoint().parse()?;
-    let provider = HttpProvider::<Ethereum>::new_http(rpc_url);
+    let provider = ReqwestProvider::<Ethereum>::new_http(rpc_url);
 
     // Create a call to get the latest answer from the Chainlink ETH/USD feed.
     let call = latestAnswerCall {}.abi_encode();

diff --git a/examples/transactions/examples/trace_call.rs b/examples/transactions/examples/trace_call.rs
@@ -3,7 +3,7 @@
 use alloy::{
     network::Ethereum,
     primitives::{address, U256},
-    providers::{HttpProvider, Provider},
+    providers::{Provider, ReqwestProvider},
     rpc::types::{
         eth::{BlockId, BlockNumberOrTag, TransactionRequest},
         trace::parity::TraceType,
@@ -15,7 +15,7 @@ use eyre::Result;
 async fn main() -> Result<()> {
     // Create a provider.
     let rpc_url = "https://eth.merkle.io".parse()?;
-    let provider = HttpProvider::<Ethereum>::new_http(rpc_url);
+    let provider = ReqwestProvider::<Ethereum>::new_http(rpc_url);
 
     // Create two users, Alice and Bob.
     let alice = address!("f39Fd6e51aad88F6F4ce6aB8827279cffFb92266");

diff --git a/examples/transactions/examples/trace_transaction.rs b/examples/transactions/examples/trace_transaction.rs
@@ -4,7 +4,7 @@ use alloy::{
     network::Ethereum,
     node_bindings::Anvil,
     primitives::b256,
-    providers::{HttpProvider, Provider},
+    providers::{Provider, ReqwestProvider},
     rpc::types::trace::geth::{
         GethDebugBuiltInTracerType, GethDebugTracerType, GethDebugTracingOptions,
         GethDefaultTracingOptions,
@@ -20,7 +20,7 @@ async fn main() -> Result<()> {
 
     // Create a provider.
     let rpc_url = anvil.endpoint().parse()?;
-    let provider = HttpProvider::<Ethereum>::new_http(rpc_url);
+    let provider = ReqwestProvider::<Ethereum>::new_http(rpc_url);
 
     // Hash of the tx we want to trace
     let hash = b256!("97a02abf405d36939e5b232a5d4ef5206980c5a6661845436058f30600c52df7");

diff --git a/examples/transactions/examples/transfer_erc20.rs b/examples/transactions/examples/transfer_erc20.rs
@@ -4,7 +4,7 @@ use alloy::{
     network::Ethereum,
     node_bindings::Anvil,
     primitives::{Address, Bytes, U256},
-    providers::{HttpProvider, Provider},
+    providers::{Provider, ReqwestProvider},
     rpc::types::eth::TransactionRequest,
     sol,
     sol_types::SolCall,
@@ -26,7 +26,7 @@ async fn main() -> Result<()> {
 
     // Create a provider.
     let rpc_url = anvil.endpoint().parse()?;
-    let provider = HttpProvider::<Ethereum>::new_http(rpc_url);
+    let provider = ReqwestProvider::<Ethereum>::new_http(rpc_url);
 
     // Create two users, Alice and Bob.
     let alice = anvil.addresses()[0];
@@ -63,7 +63,7 @@ async fn main() -> Result<()> {
 }
 
 async fn deploy_token_contract(
-    provider: &HttpProvider<Ethereum>,
+    provider: &ReqwestProvider<Ethereum>,
     from: Address,
 ) -> Result<Address> {
     // Compile the contract.
@@ -89,7 +89,7 @@ async fn deploy_token_contract(
 }
 
 async fn balance_of(
-    provider: &HttpProvider<Ethereum>,
+    provider: &ReqwestProvider<Ethereum>,
     account: Address,
     contract_address: Address,
 ) -> Result<U256> {

diff --git a/examples/transactions/examples/transfer_eth.rs b/examples/transactions/examples/transfer_eth.rs
@@ -4,7 +4,7 @@ use alloy::{
     network::Ethereum,
     node_bindings::Anvil,
     primitives::U256,
-    providers::{HttpProvider, Provider},
+    providers::{Provider, ReqwestProvider},
     rpc::types::eth::TransactionRequest,
 };
 use eyre::Result;
@@ -17,7 +17,7 @@ async fn main() -> Result<()> {
 
     // Create a provider.
     let rpc_url = anvil.endpoint().parse()?;
-    let provider = HttpProvider::<Ethereum>::new_http(rpc_url);
+    let provider = ReqwestProvider::<Ethereum>::new_http(rpc_url);
 
     // Create two users, Alice and Bob.
     let alice = anvil.addresses()[0];