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.

Sign up for GitHub

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

Jump to bottom

Removal of SortedOracle multiplier #10931

Merged
merged 6 commits into from
Feb 12, 2024
Merged

Removal of SortedOracle multiplier #10931

merged 6 commits into from
Feb 12, 2024

Conversation

pahor167
Copy link
Contributor

@pahor167 pahor167 commented Feb 9, 2024 •
edited
Loading

Description

Removal of multiplier in SortedOracles since we will not be using it.

Addresses: https://github.com/celo-org/audit-a-findings/issues/6
Addresses: https://github.com/celo-org/audit-a-findings/issues/15

@pahor167 pahor167 requested a review from a team as a code owner February 9, 2024 10:12
@pahor167 pahor167 enabled auto-merge (squash) February 12, 2024 13:14
m-chrzan
m-chrzan reviewed Feb 12, 2024
View reviewed changes
Copy link
Contributor

@m-chrzan m-chrzan left a comment

Choose a reason for hiding this comment

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

There's still a reference to multiplier in the comment for getEquivalentToken.

packages/protocol/contracts/stability/SortedOracles.sol Outdated
@@ -351,16 +344,10 @@ contract SortedOracles is ISortedOracles, ICeloVersionedContract, Ownable, Initi
function medianRate(address token) external view returns (uint256, uint256) {
EquivalentToken storage equivalentToken = equivalentTokens[token];
if (equivalentToken.token != address(0)) {
(uint256 equivalentMedianRate, uint256 numRates) = medianRateWithoutEquivalentMapping(
(uint256 equivalentMedianRate, uint256 _numRates) = medianRateWithoutEquivalentMapping(
Copy link
Contributor

Choose a reason for hiding this comment

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

_numRates => denominator. And looks like this is incorrectly named in several other places (e.g. the medianRate function).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed, thanks

@pahor167
Copy link
Contributor Author

There's still a reference to multiplier in the comment for getEquivalentToken.

Thanks, fixed

@pahor167 pahor167 merged commit 5bc7105 into release/core-contracts/11 Feb 12, 2024
23 checks passed
@pahor167 pahor167 deleted the pahor/removalOfMultiplier branch February 12, 2024 15:23
pahor167 added a commit that referenced this pull request Apr 19, 2024
@pahor167 @martinvol
@soloseng @timmoreton @alvarof2 @jcortejoso
CR11 merge to master (#10965)
c71bada 
* 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
Reviewers

@m-chrzan m-chrzan m-chrzan left review comments

@soloseng soloseng soloseng approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@pahor167 @m-chrzan @soloseng