From 52bc15d79ce934b9c4683ceda3e40f27703594bd Mon Sep 17 00:00:00 2001 From: Tjemmmic Date: Wed, 22 Jan 2025 12:37:19 -0600 Subject: [PATCH] fix(ci): workflow fix --- Cargo.lock | 26 +++++++++---------- Cargo.toml | 2 +- crates/clients/evm/src/instrumented_client.rs | 4 +-- .../tangle/src/node/transactions.rs | 5 +++- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3b205c4..f1faeae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4722,7 +4722,7 @@ dependencies = [ [[package]] name = "eigen-client-avsregistry" version = "0.1.2" -source = "git+https://github.com/Layr-Labs/eigensdk-rs.git?branch=dev#6ab2674cf19e2f2c78218de706975af1244dad9c" +source = "git+https://github.com/Layr-Labs/eigensdk-rs.git?rev=6ab2674cf19e2f2c78218de706975af1244dad9c#6ab2674cf19e2f2c78218de706975af1244dad9c" dependencies = [ "alloy", "alloy-primitives 0.8.19", @@ -4744,7 +4744,7 @@ dependencies = [ [[package]] name = "eigen-client-elcontracts" version = "0.1.2" -source = "git+https://github.com/Layr-Labs/eigensdk-rs.git?branch=dev#6ab2674cf19e2f2c78218de706975af1244dad9c" +source = "git+https://github.com/Layr-Labs/eigensdk-rs.git?rev=6ab2674cf19e2f2c78218de706975af1244dad9c#6ab2674cf19e2f2c78218de706975af1244dad9c" dependencies = [ "alloy", "alloy-primitives 0.8.19", @@ -4759,7 +4759,7 @@ dependencies = [ [[package]] name = "eigen-common" version = "0.1.2" -source = "git+https://github.com/Layr-Labs/eigensdk-rs.git?branch=dev#6ab2674cf19e2f2c78218de706975af1244dad9c" +source = "git+https://github.com/Layr-Labs/eigensdk-rs.git?rev=6ab2674cf19e2f2c78218de706975af1244dad9c#6ab2674cf19e2f2c78218de706975af1244dad9c" dependencies = [ "alloy-provider", "alloy-pubsub", @@ -4772,7 +4772,7 @@ dependencies = [ [[package]] name = "eigen-crypto-bls" version = "0.1.2" -source = "git+https://github.com/Layr-Labs/eigensdk-rs.git?branch=dev#6ab2674cf19e2f2c78218de706975af1244dad9c" +source = "git+https://github.com/Layr-Labs/eigensdk-rs.git?rev=6ab2674cf19e2f2c78218de706975af1244dad9c#6ab2674cf19e2f2c78218de706975af1244dad9c" dependencies = [ "alloy-primitives 0.8.19", "ark-bn254", @@ -4789,7 +4789,7 @@ dependencies = [ [[package]] name = "eigen-crypto-bn254" version = "0.1.2" -source = "git+https://github.com/Layr-Labs/eigensdk-rs.git?branch=dev#6ab2674cf19e2f2c78218de706975af1244dad9c" +source = "git+https://github.com/Layr-Labs/eigensdk-rs.git?rev=6ab2674cf19e2f2c78218de706975af1244dad9c#6ab2674cf19e2f2c78218de706975af1244dad9c" dependencies = [ "ark-bn254", "ark-ec 0.5.0", @@ -4800,7 +4800,7 @@ dependencies = [ [[package]] name = "eigen-logging" version = "0.1.2" -source = "git+https://github.com/Layr-Labs/eigensdk-rs.git?branch=dev#6ab2674cf19e2f2c78218de706975af1244dad9c" +source = "git+https://github.com/Layr-Labs/eigensdk-rs.git?rev=6ab2674cf19e2f2c78218de706975af1244dad9c#6ab2674cf19e2f2c78218de706975af1244dad9c" dependencies = [ "ctor", "once_cell", @@ -4811,7 +4811,7 @@ dependencies = [ [[package]] name = "eigen-services-avsregistry" version = "0.1.2" -source = "git+https://github.com/Layr-Labs/eigensdk-rs.git?branch=dev#6ab2674cf19e2f2c78218de706975af1244dad9c" +source = "git+https://github.com/Layr-Labs/eigensdk-rs.git?rev=6ab2674cf19e2f2c78218de706975af1244dad9c#6ab2674cf19e2f2c78218de706975af1244dad9c" dependencies = [ "alloy-primitives 0.8.19", "ark-bn254", @@ -4827,7 +4827,7 @@ dependencies = [ [[package]] name = "eigen-services-blsaggregation" version = "0.1.2" -source = "git+https://github.com/Layr-Labs/eigensdk-rs.git?branch=dev#6ab2674cf19e2f2c78218de706975af1244dad9c" +source = "git+https://github.com/Layr-Labs/eigensdk-rs.git?rev=6ab2674cf19e2f2c78218de706975af1244dad9c#6ab2674cf19e2f2c78218de706975af1244dad9c" dependencies = [ "alloy", "alloy-primitives 0.8.19", @@ -4850,7 +4850,7 @@ dependencies = [ [[package]] name = "eigen-services-operatorsinfo" version = "0.1.2" -source = "git+https://github.com/Layr-Labs/eigensdk-rs.git?branch=dev#6ab2674cf19e2f2c78218de706975af1244dad9c" +source = "git+https://github.com/Layr-Labs/eigensdk-rs.git?rev=6ab2674cf19e2f2c78218de706975af1244dad9c#6ab2674cf19e2f2c78218de706975af1244dad9c" dependencies = [ "alloy", "alloy-primitives 0.8.19", @@ -4872,7 +4872,7 @@ dependencies = [ [[package]] name = "eigen-signer" version = "0.1.2" -source = "git+https://github.com/Layr-Labs/eigensdk-rs.git?branch=dev#6ab2674cf19e2f2c78218de706975af1244dad9c" +source = "git+https://github.com/Layr-Labs/eigensdk-rs.git?rev=6ab2674cf19e2f2c78218de706975af1244dad9c#6ab2674cf19e2f2c78218de706975af1244dad9c" dependencies = [ "alloy", "alloy-network", @@ -4892,7 +4892,7 @@ dependencies = [ [[package]] name = "eigen-types" version = "0.1.2" -source = "git+https://github.com/Layr-Labs/eigensdk-rs.git?branch=dev#6ab2674cf19e2f2c78218de706975af1244dad9c" +source = "git+https://github.com/Layr-Labs/eigensdk-rs.git?rev=6ab2674cf19e2f2c78218de706975af1244dad9c#6ab2674cf19e2f2c78218de706975af1244dad9c" dependencies = [ "alloy-primitives 0.8.19", "eigen-crypto-bls", @@ -4905,7 +4905,7 @@ dependencies = [ [[package]] name = "eigen-utils" version = "0.1.2" -source = "git+https://github.com/Layr-Labs/eigensdk-rs.git?branch=dev#6ab2674cf19e2f2c78218de706975af1244dad9c" +source = "git+https://github.com/Layr-Labs/eigensdk-rs.git?rev=6ab2674cf19e2f2c78218de706975af1244dad9c#6ab2674cf19e2f2c78218de706975af1244dad9c" dependencies = [ "alloy", "reqwest 0.12.12", @@ -4914,7 +4914,7 @@ dependencies = [ [[package]] name = "eigensdk" version = "0.1.2" -source = "git+https://github.com/Layr-Labs/eigensdk-rs.git?branch=dev#6ab2674cf19e2f2c78218de706975af1244dad9c" +source = "git+https://github.com/Layr-Labs/eigensdk-rs.git?rev=6ab2674cf19e2f2c78218de706975af1244dad9c#6ab2674cf19e2f2c78218de706975af1244dad9c" dependencies = [ "eigen-client-avsregistry", "eigen-client-elcontracts", diff --git a/Cargo.toml b/Cargo.toml index ad7b2bc..292d538 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -251,7 +251,7 @@ rayon = { version = "1", default-features = false } zeroize = { version = "1.8.1", default-features = false } # Eigenlayer -eigensdk = { git = "https://github.com/Layr-Labs/eigensdk-rs.git", branch = "dev", default-features = false } +eigensdk = { git = "https://github.com/Layr-Labs/eigensdk-rs.git", rev = "6ab2674cf19e2f2c78218de706975af1244dad9c", default-features = false } rust-bls-bn254 = { version = "0.2.1", default-features = false } testcontainers = { version = "0.23.1", default-features = false } diff --git a/crates/clients/evm/src/instrumented_client.rs b/crates/clients/evm/src/instrumented_client.rs index be47508..17d8e66 100644 --- a/crates/clients/evm/src/instrumented_client.rs +++ b/crates/clients/evm/src/instrumented_client.rs @@ -1172,7 +1172,7 @@ mod tests { ])) .await .expect("Failed to mine anvil blocks"); - tokio::time::sleep(gadget_std::time::Duration::from_secs(1)).await; + tokio::time::sleep(gadget_std::time::Duration::from_secs(5)).await; let expected_block_number = provider.clone().get_block_number().await.unwrap(); let block_number = instrumented_client.block_number().await.unwrap(); @@ -1216,7 +1216,7 @@ mod tests { ])) .await .expect("Failed to mine anvil blocks"); - tokio::time::sleep(gadget_std::time::Duration::from_secs(1)).await; + tokio::time::sleep(gadget_std::time::Duration::from_secs(5)).await; let block_count = 4; let last_block = BlockNumberOrTag::Latest; diff --git a/crates/testing-utils/tangle/src/node/transactions.rs b/crates/testing-utils/tangle/src/node/transactions.rs index b2488b8..e216447 100644 --- a/crates/testing-utils/tangle/src/node/transactions.rs +++ b/crates/testing-utils/tangle/src/node/transactions.rs @@ -3,6 +3,8 @@ use alloy_provider::{ network::{ReceiptResponse, TransactionBuilder}, PendingTransactionError, Provider, WsConnect, }; +use alloy_provider::network::AnyNetwork; +use alloy_rpc_types::serde_helpers::WithOtherFields; use alloy_signer_local::PrivateKeySigner; use gadget_clients::tangle::client::{TangleClient as TestClient, TangleConfig}; use gadget_logging::{error, info}; @@ -64,12 +66,13 @@ pub async fn deploy_new_mbsm_revision>( let wallet = alloy_provider::network::EthereumWallet::from(signer_evm); let provider = alloy_provider::ProviderBuilder::new() .with_recommended_fillers() + .network::() .wallet(wallet) .on_ws(WsConnect::new(evm_rpc_endpoint)) .await?; let tx = alloy_rpc_types::TransactionRequest::default().with_deploy_code(bytecode.to_vec()); - let send_result = provider.send_transaction(tx).await; + let send_result = provider.send_transaction(WithOtherFields::new(tx)).await; let tx = match send_result { Ok(tx) => tx, Err(err) => {