Code

Governor#2672

Code

Merged

frangio merged 202 commits intoOpenZeppelin:masterOpenZeppelin/openzeppelin-contracts:masterfrom Amxx:feature/governanceAmxx/openzeppelin-contracts:feature/governanceCopy head branch name to clipboardJul 16, 2021

+5,302-377

Commits

Commits on Mar 10, 2021

• starting work on the Timer contract

  Amxx

  committed
  a0fd692

  Copy full SHA for a0fd692

• Timers: solidity version

  Amxx

  committed
  41367cf

  Copy full SHA for 41367cf

• Rebase onto master

  Amxx

  committed
  e7bd166

  Copy full SHA for e7bd166

• support locking timers

  Amxx

  committed
  5facd4c

  Copy full SHA for 5facd4c

• rafactor TimelockController to use Timers

  Amxx

  committed
  e0311c6

  Copy full SHA for e0311c6

• renaming timers internal functions

  Amxx

  committed
  18d0d94

  Copy full SHA for 18d0d94

Commits on Mar 12, 2021

• add ERC20SnapshotEveryBlock

  Amxx

  committed
  4494cc8

  Copy full SHA for 4494cc8

• add changelog entry

  Amxx

  committed
  53edd89

  Copy full SHA for 53edd89

Commits on Mar 23, 2021

• testing for ERC20SnapshotEveryBlock

  Amxx

  committed
  10a5b63

  Copy full SHA for 10a5b63

Commits on Mar 24, 2021

• improve snapshoting

  Amxx

  committed
  512324a

  Copy full SHA for 512324a

Commits on Mar 25, 2021

• split Timelock into module (inheritable) and controller (standalone)

  Amxx

  committed
  3f317cd

  Copy full SHA for 3f317cd

Commits on Apr 18, 2021

• start work on a Comp extension to ERC20

  Amxx

  committed
  e87de1e

  Copy full SHA for e87de1e

• delegation query cleanup

  Amxx

  committed
  a235d0c

  Copy full SHA for a235d0c

Commits on Apr 19, 2021

• minor cleanup of comp test

  Amxx

  committed
  4c17b9a

  Copy full SHA for 4c17b9a

• Merge branch 'feature/ERC20SnapshotBlockNumber' into feature/erc20/comp

  Amxx

  committed
  d4b655c

  Copy full SHA for d4b655c

Commits on Apr 20, 2021

• remove autodelegation

  Amxx

  committed
  46aa3cc

  Copy full SHA for 46aa3cc

• fix/improve testing for ERC20Comp

  Amxx

  committed
  fabd802

  Copy full SHA for fabd802

• rename ERC20Comp to ERC20Votes

  Amxx

  committed
  ba43a54

  Copy full SHA for ba43a54

Commits on Apr 28, 2021

• gas optimization + comp compatibility and tests

  Amxx

  committed
  c9a321d

  Copy full SHA for c9a321d

• function ordering

  Amxx

  committed
  74812f9

  Copy full SHA for 74812f9

• minor refactor

  Amxx

  committed
  9e49d5e

  Copy full SHA for 9e49d5e

• minor gas reduction

  Amxx

  committed
  fc83c27

  Copy full SHA for fc83c27

• improve testing

  Amxx

  committed
  0678a9f

  Copy full SHA for 0678a9f

• remove ERC20SnapsotEveryBlock for now

  Amxx

  committed
  321bdf3

  Copy full SHA for 321bdf3

Commits on May 3, 2021

• Merge branch 'master' into feature/timers

  Amxx

  committed
  6aa3372

  Copy full SHA for 6aa3372

• use low level errors in timers

  Amxx

  committed
  60a28fc

  Copy full SHA for 60a28fc

• overload modifier to keep revert messages in TimelockController

  Amxx

  committed
  cbc9b49

  Copy full SHA for cbc9b49

• Merge branch 'feature/erc20/comp' into feature/governance

  Amxx

  committed
  95e3d41

  Copy full SHA for 95e3d41

• initial governor code

  Amxx

  committed
  d6efa11

  Copy full SHA for d6efa11

Commits on May 10, 2021

• make getVote public

  Amxx

  committed
  009612b

  Copy full SHA for 009612b

Commits on May 14, 2021

