Skip to content

chore: updated defaults for config.rs #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
redpanda-f merged 2 commits into from
Mar 9, 2026
Merged

chore: updated defaults for config.rs #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c12f55
update: Defaults for config.rs
redpanda-f Mar 9, 2026
85c236b
fix: deployment script
redpanda-f Mar 9, 2026
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
2 changes: 1 addition & 1 deletion .github/copilot-instructions.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand Down
2 changes: 1 addition & 1 deletion src/commands/start/foc_deploy/foc_deploy_step.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
8 changes: 4 additions & 4 deletions src/commands/start/foc_deployer/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ pub fn deploy_foc_contracts(
lotus_rpc_url: &str,
run_id: &str,
) -> Result<DeploymentResult, Box<dyn Error>> {
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);
Expand All @@ -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());
Expand Down Expand Up @@ -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
);

Expand Down
6 changes: 3 additions & 3 deletions src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Copy link
Copy Markdown
Contributor

@BigLep BigLep Mar 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe easier to reason about / spot check if we tie to a tag: https://github.com/filecoin-project/curio/tree/pdp/v1.2.0 ?

(I'm sure @rjan90 can cut a more recent tag if we want.)

},
filecoin_services: Location::GitCommit {
url: "https://github.com/FilOzone/filecoin-services.git".to_string(),
commit: "2b247916ddd33e4112dc69fd3ea4fc88a3976f56".to_string(),
commit: "c79e2c6b37372e9b381d3e2b79e787dc132195dc".to_string(),
Copy link
Copy Markdown
Contributor

@BigLep BigLep Mar 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here: ok to use a tag https://github.com/FilOzone/filecoin-services/tree/v1.1.0 ?

},
multicall3: Location::GitTag {
url: "https://github.com/mds1/multicall3.git".to_string(),
Expand Down
Loading