Fix collateral balancing when building transaction #631
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
carbolymer
changed the title
carbolymer
force-pushed
the
mgalazyn/fix/collateral-autobalance
branch
6 times, most recently
from
8c6b528
to
02f6030
Compare
carbolymer
requested review from
dcoutts,
Jimbo4350,
erikd,
newhoggy,
smelc,
palas,
kevinhammond,
CarlosLopezDeLara and
disassembler
as code owners
Jimbo4350
approved these changes
Sep 16, 2024
| @@ -114,6 +116,10 @@ conwayEraOnwardsToShelleyBasedEra :: ConwayEraOnwards era -> ShelleyBasedEra era | |||
| conwayEraOnwardsToShelleyBasedEra = \case | |||
| ConwayEraOnwardsConway -> ShelleyBasedEraConway | |||
|
|
|||
| conwayEraOnwardsToBabbageEraOnwards :: ConwayEraOnwards era -> BabbageEraOnwards era | |||
| , totalCollateral | ||
| ) | ||
| else (TxReturnCollateralNone, TxTotalCollateralNone) | ||
| calcReturnAndTotalCollateral w fee pp' TxInsCollateral{} txReturnCollateral txTotalCollateral cAddr totalAvailableCollateral = babbageEraOnwardsConstraints w $ do |
There was a problem hiding this comment.
Does this function exist in cardano-ledger? Or any function that can assist in this calculation? The more we can call from ledger the better.
There was a problem hiding this comment.
Something similar is implemented here, but it's a validation, not a calculation, so we can't just reuse it. https://github.com/IntersectMBO/cardano-ledger/blob/master/eras/babbage/impl/src/Cardano/Ledger/Babbage/Rules/Utxo.hs#L307
| import Test.Tasty (TestTree, testGroup) | ||
| import Test.Tasty.Hedgehog (testProperty) | ||
|
|
||
| -- | Test that the fee is the same when spending minted asset manually or when autobalancing it | ||
| prop_make_transaction_body_autobalance_return_correct_fee_for_multi_asset :: Property | ||
| prop_make_transaction_body_autobalance_return_correct_fee_for_multi_asset = H.propertyOnce $ do | ||
| let sbe = ShelleyBasedEraConway | ||
| let ceo = ConwayEraOnwardsConway | ||
| beo = conwayEraOnwardsToBabbageEraOnwards ceo |
There was a problem hiding this comment.
Another good example as to why we have to ditch the Eons.
carbolymer
force-pushed
the
mgalazyn/fix/collateral-autobalance
branch
from
02f6030
to
2bf5f99
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.
Changelog
Context
This PR fixes:
This PR consist of two commits:
Checklist