Release: Develop -> Master #17
Merged
Conversation
This file contains 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
…ionality or tests
OCG Permissions for Activation
(cherry picked from commit 79e12cf)
(cherry picked from commit 4eb7110)
(cherry picked from commit d4d498b)
(cherry picked from commit 6cadd53)
(cherry picked from commit 3d4d394)
(cherry picked from commit 833ef74)
…r executed" This reverts commit bd88440.
Script improvements
# Conflicts: # .github/workflows/CI.yml # .gitignore # .prettierignore # .solhintignore # CODE_STD.md # README.md # foundry.toml # lib/clones-with-immutable-args~bophades-develop # lib/ds-test~bophades-develop # lib/forge-proposal-simulator~bophades-develop # lib/forge-std~bophades-develop # lib/openzeppelin-contracts~bophades-develop # lib/solidity-examples~bophades-develop # lib/solmate~bophades-develop # package.json # remappings.txt # shell/full_install.sh # src/interfaces/IStaking.sol # src/policies/Distributor/Distributor.sol # src/policies/Heart.sol # src/policies/interfaces/IDistributor.sol # src/policies/interfaces/IHeart.sol # src/proposals/OCG.md # src/proposals/README.md # src/proposals/addresses.json # src/test/mocks/MockLegacyAuthority.sol # src/test/mocks/MockOhm.sol # src/test/policies/BoostedLiquidity/BLVaultLidoFork.t.sol # src/test/policies/BoostedLiquidity/BLVaultLusdFork.t.sol # src/test/policies/BoostedLiquidity/BLVaultManagerLidoFork.t.sol # src/test/policies/BoostedLiquidity/BLVaultManagerLusdFork.t.sol # src/test/policies/Heart.t.sol # src/test/sim/RangeSim.sol
Merge bophades/develop into olympus-v3 repo
LCOV of commit
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Brings the master branch up to date with the current state of the Bophades stack.