fix alonzo block serialization #2274
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
Additionally, clean up the arbitrary Block instance to work in Alonzo.
JaredCorduan
force-pushed
the
jc/fix-alonzo-block-cbor
branch
from
60f0cbd
to
3dba118
Compare
nc6
approved these changes
May 7, 2021
| @@ -214,6 +214,7 @@ instance CC.Crypto c => EraModule.SupportsSegWit (AlonzoEra c) where | |||
| fromTxSeq = Alonzo.txSeqTxns | |||
| toTxSeq = Alonzo.TxSeq | |||
| hashTxSeq = Alonzo.hashTxSeq | |||
| numSegComponents = 3 | |||
There was a problem hiding this comment.
Would it not be easier to have this return the total number of segregated components, rather than just the "non-body" ones?
There was a problem hiding this comment.
I think it would. I wasn't sure if that was breaking the abstraction, though (ie why should SupportsSegWit know about block size). but maybe that's silly.
There was a problem hiding this comment.
oh wait, you mean to not include the block header. yea, that's better!
| alignedValidFlags' prev n (x : xs) = | ||
| Seq.replicate (x - prev - 1) (IsValidating True) | ||
| Seq.>< IsValidating False | ||
| Seq.<| alignedValidFlags' x (n - (x - prev)) xs |
added 2 commits
May 7, 2021 08:00
I added a method to the SupportsSegWit class to return the number of non-body segments. This is used in the Block serialization to enforce the number of items in a Block.
JaredCorduan
force-pushed
the
jc/fix-alonzo-block-cbor
branch
from
3dba118
to
8409011
Compare
nfrisby
added a commit
to IntersectMBO/ouroboros-network
that referenced
this pull request
May 13, 2021
This commit hash matches and the sources.json content matches-or-exceeds that of the first cardano-ledger-specs commit that provides everything we require for our initial Alonzo integration (ie no serialization tests, but a Mary-to-Alonzo HF ThreadNet test). We needed to introduce the `Coherent` QuickCheck modifier because PR IntersectMBO/cardano-ledger#2274 loosened the `Arbitrary` instance for Shelley blocks. We have a few tests that assumed the arbitrary blocks would pass "integrity" checks and that the header's claim for the block body's size was mostly correct. The follow-up IntersectMBO/cardano-ledger#2280 re-introduced the generator for coherent header-body pairs, and the new `Coherent` modifier lets us select that for the requisite properties.
nfrisby
added a commit
to IntersectMBO/ouroboros-network
that referenced
this pull request
May 13, 2021
This commit hash matches and the sources.json content matches-or-exceeds that of the first cardano-ledger-specs commit that provides everything we require for our initial Alonzo integration (ie no serialization tests, but a Mary-to-Alonzo HF ThreadNet test). We needed to introduce the `Coherent` QuickCheck modifier because PR IntersectMBO/cardano-ledger#2274 loosened the `Arbitrary` instance for Shelley blocks. We have a few tests that assumed the arbitrary blocks would pass "integrity" checks and that the header's claim for the block body's size was mostly correct. The follow-up IntersectMBO/cardano-ledger#2280 re-introduced the generator for coherent header-body pairs, and the new `Coherent` modifier lets us select that for the requisite properties.
nfrisby
added a commit
to IntersectMBO/ouroboros-network
that referenced
this pull request
May 13, 2021
This commit hash matches and the sources.json content matches-or-exceeds that of the first cardano-ledger-specs commit that provides everything we require for our initial Alonzo integration (ie no serialization tests, but a Mary-to-Alonzo HF ThreadNet test). We needed to introduce the `Coherent` QuickCheck modifier because PR IntersectMBO/cardano-ledger#2274 loosened the `Arbitrary` instance for Shelley blocks. We have a few tests that assumed the arbitrary blocks would pass "integrity" checks and that the header's claim for the block body's size was mostly correct. The follow-up IntersectMBO/cardano-ledger#2280 re-introduced the generator for coherent header-body pairs, and the new `Coherent` modifier lets us select that for the requisite properties.
nfrisby
added a commit
to IntersectMBO/ouroboros-network
that referenced
this pull request
May 13, 2021
This commit hash matches and the sources.json content matches-or-exceeds that of the first cardano-ledger-specs commit that provides everything we require for our initial Alonzo integration (ie no serialization tests, but a Mary-to-Alonzo HF ThreadNet test). We needed to introduce the `Coherent` QuickCheck modifier because PR IntersectMBO/cardano-ledger#2274 loosened the `Arbitrary` instance for Shelley blocks. We have a few tests that assumed the arbitrary blocks would pass "integrity" checks and that the header's claim for the block body's size was mostly correct. The follow-up IntersectMBO/cardano-ledger#2280 re-introduced the generator for coherent header-body pairs, and the new `Coherent` modifier lets us select that for the requisite properties.
nfrisby
added a commit
to IntersectMBO/ouroboros-network
that referenced
this pull request
May 13, 2021
This commit hash matches and the sources.json content matches-or-exceeds that of the first cardano-ledger-specs commit that provides everything we require for our initial Alonzo integration (ie no serialization tests, but a Mary-to-Alonzo HF ThreadNet test). We needed to introduce the `Coherent` QuickCheck modifier because PR IntersectMBO/cardano-ledger#2274 loosened the `Arbitrary` instance for Shelley blocks. We have a few tests that assumed the arbitrary blocks would pass "integrity" checks and that the header's claim for the block body's size was mostly correct. The follow-up IntersectMBO/cardano-ledger#2280 re-introduced the generator for coherent header-body pairs, and the new `Coherent` modifier lets us select that for the requisite properties.
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 Alonzo blocks now pass the roundtrip serialization tests. I had to:
PreAlonzoconstraint from the block generator. (Now that I have looked at that generator in detail, I see more cleanup that I want to do, but I will do that in a follow up PR. generators for serialization should be much more "white noise" than what we have).SupportsSegWitclass to return the number of non-body segments. This is used in the Block serialization to enforce the number of items in a Block.alignedValidFlagsfunction that is used in AlonzoTxSeqdecoding. It is supposed to be the moral dual ofnonValidatingIndices, but the recursive step was not taking into account the index of the lastFalsethat it had seen.