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

DRep Refunds and update evalTransactionBalance #3688

Merged
merged 1 commit into from
Sep 1, 2023
Merged

DRep Refunds and update evalTransactionBalance #3688

merged 1 commit into from
Sep 1, 2023

Conversation

aniketd
Copy link
Contributor

@aniketd aniketd commented Aug 29, 2023 •
edited
Loading

Description

Closes #3645

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

@aniketd aniketd changed the title Aniketd/drep refunds DRep Refunds and ConwayUTXO Aug 29, 2023
@aniketd aniketd force-pushed the aniketd/drep-refunds branch 2 times, most recently from bc49410 to 5303a89 Compare August 30, 2023 16:49
@aniketd aniketd changed the title DRep Refunds and ConwayUTXO DRep Refunds and update evalTransactionBalance Aug 30, 2023
@aniketd aniketd marked this pull request as ready for review August 30, 2023 16:51
lehins
lehins requested changes Aug 30, 2023
View reviewed changes
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 realize why you mixed it up. Consumed and produced are a bit weirdly named and unclear concepts.

Anyways, this PR needs some serious fixing.

eras/conway/impl/src/Cardano/Ledger/Conway/UTxO.hs Outdated Show resolved Hide resolved
libs/cardano-ledger-core/src/Cardano/Ledger/UTxO.hs Outdated Show resolved Hide resolved
@aniketd aniketd force-pushed the aniketd/drep-refunds branch from e2eeff2 to 64dbcf4 Compare August 31, 2023 18:58
@aniketd aniketd requested a review from lehins August 31, 2023 18:59
@aniketd
Copy link
Contributor Author

aniketd commented Aug 31, 2023

I hope I have got it correct this time 😰

@aniketd aniketd force-pushed the aniketd/drep-refunds branch from 9e99efd to 42e6133 Compare August 31, 2023 19:24
lehins
lehins requested changes Aug 31, 2023
View reviewed changes
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.

Now that looks much better! 😄

Few minor things need adjustment. Also ghc-9.6 needs TyepOperators extension, see the CI failure

libs/cardano-ledger-api/test/Test/Cardano/Ledger/Api/Tx/Body.hs Outdated Show resolved Hide resolved
eras/shelley/impl/src/Cardano/Ledger/Shelley/UTxO.hs Outdated Show resolved Hide resolved
eras/mary/impl/src/Cardano/Ledger/Mary/UTxO.hs Outdated Show resolved Hide resolved
@aniketd aniketd force-pushed the aniketd/drep-refunds branch from b5b23b3 to 0741f98 Compare September 1, 2023 10:32
@aniketd aniketd requested a review from lehins September 1, 2023 10:32
@aniketd aniketd force-pushed the aniketd/drep-refunds branch from 0741f98 to 7cdfa54 Compare September 1, 2023 10:48
lehins
lehins approved these changes Sep 1, 2023
View reviewed changes
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.

Looks great. Thank you!

@aniketd @lehins
Add DRep refunds to Conway consumed/produced value
16fb7d9 
Also make lenses for UtxoEnv, and,
breaking change to API.evalTransactionBalance
@lehins lehins force-pushed the aniketd/drep-refunds branch from 7cdfa54 to 16fb7d9 Compare September 1, 2023 13:04
@lehins lehins enabled auto-merge September 1, 2023 13:04
@lehins lehins merged commit 96d728f into master Sep 1, 2023
@iohk-bors iohk-bors bot deleted the aniketd/drep-refunds branch September 1, 2023 14:47
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

@Soupstraw Soupstraw Awaiting requested review from Soupstraw

@TimSheard TimSheard Awaiting requested review from TimSheard

@WhatisRT WhatisRT Awaiting requested review from WhatisRT

@teodanciu teodanciu Awaiting requested review from teodanciu

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

DRep deposits and refunds
2 participants
@aniketd @lehins