diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index 5b28cf57..68002e99 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -117,7 +117,7 @@ MockUSDFC + FOC Service Contracts - Uses: `forge create` with `--broadcast` flag 2. **FOC Service Contracts**: - - Deployed via `deploy-all-warm-storage.sh` script + - Deployed via `warm-storage-deploy-all.sh` script - Includes: PDPVerifier, ServiceProviderRegistry, FilecoinWarmStorageService, etc. - All addresses saved to `foc-contract-addresses.json` diff --git a/src/commands/start/foc_deploy/foc_deploy_step.rs b/src/commands/start/foc_deploy/foc_deploy_step.rs index 4e01f615..e04db7cc 100644 --- a/src/commands/start/foc_deploy/foc_deploy_step.rs +++ b/src/commands/start/foc_deploy/foc_deploy_step.rs @@ -60,7 +60,7 @@ impl Step for FOCDeployStep { let deploy_script = services_repo .join("service_contracts") .join("tools") - .join("deploy-all-warm-storage.sh"); + .join("warm-storage-deploy-all.sh"); if !deploy_script.exists() { return Err( diff --git a/src/commands/start/foc_deployer/mod.rs b/src/commands/start/foc_deployer/mod.rs index 2800639c..fb6b2faa 100644 --- a/src/commands/start/foc_deployer/mod.rs +++ b/src/commands/start/foc_deployer/mod.rs @@ -75,7 +75,7 @@ pub fn deploy_foc_contracts( lotus_rpc_url: &str, run_id: &str, ) -> Result> { - info!("Running deploy-all-warm-storage.sh..."); + info!("Running warm-storage-deploy-all.sh..."); // Log the RPC URL for debugging info!("Lotus RPC URL: {}", lotus_rpc_url); @@ -87,7 +87,7 @@ pub fn deploy_foc_contracts( let contracts_dir = services_repo.join("service_contracts"); let deploy_script = contracts_dir .join("tools") - .join("deploy-all-warm-storage.sh"); + .join("warm-storage-deploy-all.sh"); if !deploy_script.exists() { return Err(format!("Deployment script not found at {}", deploy_script.display()).into()); @@ -122,14 +122,14 @@ pub fn deploy_foc_contracts( ]; // Run the deployment script - // Import wallet into keystore first (required by deploy-all-warm-storage.sh) + // Import wallet into keystore first (required by warm-storage-deploy-all.sh) // The script uses forge create --password which requires a keystore file let deploy_cmd = format!( r#"set -e mkdir -p /home/foc-user/.foundry/keystores cast wallet import foc-deployer --private-key {} --unsafe-password '' cd /service_contracts -bash /service_contracts/tools/deploy-all-warm-storage.sh 2>&1 | tee /tmp/foc-deploy.log"#, +bash /service_contracts/tools/warm-storage-deploy-all.sh 2>&1 | tee /tmp/foc-deploy.log"#, private_key ); diff --git a/src/config.rs b/src/config.rs index 85b3e822..d07cf912 100644 --- a/src/config.rs +++ b/src/config.rs @@ -212,15 +212,15 @@ impl Default for Config { port_range_count: 100, lotus: Location::GitTag { url: "https://github.com/filecoin-project/lotus.git".to_string(), - tag: "v1.34.4-rc1".to_string(), + tag: "v1.35.0".to_string(), }, curio: Location::GitCommit { url: "https://github.com/filecoin-project/curio.git".to_string(), - commit: "4d53c8017ad345410adfd80794fd7518b49c9128".to_string(), + commit: "60f77a618eee24cd3482be5fea545e01f26052a4".to_string(), }, filecoin_services: Location::GitCommit { url: "https://github.com/FilOzone/filecoin-services.git".to_string(), - commit: "2b247916ddd33e4112dc69fd3ea4fc88a3976f56".to_string(), + commit: "c79e2c6b37372e9b381d3e2b79e787dc132195dc".to_string(), }, multicall3: Location::GitTag { url: "https://github.com/mds1/multicall3.git".to_string(),