Translate tables if needed when pushing diffs in V2 #1360
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
jasagredo
requested review from
nfrisby,
amesgen,
fraser-iohk,
dnadales and
geo2a
as code owners
jasagredo
commented
Jan 17, 2025
| atomically | ||
| $ modifyTVar tv | ||
| (\r -> guardClosed r (LedgerTablesHandleOpen . flip (ltliftA2 (\(ValuesMK vals) (DiffMK d) -> ValuesMK (Diff.applyDiff vals d))) diffs)) | ||
| (\r -> guardClosed r (LedgerTablesHandleOpen . flip (ltliftA2 (\(ValuesMK vals) (DiffMK d) -> ValuesMK (Diff.applyDiff vals d))) (projectLedgerTables diffs) . upgradeTables st0 diffs)) |
There was a problem hiding this comment.
This is the place where upgradeTables is used.
| @@ -1110,6 +1112,44 @@ class ( Show (HardForkTxOut xs) | |||
| default txOutEjections :: CanHardFork xs => NP (K (NS WrapTxOut xs) -.-> WrapTxOut) xs | |||
| txOutEjections = composeTxOutTranslations $ ipTranslateTxOut hardForkEraTranslation | |||
|
|
|||
| instance (CanHardFork xs, HasHardForkTxOut xs) => CanUpgradeLedgerTables (LedgerState (HardForkBlock xs)) where | |||
| upgradeTables | |||
There was a problem hiding this comment.
This is where we define it for the HardForkBlock (so for Cardano)
| @@ -527,3 +528,6 @@ decodeByronResult :: BlockQuery ByronBlock fp result | |||
| -> forall s. Decoder s result | |||
| decodeByronResult query = case query of | |||
| GetUpdateInterfaceState -> fromByronCBOR | |||
|
|
|||
| instance V2.CanUpgradeLedgerTables (LedgerState ByronBlock) where | |||
There was a problem hiding this comment.
Byron instance is trivial
| @@ -754,3 +755,6 @@ decodeShelleyLedgerState = decodeVersion [ | |||
| , shelleyLedgerTransition | |||
| , shelleyLedgerTables = emptyLedgerTables | |||
| } | |||
|
|
|||
| instance V2.CanUpgradeLedgerTables (LedgerState (ShelleyBlock proto era)) where | |||
There was a problem hiding this comment.
Shelley instance is trivial
...oros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Ledger.hs
Outdated
Show resolved
Hide resolved
jasagredo
force-pushed
the
utxo-hd-txout-fwd-3
branch
from
5f97360 to
88b224f
Compare
jasagredo
commented
Jan 17, 2025
| pushDiffs newtbs diffs | ||
| newst = forgetLedgerTables st' | ||
|
|
||
| pushDiffs newtbs st' st' |
There was a problem hiding this comment.
This is wrong. It should be st st'
jorisdral
reviewed
Jan 17, 2025
| LedgerTables | ||
| $ ValuesMK | ||
| $ ( | ||
| if (nsToIndex $ Telescope.tip hs0) /= (nsToIndex $ Telescope.tip hs1) |
There was a problem hiding this comment.
I think we can write something more direct by recursing on both telescopes. Or maybe something like this already exists, like matchTelescope.
It's maybe not a super important optimisation to apply, what do you think? We'll be calling this function every time we push diffs
ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Ledger.hs
Outdated
Show resolved
Hide resolved
ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Node/Run.hs
Outdated
Show resolved
Hide resolved
ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/LedgerDB/V2/InMemory.hs
Outdated
Show resolved
Hide resolved
ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/LedgerDB/V2/InMemory.hs
Outdated
Show resolved
Hide resolved
...boros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/LedgerDB/V2/LedgerSeq.hs
Outdated
Show resolved
Hide resolved
...boros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/LedgerDB/V2/LedgerSeq.hs
Show resolved
Hide resolved
ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Ledger.hs
Outdated
Show resolved
Hide resolved
jasagredo
force-pushed
the
utxo-hd-txout-fwd-3
branch
from
88b224f to
62fa65a
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.
The new function
upgradeTables(local to the V2 implementation) will be used when pushing diffs, giving it the current tip and the new tip with diffs (as returned by the ledger rules). If can then choose to eject all txouts to the new tip index (performing translations) then reinjecting them. This should only be called when we are crossing an era boundary.