Skip to content

Commit

Permalink
Fix wasm build errors after rebase due to transitive dependencies
Browse files Browse the repository at this point in the history
The fix was to removing "crypto" feature from fvm_shared dependency
in contracts/binding/Cargo.toml, recompile, and then add it back.
  • Loading branch information
fridrik01 committed Jan 26, 2024
1 parent 2386c7d commit 02461cf
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 15 deletions.
19 changes: 8 additions & 11 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 9 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,12 @@ ipc_actors_abis = { path = "contracts/binding" }
# Vendored for cross-compilation, see https://github.com/cross-rs/cross/wiki/Recipes#openssl
openssl = { version = "0.10", features = ["vendored"] }

fvm = { version = "4.1.0", default-features = false } # no opencl feature or it fails on CI
fvm_shared = { version = "4.1.0", features = ["crypto"] }
# NOTE: When upgrading the FVM it may cause our fendermint/actors/build.rs to fail as it can
# pull in crates as transitive dependencies that do not support Wasm architector. If this
# happens, try removing "crypto" feature from fvm_shared dependency in contracts/binding/Cargo.toml
# and run `cargo build`. Then add the "crypto" feature back and run `cargo build` again.
fvm = { version = "4.1.0", default-features = false } # no opencl feature or it fails on CI
fvm_shared = { version = "4.1.0" }
fvm_sdk = { version = "4.1.0" }

fvm_ipld_blockstore = "0.2.0"
Expand All @@ -171,7 +175,7 @@ fvm_ipld_amt = "0.6.2"
# fvm_ipld_encoding = { path = "../ref-fvm/ipld/encoding" }
# fvm_ipld_car = { path = "../ref-fvm/ipld/car" }
# fvm_ipld_hamt = { path = "../ref-fvm/ipld/hamt" }
# fvm_shared = { path = "../ref-fvm/shared", features = ["crypto"] }
# fvm_shared = { path = "../ref-fvm/shared" }

# We are using the bundle for the builtin-actors dependency, and repeating DTO classes on our side,
# to cut down the time it takes to compile everything. However, some projects have a "shared" part,
Expand All @@ -188,7 +192,8 @@ cid = { version = "0.10.1", default-features = false, features = [
"std",
] }

frc42_dispatch = "5.0.0"
# We need a version of frc42_dispatch that has been updated to use FVM 4.1
frc42_dispatch = { git = "https://github.com/fridrik01/filecoin.git", branch = "update-fvm-4.1" }

# Using the same tendermint-rs dependency as tower-abci. From both we are interested in v037 modules.
tower-abci = { version = "0.7" }
Expand Down

0 comments on commit 02461cf

Please sign in to comment.