• update governor interface

  Amxx

  committed
  837d519

  Copy full SHA for 837d519

• Merge branch 'master' into feature/governance

  Amxx

  committed
  e1dec20

  Copy full SHA for e1dec20

• Fix Changelog

  Amxx

  committed
  6fc519e

  Copy full SHA for 6fc519e

• using uint256 for proposalId

  Amxx

  committed
  13aab40

  Copy full SHA for 13aab40

• add some initial governor testing

  Amxx

  committed
  e2420b2

  Copy full SHA for e2420b2

• remove Timers abstract contract in favor of the Time library

  Amxx

  committed
  01f38d5

  Copy full SHA for 01f38d5

• reenable internal timelock

  Amxx

  committed
  dbd5032

  Copy full SHA for dbd5032

• rename function in the Time library

  Amxx

  committed
  ee5b5ac

  Copy full SHA for ee5b5ac

Commits on May 15, 2021

• revert to 0.8.3

  Amxx

  committed
  07eb7c6

  Copy full SHA for 07eb7c6

Commits on May 18, 2021

• remove timelock changes from this PR

  Amxx

  committed
  b984baf

  Copy full SHA for b984baf

• merge GovernorCore into Governor

  Amxx

  committed
  e0d77d8

  Copy full SHA for e0d77d8

Commits on May 19, 2021

• cleanup governance

  Amxx

  committed
  8acc1cc

  Copy full SHA for 8acc1cc

• reduce distance to GovernorAlpha/Bravo events

  Amxx

  committed
  f39699f

  Copy full SHA for f39699f

• add timelock() view function in IGovernorWithTimelock

  Amxx

  committed
  c37403b

  Copy full SHA for c37403b

Commits on May 20, 2021

• add description to proposal + make params memory instead of calldata to fix stack too deep

  Amxx

  committed
  0c78480

  Copy full SHA for 0c78480

• support cancel in timelock

  Amxx

  committed
  62c2662

  Copy full SHA for 62c2662

• make execute functions payable

  Amxx

  committed
  46d059d

  Copy full SHA for 46d059d

• add comp timelock support(wip)

  Amxx

  committed
  0733c67

  Copy full SHA for 0733c67

• fix module name

  Amxx

  committed
  31a1bc2

  Copy full SHA for 31a1bc2

• disable execute function with wrong signature

  Amxx

  committed
  3cad527

  Copy full SHA for 3cad527

• fix the signature issue with comp timelock

  Amxx

  committed
  8f68441

  Copy full SHA for 8f68441

Commits on May 21, 2021

• test comptimelock module for governor

  Amxx

  committed
  e73357f

  Copy full SHA for e73357f

• add check

  Amxx

  committed
  bb21719

  Copy full SHA for bb21719

• working on governor testing

  Amxx

  committed
  2050af7

  Copy full SHA for 2050af7

• improve test coverage

  Amxx

  committed
  a2501f6

  Copy full SHA for a2501f6

• improve revert reasons

  Amxx

  committed
  33d0016

  Copy full SHA for 33d0016

Commits on May 22, 2021

• add a blockNumber argument to the quorum() function

  Amxx

  committed
  5291af5

  Copy full SHA for 5291af5

Commits on May 25, 2021

• improve governanor coverage

  Amxx

  committed
  f9b5d78

  Copy full SHA for f9b5d78

• complete coverage of governor core and extensions

  Amxx

  committed
  2cbb385

  Copy full SHA for 2cbb385

• fix lint

  Amxx

  committed
  630152e

  Copy full SHA for 630152e

• fix lint

  Amxx

  committed
  ae7edba

  Copy full SHA for ae7edba

Commits on May 26, 2021

• governor documentation

  Amxx

  committed
  81604cc

  Copy full SHA for 81604cc

• fix doc links

  Amxx

  committed
  9ac4a1a

  Copy full SHA for 9ac4a1a

• remove viewProposalStatus in favor of state

  Amxx

  committed
  7e35f9a

  Copy full SHA for 7e35f9a

Commits on May 27, 2021

• improve governor alpha compatibility

  Amxx

  committed
  b0cbd58

  Copy full SHA for b0cbd58

• improve soldity style

  Amxx

  committed
  b5fa119

  Copy full SHA for b5fa119

