CR11 merge to master #10965
Merged
CR11 merge to master #10965
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
* Sorted oracles update * integration test fixes * constants added * Update packages/protocol/contracts/stability/SortedOracles.sol Co-authored-by: Martín Volpe <[email protected]> * Removal of Mento reference * Update packages/protocol/test-sol/stability/SortedOracles.t.sol Co-authored-by: soloseng <[email protected]> * Update packages/protocol/test-sol/stability/SortedOracles.t.sol Co-authored-by: soloseng <[email protected]> * PR comments * Equivalent tokens on top of updated sorted oracles (Based of CR10) (#10904) * Brought changes from https://github.com/celo-org/celo-monorepo/pull/10895/files#diff-ba272032c5f1b7e89d5777b3c886685b581324bdf22733ee272e2790f5d631df * Fuzzy added --------- Co-authored-by: pahor167 <[email protected]> * prettify fix --------- Co-authored-by: Martín Volpe <[email protected]> Co-authored-by: soloseng <[email protected]>
* FeeCurrency Adapter * PR comments * Format documents * gitmodules * submodules added * solidity version fix * OZ contracts same commit as master * Revert "OZ contracts same commit as master" This reverts commit 8d8f2d6. * OZ to same commit as master * Getter&Setter for wrapped token * Proxy added * split of FeeCurrencyAdapter * prettier fix * refactor * Update packages/protocol/test-sol/stability/FeeCurrencyAdapter.t.sol Co-authored-by: Martín Volpe <[email protected]> * PR comments * PR comments * Decimals + Total supply added * Update packages/protocol/contracts-0.8/stability/FeeCurrencyAdapter.sol * Update packages/protocol/contracts-0.8/stability/FeeCurrencyAdapter.sol * Trigger * Wrapper reference removed * interface added --------- Co-authored-by: Martín Volpe <[email protected]> Co-authored-by: Tim Moreton <[email protected]> Co-authored-by: alvarof2 <[email protected]>
* Fix for historical vote records * contractkit fix * lint fix * Governance version update * PR comments * extended test * Remove console.log * Test * lint fix * version fix * version fix --------- Co-authored-by: Martín Volpe <[email protected]>
* Update Dockerfiles (#10915) * Remove references to packages deleted * Remove circleci dockerfiles and workflow * Delete reference to patches folder * Update workload-id-provider in metadata-crawler-build job (#10916) Use `master` workload-id-provider pool * fix ganache dependency resolution (#10917) * fix & cleanup * fixed resolved field in lock file * test * Tooling fix * lint fix * revert of gas price minimum * Update packages/protocol/lib/compatibility/ast-code.ts Co-authored-by: Martín Volpe <[email protected]> --------- Co-authored-by: Javier Cortejoso <[email protected]> Co-authored-by: soloseng <[email protected]> Co-authored-by: Martín Volpe <[email protected]>
Storage gap
* Removal of SortedOracle multiplier * removal of comment
* Round up of debit * PR comments
Code quality
* SortedOracles sourced from Mento core * PR comments
* Force AddressSortedLinkedListWithMedian library redeploy for CR11 * CI fix * PR comments
CR11 merge to master
🚨 Report Summary
For more details view the full report in OpenZeppelin Code Inspector |
auto-merge was automatically disabled
April 18, 2024 20:53
Rebase failed
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.
Description
Merging CR11 back to master
Other changes
No other changes