Reorganize Cardano.Ledger.Shelley and ShelleyMA era modules
#2021
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
nc6
approved these changes
Nov 26, 2020
There was a problem hiding this comment.
Looks great, thanks Damian!
I'm a little uncertain about pulling e.g. ValidateScript to the top, but this is my own fault for making these things era-based, rather than using the specific Script type. So this is perhaps something to address in the future, but I think that this PR takes the best approach to these things as they are defined now.
mrBliss
approved these changes
Nov 26, 2020
Comment on lines
18
to
20
| import Shelley.Spec.Ledger.MetaData (MetaData (MetaData), MetaDataHash (MetaDataHash), ValidateMetadata (hashMetadata, validateMetadata), validMetaDatum) | ||
| import Shelley.Spec.Ledger.Scripts (MultiSig) | ||
| import Shelley.Spec.Ledger.Tx (TxBody, ValidateScript (hashScript, validateScript), hashMultiSigScript, validateNativeMultiSigScript) |
There was a problem hiding this comment.
There are a few lines that I would wrap.
|
|
||
| instance CryptoClass.Crypto c => ValidateMetadata (ShelleyEra c) where | ||
| hashMetadata = MetaDataHash . hashWithSerialiser toCBOR | ||
| validateMetadata (MetaData m) = all validMetaDatum m |
There was a problem hiding this comment.
Probably unrelated to this PR, but I saw a deepseq here in some other implementation. Is that intentional?
There was a problem hiding this comment.
That was in the Shelley-MA package, related to the new optional scripts. The idea there is that we want to verify that scripts included in the metadata are valid. Scripts are valid by construction, so this check comes down to making sure they're fully deserialised.
| module Cardano.Ledger.Shelley.Constraints where | ||
|
|
||
| import Cardano.Ledger.Compactible (Compactible (..)) | ||
| import Cardano.Ledger.Core (AnnotatedData, ChainData, Metadata, Script, SerialisableData, TxBody, Value) |
…lley`. - Define `Core` instances in the `ShelleMA` era module.
dnadales
force-pushed
the
dnadales/move-shelley-era-to-its-own-module
branch
from
69568ba to
a260d53
Compare
|
bors r+ |
iohk-bors
bot
deleted the
dnadales/move-shelley-era-to-its-own-module
branch
mrBliss
added a commit
to IntersectMBO/cardano-node
that referenced
this pull request
Dec 1, 2020
Visible changes: * IntersectMBO/cardano-ledger#1993 * IntersectMBO/cardano-ledger#2021
dcoutts
pushed a commit
to IntersectMBO/cardano-node
that referenced
this pull request
Dec 1, 2020
Visible changes: * IntersectMBO/cardano-ledger#1993 * IntersectMBO/cardano-ledger#2021 One of the changes in Allegra over Shelley is the notion of transaction auxiliary data. We retrospectively define tx metadata to be part of the auxiliary data where in the Shelley era this consists only of the existing tx metadata. But from the Allegra era the auxiliary data contains both the tx metadata and also auxiliary scripts. So where we previously hashed the tx metadata, we now hash the auxiliary data. Take the opportunity to refactor the tx metadata representation and conversion functions to fit better with the new scheme. Also take the opportunity to tidy up the imports in the Query module since we have some very similarly-named type classes. Co-Authored by: Duncan Coutts <[email protected]>
dcoutts
added a commit
to IntersectMBO/cardano-node
that referenced
this pull request
Dec 1, 2020
Visible changes: * IntersectMBO/cardano-ledger#1993 * IntersectMBO/cardano-ledger#2021 One of the changes in Allegra over Shelley is the notion of transaction auxiliary data. We retrospectively define tx metadata to be part of the auxiliary data where in the Shelley era this consists only of the existing tx metadata. But from the Allegra era the auxiliary data contains both the tx metadata and also auxiliary scripts. So where we previously hashed the tx metadata, we now hash the auxiliary data. Take the opportunity to refactor the tx metadata representation and conversion functions to fit better with the new scheme. Also take the opportunity to tidy up the imports in the Query module since we have some very similarly-named type classes. Co-authored-by: Duncan Coutts <[email protected]>
iohk-bors bot
added a commit
to IntersectMBO/cardano-node
that referenced
this pull request
Dec 1, 2020
2149: Update dependencies r=dcoutts a=mrBliss Visible changes: * IntersectMBO/cardano-ledger#1993 * IntersectMBO/cardano-ledger#2021 Co-authored-by: Thomas Winant <[email protected]>
intricate
pushed a commit
to IntersectMBO/cardano-node
that referenced
this pull request
Dec 1, 2020
Visible changes: * IntersectMBO/cardano-ledger#1993 * IntersectMBO/cardano-ledger#2021 One of the changes in Allegra over Shelley is the notion of transaction auxiliary data. We retrospectively define tx metadata to be part of the auxiliary data where in the Shelley era this consists only of the existing tx metadata. But from the Allegra era the auxiliary data contains both the tx metadata and also auxiliary scripts. So where we previously hashed the tx metadata, we now hash the auxiliary data. Take the opportunity to refactor the tx metadata representation and conversion functions to fit better with the new scheme. Also take the opportunity to tidy up the imports in the Query module since we have some very similarly-named type classes. Co-authored-by: Duncan Coutts <[email protected]>
dcoutts
added a commit
to IntersectMBO/cardano-node
that referenced
this pull request
Dec 1, 2020
Visible changes: * IntersectMBO/cardano-ledger#1993 * IntersectMBO/cardano-ledger#2021 One of the changes in Allegra over Shelley is the notion of transaction auxiliary data. We retrospectively define tx metadata to be part of the auxiliary data where in the Shelley era this consists only of the existing tx metadata. But from the Allegra era the auxiliary data contains both the tx metadata and also auxiliary scripts. So where we previously hashed the tx metadata, we now hash the auxiliary data. Take the opportunity to refactor the tx metadata representation and conversion functions to fit better with the new scheme. Also take the opportunity to tidy up the imports in the Query module since we have some very similarly-named type classes. Co-authored-by: Duncan Coutts <[email protected]>
iohk-bors bot
added a commit
to IntersectMBO/cardano-node
that referenced
this pull request
Dec 1, 2020
2149: Update dependencies r=dcoutts a=mrBliss Visible changes: * IntersectMBO/cardano-ledger#1993 * IntersectMBO/cardano-ledger#2021 Co-authored-by: Thomas Winant <[email protected]> Co-authored-by: Duncan Coutts <[email protected]> Co-authored-by: Luke Nadur <[email protected]>
newhoggy
pushed a commit
to IntersectMBO/cardano-api
that referenced
this pull request
May 23, 2023
Visible changes: * IntersectMBO/cardano-ledger#1993 * IntersectMBO/cardano-ledger#2021 One of the changes in Allegra over Shelley is the notion of transaction auxiliary data. We retrospectively define tx metadata to be part of the auxiliary data where in the Shelley era this consists only of the existing tx metadata. But from the Allegra era the auxiliary data contains both the tx metadata and also auxiliary scripts. So where we previously hashed the tx metadata, we now hash the auxiliary data. Take the opportunity to refactor the tx metadata representation and conversion functions to fit better with the new scheme. Also take the opportunity to tidy up the imports in the Query module since we have some very similarly-named type classes. Co-authored-by: Duncan Coutts <[email protected]>
newhoggy
pushed a commit
to IntersectMBO/cardano-cli
that referenced
this pull request
May 24, 2023
Visible changes: * IntersectMBO/cardano-ledger#1993 * IntersectMBO/cardano-ledger#2021 One of the changes in Allegra over Shelley is the notion of transaction auxiliary data. We retrospectively define tx metadata to be part of the auxiliary data where in the Shelley era this consists only of the existing tx metadata. But from the Allegra era the auxiliary data contains both the tx metadata and also auxiliary scripts. So where we previously hashed the tx metadata, we now hash the auxiliary data. Take the opportunity to refactor the tx metadata representation and conversion functions to fit better with the new scheme. Also take the opportunity to tidy up the imports in the Query module since we have some very similarly-named type classes. Co-authored-by: Duncan Coutts <[email protected]>
newhoggy
pushed a commit
to IntersectMBO/cardano-cli
that referenced
this pull request
May 24, 2023
2149: Update dependencies r=dcoutts a=mrBliss Visible changes: * IntersectMBO/cardano-ledger#1993 * IntersectMBO/cardano-ledger#2021 Co-authored-by: Thomas Winant <[email protected]> Co-authored-by: Duncan Coutts <[email protected]> Co-authored-by: Luke Nadur <[email protected]>
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.
Move
ShelleyEraand associated definitions toCardano.Ledger.Shelley.Define
Coreinstances in theShelleMAera module.