Skip to content

ci: remove orphaned foundry.lock left over from soldeer migration - #2714

Merged
thedavidmeister merged 1 commit into
mainfrom
2026-06-12-issue-2560
Jun 13, 2026
Merged

thedavidmeister merged 1 commit into
mainfrom
2026-06-12-issue-2560

Conversation

@thedavidmeister

Copy link
Copy Markdown
Contributor

What

Removes the orphaned foundry.lock (the old git-submodule dependency lockfile) and its two now-dangling housekeeping references in REUSE.toml and .soldeerignore.

Why

Issue #2560 asked for a CI step that runs forge update on the four git submodules recorded in foundry.lock (lib/rain.deploy, lib/rain.interpreter, lib/rain.raindex.interface, lib/sushixswap-v2) and asserts git diff --exit-code, to keep the lockfile revs consistent with the submodule pointers and reachable upstream. That was the correct fix for the bug shipped at #2558 — a foundry.lock rev that did not exist upstream passed CI silently and only broke when a downstream forge update hit fatal: unable to read tree.

Since the issue was filed, #2586 ("migrate raindex to soldeer for dependency management", merged 2026-05-29) deleted all four git submodules and .gitmodules. Every Solidity dependency is now Soldeer-managed via soldeer.lock + [dependencies] in foundry.toml (foundry.toml even states: "All Solidity dependencies are Soldeer-managed; no git submodules remain.").

So the submodules the proposed forge update check would iterate no longer exist — the literal check is moot. But foundry.lock itself was not removed by #2586 and is now a dead, unreferenced artifact pointing at submodules that are gone (sushixswap-v2 was dropped entirely; the other three became the soldeer deps rain-deploy / rain-interpreter-interface+rainlang / raindex-interface).

The smallest correct fix that resolves the exact inconsistency the issue worries about — a dependency lockfile that disagrees with the tree and can silently pass CI — is to delete the orphaned lockfile so there is no longer any such file to drift. No CI job reads it: the Foundry cache key in rainix's rainix-sol-{test,static}.yaml hashes soldeer.lock (not foundry.lock), and dependencies come from forge soldeer install.

Also drops the two now-dangling housekeeping references to the file:

  • REUSE.toml annotation entry (it kept reuse lint happy for the file).
  • .soldeerignore exclude line (it excluded the file from the soldeer publish zip).

Verification

Run in nix develop github:rainlanguage/rainix#sol-shell:

  • reuse lint → compliant, 1139/1139 files, 0 errors, 0 unused licenses (confirms the REUSE.toml edit is clean).
  • forge soldeer install → dependencies installed from soldeer.lock; foundry.lock is not consulted.
  • forge build → compiles clean (exit 0; only pre-existing unsafe-typecast lint warnings in test files, unrelated to this change).

Fixes #2560

🤖 Generated with Claude Code

Issue #2560 asked for a CI step that runs `forge update` on the four git
submodules recorded in `foundry.lock` (lib/rain.deploy, lib/rain.interpreter,
lib/rain.raindex.interface, lib/sushixswap-v2) and asserts no git diff, to keep
`foundry.lock` revs consistent with the submodule pointers and reachable
upstream. That was the right fix for the bug shipped at #2558 — a `foundry.lock`
rev that did not exist upstream passed CI silently.

Since then, #2586 ("migrate raindex to soldeer for dependency management",
merged 2026-05-29) deleted all four git submodules and `.gitmodules`; every
Solidity dependency is now Soldeer-managed via `soldeer.lock` + `[dependencies]`
in `foundry.toml`. The submodules the proposed `forge update` check would
iterate no longer exist, so the literal check is moot. `foundry.lock` itself was
not removed by #2586 and is now a dead, unreferenced artifact pointing at
submodules that are gone (sushixswap-v2 was dropped entirely; the other three
became the soldeer deps rain-deploy / rain-interpreter-interface+rainlang /
raindex-interface).

The smallest correct fix that resolves the exact inconsistency the issue worries
about — a dependency lockfile that disagrees with the tree and can silently
pass CI — is to delete the orphaned lockfile. No CI job reads it: the cache key
in rainix-sol-{test,static}.yaml hashes `soldeer.lock`, not `foundry.lock`, and
deps come from `forge soldeer install`.

Also drop the two now-dangling housekeeping references to the file:
- REUSE.toml annotation entry (kept `reuse lint` happy for the file).
- .soldeerignore exclude line (excluded it from the soldeer publish zip).

