Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CR11 fix verification #10951

Merged
merged 3 commits into from
Feb 28, 2024

Conversation

pahor167
Copy link
Contributor

Description

Force redeploy of AddressSortedLinkedListWithMedian for CR11 since it was deployed by Mento team with different settings and bytecode.

@pahor167 pahor167 requested a review from a team as a code owner February 26, 2024 11:21
@@ -43,6 +45,11 @@ const argv = yargs
default: false,
type: 'boolean',
})
.option('new_branch', {
alias: 'nb',
Copy link
Contributor

Choose a reason for hiding this comment

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

Total nit, but usually aliases are single letter. Not even sure if the library will correctly handle this? Would just go with no alias for this flag.

packages/protocol/scripts/check-backward.ts Show resolved Hide resolved
if (version === 11) {
// force redeploy of AddressSortedLinkedListWithMedian for CR11
// since it was deployed by Mento team with different settings and bytecode
backward.report.libraries.AddressSortedLinkedListWithMedian = {} as CategorizedChanges
Copy link
Contributor

Choose a reason for hiding this comment

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

Is putting this logic in the version check script correct? Would it make more sense to add a flag to the release script, like --force-deploy, to customize the deployment?

Copy link
Contributor Author

@pahor167 pahor167 Feb 28, 2024

Choose a reason for hiding this comment

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

Without this CR11 will not correctly verify previous release & generate new proposal (since bytecodes do not match). It is also dependent on CR11 to checkout Mento repo. This is rather specific to only CR11 - I would prefer not to propagate it to any public facing flags.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

On second though, we might want to add this as a new feature, but it should be in different task since this is currently blocking CR11 release

@pahor167 pahor167 merged commit 901cd42 into release/core-contracts/11 Feb 28, 2024
25 checks passed
@pahor167 pahor167 deleted the pahor/CR11_fixReleaseVerification branch February 28, 2024 10:11
pahor167 added a commit that referenced this pull request Apr 19, 2024
* Release: Sorted oracles update (#10891)

* Sorted oracles update

* integration test fixes

* constants added

* Update packages/protocol/contracts/stability/SortedOracles.sol

Co-authored-by: Martín Volpe <volpe@clabs.co>

* Removal of Mento reference

* Update packages/protocol/test-sol/stability/SortedOracles.t.sol

Co-authored-by: soloseng <102702451+soloseng@users.noreply.github.com>

* Update packages/protocol/test-sol/stability/SortedOracles.t.sol

Co-authored-by: soloseng <102702451+soloseng@users.noreply.github.com>

* 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 <47992132+pahor167@users.noreply.github.com>

* prettify fix

---------

Co-authored-by: Martín Volpe <volpe@clabs.co>
Co-authored-by: soloseng <102702451+soloseng@users.noreply.github.com>

* FeeCurrency Adapter (#10907)

* 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 <volpe@clabs.co>

* 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 <volpe@clabs.co>
Co-authored-by: Tim Moreton <timmoreton@users.noreply.github.com>
Co-authored-by: alvarof2 <fernandez.f.alvaro@gmail.com>

* Calculation of unlockable gold (#10731)

* 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 <volpe@clabs.co>

* Gas Price Minimum should never be zero (#10909)

* GasPriceMinimum backward compatibility fix (#10922)

* 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 <volpe@clabs.co>

---------

Co-authored-by: Javier Cortejoso <javier.cortejoso@gmail.com>
Co-authored-by: soloseng <102702451+soloseng@users.noreply.github.com>
Co-authored-by: Martín Volpe <volpe@clabs.co>

* Storage gap for FeeCurrencyAdapter (#10933)

Storage gap

* Debit 0 value check (#10930)

* Removal of SortedOracle multiplier (#10931)

* Removal of SortedOracle multiplier

* removal of comment

* Make super of FeeCurrencyAdapterOwnable.sol explicit (#10944)

* Added note to FeeCurrencyAdapter.sol initializer (#10943)

* FeeAdapter debit round up (#10940)

* Round up of debit

* PR comments

* Code quality post audit (#10945)

Code quality

* SortedOracles sourced from Mento core for CR10 (#10946)

* SortedOracles sourced from Mento core

* PR comments

* Update gap size to follow 50 rule (#10948)

* CR11 fix verification (#10951)

* Force AddressSortedLinkedListWithMedian library redeploy for CR11

* CI fix

* PR comments

* yarn lock

* Updates specification of SrotedOracles (#10970)

* Update Natspec for FeeAdapter (#10969)

* dockerfile

---------

Co-authored-by: Martín Volpe <volpe@clabs.co>
Co-authored-by: soloseng <102702451+soloseng@users.noreply.github.com>
Co-authored-by: Tim Moreton <timmoreton@users.noreply.github.com>
Co-authored-by: alvarof2 <fernandez.f.alvaro@gmail.com>
Co-authored-by: Javier Cortejoso <javier.cortejoso@gmail.com>
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.

3 participants