• check that old timelock has pending admin before updating

  Amxx

  committed
  7d8d4c5

  Copy full SHA for 7d8d4c5

• clarify setup of governor with openzeppelin timelock

  Amxx

  committed
  73adefa

  Copy full SHA for 73adefa

Commits on May 28, 2021

• improve governor module inheritance and refactor voting arguments

  Amxx

  committed
  ea82e23

  Copy full SHA for ea82e23

• put voting into modules

  Amxx

  committed
  46851fa

  Copy full SHA for 46851fa

• add a proposalScore accessor

  Amxx

  committed
  699f37e

  Copy full SHA for 699f37e

• Merge branch 'master' into feature/governance

  Amxx

  committed
  f841315

  Copy full SHA for f841315

• fix governor tests

  Amxx

  committed
  783bdec

  Copy full SHA for 783bdec

• coverage testing of ScoreVoting

  Amxx

  committed
  1d71b99

  Copy full SHA for 1d71b99

• fix lint

  Amxx

  committed
  d7f4028

  Copy full SHA for d7f4028

• renaming governor extensions

  Amxx

  committed
  85f44ca

  Copy full SHA for 85f44ca

• mocks with timelock should not have a receive function

  Amxx

  committed
  a04eff5

  Copy full SHA for a04eff5

Commits on May 31, 2021

• remove extra modules (keept in separate branch)

  Amxx

  committed
  8668af3

  Copy full SHA for 8668af3

• documentation of governor's modules

  Amxx

  committed
  d238096

  Copy full SHA for d238096

• prevent queueing duplicated sub-calls

  Amxx

  committed
  cbda273

  Copy full SHA for cbda273

Commits on Jun 1, 2021

• documentation for the governor

  Amxx

  committed
  982d6d1

  Copy full SHA for 982d6d1

• documentation for the governor

  Amxx

  committed
  a30e280

  Copy full SHA for a30e280

• minor improvement to utils/Time readability

  Amxx

  committed
  895a6f0

  Copy full SHA for 895a6f0

• fix linting

  Amxx

  committed
  b7b9f5e

  Copy full SHA for b7b9f5e

Commits on Jun 2, 2021

• Improve gas efficiency of the voting system

  Amxx

  committed
  577be2c

  Copy full SHA for 577be2c

• fix error message testing

  Amxx

  committed
  a8247d9

  Copy full SHA for a8247d9

• add a proposalVotes accessor

  Amxx

  committed
  dfe20d2

  Copy full SHA for dfe20d2

• documentation for proposalVotes

  Amxx

  committed
  31a9b42

  Copy full SHA for 31a9b42

Commits on Jun 3, 2021

• Add compound licence

  Amxx

  committed
  acbb608

  Copy full SHA for acbb608

• Move ProposalState enum definition to IGovernor

  Amxx

  committed
  d0e8456

  Copy full SHA for d0e8456

• Address comments on the PR

  Amxx

  committed
  1a48129

  Copy full SHA for 1a48129

• fix naming mistake

  Amxx

  committed
  63c4e05

  Copy full SHA for 63c4e05

• fix cancel condition

  Amxx

  committed
  d30c56c

  Copy full SHA for d30c56c

• addressing many issues from the PR

  Amxx

  committed
  c17daf0

  Copy full SHA for c17daf0

• minor renaming in GovernorVotingSimple

  Amxx

  committed
  5da0219

  Copy full SHA for 5da0219

Commits on Jun 4, 2021

• fix old natspec comments

  Amxx

  committed
  a299185

  Copy full SHA for a299185

• Merge branch 'master' into feature/governance

  Amxx

  committed
  29c98f2

  Copy full SHA for 29c98f2

• update vote modules according to recent ERC20Votes changes

  Amxx

  committed
  ac618df

  Copy full SHA for ac618df

Commits on Jun 7, 2021

• improve testing

  Amxx

  committed
  909faf0

  Copy full SHA for 909faf0

• remove dead code

  Amxx

  committed
  37bbbcb

  Copy full SHA for 37bbbcb

• Merge branch 'master' into feature/governance

  Amxx

  committed
  48e7ae1

  Copy full SHA for 48e7ae1

• apply prettifier to the governance contract

  Amxx

  committed
  26bdaa9

  Copy full SHA for 26bdaa9

