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

Merge develop #136

Merged
merged 31 commits into from
Oct 13, 2023
Merged

Merge develop #136

merged 31 commits into from
Oct 13, 2023

Conversation

MikeHathaway
Copy link
Collaborator

@MikeHathaway MikeHathaway commented Oct 13, 2023

Description of change

High level

  • Add deployer contract
  • Expand invariant tests with additional scenario

Mike and others added 30 commits May 25, 2023 17:59
* Add invariants DP7, SS10, SS11, ES4, ES5 and DR4

* Fix stack too deep issue

* PR feedback
* rename invariant tests

* refactor invariant test structure

* additional refactoring

* refactor multiple distribution invariants

* fix stack too deep error

* fix screening invariants

* fix DR4 bug

* remove redundant DP6 check

* pr feedback

---------

Co-authored-by: Mike <mikehathaway@makerdao.com>
* add support for multiple distribution periods to funding invariants

* fix FS7 for multiple dist

* begin updating screening invariants

* remaining fixes to funding stage invariants

* get screening stage invariants working in multiple distribution scenario

* pr feedback

---------

Co-authored-by: Mike <mikehathaway@makerdao.com>
* add support for multiple distribution periods to funding invariants

* fix FS7 for multiple dist

* begin updating screening invariants

* remaining fixes to funding stage invariants

* get screening stage invariants working in multiple distribution scenario

* begin fixing todos

* fix negative funding votes in happy path; update proposal token requested; update DR5 invariant check

* improve ES2 invariant check

* add Logger contract; cleanup logging; add useCurrentBlock modifier to TestBase

* add support for env variables in invariant tests

* expand usage of useCurrentBlock

* cleanup invariants list doc

* add P1 invariant

* cleanups

* cleanup multiple distribution scenario logging; add logActorDelegationRewards

* fix findUnclaimedRewards; expand logging

* improve DR5 check across multiple periods

* cleanups

* initial pr feedback

* Invariant Improvements: Fix Actor log and improve `screeningVote` handler (#110)

* Fix actors logs for Multiple Distribution Invariant when no distribution started

* Improve screeningVote by using _screeningVoteParams to generate parameter

* Add configuration for logging in invariants (#111)

* update README

* update docs

* paramterize percentageTokensReq

* fix compilation warnings

* Add invariant CS7: The highest submitted funded proposal slate should have won or tied depending on when it was submitted. (#113)

---------

Co-authored-by: Mike <mikehathaway@makerdao.com>
Co-authored-by: Prateek Gupta <prateek105@users.noreply.github.com>
* expand CS7 invariant check

* fix nit

---------

Co-authored-by: Mike <mikehathaway@makerdao.com>
Adjusted README to remove irrelevant deployment instruction
Copy link
Contributor

@EdNoepel EdNoepel left a comment

Choose a reason for hiding this comment

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

Much thanks. Please delete develop branch after merging.

Copy link
Contributor

@ith-harvey ith-harvey left a comment

Choose a reason for hiding this comment

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

LGTM

@EdNoepel EdNoepel merged commit 640d5c9 into main Oct 13, 2023
3 checks passed
@MikeHathaway MikeHathaway deleted the develop branch October 13, 2023 20:06
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.

4 participants