Merge metamorpho/main (incl. #451 remove yarn)#88
Closed
prd-carapulse[bot] wants to merge 31 commits into
Closed
Conversation
[Certora] Fix tokens reallocate
Compatibility via-ir
[Certora] Update to prover v8
Signed-off-by: MathisGD <74971347+MathisGD@users.noreply.github.com>
docs: morpho vault wording
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).
Contributor
|
closing in favor of #89 |
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
3 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.
Merges
metamorpho/mainintometamorpho-v1.1/mainas requested, so that PR #451 ("remove yarn") and the other 30 commits onmetamorpho/mainnot yet in v1.1 are pulled in via a proper merge rather than a hand-recreated diff.Follows Mathis's "let's do a proper merge instead" on the earlier (now-closed) #87.
Branch tip:
34f411a=metamorpho/maintip = Merge of morpho-org/metamorpho#451.There are currently 21 conflicting files (contracts diverged between v1 and v1.1, and several of the 31 incoming commits were already cherry-picked into v1.1 as separate PRs, e.g. #451, #452→#85, #447→#82, #446→#81, #444→#79). Conflicts to resolve:
.github/workflows/foundry.yml.github/workflows/hardhat.yml(del in v1 / mod in v1.1).github/workflows/npm-release.yml(del / mod).gitignoreREADME.mdcertora/applyMunging.patchfoundry.lockfoundry.tomlhardhat.config.ts(del / mod)package.json(del / mod)src/MetaMorphoV1_1.sol(contract divergence)src/MetaMorphoV1_1Factory.solsrc/mocks/MetaMorphoMock.soltest/LostAssetsTest.sol(v1.1-only file, v1 renamedtest/forge → test)test/MetaMorphoFactoryTest.soltest/ReentrancyTest.soltest/forge/MetaMorphoInternalTest.sol(del / mod)test/hardhat/MetaMorpho.spec.ts(del / mod)test/helpers/BaseTest.soltest/helpers/IntegrationTest.solyarn.lock(del / mod)Quentin will resolve conflicts.