Skip to content

Commit

Permalink
Merge branch 'main' into exponential_backoff
Browse files Browse the repository at this point in the history
  • Loading branch information
TomasArrachea committed Nov 13, 2024
2 parents eed71b2 + 637ed69 commit fb388be
Show file tree
Hide file tree
Showing 11 changed files with 801 additions and 759 deletions.
1,433 changes: 733 additions & 700 deletions Cargo.lock

Large diffs are not rendered by default.

90 changes: 41 additions & 49 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -83,78 +83,70 @@ eth-keystore = "0.5.0"
ethers = "2.0.14"
ethers-signers = "2.0.14"
eyre = "0.6.12"
futures-util = "0.3.30"
futures-util = "0.3.31"
futures = "0.3.31"
hex = "0.4"
hex-literal = "0.4.1"
hyper = "0.14.25"
hex-literal = "0.4.3"
hyper = "0.5.0"
info-operator-service = { path = "examples/info-operator-service" }
k256 = "0.13.3"
metrics = "0.23.0"
metrics-exporter-prometheus = "0.15.3"
k256 = "0.13.4"
metrics = "0.24.0"
metrics-exporter-prometheus = "0.16.0"
num-bigint = "0.4.6"
once_cell = "1.17"
prometheus-client = "0.22.2"
quote = "1.0"
rand = "0.8"
rand_core = "0.6"
reqwest = "0.12.4"
rstest = "0.22.0"
serde = { version = "1.0.197", features = ["derive"] }
serde_json = "1.0.121"
serial_test = "3.1"
syn = "2.0"
tempfile = "3"
testcontainers = "0.20.1"
thiserror = "1.0"
tokio = { version = "1.37.0", features = ["test-util", "full", "sync"] }
once_cell = "1.20.2"
prometheus-client = "0.22.3"
quote = "1.0.37"
rand = "0.8.5"
rand_core = "0.6.4 "
reqwest = "0.12.9"
rstest = "0.23.0"
serde = { version = "1.0.214", features = ["derive"] }
serde_json = "1.0.132"
serial_test = "3.1.1"
syn = "2.0.86"
tempfile = "3.13.0"
testcontainers = "0.23.1"
thiserror = "1.0.66"
tokio = { version = "1.41.0", features = ["test-util", "full", "sync"] }
tracing = "0.1.40"
tracing-subscriber = { version = "0.3", features = ["json"] }
tracing-subscriber = { version = "0.3.18", features = ["json"] }
url = "2.5.2"

#misc
rust-bls-bn254 = { version = "0.2.0", features = ["std"] }
uuid = { version = "1.10.0", features = ["v4"] }
rust-bls-bn254 = { git = "https://github.com/Layr-Labs/rust-bls-bn254", rev = "ce3313f" ,features = ["std"] }
uuid = { version = "1.11.0", features = ["v4"] }


#misc
parking_lot = "0.12"
parking_lot = "0.12.3"