Verification (nix develop github:rainlanguage/rainix#sol-shell):
- `reuse lint` -> compliant, 1139/1139 files, 0 errors, 0 unused licenses.
- `forge soldeer install` -> deps installed from soldeer.lock, foundry.lock not
  consulted.
- `forge build` -> compiles clean (exit 0; only pre-existing unsafe-typecast
  lint warnings in test files, unrelated to this change).

Fixes #2560

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
@thedavidmeister thedavidmeister self-assigned this Jun 13, 2026
@coderabbitai

coderabbitai Bot commented Jun 13, 2026

Copy link
Copy Markdown
Contributor

Warning

Review limit reached

@thedavidmeister, we couldn't start this review because you've reached your PR review rate limit.

More reviews will be available in 57 minutes and 4 seconds. Learn how PR review limits work.

Your organization has run out of usage credits. Purchase more credits in the billing tab to continue.

⌛ How to resolve this issue?

After more reviews become available, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans include higher PR review limits than trial, open-source, and free plans. In all cases, reviews become available again over time. During sustained high-volume PR review activity, CodeRabbit may temporarily slow when the next review becomes available.

Please see our Fair Usage Limits Policy for further information.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: 8279da37-d707-453e-ab9f-845bcca899f8

📥 Commits

Reviewing files that changed from the base of the PR and between e7a7722 and ee63d46.

⛔ Files ignored due to path filters (1)
  • foundry.lock is excluded by !**/*.lock
📒 Files selected for processing (2)
  • .soldeerignore
  • REUSE.toml
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch 2026-06-12-issue-2560

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@thedavidmeister

Copy link
Copy Markdown
Contributor Author

Reviewed ee63d46: Removes the orphaned foundry.lock left over from the submodule->soldeer migration (Solidity deps are pinned via foundry.toml [dependencies] + soldeer.lock now), and drops its stale REUSE.toml / .soldeerignore entries. CI/housekeeping only - no src, bytecode, or subgraph impact. All checks green. LGTM.

@thedavidmeister
thedavidmeister merged commit 8d79671 into main Jun 13, 2026
16 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

@coderabbitai assess this PR size classification for the totality of the PR with the following criterias and report it in your comment:

S/M/L PR Classification Guidelines:

This guide helps classify merged pull requests by effort and complexity rather than just line count. The goal is to assess the difficulty and scope of changes after they have been completed.

Small (S)

Characteristics:

  • Simple bug fixes, typos, or minor refactoring
  • Single-purpose changes affecting 1-2 files
  • Documentation updates
  • Configuration tweaks
  • Changes that require minimal context to review

Review Effort: Would have taken 5-10 minutes

Examples:

  • Fix typo in variable name
  • Update README with new instructions
  • Adjust configuration values
  • Simple one-line bug fixes
  • Import statement cleanup

Medium (M)

Characteristics:

  • Feature additions or enhancements
  • Refactoring that touches multiple files but maintains existing behavior
  • Breaking changes with backward compatibility
  • Changes requiring some domain knowledge to review

Review Effort: Would have taken 15-30 minutes

Examples:

  • Add new feature or component
  • Refactor common utility functions
  • Update dependencies with minor breaking changes
  • Add new component with tests
  • Performance optimizations
  • More complex bug fixes

Large (L)

Characteristics:

  • Major feature implementations
  • Breaking changes or API redesigns
  • Complex refactoring across multiple modules
  • New architectural patterns or significant design changes
  • Changes requiring deep context and multiple review rounds

Review Effort: Would have taken 45+ minutes

Examples:

  • Complete new feature with frontend/backend changes
  • Protocol upgrades or breaking changes
  • Major architectural refactoring
  • Framework or technology upgrades

Additional Factors to Consider

When deciding between sizes, also consider:

  • Test coverage impact: More comprehensive test changes lean toward larger classification
  • Risk level: Changes to critical systems bump up a size category
  • Team familiarity: Novel patterns or technologies increase complexity

Notes:

  • the assessment must be for the totality of the PR, that means comparing the base branch to the last commit of the PR
  • the assessment output must be exactly one of: S, M or L (single-line comment) in format of: SIZE={S/M/L}
  • do not include any additional text, only the size classification
  • your assessment comment must not include tips or additional sections
  • do NOT tag me or anyone else on your comment

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

ci: verify foundry.lock revs match submodule pointers and exist upstream

1 participant