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
20 changes: 17 additions & 3 deletions src/commands/start/synapse_test_e2e/synapse_test_step.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use tracing::{info, warn};
const POST_DEPLOY_WAIT_SECONDS: u64 = 5;

/// Type alias for extracted contract addresses and keys
pub type ContractAddresses = (String, String, String, String, String);
pub type ContractAddresses = (String, String, String, String, String, String);

/// Parameters for Docker test execution
struct DockerTestParams<'a> {
Expand All @@ -31,6 +31,7 @@ struct DockerTestParams<'a> {
multicall3_addr: &'a str,
usdfc_addr: &'a str,
sp_registry_addr: &'a str,
endorsements_addr: &'a str,
}

pub struct SynapseTestE2EStep {
Expand Down Expand Up @@ -94,8 +95,14 @@ impl Step for SynapseTestE2EStep {
let keys = load_wallet_keys()?;

// Extract required addresses and keys
let (user_key, warm_storage_addr, usdfc_addr, multicall3_addr, sp_registry_addr) =
extract_required_addresses(&addresses, &keys)?;
let (
user_key,
warm_storage_addr,
usdfc_addr,
multicall3_addr,
sp_registry_addr,
endorsements_addr,
) = extract_required_addresses(&addresses, &keys)?;

let lotus_rpc_url = crate::commands::start::lotus_utils::get_lotus_rpc_url(context)?;

Expand Down Expand Up @@ -124,6 +131,7 @@ impl Step for SynapseTestE2EStep {
multicall3_addr: &multicall3_addr,
usdfc_addr: &usdfc_addr,
sp_registry_addr: &sp_registry_addr,
endorsements_addr: &endorsements_addr,
})
}

Expand Down Expand Up @@ -176,6 +184,7 @@ fn build_docker_command(params: &DockerTestParams) -> Result<Vec<String>, Box<dy
("MULTICALL3_ADDRESS", params.multicall3_addr.to_string()),
("USDFC_ADDRESS", params.usdfc_addr.to_string()),
("SP_REGISTRY_ADDRESS", params.sp_registry_addr.to_string()),
("ENDORSEMENTS_ADDRESS", params.endorsements_addr.to_string()),
("CI", "true".to_string()),
];

Expand Down Expand Up @@ -263,13 +272,18 @@ fn extract_required_addresses(
.as_str()
.ok_or("SP Registry address not found in contract_addresses.json")?
.to_string();
let endorsements_addr = addresses["foc_contracts"]["endorsements"]
.as_str()
.ok_or("Endorsements address not found in contract_addresses.json")?
.to_string();

Ok((
user_key_prefixed,
warm_storage_addr,
usdfc_addr,
multicall3_addr,
sp_registry_addr,
endorsements_addr,
))
}

Expand Down
4 changes: 2 additions & 2 deletions src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -219,15 +219,15 @@ impl Default for Config {
},
filecoin_services: Location::GitCommit {
url: "https://github.com/FilOzone/filecoin-services.git".to_string(),
commit: "0179f8b328c3dc36e81e44677e0078f064975377".to_string(),
commit: "2b247916ddd33e4112dc69fd3ea4fc88a3976f56".to_string(),
},
multicall3: Location::GitTag {
url: "https://github.com/mds1/multicall3.git".to_string(),
tag: "v3.1.0".to_string(),
},
synapse_sdk: Location::GitCommit {
url: "https://github.com/FilOzone/synapse-sdk.git".to_string(),
commit: "773551bf1e9cf4cdc49aeb63a47a81f8dc5cb9e1".to_string(),
commit: "3bc6a7fd2d0b66119163c6759241a6ff74ac03e1".to_string(),
},
yugabyte_download_url: Self::get_default_yugabyte_url(),
approved_pdp_sp_count: 1,
Expand Down
Loading