fix: hotfix cast logs subscribe (#7688)

* fix: hotfix cast logs subscribe * fix features
foundry-rs · Apr 16, 2024 · 8513f61 · 8513f61
1 parent 24536cd
commit 8513f61
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/anvil/Cargo.toml b/crates/anvil/Cargo.toml
@@ -47,7 +47,7 @@ alloy-sol-types = { workspace = true, features = ["std"] }
 alloy-dyn-abi = { workspace = true, features = ["std", "eip712"] }
 alloy-rpc-types.workspace = true
 alloy-rpc-types-trace.workspace = true
-alloy-provider = { workspace = true, features = ["pubsub"] }
+alloy-provider = { workspace = true, features = ["reqwest", "ws", "ipc"] }
 alloy-transport.workspace = true
 alloy-chains.workspace = true
 alloy-genesis.workspace = true

diff --git a/crates/cast/Cargo.toml b/crates/cast/Cargo.toml
@@ -34,7 +34,7 @@ alloy-dyn-abi.workspace = true
 alloy-json-abi.workspace = true
 alloy-primitives.workspace = true
 alloy-rlp.workspace = true
-alloy-provider = { workspace = true, features = ["pubsub"] }
+alloy-provider = { workspace = true, features = ["reqwest", "ws", "ipc"] }
 alloy-transport.workspace = true
 alloy-rpc-types.workspace = true
 alloy-json-rpc.workspace = true

diff --git a/crates/cast/bin/cmd/logs.rs b/crates/cast/bin/cmd/logs.rs
@@ -1,5 +1,6 @@
 use alloy_dyn_abi::{DynSolType, DynSolValue, Specifier};
 use alloy_json_abi::Event;
+use alloy_network::AnyNetwork;
 use alloy_primitives::{Address, B256};
 use alloy_rpc_types::{BlockId, BlockNumberOrTag, Filter, FilterBlockOption, FilterSet, Topic};
 use cast::Cast;
@@ -93,6 +94,14 @@ impl LogsArgs {
             return Ok(())
         }
 
+        // FIXME: this is a hotfix for <https://github.com/foundry-rs/foundry/issues/7682>
+        //  currently the alloy `eth_subscribe` impl does not work with all transports, so we use
+        // the builtin transport here for now
+        let url = config.get_rpc_url_or_localhost_http()?;
+        let provider = alloy_provider::ProviderBuilder::<_, _, AnyNetwork>::default()
+            .on_builtin(url.as_ref())
+            .await?;
+        let cast = Cast::new(&provider);
         let mut stdout = io::stdout();
         cast.subscribe(filter, &mut stdout, json).await?;
 

diff --git a/crates/forge/Cargo.toml b/crates/forge/Cargo.toml
@@ -51,7 +51,7 @@ alloy-dyn-abi.workspace = true
 alloy-json-abi.workspace = true
 alloy-primitives = { workspace = true, features = ["serde"] }
 alloy-rpc-types.workspace = true
-alloy-provider.workspace = true
+alloy-provider = { workspace = true, features = ["reqwest", "ws", "ipc"] }
 alloy-network.workspace = true
 alloy-transport.workspace = true
 alloy-signer.workspace = true