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

Add proposal delaying, remove predicate failure from ENACT #3684

Merged
merged 1 commit into from
Aug 31, 2023

Conversation

Soupstraw
Copy link
Contributor

@Soupstraw Soupstraw commented Aug 28, 2023

Description

Removed the predicate failure from ENACT. Made the enactment of some actions delay all the other actions. Treasury withdrawals are now delayed when there is not enough ADA in the treasury.

I also changed the logic of RATIFY so that actions with invalid previous governance action ID get delayed rather than dropped.

closes #3675

Checklist

  • Commit sequence broadly makes sense and commits have useful messages
  • New tests are added if needed and existing tests are updated
  • When applicable, versions are updated in .cabal and CHANGELOG.md files according to the
    versioning process.
  • The version bounds in .cabal files for all affected packages are updated. If you change the bounds in a cabal file, that package itself must have a version increase. (See RELEASING.md)
  • All visible changes are prepended to the latest section of a CHANGELOG.md for the affected packages. New section is never added with the code changes. (See RELEASING.md)
  • Code is formatted with fourmolu (use scripts/fourmolize.sh)
  • Cabal files are formatted (use scripts/cabal-format.sh)
  • hie.yaml has been updated (use scripts/gen-hie.sh)
  • Self-reviewed the diff

@Soupstraw Soupstraw force-pushed the jj/delay-proposal branch 11 times, most recently from 914e168 to 7e3d316 Compare August 29, 2023 12:40
@Soupstraw Soupstraw marked this pull request as ready for review August 29, 2023 12:42
@Soupstraw Soupstraw force-pushed the jj/delay-proposal branch 3 times, most recently from 072fc29 to 177f8a1 Compare August 29, 2023 12:59
@Soupstraw
Copy link
Contributor Author

Soupstraw commented Aug 29, 2023

Oops, I just noticed @teodanciu already had an open PR implementing the delaying and GovId checking #3670

Copy link
Collaborator

@lehins lehins left a comment

Choose a reason for hiding this comment

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

I chose to go with @teodanciu's approach implemented in #3670 because it is correct, while this implementation is not quite. More importantly, however, the approach take in #3670 is much cleaner and is more flexible, because we will likely need to update prevGovActionId for PParamsUpdate during ratification. Updating the PParams during Enactment will have to happen an epoch later due to #3691. HashProtected approach in this PR prevents us from doing so.

In any case I found the HashProtected approach in the spec a bit ugly to begin with, because it is more convoluted that it has to be.

So, could you extract only the parts that are relevant for #3675 and either submit it as a new PR or modify this one, whichever you prefer.

@Soupstraw Soupstraw force-pushed the jj/delay-proposal branch 3 times, most recently from 9e1c52c to b86602c Compare August 31, 2023 11:04
@Soupstraw Soupstraw force-pushed the jj/delay-proposal branch 4 times, most recently from 3dd8d07 to de8c3a1 Compare August 31, 2023 11:44
@Soupstraw Soupstraw requested a review from lehins August 31, 2023 11:45
@Soupstraw Soupstraw force-pushed the jj/delay-proposal branch 4 times, most recently from c0f86ae to 2068c60 Compare August 31, 2023 15:44
Copy link
Collaborator

@lehins lehins left a comment

Choose a reason for hiding this comment

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

Very nice!!!! 💪

Love all the predicate failure cleanup

@lehins lehins merged commit 661f28b into master Aug 31, 2023
11 checks passed
@iohk-bors iohk-bors bot deleted the jj/delay-proposal branch August 31, 2023 23:33
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.

Remove failures from enactment
3 participants