• turing ternary operator into if/elseif/else for clarity

  Amxx

  committed
  c582c24

  Copy full SHA for c582c24

• run lint:fix with updated dependencies

  Amxx

  committed
  4b687af

  Copy full SHA for 4b687af

Commits on Jun 10, 2021

• making governor events comp compliant

  Amxx

  committed
  3e4d388

  Copy full SHA for 3e4d388

• expand proposalCreated event testing

  Amxx

  committed
  f63d273

  Copy full SHA for f63d273

Commits on Jun 11, 2021

• store timers in uint64

  Amxx

  committed
  a99c8de

  Copy full SHA for a99c8de

• fixe my mess (from changing deadline types to uint64)

  Amxx

  committed
  2e1db61

  Copy full SHA for 2e1db61

• fix lint

  Amxx

  committed
  cc42201

  Copy full SHA for cc42201

• Working on a comp compatibility layer for the governor

  Amxx

  committed
  5d4b90c

  Copy full SHA for 5d4b90c

Commits on Jun 14, 2021

• working on comp compatiblity

  Amxx

  committed
  32a7cf3

  Copy full SHA for 32a7cf3

• fix cancelled & executed status in comp compatibility

  Amxx

  committed
  05154ba

  Copy full SHA for 05154ba

• skip tests if optimization is not enabled

  Amxx

  committed
  bb5aa87

  Copy full SHA for bb5aa87

• lint:fix

  Amxx

  committed
  c5d6eb4

  Copy full SHA for c5d6eb4

• documentation of GovernorCompound

  Amxx

  committed
  83279db

  Copy full SHA for 83279db

• enable all testing + allowUnlimitedContractSize if optimisations are not enabled

  Amxx

  committed
  b68740b

  Copy full SHA for b68740b

Commits on Jun 16, 2021

• renaming struct to improve compound compliance

  Amxx

  committed
  1b16e0a

  Copy full SHA for 1b16e0a

• documentation of the GovernorCompound compatibility layer

  Amxx

  committed
  5b89af0

  Copy full SHA for 5b89af0

• make revert reason match contract names

  Amxx

  committed
  5d82a7e

  Copy full SHA for 5d82a7e

Commits on Jun 17, 2021

• revert change made by early version of the linter

  Amxx

  committed
  e70dd54

  Copy full SHA for e70dd54

• store proposal in core interface of comp compatibility layer

  Amxx

  committed
  3791bb9

  Copy full SHA for 3791bb9

• fix contract inheritance to enforce existance of an ordering

  Amxx

  committed
  7f75429

  Copy full SHA for 7f75429

Commits on Jun 18, 2021

• fix lint (again)

  Amxx

  committed
  a9e98e1

  Copy full SHA for a9e98e1

• reorganise proposals() view function to improve contract size

  Amxx

  committed
  c39a4c7

  Copy full SHA for c39a4c7

• fix lint yet again

  Amxx

  committed
  25db6ea

  Copy full SHA for 25db6ea

• Merge branch 'master' into feature/governance

  Amxx

  committed
  2413e55

  Copy full SHA for 2413e55

Commits on Jun 22, 2021

• use proposal description for salt

  Amxx

  committed
  77ea9f5

  Copy full SHA for 77ea9f5

• remove ProposalSalt event made superfluous by the use of description hash as a salt

  Amxx

  committed
  f7e7cb4

  Copy full SHA for f7e7cb4

Commits on Jun 23, 2021

• Merge branch 'master' into feature/governance

  Amxx

  committed
  1c643b8

  Copy full SHA for 1c643b8

• Governor is now scheduled for 4.3

  Amxx

  committed
  61f27da

  Copy full SHA for 61f27da

Commits on Jun 24, 2021

• add the proposalThreshold access restriction mechanism, with default to 0

  Amxx

  committed
  498187b

  Copy full SHA for 498187b

Commits on Jun 25, 2021

• make BALLOT_TYPEHASH public

  Amxx

  committed
  745d20e

  Copy full SHA for 745d20e

• IGovernorTimelock is IGovernor

  Amxx

  committed
  9b6dd41

  Copy full SHA for 9b6dd41

Commits on Jun 26, 2021

• deep refactor of IGovernor vs Governor

  Amxx

  committed
  8e3cd7a

  Copy full SHA for 8e3cd7a

