Skip to content

Merge remote-tracking branch 'metamorpho/main' into merge-04-2026#89

Open
MathisGD wants to merge 33 commits into
mainfrom
merge-04-2026
Open

Merge remote-tracking branch 'metamorpho/main' into merge-04-2026#89
MathisGD wants to merge 33 commits into
mainfrom
merge-04-2026

Conversation

@MathisGD
Copy link
Copy Markdown
Contributor

merge metamorpho. updated forge-std while debugging, can rollback if needed

QGarchery and others added 30 commits July 8, 2025 13:08
Signed-off-by: MathisGD <74971347+MathisGD@users.noreply.github.com>
Harmonize pinned GitHub Actions `uses:` refs to the latest major version across common dependencies.

Files updated: .github/workflows/certora.yml, .github/workflows/formatting.yml, .github/workflows/foundry.yml, .github/workflows/hardhat.yml, .github/workflows/npm-release.yml
…s-20260416

ci: pin GitHub Actions refs to commit SHAs
Resolves conflicts with main by keeping the deletions of hardhat.yml
and npm-release.yml workflows (which this PR removes) while preserving
the pinned GitHub Actions SHAs introduced on main for the remaining
workflows (certora.yml, formatting.yml, foundry.yml).
@MathisGD MathisGD self-assigned this Apr 23, 2026
@MathisGD MathisGD requested review from QGarchery and peyha April 23, 2026 07:37
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: f909db60fe

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread .gitignore
Comment thread foundry.toml Outdated
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this file should be deleted (or updated) if we remove erc4626-tests

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how can the ci be passing now

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

when I run forge test this file is not tested weirdly

Copy link
Copy Markdown
Contributor

@QGarchery QGarchery Apr 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have no idea, plus we have the following issue (should remove ../) but tests still pass:
Unable to resolve imports: "../../src/MetaMorphoV1_1Factory.sol" in "/home/runner/work/metamorpho-v1.1/metamorpho-v1.1/test/MetaMorphoFactoryTest.sol"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how can the ci be passing now

I think I get it, it's because it can find it in lib/openzeppelin-contracts/lib/erc4626-tests/

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

when I run forge test this file is not tested weirdly

weird, it's tested for me. Can you try rerunning by removing everything in the test folder except what's inside test/helpers + ERC4626ComplianceTest.sol + ERC4626Test.sol ?

Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

import "../../src/MetaMorphoV1_1Factory.sol";

P1 Badge Correct factory test import to stay inside repo

This import path is now invalid after moving the test from test/forge to test: ../../src/MetaMorphoV1_1Factory.sol resolves to /workspace/src/MetaMorphoV1_1Factory.sol, which does not exist in this repository. As a result, forge test/CI compilation fails before tests run. Update the path to the repo-local src directory (from test/, that should be ../src/...).

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's keep the changes in this PR minimal, and we can do an update of metamorpho and merge again if needed

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So notably I think it would be good to roll back the changes of forge-std, to have the same version between metamorpho and metamorpho v1.1. Even though we probably want some of those new commits

Image

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

List of changes that we might want on both repos:

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.

4 participants