Skip to content

Commit 8aa0ee2

Browse files
committed
feat: enhance IPC subnet manager and dependencies
- Updated `Cargo.toml` to disable default features for `ethers` and `reqwest`, adding `rustls` support to avoid OpenSSL issues during cross-compilation. - Introduced a new `Cross.toml` file for cross-compilation configuration, including OpenSSL header installation. - Enhanced `ipc-subnet-config-local.yml` and `ipc-subnet-config.yml` with new storage service configurations and updated subnet parameters. - Updated `ipc-subnet-manager.sh` to include new commands for managing storage services and improved options for binary updates.
1 parent c9db30e commit 8aa0ee2

63 files changed

Lines changed: 676 additions & 2391 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ dircpy = "0.3.19"
113113
either = "1.10"
114114
env_logger = "0.10"
115115
erased-serde = "0.3"
116-
ethers = { version = "2.0.13", features = ["abigen", "ws"] }
116+
ethers = { version = "2.0.13", default-features = false, features = ["abigen", "ws", "rustls"] }
117117
ethers-core = { version = "2.0.13" }
118118
ethers-contract = "2.0.13"
119119
fnv = "1.0"

Cross.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[target.x86_64-unknown-linux-gnu]
2+
image = "ghcr.io/cross-rs/x86_64-unknown-linux-gnu:main"
3+
# Install OpenSSL headers/pkg-config inside the cross container so crates that
4+
# depend on native-tls/openssl-sys can compile.
5+
pre-build = [
6+
"dpkg --add-architecture $CROSS_DEB_ARCH",
7+
"apt-get update && apt-get --assume-yes install pkg-config libssl-dev:$CROSS_DEB_ARCH"
8+
]

ipc-storage/ipc-decentralized-storage/Cargo.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ urlencoding.workspace = true
2929
blake3.workspace = true
3030

3131
# HTTP client dependencies
32-
reqwest = { version = "0.11", features = ["json"] }
32+
# Use rustls to avoid OpenSSL target sysroot issues during macOS -> Linux cross compilation.
33+
reqwest = { version = "0.11", default-features = false, features = ["json", "rustls-tls"] }
3334

3435
# CLI dependencies
3536
clap = { workspace = true, features = ["derive"] }
@@ -54,7 +55,8 @@ fendermint_crypto = { path = "../../fendermint/crypto" }
5455

5556
# IPC dependencies for address parsing
5657
ipc-api = { path = "../../ipc/api" }
57-
ethers.workspace = true
58+
# Keep ethers minimal here to avoid pulling native-tls/OpenSSL in local cross-compiles.
59+
ethers = { workspace = true, default-features = false, features = ["rustls"] }
5860

5961
# FVM dependencies
6062
fvm_shared.workspace = true

scripts/ipc-subnet-manager/QUICK-FIX-PROMPT.txt

Lines changed: 0 additions & 48 deletions
This file was deleted.

scripts/ipc-subnet-manager/ADVANCED-TUNING-GUIDE.md renamed to scripts/ipc-subnet-manager/docs/ADVANCED-TUNING-GUIDE.md

scripts/ipc-subnet-manager/ALL-LOCAL-MODE-FIXES-SUMMARY.md renamed to scripts/ipc-subnet-manager/docs/ALL-LOCAL-MODE-FIXES-SUMMARY.md

scripts/ipc-subnet-manager/BOTTOMUP-CHECKPOINT-FIX.md renamed to scripts/ipc-subnet-manager/docs/BOTTOMUP-CHECKPOINT-FIX.md

0 commit comments

Comments
 (0)