#alloy
alloy-chains = "0.1.36"
alloy-consensus = { version = "0.4.2", default-features = false }
alloy-contract = { version = "0.4.2", default-features = false }
alloy-dyn-abi = "0.8.7"
alloy-eips = { version = "0.4.2", default-features = false }
alloy-genesis = { version = "0.4.2", default-features = false }
alloy-json-rpc = { version = "0.4.2", default-features = false }
alloy-network = { version = "0.4.2", default-features = false }
alloy-node-bindings = { version = "0.4.2", default-features = false }
alloy-json-rpc = { version = "0.5.3", default-features = false }
alloy-network = { version = "0.5.3", default-features = false }
alloy-node-bindings = { version = "0.5.3", default-features = false }
alloy-primitives = "0.8.7"
alloy-provider = { version = "0.4.2", default-features = false, features = [
alloy-provider = { version = "0.5.3", default-features = false, features = [
"reqwest",
"ws",
] }
alloy-pubsub = { version = "0.4.2", default-features = false }
alloy-pubsub = { version = "0.5.3", default-features = false }
alloy-rlp = "0.3.8"
alloy-rpc-client = "0.4.2"
alloy-rpc-types = { version = "0.4.2", default-features = false, features = [
alloy-rpc-client = "0.5.3"
alloy-rpc-types = { version = "0.5.3", default-features = false, features = [
"eth",
] }
alloy-rpc-types-eth = "0.4.2"
alloy-serde = { version = "0.4.2", default-features = false }
alloy-signer = { version = "0.4.2", default-features = false }
alloy-signer-aws = "0.4.2"
alloy-signer-local = { version = "0.4.2", default-features = false }
alloy-serde = { version = "0.5.3", default-features = false }
alloy-signer = { version = "0.5.3", default-features = false }
alloy-signer-aws = "0.5.3"
alloy-signer-local = { version = "0.5.3", default-features = false }
alloy-sol-types = "0.8.7"
alloy-transport = { version = "0.4.2" }
alloy-transport-http = { version = "0.4.2", features = [
alloy-transport = { version = "0.5.3" }
alloy-transport-http = { version = "0.5.3", features = [
"reqwest-rustls-tls",
], default-features = false }
alloy-transport-ipc = { version = "0.4.2", default-features = false }
alloy-transport-ws = { version = "0.4.2", default-features = false }
alloy-trie = "0.6.0"
alloy = { version = "0.4.2", features = ["sol-types", "contract","full","signer-aws"] }
alloy-transport-ipc = { version = "0.5.3", default-features = false }
alloy-transport-ws = { version = "0.5.3", default-features = false }
alloy = { version = "0.5.3", features = ["sol-types", "contract","full","signer-aws"] }
anvil-utils = { path = "examples/anvil-utils" }
avsregistry-read = { path = "examples/avsregistry-read" }
avsregistry-write = { path = "examples/avsregistry-write" }
22 changes: 21 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,27 @@ Licensor: Layr Labs, Inc.
Licensed Work: eigensdk-rs
The Licensed Work is (c) 2023 Layr Labs, Inc.

Additional Use Grant: None.
Additional Use Grant:

You may additionally use any of the software included in the following repositories
[here](https://docs.google.com/spreadsheets/d/1PlJRow5C0GMqXZlIxRm5CEnkhH-gMV1wIdq1pCfbZco/edit?usp=sharing)
(“Additional Use Grant Software”) for production commercial uses, but only if such
uses are (i) built on or using the EigenLayer Protocol or EigenDA, and (ii) not
Competing Uses.

“Competing Use” means any use of the Additional Use Grant Software in any product,
protocol, application or service that is made available to third parties and that
(i) substitutes for use of EigenLayer Protocol or EigenDA, (ii) offers the same or
substantially similar functionality as the EigenLayer Protocol or EigenDA or
(iii) is built on or using a protocol with substantially similar functionality as
the EigenLayer Protocol.

EigenLayer Protocol means the restaking protocol as further described in the
documentation [here](https://docs.eigenlayer.xyz/), as updated from time to time.

EigenDA means the data availability protocol built on top of the EigenLayer
Protocol as further described in the documentation
[here](https://docs.eigenlayer.xyz/eigenda/overview), as updated from time to time.

Change Date: 2026-03-31 (March 31st, 2026)

Expand Down
1 change: 0 additions & 1 deletion crates/chainio/txmanager/src/fake_backend.rs
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ impl EthBackend for FakeEthBackend {
from: Address::default(),
to: None,
contract_address: None,
state_root: None,
authorization_list: None,
})
}
Expand Down
2 changes: 1 addition & 1 deletion crates/chainio/txmanager/src/simple_tx_manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ impl SimpleTxManager {
/// * `TxManagerError` - If the transaction receipt cannot be retrieved.
pub async fn wait_for_receipt(
&self,
pending_tx: PendingTransactionBuilder<'_, Transport, Ethereum>,
pending_tx: PendingTransactionBuilder<Transport, Ethereum>,
) -> Result<TransactionReceipt, TxManagerError> {
pending_tx
.get_receipt()
Expand Down
4 changes: 2 additions & 2 deletions crates/crypto/bn254/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ license-file.workspace = true
ark-bn254.workspace = true
ark-ec.workspace = true
ark-ff.workspace = true
num-bigint = "0.4.4"
num-bigint.workspace = true
rust-bls-bn254.workspace = true


[dev-dependencies]
rand = "0.8.4"
rand.workspace = true
tokio = { workspace = true, features = ["full"] }
1 change: 0 additions & 1 deletion crates/eigen-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ license-file.workspace = true

[dependencies]
alloy.workspace = true
alloy-contract.workspace = true
alloy-json-rpc.workspace = true
alloy-primitives.workspace = true
alloy-provider.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/metrics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ license-file.workspace = true
eigen-logging.workspace = true
metrics.workspace = true
metrics-exporter-prometheus.workspace = true
metrics-util = "0.17.0"
metrics-util = "0.18.0"

[dev-dependencies]
alloy-primitives.workspace = true
Expand Down
1 change: 0 additions & 1 deletion crates/signer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ license-file.workspace = true

[dependencies]
alloy.workspace =true
alloy-consensus.workspace = true
alloy-network.workspace = true
alloy-primitives.workspace = true
alloy-rpc-client.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/signer/src/web3_signer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ impl TxSigner<Signature> for Web3Signer {
) -> alloy::signers::Result<Signature> {
let params = SignTransactionParams {
from: self.address.to_string(),
to: tx.to(),
to: tx.to().into(),
value: tx.value(),
gas: format!("0x{:x}", tx.gas_limit()),
gas_price: tx.gas_price().map(|price| format!("0x{:x}", price)),
Expand Down
2 changes: 1 addition & 1 deletion testing/testing-utils/src/transaction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ pub async fn wait_transaction(
) -> Result<TransactionReceipt, PendingTransactionError> {
let url = Url::parse(rpc_url).map_err(|_| TransportErrorKind::custom_str("Invalid RPC URL"))?;
let root_provider = ProviderBuilder::new().on_http(url);
let pending_tx = PendingTransactionBuilder::new(&root_provider, tx_hash);
let pending_tx = PendingTransactionBuilder::new(root_provider, tx_hash);
pending_tx.get_receipt().await
}

0 comments on commit fb388be

Please sign in to comment.