Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
crates/json-rpc @prestwich
crates/transports @evalir @prestwich
crates/networks @prestwich
crates/providers @evalir @prestwich
crates/provider @evalir @prestwich
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/BUG-FORM.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ body:
- consensus, eips, genesis
- network, json-rpc
- nodes
- providers, pubsub
- provider, pubsub
- rpc
- signers
- transports
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/FEATURE-FORM.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ body:
- consensus, eips, genesis
- network, json-rpc
- nodes
- providers, pubsub
- provider, pubsub
- rpc
- signers
- transports
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
--exclude alloy-contract \
--exclude alloy-network \
--exclude alloy-node-bindings \
--exclude alloy-providers \
--exclude alloy-provider \
--exclude alloy-signer \
--exclude alloy-signer-aws \
--exclude alloy-signer-gcp \
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ alloy-genesis = { version = "0.1.0", default-features = false, path = "crates/ge
alloy-json-rpc = { version = "0.1.0", default-features = false, path = "crates/json-rpc" }
alloy-network = { version = "0.1.0", default-features = false, path = "crates/network" }
alloy-node-bindings = { version = "0.1.0", default-features = false, path = "crates/node-bindings" }
alloy-providers = { version = "0.1.0", default-features = false, path = "crates/providers" }
alloy-provider = { version = "0.1.0", default-features = false, path = "crates/provider" }
alloy-pubsub = { version = "0.1.0", default-features = false, path = "crates/pubsub" }
alloy-rpc-client = { version = "0.1.0", default-features = false, path = "crates/rpc-client" }
alloy-rpc-engine-types = { version = "0.1.0", default-features = false, path = "crates/rpc-engine-types" }
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ This repository contains the following crates:
- [`alloy-json-rpc`] - Core data types for JSON-RPC 2.0 clients
- [`alloy-network`] - Network abstraction for RPC types
- [`alloy-node-bindings`] - Ethereum execution-layer client bindings
- [`alloy-providers`] - Interface with an Ethereum blockchain
- [`alloy-provider`] - Interface with an Ethereum blockchain
- [`alloy-pubsub`] - Ethereum JSON-RPC [publish-subscribe] tower service and type definitions
- [`alloy-rpc-client`] - Low-level Ethereum JSON-RPC client implementation
- [`alloy-rpc-types`] - Ethereum JSON-RPC types
Expand All @@ -50,7 +50,7 @@ This repository contains the following crates:
[`alloy-json-rpc`]: crates/json-rpc
[`alloy-network`]: crates/network
[`alloy-node-bindings`]: crates/node-bindings
[`alloy-providers`]: crates/providers
[`alloy-provider`]: crates/provider
[`alloy-pubsub`]: crates/pubsub
[`alloy-rpc-client`]: crates/rpc-client
[`alloy-rpc-engine-types`]: crates/rpc-engine-types
Expand Down
9 changes: 6 additions & 3 deletions crates/alloy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ alloy-eips = { workspace = true, default-features = false, optional = true }
alloy-genesis = { workspace = true, default-features = false, optional = true }
alloy-network = { workspace = true, default-features = false, optional = true }
alloy-node-bindings = { workspace = true, default-features = false, optional = true }
alloy-providers = { workspace = true, default-features = false, optional = true }
alloy-provider = { workspace = true, default-features = false, optional = true }
alloy-pubsub = { workspace = true, default-features = false, optional = true }

# rpc
Expand Down Expand Up @@ -81,7 +81,10 @@ eip712 = [

# alloy
default-tls = ["reqwest?/default-tls"]
jsonrpsee-types = ["alloy-rpc-types?/jsonrpsee-types", "alloy-rpc-engine-types?/jsonrpsee-types"]
jsonrpsee-types = [
"alloy-rpc-types?/jsonrpsee-types",
"alloy-rpc-engine-types?/jsonrpsee-types",
]

consensus = ["dep:alloy-consensus"]
eips = ["dep:alloy-eips"]
Expand All @@ -92,7 +95,7 @@ node-bindings = ["dep:alloy-node-bindings"]
contract = ["dep:alloy-contract", "dyn-abi", "json-abi", "json", "sol-types"]

## providers
providers = ["dep:alloy-providers"]
providers = ["dep:alloy-provider"]
provider-http = ["providers", "transport-http"]
provider-ws = ["providers", "transport-ws"]
provider-ipc = ["providers", "transport-ipc"]
Expand Down
8 changes: 4 additions & 4 deletions crates/alloy/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,11 @@ pub use alloy_node_bindings as node_bindings;

/// Interface with an Ethereum blockchain.
///
/// See [`alloy_providers`] for more details.
/// See [`alloy_provider`] for more details.
#[cfg(feature = "providers")]
pub mod providers {
#[doc(inline)]
pub use alloy_providers::*;
pub use alloy_provider::*;

// TODO: provider type aliases
// #[cfg(feature = "provider-http")]
Expand Down Expand Up @@ -171,7 +171,7 @@ pub mod signers {
#[cfg_attr(feature = "providers", doc = "[`providers`]: crate::providers")]
#[cfg_attr(
not(feature = "providers"),
doc = "[`providers`]: https://github.com/alloy-rs/alloy/tree/main/crates/providers"
doc = "[`providers`]: https://github.com/alloy-rs/alloy/tree/main/crates/provider"
)]
#[cfg(feature = "transports")]
pub mod transports {
Expand Down Expand Up @@ -199,7 +199,7 @@ pub mod transports {
#[cfg_attr(feature = "providers", doc = "[`providers`]: crate::providers")]
#[cfg_attr(
not(feature = "providers"),
doc = "[`providers`]: https://github.com/alloy-rs/alloy/tree/main/crates/providers"
doc = "[`providers`]: https://github.com/alloy-rs/alloy/tree/main/crates/provider"
)]
#[cfg(feature = "pubsub")]
pub mod pubsub {
Expand Down
2 changes: 1 addition & 1 deletion crates/contract/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ exclude.workspace = true

[dependencies]
alloy-network.workspace = true
alloy-providers.workspace = true
alloy-provider.workspace = true
alloy-rpc-types.workspace = true
alloy-transport.workspace = true

Expand Down
4 changes: 2 additions & 2 deletions crates/contract/src/call.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use alloy_dyn_abi::{DynSolValue, FunctionExt, JsonAbiExt};
use alloy_json_abi::Function;
use alloy_network::{Network, ReceiptResponse, TransactionBuilder};
use alloy_primitives::{Address, Bytes, U256, U64};
use alloy_providers::Provider;
use alloy_provider::Provider;
use alloy_rpc_types::{state::StateOverride, BlockId};
use alloy_sol_types::SolCall;
use alloy_transport::Transport;
Expand Down Expand Up @@ -468,7 +468,7 @@ mod tests {
use alloy_network::Ethereum;
use alloy_node_bindings::{Anvil, AnvilInstance};
use alloy_primitives::{address, b256, bytes, hex};
use alloy_providers::{HttpProvider, Provider, RootProvider};
use alloy_provider::{HttpProvider, Provider, RootProvider};
use alloy_rpc_client::RpcClient;
use alloy_sol_types::sol;
use alloy_transport_http::Http;
Expand Down
2 changes: 1 addition & 1 deletion crates/contract/src/instance.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use alloy_dyn_abi::DynSolValue;
use alloy_json_abi::{Function, JsonAbi};
use alloy_network::Network;
use alloy_primitives::{Address, Selector};
use alloy_providers::Provider;
use alloy_provider::Provider;
use alloy_transport::Transport;
use std::marker::PhantomData;

Expand Down
2 changes: 1 addition & 1 deletion crates/contract/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ pub use call::*;
#[doc(hidden)]
pub mod private {
pub use alloy_network::Network;
pub use alloy_providers::Provider;
pub use alloy_provider::Provider;
pub use alloy_transport::Transport;
}
4 changes: 2 additions & 2 deletions crates/network/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ networking. The core model is as follows:
## Usage

This crate is not intended to be used directly. It is used by the
[alloy-providers] library and reth to modify the input and output types of the
[alloy-provider] library and reth to modify the input and output types of the
RPC methods.

This crate will primarily be used by blockchain maintainers to add bespoke RPC
Expand Down Expand Up @@ -61,4 +61,4 @@ trait FooProviderExt: Provider<Foo> {
}
```

[alloy-providers]: ../providers
[alloy-provider]: ../provider
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "alloy-providers"
name = "alloy-provider"
description = "Interface with an Ethereum blockchain"

version.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/providers/README.md → crates/provider/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# alloy-providers
# alloy-provider

<!-- TODO: links, docs, examples, etc -->

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion crates/transport/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This crate handles RPC connection and request management. It builds an
futures for simple and batch RPC requests as well as a unified `TransportError`
type.

[alloy-providers]: ../providers/
[alloy-provider]: ../provider/
[tower `Service`]: https://docs.rs/tower/latest/tower/trait.Service.html

## Usage
Expand Down