the alonzo UTxO rule to use alonzo minfee function #2936
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
JaredCorduan
force-pushed
the
jc/fix-alonzo-minfee
branch
from
1b13d9e
to
62b44dc
Compare
teodanciu
reviewed
Jul 28, 2022
| @@ -295,9 +294,11 @@ feesOK pp tx (UTxO utxo) = | |||
| -- restrict Utxo to those inputs we use to pay fees. | |||
| utxoCollateral = eval (collateral ◁ utxo) | |||
| bal = balance @era (UTxO utxoCollateral) | |||
| theFee = txBody ^. feeTxBodyL | |||
There was a problem hiding this comment.
The first usage of our new lens friends 😀
teodanciu
approved these changes
Jul 28, 2022
There was a problem hiding this comment.
Looks good to me.
I was going through the commit that introduced the problem, and was wondering about two other cases that are reusing a Shelley function (and also using pp, which from my understanding was the problem - I might be wrong!)
- ShelleyMA.validateValueNotConservedUTxO . But the original version is still using the
Shelley.produced, so maybe not a problem? - Shelley.validateMaxTxSizeUTxO - is this using the maxTxSize from Shelley?
Anyway, just some questions based on perhaps vague understanding- sorry if I'm barking up the wrong tree here!
|
Thank you so much @teodanciu for checking out the rest of the refactor!
Thanks again for looking out for more trouble! |
TimSheard
reviewed
Jul 28, 2022
eras/alonzo/test-suite/test/Test/Cardano/Ledger/Alonzo/Golden.hs
Outdated
Show resolved
Hide resolved
Additionally, a new golden test for the alonzo fee calculation has been added, using the block from: IntersectMBO/cardano-node#4228 (comment)
JaredCorduan
force-pushed
the
jc/fix-alonzo-minfee
branch
from
62b44dc
to
8c5498d
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A bug was introduced, causing the Alonzo UTxO rule to use the Shelley
minfeefunction instead of the Alonzo version. This PR reverts that.Additionally, a new golden test for the Alonzo fee calculation has been added, using the block from:
IntersectMBO/cardano-node#4228 (comment)
I will cherry pick the commit in this PR onto the release branch
release/1.0.0after this PR is merged.resolves IntersectMBO/cardano-node#4228