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

Add timestamp based governor with EIP-6372 and EIP-5805 #3934

Merged
merged 70 commits into from
Feb 9, 2023
Merged

Add timestamp based governor with EIP-6372 and EIP-5805 #3934

merged 70 commits into from
Feb 9, 2023

Commits on Jan 6, 2023

  1. Add EIP-5805 clock to the Votes module

    @Amxx
    Amxx committed Jan 6, 2023
    Configuration menu
    Copy the full SHA
    4312336 View commit details
    Browse the repository at this point in the history

  2. Add EIP-5805 clock to ERC20Votes

    @Amxx
    Amxx committed Jan 6, 2023
    Configuration menu
    Copy the full SHA
    3d11319 View commit details
    Browse the repository at this point in the history

  3. make governor clock dependant

    @Amxx
    Amxx committed Jan 6, 2023
    Configuration menu
    Copy the full SHA
    cee1f9c View commit details
    Browse the repository at this point in the history

  4. wording blockNumber → timepoint

    @Amxx
    Amxx committed Jan 6, 2023
    Configuration menu
    Copy the full SHA
    f5b77d8 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2023

  1. test ERC20Votes with timestamp

    @Amxx
    Amxx committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    cb1fa78 View commit details
    Browse the repository at this point in the history

  2. check clock return value

    @Amxx
    Amxx committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    b1c155d View commit details
    Browse the repository at this point in the history

  3. fix lint

    @Amxx
    Amxx committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    c6d3ef9 View commit details
    Browse the repository at this point in the history

  4. test Votes.sol in timestamp mode

    @Amxx
    Amxx committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    c73f08f View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2023

  1. test governor with timestamp

    @Amxx
    Amxx committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    8a70c35 View commit details
    Browse the repository at this point in the history

  2. all governance test against blockNumber & timestamp modes

    @Amxx
    Amxx committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    0981e95 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2023

  1. add testing of new governor against legacy voting tokens

    @Amxx
    Amxx committed Jan 12, 2023
    Configuration menu
    Copy the full SHA
    bcedb7e View commit details
    Browse the repository at this point in the history

  2. spelling

    @Amxx
    Amxx committed Jan 12, 2023
    Configuration menu
    Copy the full SHA
    fdeabb7 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2023

  1. Merge branch 'master' into feature/timestamp-governor

    @Amxx
    Amxx committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    5d2cd45 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2023

  1. revert IVotes and add IERC5805 that extends IVotes with clock functions

    @Amxx
    Amxx committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    fb0619c View commit details
    Browse the repository at this point in the history

  2. rewrite time helper

    @Amxx
    Amxx committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    82ff76b View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2023

  1. add retyped from directive

    @Amxx
    Amxx committed Jan 25, 2023
    Configuration menu
    Copy the full SHA
    21588f0 View commit details
    Browse the repository at this point in the history

  2. more retyped-from directives

    @Amxx
    Amxx committed Jan 25, 2023
    Configuration menu
    Copy the full SHA
    3ae7f12 View commit details
    Browse the repository at this point in the history

  3. add IERC6372.sol

    @Amxx
    Amxx committed Jan 25, 2023
    Configuration menu
    Copy the full SHA
    490a379 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2023

  1. fix retype annotations, add missing

    @frangio
    frangio committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    c3d83d6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' 

    Conflicts:
	contracts/governance/Governor.sol
	test/governance/Governor.test.js
	test/governance/compatibility/GovernorCompatibilityBravo.test.js
	test/governance/extensions/GovernorTimelockCompound.test.js
	test/governance/extensions/GovernorTimelockControl.test.js
    @Amxx
    Amxx committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    b2bd811 View commit details
    Browse the repository at this point in the history

  3. Update README.adoc

    @Amxx
    Amxx committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    d16a02e View commit details
    Browse the repository at this point in the history

  4. Update ERC20VotesLegacyMock.sol

    @Amxx
    Amxx committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    2546026 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2023

  1. compact the new ProposalCore struct

    @Amxx
    Amxx committed Jan 30, 2023
    Configuration menu
    Copy the full SHA
    8348311 View commit details
    Browse the repository at this point in the history

  2. fix

    @Amxx
    Amxx committed Jan 30, 2023
    Configuration menu
    Copy the full SHA
    7c9d08f View commit details
    Browse the repository at this point in the history

  3. refactor retypes

    @Amxx
    Amxx committed Jan 30, 2023
    Configuration menu
    Copy the full SHA
    cfd7d79 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2023

  1. cleanup

    @Amxx
    Amxx committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    b7e46ed View commit details
    Browse the repository at this point in the history

  2. Apply suggestions from code review 

    Co-authored-by: Ernesto García <ernestognw@gmail.com>
    @Amxx @ernestognw
    Amxx and ernestognw committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    37d5a3d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' 

    Conflicts:
	contracts/governance/IGovernor.sol
	test/governance/extensions/GovernorTimelockControl.test.js
    @Amxx
    Amxx committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    7550395 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2023

  1. Update contracts/governance/README.adoc 

    Co-authored-by: Ernesto García <ernestognw@gmail.com>
    @Amxx @ernestognw
    Amxx and ernestognw committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    21483ad View commit details
    Browse the repository at this point in the history

  2. add upperLookupRecent to Checkpoints

    @Amxx
    Amxx committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    9359d68 View commit details
    Browse the repository at this point in the history

  3. use upperLookupRecent in Votes.sol

    @Amxx
    Amxx committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    97a34fd View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into feature/timestamp-governor

    @Amxx
    Amxx committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    5cae0e6 View commit details
    Browse the repository at this point in the history

  5. fix lint

    @Amxx
    Amxx committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    0822651 View commit details
    Browse the repository at this point in the history

  6. fix lint

    @Amxx
    Amxx committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    d49ab18 View commit details
    Browse the repository at this point in the history

  7. reorder for reentrancy

    @Amxx
    Amxx committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    ecf0bde View commit details
    Browse the repository at this point in the history

  8. fix inheritance ordering

    @Amxx
    Amxx committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    0c05bc7 View commit details
    Browse the repository at this point in the history

  9. put storage error directly in the output

    @Amxx
    Amxx committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    662c96e View commit details
    Browse the repository at this point in the history

  10. simplify output

    @Amxx
    Amxx committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    0fe6bb5 View commit details
    Browse the repository at this point in the history

  11. use block solhint-disable/solhint-enable to improve readability

    @Amxx
    Amxx committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    3a2882d View commit details
    Browse the repository at this point in the history

  12. add a proposalProposer accessor

    @Amxx
    Amxx committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    b5f0b63 View commit details
    Browse the repository at this point in the history

  13. avoid duplicate sload in GovernorCompatibilityBravo.cancel

    @Amxx
    Amxx committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    250ba20 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'master' into feature/timestamp-governor

    @Amxx
    Amxx committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    a851552 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2023

  1. Apply suggestions from code review 

    Co-authored-by: Francisco <frangio.1@gmail.com>
    @Amxx @frangio
    Amxx and frangio committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    a75ca18 View commit details
    Browse the repository at this point in the history

  2. Apply suggestions from code review 

    Co-authored-by: Francisco <frangio.1@gmail.com>
    @Amxx @frangio
    Amxx and frangio committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    07b60a7 View commit details
    Browse the repository at this point in the history

  3. safecast

    @Amxx
    Amxx committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    dab340d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feature/timestamp-governor' of github.com:Amxx/openzepp… 

    …elin-contracts into feature/timestamp-governor
    @Amxx
    Amxx committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    f27149b View commit details
    Browse the repository at this point in the history

  5. lint

    @Amxx
    Amxx committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    54632b8 View commit details
    Browse the repository at this point in the history

  6. changeset

    @Amxx
    Amxx committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    32e0ebf View commit details
    Browse the repository at this point in the history

  7. relax gas compare requierement to still produce an output when tests are 

    updated
    @Amxx
    Amxx committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    18174a9 View commit details
    Browse the repository at this point in the history

  8. improve comments

    @Amxx
    Amxx committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    e1be9a2 View commit details
    Browse the repository at this point in the history

  9. use safecast in mocks

    @Amxx
    Amxx committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    6f7f346 View commit details
    Browse the repository at this point in the history

  10. do recent lookup for _quorumNumeratorHistory

    @Amxx
    Amxx committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    b173774 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2023

  1. Merge branch 'master' into feature/timestamp-governor

    @Amxx
    Amxx committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    3d15872 View commit details
    Browse the repository at this point in the history

  2. change casts

    @Amxx
    Amxx committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    759bbd8 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into feature/timestamp-governor

    @Amxx
    Amxx committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    cf548e3 View commit details
    Browse the repository at this point in the history

  4. Update ninety-hornets-kick.md

    @frangio
    frangio committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    155ee75 View commit details
    Browse the repository at this point in the history

  5. Update four-bats-sniff.md

    @frangio
    frangio committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    b192f8c View commit details
    Browse the repository at this point in the history

  6. overriden -> overridden

    @frangio
    frangio committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    c772388 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2023

  1. Merge branch 'master' into feature/timestamp-governor

    @frangio
    frangio committed Feb 4, 2023
    Configuration menu
    Copy the full SHA
    8cec0b6 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2023

  1. Merge branch 'master' into feature/timestamp-governor

    @Amxx
    Amxx committed Feb 6, 2023
    Configuration menu
    Copy the full SHA
    e4fb558 View commit details
    Browse the repository at this point in the history

  2. Update contracts/governance/extensions/GovernorVotesQuorumFraction.sol 

    Co-authored-by: Francisco <fg@frang.io>
    @Amxx @frangio
    Amxx and frangio committed Feb 6, 2023
    Configuration menu
    Copy the full SHA
    773c4c0 View commit details
    Browse the repository at this point in the history

  3. add EIP6372.behavior.js

    @Amxx
    Amxx committed Feb 6, 2023
    Configuration menu
    Copy the full SHA
    df59b36 View commit details
    Browse the repository at this point in the history

  4. improve coverage

    @Amxx
    Amxx committed Feb 6, 2023
    Configuration menu
    Copy the full SHA
    3c6c942 View commit details
    Browse the repository at this point in the history

  5. rename event params

    @Amxx
    Amxx committed Feb 6, 2023
    Configuration menu
    Copy the full SHA
    9a42c99 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2023

  1. Update contracts/governance/extensions/GovernorTimelockCompound.sol 

    Co-authored-by: Francisco <fg@frang.io>
    @Amxx @frangio
    Amxx and frangio committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    11ac9da View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' 

    Conflicts:
	test/governance/Governor.test.js
	test/governance/extensions/GovernorTimelockCompound.test.js
	test/governance/extensions/GovernorTimelockControl.test.js
	test/governance/extensions/GovernorWithParams.test.js
	test/governance/utils/Votes.behavior.js
	test/token/ERC20/extensions/ERC20Votes.test.js
	test/token/ERC20/extensions/ERC20VotesComp.test.js
    @Amxx
    Amxx committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    cc0f45f View commit details
    Browse the repository at this point in the history

  3. Update governance.js

    @Amxx
    Amxx committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    e2eb048 View commit details
    Browse the repository at this point in the history

  4. Update ERC721Votes.test.js

    @Amxx
    Amxx committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    5e54e88 View commit details
    Browse the repository at this point in the history

  5. improve coverage

    @Amxx
    Amxx committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    60992b6 View commit details
    Browse the repository at this point in the history

  6. remove full IGovernor from ERC165

    @Amxx
    Amxx committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    8397ce7 View commit details
    Browse the repository at this point in the history