fix: ci issue

# Conflicts:
#	Cargo.lock
#	Cargo.toml

Author: karlem

.github/workflows/build.yaml

@@ -99,14 +99,14 @@ jobs:
           COPY /target/release/fendermint /app/output/bin/fendermint
           COPY /target/release/ipc-cli /app/output/bin/ipc-cli
           EOF
-          
+
           ## Append the runner build phase to the Dockerfile.
           cat fendermint/docker/runner.Dockerfile >> /tmp/Dockerfile
-          
+
           ## Print the Dockerfile for debugging.
           echo "Dockerfile:"
           cat /tmp/Dockerfile
-          
+
           ## Create the temporary .dockerignore file.
           cat <<EOF > /tmp/Dockerfile.dockerignore
           target
@@ -115,11 +115,11 @@ jobs:
           contracts/cache
           contracts/node-modules
           EOF
-          
+
           ## Print the .dockerignore file for debugging.
           echo "Dockerfile.dockerignore:"
           cat /tmp/Dockerfile.dockerignore
-          
+
           ## Build the Docker image.
           DOCKER_BUILDKIT=1 docker build \
             --load \

Cargo.lock

@@ -221,6 +221,7 @@ fvm_ipld_amt = "0.7.4"
 # and this copy-paste is clunky, so at least for those that have it, we should use it.
 # Keep the version here in sync with the Makefile!
 # NOTE: Using master branch instead of v17.0.0 tag due to serde dependency fixes
+# Master is currently at commit 2f040c12 which fixes the serde::__private::PhantomData import issue
 fil_actors_evm_shared = { git = "https://github.com/filecoin-project/builtin-actors", branch = "master" }
 fil_actor_eam = { git = "https://github.com/filecoin-project/builtin-actors", branch = "master" }
 fil_actor_evm = { git = "https://github.com/filecoin-project/builtin-actors", branch = "master" }
@@ -246,29 +247,16 @@ tendermint-rpc = { version = "0.31", features = [
 tendermint-proto = { version = "0.31" }
 
 [patch.crates-io]
-fvm = { git = "https://github.com/consensus-shipyard/ref-fvm.git" }
-fvm_shared = { git = "https://github.com/consensus-shipyard/ref-fvm.git" }
-fvm_sdk = { git = "https://github.com/consensus-shipyard/ref-fvm.git" }
-fvm_ipld_blockstore = { git = "https://github.com/consensus-shipyard/ref-fvm.git" }
-fvm_ipld_car = { git = "https://github.com/consensus-shipyard/ref-fvm.git" }
-fvm_ipld_encoding = { git = "https://github.com/consensus-shipyard/ref-fvm.git" }
-fvm_ipld_hamt = { git = "https://github.com/consensus-shipyard/ref-fvm.git" }
-fvm_ipld_amt = { git = "https://github.com/consensus-shipyard/ref-fvm.git" }
+# Using latest FVM to match builtin-actors v17.0.0 requirements
+fvm = { git = "https://github.com/consensus-shipyard/ref-fvm.git", branch = "master" }
+fvm_shared = { git = "https://github.com/consensus-shipyard/ref-fvm.git", branch = "master" }
+fvm_sdk = { git = "https://github.com/consensus-shipyard/ref-fvm.git", branch = "master" }
+fvm_ipld_blockstore = { git = "https://github.com/consensus-shipyard/ref-fvm.git", branch = "master" }
+fvm_ipld_car = { git = "https://github.com/consensus-shipyard/ref-fvm.git", branch = "master" }
+fvm_ipld_encoding = { git = "https://github.com/consensus-shipyard/ref-fvm.git", branch = "master" }
+fvm_ipld_hamt = { git = "https://github.com/consensus-shipyard/ref-fvm.git", branch = "master" }
+fvm_ipld_amt = { git = "https://github.com/consensus-shipyard/ref-fvm.git", branch = "master" }
 yamux = { git = "https://github.com/paritytech/yamux", tag = "yamux-v0.13.4" }
-# Removed - this would override the master branch version with the buggy v15.0.0
-# fil_actors_runtime = { git = "https://github.com/filecoin-project/builtin-actors.git", tag = "v15.0.0" }
-
-# Note: This patch section is currently not needed since we're using master branch
-# which should be compatible with the latest FVM. If you encounter version conflicts,
-# uncomment and adjust as needed.
-# [patch."https://github.com/filecoin-project/builtin-actors"]
-# fvm = { git = "https://github.com/consensus-shipyard/ref-fvm.git" }
-# fvm_shared = { git = "https://github.com/consensus-shipyard/ref-fvm.git" }
-# fvm_sdk = { git = "https://github.com/consensus-shipyard/ref-fvm.git" }
-# fvm_ipld_blockstore = { git = "https://github.com/consensus-shipyard/ref-fvm.git" }
-# fvm_ipld_encoding = { git = "https://github.com/consensus-shipyard/ref-fvm.git" }
-# fvm_ipld_hamt = { git = "https://github.com/consensus-shipyard/ref-fvm.git" }
-# fvm_ipld_amt = { git = "https://github.com/consensus-shipyard/ref-fvm.git" }
 
 [profile.wasm]
 inherits = "release"