vendor fvm-solidity mocks; convert DDO test off MockAllocationFacet#669
Merged
vendor fvm-solidity mocks; convert DDO test off MockAllocationFacet#669
Conversation
util/testutil/sol/ vendors the upstream fvm-solidity sources (pin b0404b9, includes the DataCap dispatch from upstream PR #16). The DataCap mock returns a canned single-allocation VerifregResponse, which drives TestIntegration_DDOFullDealFlow through the real createAllocationRequests path -- the MockAllocationFacet bypass (mock_ddo.go, mock_allocation_facet_bytecode.txt) is removed as obsolete, along with the now-redundant tripwire test. `make bytecode` regenerates the embedded .txt blobs via forge. `make drift` fetches the pinned upstream files and diffs against the vendored copies. CI is unchanged -- forge is a developer-only dep, checked-in bytecode is what runs. SendImpersonatedTx gas bumped 500k -> 5M to fit the full register-allocation + payment-rail-creation path.
Collaborator
Author
|
upstreamed here: filecoin-project/fvm-solidity#16 (comment) |
Collaborator
|
lgtm |
anjor
approved these changes
Apr 23, 2026
2 tasks
parkan
added a commit
that referenced
this pull request
Apr 23, 2026
## Summary PR #669 added \`//go:generate make -C sol bytecode\` to \`util/testutil/fvm_precompiles.go\`, which calls \`forge build\` + \`forge inspect\`. The devcontainer's Dockerfile only copied \`anvil\` from the Foundry image, not \`forge\`. Effect: CI's \"Generate swagger code\" step runs \`go generate ./...\` whenever codegen-gated paths (\`api/\`, \`handler/\`, \`cmd/\`, \`storagesystem/\`, \`docs/gen/\`, \`model/\`, \`singularity.go\`, \`docgen.sh\`) change. On those PRs, \`make -C sol bytecode\` fails with \`forge: No such file or directory\`. Currently blocks #670, #673, #674. ## Test plan - [ ] CI devcontainer build includes \`/usr/local/bin/forge\` - [ ] \`go generate ./...\` succeeds inside the devcontainer
4 tasks
parkan
added a commit
that referenced
this pull request
Apr 23, 2026
## Summary \`forge inspect\` appends a CBOR metadata section to the deployedBytecode: an IPFS hash of the compiler metadata JSON plus the solc version tag. That IPFS hash drifts between forge versions even with \`solc\` pinned in \`foundry.toml\`. Locally (forge 1.5.1) it matches what was committed in #669; in CI (\`foundry:latest\`, newer) \`go generate ./...\` produces different trailing bytes and \`git diff --exit-code\` fails. Fix: \`bytecode_hash = \"none\"\` + \`cbor_metadata = false\` -- solc omits the metadata section entirely. Output is deterministic across forge versions and solc patches. Regenerated the three .txt files against the new config; runtime bytecode is unchanged (FVM precompile mocks don't consult the metadata). Currently blocks #670, #673, #674 after #675 unblocked the missing-\`forge\` issue. ## Test plan - [x] \`make -C util/testutil/sol clean bytecode\` produces the committed output under forge 1.5.1 - [x] \`go test ./util/testutil/...\` pass - [x] \`go test ./service/dealpusher/...\` pass (DDO / PDP mocks exercise the stripped bytecode) - [ ] CI
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Test plan