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

Treasury donations #3523

Merged
merged 1 commit into from
Aug 10, 2023
Merged

Treasury donations #3523

merged 1 commit into from
Aug 10, 2023

Conversation

Soupstraw
Copy link
Contributor

@Soupstraw Soupstraw commented Jul 6, 2023 •
edited

Description

Fixes #3436

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
Copy link
Contributor Author

Depends on UTXO added in #3495

@lehins lehins added this to In progress in Conway via automation Jul 18, 2023
@lehins lehins added conway SanchoNet Minimal working version of Governance labels Jul 18, 2023
@Soupstraw Soupstraw force-pushed the jj/treasury-donations branch 5 times, most recently from 5c32e6a to 96a38bd Compare July 31, 2023 13:10
@Soupstraw Soupstraw force-pushed the jj/treasury-donations branch 4 times, most recently from 8a2b2a9 to 9269c0c Compare August 1, 2023 12:46
@Soupstraw Soupstraw marked this pull request as ready for review August 1, 2023 12:51
@Soupstraw Soupstraw force-pushed the jj/treasury-donations branch 9 times, most recently from 4bf639a to 173d4f8 Compare August 2, 2023 09:26
@Soupstraw Soupstraw force-pushed the jj/treasury-donations branch 3 times, most recently from c4a10c8 to 2371e46 Compare August 3, 2023 11:39
lehins
lehins approved these changes Aug 3, 2023
View reviewed changes
Copy link
Contributor

@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.

Aside from the decoder, this PR is ready

eras/conway/impl/src/Cardano/Ledger/Conway/TxBody.hs Show resolved Hide resolved
@Soupstraw Soupstraw force-pushed the jj/treasury-donations branch 5 times, most recently from 5d489c2 to 6071885 Compare August 7, 2023 12:41
@lehins lehins moved this from In progress to In review in Conway Aug 7, 2023
@Soupstraw Soupstraw force-pushed the jj/treasury-donations branch 5 times, most recently from 2abaf2e to 3f71044 Compare August 8, 2023 12:41
@Soupstraw Soupstraw enabled auto-merge (rebase) August 8, 2023 13:27
@Soupstraw Soupstraw force-pushed the jj/treasury-donations branch 4 times, most recently from 196181f to fb25050 Compare August 9, 2023 14:52
@Soupstraw Soupstraw force-pushed the jj/treasury-donations branch 2 times, most recently from 604cfa0 to be7b800 Compare August 10, 2023 09:56
@Soupstraw
Added treasury donations field
94c9930 
Move donations to treasury at epoch boundary
@Soupstraw Soupstraw merged commit 5b90d15 into master Aug 10, 2023
11 of 12 checks passed
@iohk-bors iohk-bors bot deleted the jj/treasury-donations branch August 10, 2023 11:48
@lehins lehins moved this from In review to Done in Conway Aug 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lehins lehins lehins approved these changes

@aniketd aniketd Awaiting requested review from aniketd

@teodanciu teodanciu Awaiting requested review from teodanciu

Assignees
No one assigned
Labels
conway SanchoNet Minimal working version of Governance
Projects
Conway
Status: Done
Conway
  
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Transfer to the treasury
2 participants
@Soupstraw @lehins