• add erc165 introspection

  Amxx

  committed
  481a279

  Copy full SHA for 481a279

• moving more things to IGOvernor

  Amxx

  committed
  872b1b1

  Copy full SHA for 872b1b1

• fix contract ordering, and improve the detector script

  Amxx

  committed
  c0c9584

  Copy full SHA for c0c9584

Commits on Jun 29, 2021

• ERC165 testing of governor core

  Amxx

  committed
  a220cbd

  Copy full SHA for a220cbd

• fix lint

  Amxx

  committed
  1961a74

  Copy full SHA for 1961a74

• test GOvernorTimelock interface

  Amxx

  committed
  867ba31

  Copy full SHA for 867ba31

• interface IGovernorTimelock

  Amxx

  committed
  a221e69

  Copy full SHA for a221e69

• fix lint

  Amxx

  committed
  5de73c5

  Copy full SHA for 5de73c5

Commits on Jun 30, 2021

• replace salt with descriptionHash

  Amxx

  committed
  e22a1ea

  Copy full SHA for e22a1ea

• replace salt with descriptionHash in tests

  Amxx

  committed
  90050fc

  Copy full SHA for 90050fc

• Merge branch 'master' into feature/governance

  Amxx

  committed
  4cf2ed6

  Copy full SHA for 4cf2ed6

Commits on Jul 1, 2021

• rename governor contracts

  Amxx

  committed
  655f96b

  Copy full SHA for 655f96b

Commits on Jul 2, 2021

• revert changes caused by an old version of prettier

  Amxx

  committed
  f07cd19

  Copy full SHA for f07cd19

• add quorum ratio to GovernorWithERC20Votes

  Amxx

  committed
  4e6a7b2

  Copy full SHA for 4e6a7b2

• quorum is strict, so it is safe to set it to 0, at least 1 vote is still requiered

  Amxx

  committed
  949d11d

  Copy full SHA for 949d11d

• fix lint

  Amxx

  committed
  b214fa0

  Copy full SHA for b214fa0

• prevent seting the quorum ratio over the maximum

  Amxx

  committed
  2468cf6

  Copy full SHA for 2468cf6

• use an internal virtual function _executor() instead of a virtual modifier (harder to override)

  Amxx

  committed
  37ad037

  Copy full SHA for 37ad037

• fix lint yet again

  Amxx

  committed
  0c0896d

  Copy full SHA for 0c0896d

• refactor token modules

  Amxx

  committed
  8a583aa

  Copy full SHA for 8a583aa

• update tests according to the module renaming

  Amxx

  committed
  3675fb4

  Copy full SHA for 3675fb4

Commits on Jul 5, 2021

• expand testing to block number based timers

  Amxx

  committed
  5771e5b

  Copy full SHA for 5771e5b

Commits on Jul 6, 2021

• addressing many comments from the PR & improving compatibility of core functions with compound

  Amxx

  committed
  ad52976

  Copy full SHA for ad52976

• Rename modules: Voting → Counting & Weight → Votes

  Amxx

  committed
  2eecef8

  Copy full SHA for 2eecef8

• fix lint

  Amxx

  committed
  f52e732

  Copy full SHA for f52e732

• remove @notice entires in favor of extended contract description

  Amxx

  committed
  2e1a8ab

  Copy full SHA for 2e1a8ab

• fix event link

  frangio

  authored
  eff08aa

  Copy full SHA for eff08aa

• fix links

  frangio

  committed
  a277991

  Copy full SHA for a277991

Commits on Jul 7, 2021

• fix abi of proposals(uint256) in the compatibility layer

  Amxx

  committed
  962fee7

  Copy full SHA for 962fee7

• Merge branch 'feature/governance' of github.com:Amxx/openzeppelin-contracts into feature/governance

  Amxx

  committed
  f49b2e6

  Copy full SHA for f49b2e6

• match governor structure declaration

  Amxx

  committed
  c096ff2

  Copy full SHA for c096ff2

• knock knock. who's there ? its the linter yet again

  Amxx

  committed
  c3c9387

  Copy full SHA for c3c9387

• address review comments on GovernorTimelockController

  Amxx

  committed
  0a0a08f

  Copy full SHA for 0a0a08f

• address review comments on GovernorTimelockCompound

  Amxx

  committed
  4be97fc

  Copy full SHA for 4be97fc

