Skip to content

Commit

Permalink
fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
supernovahs committed Jan 10, 2025
1 parent 23fedf5 commit 3b15f3a
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 7 deletions.
2 changes: 1 addition & 1 deletion contracts/script/deployments/core/31337.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"lastUpdate":{"timestamp":"1736436633","block_number":"1"},"addresses":{"proxyAdmin":"0xe7f1725e7734ce288f8367e1bb143e90bb3f0512","delegation":"0xcf7ed3acca5a467e9e704c703e8d87f634fb0fc9","delegationManagerImpl":"0x322813fd9a801c5507c9de605d63cea4f2ce6c44","avsDirectory":"0xb7f8bc63bbcad18155201308c8f3540b07f84f5e","avsDirectoryImpl":"0x4a679253410272dd5232b3ff7cf5dbb88f295319","strategyManager":"0xa513e6e4b8f2a923d98304ec87f64353c4d5c853","strategyManagerImpl":"0x7a2088a1bfc9d81c55368ae168c2c02570cb814f","eigenPodManager":"0xc6e7df5e7b4f2a278906862b61205850344d4e7d","eigenPodManagerImpl":"0x67d269191c92caf3cd7723f116c85e6e9bf55933","strategyFactory":"0x68b1d87f95878fe05b998f19b66f4baba5de1aed","rewardsCoordinator":"0x0dcd1bf9a1b36ce34237eeafef220932846bcd82","pauserRegistry":"0x959922be3caee4b8cd9a407cc3ac1c251c2007b1","strategyBeacon":"0xa82ff9afd8f496c3d6ac40e2a0f282e47488cfc9","allocationManager":"0x8a791620dd6260079bf849dc5567adc3f2fdc318","permissionController":"0x4ed7c70f96b99c776995fb64377f0d4ab3b0e1c1"}}
{"lastUpdate":{"timestamp":"1736501611","block_number":"1"},"addresses":{"proxyAdmin":"0xe7f1725e7734ce288f8367e1bb143e90bb3f0512","delegation":"0xcf7ed3acca5a467e9e704c703e8d87f634fb0fc9","delegationManagerImpl":"0x322813fd9a801c5507c9de605d63cea4f2ce6c44","avsDirectory":"0xb7f8bc63bbcad18155201308c8f3540b07f84f5e","avsDirectoryImpl":"0x4a679253410272dd5232b3ff7cf5dbb88f295319","strategyManager":"0xa513e6e4b8f2a923d98304ec87f64353c4d5c853","strategyManagerImpl":"0x7a2088a1bfc9d81c55368ae168c2c02570cb814f","eigenPodManager":"0xc6e7df5e7b4f2a278906862b61205850344d4e7d","eigenPodManagerImpl":"0x67d269191c92caf3cd7723f116c85e6e9bf55933","strategyFactory":"0x68b1d87f95878fe05b998f19b66f4baba5de1aed","rewardsCoordinator":"0x0dcd1bf9a1b36ce34237eeafef220932846bcd82","pauserRegistry":"0x959922be3caee4b8cd9a407cc3ac1c251c2007b1","strategyBeacon":"0xa82ff9afd8f496c3d6ac40e2a0f282e47488cfc9","allocationManager":"0x8a791620dd6260079bf849dc5567adc3f2fdc318","permissionController":"0x4ed7c70f96b99c776995fb64377f0d4ab3b0e1c1"}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"lastUpdate":{"timestamp":"1736436676","block_number":"44"},"addresses":{"proxyAdmin":"0x1291be112d480055dafd8a610b7d1e203891c274","IncredibleSquaringServiceManager":"0xb7278a61aa25c888815afc32ad3cc52ff24fe575","incredibleSquaringServiceManagerImpl":"0x202cce504e04bed6fc0521238ddf04bc9e8e15ab","IncredibleSquaringTaskManager":"0x7969c5ed335650692bc04293b07f5bf2e7a673c0","registryCoordinator":"0xc351628eb244ec633d5f21fbd6621e1a683b1181","blsapkRegistry":"0xcbeaf3bde82155f56486fb5a1072cb8baaf547cc","indexRegistry":"0xb0d4afd8879ed9f52b28595d31b441d079b2ca07","stakeRegistry":"0x82e01223d51eb87e16a03e24687edf0f294da6f1","operatorStateRetriever":"0xdbc43ba45381e02825b14322cddd15ec4b3164e6","strategy":"0x5e3d0fde6f793b3115a9e7f5ebc195bbeed35d6c","pauserRegistry":"0x0000000000000000000000000000000000000000","token":"0x0000000000000000000000000000000000000000","instantSlasher":"0x1fa02b2d6a771842690194cf62d91bdd92bfe28d"}}
{"lastUpdate":{"timestamp":"1736501654","block_number":"44"},"addresses":{"proxyAdmin":"0x1291be112d480055dafd8a610b7d1e203891c274","IncredibleSquaringServiceManager":"0xb7278a61aa25c888815afc32ad3cc52ff24fe575","incredibleSquaringServiceManagerImpl":"0x202cce504e04bed6fc0521238ddf04bc9e8e15ab","IncredibleSquaringTaskManager":"0x7969c5ed335650692bc04293b07f5bf2e7a673c0","registryCoordinator":"0xc351628eb244ec633d5f21fbd6621e1a683b1181","blsapkRegistry":"0xcbeaf3bde82155f56486fb5a1072cb8baaf547cc","indexRegistry":"0xb0d4afd8879ed9f52b28595d31b441d079b2ca07","stakeRegistry":"0x82e01223d51eb87e16a03e24687edf0f294da6f1","operatorStateRetriever":"0xdbc43ba45381e02825b14322cddd15ec4b3164e6","strategy":"0x5e3d0fde6f793b3115a9e7f5ebc195bbeed35d6c","pauserRegistry":"0x0000000000000000000000000000000000000000","token":"0x0000000000000000000000000000000000000000","instantSlasher":"0x1fa02b2d6a771842690194cf62d91bdd92bfe28d"}}
2 changes: 2 additions & 0 deletions crates/aggregator/src/fake_aggregator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,7 @@ mod tests {

use alloy::primitives::{FixedBytes, U256};
use eigen_crypto_bls::BlsKeyPair;
use eigen_logging::init_logger;
use eigen_types::test::TestOperator;
use incredible_testing_utils::{
get_incredible_squaring_operator_state_retriever,
Expand Down Expand Up @@ -446,6 +447,7 @@ mod tests {

#[tokio::test]
async fn test_build() {
init_logger(eigen_logging::log_level::LogLevel::Info);
let fake_aggregator = build_aggregator().await;
fake_aggregator
.bls_aggregation_service
Expand Down
8 changes: 8 additions & 0 deletions crates/challenger/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,8 @@ signer = "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
[ecdsa_config]
keystore_path = "../testing-utils/src/ecdsakeystore.json"
keystore_password = "test"
keystore_2_path = "../testing-utils/src/ecdsa_keystore_2.json"
keystore_2_password = "test"
[bls_config]
keystore_path = "../testing-utils/src/blskeystore.json"
Expand All @@ -303,6 +305,12 @@ operator_address = "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266"
operator_id = "0xb345f720903a3ecfd59f3de456dd9d266c2ce540b05e8c909106962684d9afa3"
operator_2_address = "0x0b065a0423f076a340f37e16e1ce22e23d66caf2"
operator_2_id = "0x17a0935b43b64cc3536d48621208fddb680ef8998561f0a1669a3ccda66676be"
operator_set_id = "1"
operator_1_token_amount = "5000000000000000000000"
operator_2_token_amount = "7000000000000000000000"
allocation_delay = "1"
slash_simulate = false
[task_manager_config]
signer = "0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d"
"#;
Expand Down
28 changes: 23 additions & 5 deletions crates/config/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -668,18 +668,26 @@ mod tests {
#[test]
fn test_operator_config_load() {
let config_file = r#"
operator_address = "https://localhost:3001"
operator_id = "0x0202020202020202020202020202020202020202020202020202020202020202"
operator_address = "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266"
operator_id = "0xb345f720903a3ecfd59f3de456dd9d266c2ce540b05e8c909106962684d9afa3"
operator_2_address = "0x0b065a0423f076a340f37e16e1ce22e23d66caf2"
operator_2_id = "0x17a0935b43b64cc3536d48621208fddb680ef8998561f0a1669a3ccda66676be"
operator_2_id = "0x17a0935b43b64cc3536d48621208fddb680ef8998561f0a1669a3ccda66676be"
operator_set_id = "1"
operator_1_token_amount = "5000000000000000000000"
operator_2_token_amount = "7000000000000000000000"
allocation_delay = "1"
slash_simulate = false
"#;

let _config: OperatorConfig = toml::from_str(config_file).unwrap();

assert_eq!(_config.operator_address, "https://localhost:3001");
assert_eq!(
_config.operator_address,
"0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266"
);
assert_eq!(
_config.operator_id,
"0x0202020202020202020202020202020202020202020202020202020202020202"
"0xb345f720903a3ecfd59f3de456dd9d266c2ce540b05e8c909106962684d9afa3"
);
}

Expand Down Expand Up @@ -731,6 +739,8 @@ mod tests {
delegation_manager_addr ="0xA44151489861Fe9e3055d95adC98FbD462B948e7"
avs_directory_addr ="0x055733000064333CaDDbC92763c58BF0192fFeBf"
strategy_manager_addr ="0xdfB5f6CE42aAA7830E94ECFCcAd411beF4d4D5b6"
rewards_coordinator_addr = "0x4838B106FCe9647Bdf1E7877BF73cE8B0BAD5f97"
permission_controller_addr = "0xdfB5f6CE42aAA7830E94ECFCcAd411beF4d4D5b6"
"#;

let _config: ELConfig = toml::from_str(config_file).unwrap();
Expand All @@ -755,6 +765,14 @@ mod tests {
_config.strategy_manager_addr,
"0xdfB5f6CE42aAA7830E94ECFCcAd411beF4d4D5b6"
);
assert_eq!(
_config.rewards_coordinator_addr,
"0x4838B106FCe9647Bdf1E7877BF73cE8B0BAD5f97"
);
assert_eq!(
_config.permission_controller_addr,
"0xdfB5f6CE42aAA7830E94ECFCcAd411beF4d4D5b6"
);

let incredible_config_file = r#"
"#;
Expand Down
5 changes: 5 additions & 0 deletions crates/operator/operator_test_config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,8 @@ operator_address = "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266"
operator_id = "0xb345f720903a3ecfd59f3de456dd9d266c2ce540b05e8c909106962684d9afa3"
operator_2_address = "0x0b065a0423f076a340f37e16e1ce22e23d66caf2"
operator_2_id = "0x17a0935b43b64cc3536d48621208fddb680ef8998561f0a1669a3ccda66676be"
operator_set_id = "1"
operator_1_token_amount = "5000000000000000000000"
operator_2_token_amount = "7000000000000000000000"
allocation_delay = "1"
slash_simulate = false
3 changes: 3 additions & 0 deletions integration-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,6 @@ eigen-testing-utils = {git = "https://github.com/layr-labs/eigensdk-rs" , rev =
serial_test = "3.1.1"
rust-bls-bn254 = {git = "https://github.com/Layr-Labs/rust-bls-bn254.git", rev = "be3ef87", features = ["std"] }
eigen-crypto-bls = {git = "https://github.com/layr-labs/eigensdk-rs" , rev = "046d497"}


[workspace]

0 comments on commit 3b15f3a

Please sign in to comment.