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

Scheme refactor #254

Merged
merged 10 commits into from
Nov 9, 2022
Merged

Scheme refactor #254

merged 10 commits into from
Nov 9, 2022

Conversation

mprasanjith
Copy link
Member

@mprasanjith mprasanjith commented Nov 2, 2022

Closes #240 and #241.

Description

  • Changes the contract name used for errors in base Scheme.sol from WalletScheme to Scheme.
  • Moves conditional check for the amount of options out of base Scheme to inherited WalletScheme and AvatarScheme contracts.
  • Use option 1 in schemes as the default negative option with no calls execution.
  • Change calls execution logic to execute all calls submitted based on options 2 and higher, for 2 options it executes all the calls if winning option is 2.
  • Change YES option to 2 and NO option to 1.

@mprasanjith mprasanjith self-assigned this Nov 2, 2022
@mprasanjith mprasanjith changed the base branch from main to refactor-dxdao-contracts November 2, 2022 13:04
mprasanjith and others added 4 commits November 2, 2022 14:06
…tiple options by default

Add smart contract description, implement executeProposal function with multiple options execution
…e proposals exec and submission

Override function to propose and execute proposals to enforce only two options to be used and
execute all calls when winning option is one
…roposal is marked as rejected

Refactor the execution of proposals in Scheme, now a proposal is marked as rejected if the calls
batch executed are just empty calls (calls to address 0 and value 0). The WalletScheme was changed
requiring the second half of the proposals submitted to be empty, this means that for option 2 it
will mark the proposal as rejected, since the second half of the calls are just empty calls.
@AugustoL AugustoL changed the title Scheme fixes (S3 and S7) Scheme refactor Nov 8, 2022
@AugustoL AugustoL merged commit cf1784e into refactor-dxdao-contracts Nov 9, 2022
@AugustoL AugustoL deleted the bugfix/scheme-fixes branch November 29, 2022 21:37
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.

S3. Wrong contract name used in errors
3 participants