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

Commits on May 25, 2023

  1. expand unit test code coverage

    Mike committed May 25, 2023
    Configuration menu
    Copy the full SHA
    3d85654 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2023

  1. Merge branch 'main' of github.com:ajna-finance/ecosystem-coordination…

    … into main
    Mike committed May 27, 2023
    Configuration menu
    Copy the full SHA
    052687e View commit details
    Browse the repository at this point in the history

Commits on May 31, 2023

  1. Merge branch 'main' of github.com:ajna-finance/ecosystem-coordination…

    … into main
    Mike committed May 31, 2023
    Configuration menu
    Copy the full SHA
    1016cc5 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2023

  1. Configuration menu
    Copy the full SHA
    9334339 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2023

  1. Configuration menu
    Copy the full SHA
    c3aaf10 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2023

  1. Configuration menu
    Copy the full SHA
    39dff97 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2023

  1. Add invariants DP7, SS10, SS11, ES4, ES5 and DR4 (#105)

    * Add invariants DP7, SS10, SS11, ES4, ES5 and DR4
    
    * Fix stack too deep issue
    
    * PR feedback
    prateek105 authored Jun 9, 2023
    Configuration menu
    Copy the full SHA
    ed47e52 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2023

  1. Update invariants (#106)

    * 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>
    MikeHathaway and Mike authored Jun 13, 2023
    Configuration menu
    Copy the full SHA
    e7e9d32 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2023

  1. Check all invariants across multiple distribution periods (#107)

    * 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>
    MikeHathaway and Mike authored Jun 16, 2023
    Configuration menu
    Copy the full SHA
    48f027f View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2023

  1. Configuration menu
    Copy the full SHA
    dc667a7 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2023

  1. Invariant improvements (#108)

    * 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>
    3 people authored Jun 21, 2023
    Configuration menu
    Copy the full SHA
    85ac65e View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2023

  1. update makefile (#115)

    MikeHathaway authored Jun 22, 2023
    Configuration menu
    Copy the full SHA
    ce90939 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. Configuration menu
    Copy the full SHA
    23cdb60 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e618039 View commit details
    Browse the repository at this point in the history
  3. expand CS7 invariant check (#118)

    * expand CS7 invariant check
    
    * fix nit
    
    ---------
    
    Co-authored-by: Mike <mikehathaway@makerdao.com>
    MikeHathaway and Mike authored Jun 27, 2023
    Configuration menu
    Copy the full SHA
    76ce84e View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2023

  1. Merge branch 'main' of github.com:ajna-finance/ecosystem-coordination…

    … into develop
    Mike committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    cf5e7f9 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2023

  1. adjusted README

    EdNoepel committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    1446c5b View commit details
    Browse the repository at this point in the history
  2. Merge pull request #122 from ajna-finance/deployment

    Adjusted README to remove irrelevant deployment instruction
    EdNoepel authored Jul 4, 2023
    Configuration menu
    Copy the full SHA
    ef9ccfa View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2023

  1. Fix make file spacing

    prateek105 committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    545ab18 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2023

  1. deploy BurnWrapper

    EdNoepel committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    7e546ff View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2023

  1. Merge pull request #123 from ajna-finance/burnwrapper-deployment

    Deploy BurnWrappedAjna
    EdNoepel authored Aug 2, 2023
    Configuration menu
    Copy the full SHA
    dea251c View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2023

  1. Configuration menu
    Copy the full SHA
    82bb87c View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2023

  1. Configuration menu
    Copy the full SHA
    9732ea2 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2023

  1. Configuration menu
    Copy the full SHA
    b8662da View commit details
    Browse the repository at this point in the history
  2. PR feedback

    prateek105 committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    d50335b View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2023

  1. Configuration menu
    Copy the full SHA
    7d49734 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    42bb2ca View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    86bd09c View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2023

  1. PR feedback

    prateek105 committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    92880a9 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2023

  1. Merge pull request #125 from ajna-finance/grantfund-deployer

    Add GrantFund Deployer contract
    EdNoepel authored Oct 13, 2023
    Configuration menu
    Copy the full SHA
    0a7edb0 View commit details
    Browse the repository at this point in the history
  2. merge main

    Mike committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    65be9c1 View commit details
    Browse the repository at this point in the history