Fvm removed from libfilcrypto, saves 24mb binary size (#768)

* fvm optional, saves 24mb binary size

* fvm for tests

* review changes

* cgo-bindings gcc12

* lint

* merge

* fix filecoin-ffi

* gen

* mod tidy fix

* lint/gen

* go mod

Author: snadrus

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ on:
       - '**'
 
 env:
-  GO_VERSION: 1.24
+  GO_VERSION: "1.24.7"
 
 jobs:
   ci-lint:
@@ -195,6 +195,7 @@ jobs:
       - name: Install FFI
         env:
           GITHUB_TOKEN: ${{ github.token }}
+          CURIO_OPTIMAL_LIBFILCRYPTO: 0
         run: |
           make deps
         shell: bash
@@ -230,7 +231,7 @@ jobs:
           echo "Using YugabyteDB Container IP: ${{env.CURIO_HARMONYDB_HOSTS}}"
           export CURIO_HARMONYDB_HOSTS=${{ env.CURIO_HARMONYDB_HOSTS }}
           export LOTUS_HARMONYDB_HOSTS=${{ env.CURIO_HARMONYDB_HOSTS }}
-          go test -v --tags=debug -timeout 30m ${{ matrix.test-suite.target }}
+          go test -v --tags="debug,fvm" -timeout 30m ${{ matrix.test-suite.target }}
 
       - name: Stop YugabyteDB container
         if: always()  # Ensure this runs even if the tests fail

GO_VERSION_MIN

@@ -1 +1 @@
-1.24
+1.24.7

Makefile

@@ -10,14 +10,31 @@ FFI_DEPS:=$(addprefix $(FFI_PATH),$(FFI_DEPS))
 
 $(FFI_DEPS): build/.filecoin-install ;
 
+# When enabled, build size-optimized libfilcrypto by default
+CURIO_OPTIMAL_LIBFILCRYPTO ?= 1
+
 build/.filecoin-install: $(FFI_PATH)
-	$(MAKE) -C $(FFI_PATH) $(FFI_DEPS:$(FFI_PATH)%=%)
+	@if [ "$(CURIO_OPTIMAL_LIBFILCRYPTO)" = "1" ]; then \
+		FFI_DISABLE_FVM=1 $(MAKE) curio-libfilecoin; \
+	else \
+		$(MAKE) -C $(FFI_PATH) $(FFI_DEPS:$(FFI_PATH)%=%); \
+	fi
 	@touch $@
 
 MODULES+=$(FFI_PATH)
 BUILD_DEPS+=build/.filecoin-install
 CLEAN+=build/.filecoin-install
 
+## Custom libfilcrypto build for Curio (size-optimized, no FVM)
+.PHONY: curio-libfilecoin
+curio-libfilecoin:
+	FFI_BUILD_FROM_SOURCE=1 \
+	FFI_USE_GPU=1 \
+	FFI_USE_MULTICORE_SDR=1 \
+	RUSTFLAGS='-C codegen-units=1 -C opt-level=3 -C strip=symbols' \
+	$(MAKE) -C $(FFI_PATH) clean .install-filcrypto
+	@echo "Rebuilt libfilcrypto for Curio (OpenCL+multicore, no default features)."
+
 ffi-version-check:
 	@[[ "$$(awk '/const Version/{print $$5}' extern/filecoin-ffi/version.go)" -eq 3 ]] || (echo "FFI version mismatch, update submodules"; exit 1)
 BUILD_DEPS+=ffi-version-check
@@ -82,6 +99,17 @@ CLEAN+=build/.update-modules
 deps: $(BUILD_DEPS)
 .PHONY: deps
 
+## Test targets
+
+test-deps: CURIO_OPTIMAL_LIBFILCRYPTO=0
+test-deps: $(BUILD_DEPS)
+	@echo "Built dependencies with FVM support for testing"
+.PHONY: test-deps
+
+test: test-deps
+	go test -v -tags="cgo,fvm" -timeout 30m ./itests/...
+.PHONY: test
+
 ## ldflags -s -w strips binary
 
 CURIO_TAGS ?= cunative
@@ -273,10 +301,24 @@ marketgen:
 	swag init -dir market/mk20/http -g http.go  -o market/mk20/http --parseDependencyLevel 3 --parseDependency
 .PHONY: marketgen
 
-gensimple: api-gen go-generate cfgdoc-gen docsgen marketgen docsgen-cli
+# Run gen steps sequentially in a single shell to avoid Go build cache race conditions.
+# The "unlinkat: directory not empty" error occurs when multiple go processes
+# contend for the same build cache simultaneously.
+# Set GOCACHE_CLEAN=1 to clear the build cache before running (fixes persistent issues).
+gensimple:
+ifeq ($(GOCACHE_CLEAN),1)
+	$(GOCC) clean -cache
+endif
+	$(MAKE) deps
+	$(MAKE) api-gen
+	$(MAKE) go-generate
+	$(MAKE) cfgdoc-gen
+	$(MAKE) docsgen
+	$(MAKE) marketgen
+	$(MAKE) docsgen-cli
 	$(GOCC) run ./scripts/fiximports
 	go mod tidy
-.PHONY: gen
+.PHONY: gensimple
 
 fiximports:
 	$(GOCC) run ./scripts/fiximports

api/api_chain_all.go

@@ -1,5 +1,4 @@
 //go:build !forest
-// +build !forest
 
 package api
 

api/api_chain_limited.go

@@ -1,5 +1,4 @@
 //go:build forest
-// +build forest
 
 package api
 

build/params_2k.go

@@ -1,5 +1,4 @@
 //go:build 2k
-// +build 2k
 
 package build
 

build/params_calibnet.go

@@ -1,5 +1,4 @@
 //go:build calibnet
-// +build calibnet
 
 package build
 

build/params_mainnet.go

@@ -1,5 +1,4 @@
 //go:build !calibnet && !debug && !2k
-// +build !calibnet,!debug,!2k
 
 package build
 

build/params_testnet.go

@@ -1,5 +1,4 @@
 //go:build debug
-// +build debug
 
 package build
 

cmd/curio/ffi.go

@@ -1,13 +1,13 @@
 package main
 
 import (
+	"context"
 	"fmt"
 	"os"
 
 	"github.com/ipfs/go-cid"
 	"github.com/snadrus/must"
 	"github.com/urfave/cli/v2"
-	"golang.org/x/net/context"
 
 	"github.com/filecoin-project/go-jsonrpc"