• make timelock modules hook into the execution module using an internal _execute function

  Amxx

  committed
  cf6cd37

  Copy full SHA for cf6cd37

• fix lint

  Amxx

  committed
  3ebb685

  Copy full SHA for 3ebb685

• imporve state checkers now that the core execution is used

  Amxx

  committed
  47d608e

  Copy full SHA for 47d608e

• variable naming

  Amxx

  committed
  a59801f

  Copy full SHA for a59801f

• add checks for revert reason bubbling in execute

  Amxx

  committed
  b26b1ab

  Copy full SHA for b26b1ab

• extend testing of proposal execution with value

  Amxx

  committed
  887c2d3

  Copy full SHA for 887c2d3

• minor refactor of governor testing

  Amxx

  committed
  7c8cb01

  Copy full SHA for 7c8cb01

• extend security of the updateTimelock process with Compound timelock

  Amxx

  committed
  e2d6c1e

  Copy full SHA for e2d6c1e

• change argument types to use contract object for tokens and timelocks

  Amxx

  committed
  d862d2b

  Copy full SHA for d862d2b

• fix documentation links

  Amxx

  committed
  fc7ad04

  Copy full SHA for fc7ad04

Commits on Jul 9, 2021

• Update contracts/governance/compatibility/GovernorCompatibilityBravo.sol

  Show description for bb5be03
  

  Amxx

  and

  frangio

  authored
  bb5be03

  Copy full SHA for bb5be03

• Update contracts/governance/extensions/GovernorCountingSimple.sol

  Show description for ec283a8
  

  Amxx

  and

  frangio

  authored
  ec283a8

  Copy full SHA for ec283a8

• rename GovernorTimelockController → GovernorTimelockControl

  Amxx

  committed
  c34d946

  Copy full SHA for c34d946

• fix recuring typo

  Amxx

  committed
  49fce6a

  Copy full SHA for 49fce6a

• fix lint

  Amxx

  committed
  3a89fd8

  Copy full SHA for 3a89fd8

• strict inaquality prevent openning proposal to the wide public

  Amxx

  committed
  ddc0d3d

  Copy full SHA for ddc0d3d

• Merge branch 'master' into feature/governance

  Amxx

  committed
  26c5ffb

  Copy full SHA for 26c5ffb

• rename GovernorVotesQuorumFractional → GovernorVotesQuorumFraction

  Amxx

  committed
  be72915

  Copy full SHA for be72915

• fix lint

  Amxx

  committed
  f421783

  Copy full SHA for f421783

• add test where timelock proposal is executed by another actor

  Amxx

  committed
  5651a98

  Copy full SHA for 5651a98

• add testing for proposalDelay

  Amxx

  committed
  d41de3d

  Copy full SHA for d41de3d

• expand governor testing

  Amxx

  committed
  66d0fe7

  Copy full SHA for 66d0fe7

• address some issues from the PR

  Amxx

  committed
  409a1d6

  Copy full SHA for 409a1d6

Commits on Jul 16, 2021

• add COUNTING_MODE

  frangio

  committed
  f0eb4f1

  Copy full SHA for f0eb4f1

• fix lint

  Amxx

  committed
  669bc0e

  Copy full SHA for 669bc0e

• fix lint and update readme

  Amxx

  committed
  814c210

  Copy full SHA for 814c210

• remove opinionated restrictions to transfer timelock

  frangio

  committed
  76cda5f

  Copy full SHA for 76cda5f

• update prettier-plugin-solidity

  frangio

  committed
  24d3ca1

  Copy full SHA for 24d3ca1

• remove commented functions

  frangio

  committed
  66f66e9

  Copy full SHA for 66f66e9

• Merge branch 'master' into feature/governance

  frangio

  committed
  ed3f574

  Copy full SHA for ed3f574

• add changelog entry

  frangio

  committed
  cd578cf

  Copy full SHA for cd578cf

• update lockfile

  frangio

  committed
  df41439

  Copy full SHA for df41439

• Merge branch 'master' into feature/governance

  frangio

  committed
  20beb65

  Copy full SHA for 20beb65

• Merge branch 'master' into feature/governance

  frangio

  committed
  42cc0db

  Copy full SHA for 42cc0db