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

[WIP- do not merge] CR10 -> master #10647

Closed
wants to merge 107 commits into from
Closed

Conversation

martinvol
Copy link
Contributor

Description

A few sentences describing the overall effects and goals of the pull request's commits.
What is the current behavior, and what is the updated/expected behavior with this PR?

Other changes

Describe any minor or "drive-by" changes here.

Tested

An explanation of how the changes were tested or an explanation as to why they don't need to be.

Related issues

  • Fixes #[issue number here]

Backwards compatibility

Brief explanation of why these changes are/are not backwards compatible.

Documentation

The set of community facing docs that have been added/modified because of this change

pahor167 and others added 9 commits June 14, 2023 13:22
* Revert "Fix dequeueProposalIfReady() for expired proposals. (#10324)"

This reverts commit 890d195.

* Revert "Update upvode function (#10268)"

This reverts commit ce75f49.

* ReleaseGold refund test fix (#10440)

* ReleaseGold refund test fix

* gas fix

* Pahor/cli fix2 (#10457)

* ReleaseGold refund test fix

* gas fix

* PR comments

* removal of comment

* Cli fix 2

* Running GitHub Action workflow from release/* branches

* Fix regex

* Trigger protocol tests on release branches

* add logging

* lint fix

* uniswap test fix

* Trigger Identity tests too

---------

Co-authored-by: Javier Cortejoso <[email protected]>
* Update of config to core-contract v9

* buildable

* buildable

* Buildable and with everything agreed on

* lockedgold tests

* tests added for 2 delegators

* lockedgold tests done

* removeVotesWhenRevokingDelegatedVotes tests start

* removeVotesWhenRevokingDelegatedVotes for one proposal working

* removeVotesWhenRevokingDelegatedVotes tests added

* Test fixes

* final tests

* Natspec + refactor

* Versions update

* Update packages/protocol/contracts/governance/LockedGold.sol

Co-authored-by: Edwin <[email protected]>

* Update packages/protocol/test/governance/voting/lockedgold.ts

Co-authored-by: soloseng <[email protected]>

* Update packages/protocol/test/governance/voting/lockedgold.ts

Co-authored-by: soloseng <[email protected]>

* Update packages/protocol/contracts/governance/LockedGold.sol

Co-authored-by: soloseng <[email protected]>

* Update packages/protocol/contracts/governance/LockedGold.sol

Co-authored-by: soloseng <[email protected]>

* Update packages/protocol/test/governance/voting/lockedgold.ts

Co-authored-by: soloseng <[email protected]>

* PR comments

* lint

* Restrict delegatee count

* Locked Gold update

* Added tests

* Artifacts singleton moved to make quicktest work again

* lint fix

* version update

* SafeMath + delegator fix

* more tests

* lint

* prettier

* Safe math

* Safe math

* PR comments

* Rounding error during removal

* revoke during unlock

* Validators cannot delegate

* tests fixes

* PR comments

* validators update

* added tests

* fixidity but tests not fully working yet

* Audit critical fixes

* comment updates

* test fix

* Auditor comments

* validators update

* locked gold fix

* Debug Protocol Release tests

* Debug Protocol test release. Adding traces

* Unbounded var

---------

Co-authored-by: Edwin <[email protected]>
Co-authored-by: soloseng <[email protected]>
Co-authored-by: Javier Cortejoso <[email protected]>
* handle and distribute only active tokens

* Correctly burn Celo

* removal of redundant check

* AMBIGUOUS LOGIC FOR MAX SLIPPAGE IN FEEHANDLERSELLER

* REDUNDANT LINE AND HANDLER CHECK IN FEEHANDLER

* UNUSED EVENTS

* Update packages/protocol/contracts/common/FeeHandler.sol

Co-authored-by: soloseng <[email protected]>

* build fix

* dont handle removed tokens

* PR comments

* Removed TODO

---------

Co-authored-by: Martín Volpe <[email protected]>
Co-authored-by: soloseng <[email protected]>
@martinvol martinvol requested review from a team as code owners October 6, 2023 18:05
@martinvol martinvol requested review from a team October 6, 2023 18:05
@martinvol martinvol requested review from a team as code owners October 6, 2023 18:05
@martinvol martinvol requested review from a team and rkachowski October 6, 2023 18:05
@martinvol martinvol changed the title CR10 -> master [WIP] CR10 -> master Oct 6, 2023
@socket-security
Copy link

🚨 Potential security issues detected. Learn more about Socket for GitHub ↗︎

To accept the risk, merge this PR and you will not be notified again.

Issue Package Version Note Source
Native code @soloseng/ganache 7.8.0-beta.1

Next steps

What's wrong with native code?

Contains native code which could be a vector to obscure malicious code, and generally decrease the likelihood of reproducible or reliable installs.

Ensure that native code bindings are expected. Consumers may consider pure JS and functionally similar alternatives to avoid the challenges and risks associated with native code bindings.

Take a deeper look at the dependency

Take a moment to review the security alert above. Review the linked package source code to understand the potential risk. Ensure the package is not malicious before proceeding. If you're unsure how to proceed, reach out to your security team or ask the Socket team for help at support [AT] socket [DOT] dev.

Remove the package

If you happen to install a dependency that Socket reports as Known Malware you should immediately remove it and select a different dependency. For other alert types, you may may wish to investigate alternative packages or consider if there are other ways to mitigate the specific risk posed by the dependency.

Mark a package as acceptable risk

To ignore an alert, reply with a comment starting with @SocketSecurity ignore followed by a space separated list of package-name@version specifiers. e.g. @SocketSecurity ignore [email protected] bar@* or ignore all packages with @SocketSecurity ignore-all

@changeset-bot
Copy link

changeset-bot bot commented Oct 18, 2023

🦋 Changeset detected

Latest commit: a7f18d0

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
Name Type
@celo/contractkit Minor

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@martinvol martinvol changed the title [WIP] CR10 -> master [WIP- do not merge] CR10 -> master Oct 26, 2023
@martinvol martinvol marked this pull request as draft October 27, 2023 15:19
@martinvol martinvol marked this pull request as ready for review October 27, 2023 15:29
@martinvol
Copy link
Contributor Author

Closed to merge #10690 instead

@martinvol martinvol closed this Oct 30, 2023
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.

5 participants