-
Notifications
You must be signed in to change notification settings - Fork 23
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Extra HashableScriptData
in TxBody
for PK inputs and reference inputs with hashed datums.
#637
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -54,11 +54,13 @@ module Cardano.Api.Script | |
, WitCtxStake | ||
, WitCtx (..) | ||
, ScriptWitness (..) | ||
, PrivateKeyWitness (..) | ||
, Witness (..) | ||
, KeyWitnessInCtx (..) | ||
, ScriptWitnessInCtx (..) | ||
, IsScriptWitnessInCtx (..) | ||
, ScriptDatum (..) | ||
, KeyDatum (..) | ||
, ScriptRedeemer | ||
, scriptWitnessScript | ||
|
||
|
@@ -722,6 +724,15 @@ data ScriptWitness witctx era where | |
|
||
deriving instance Show (ScriptWitness witctx era) | ||
|
||
data PrivateKeyWitness witctx era where | ||
PrivateKeyWitness | ||
:: KeyDatum witctx | ||
-> PrivateKeyWitness witctx era | ||
|
||
deriving instance Show (PrivateKeyWitness witctx era) | ||
|
||
deriving instance Eq (PrivateKeyWitness witctx era) | ||
|
||
-- The GADT in the SimpleScriptWitness constructor requires a custom instance | ||
instance Eq (ScriptWitness witctx era) where | ||
(==) | ||
|
@@ -773,6 +784,14 @@ deriving instance Eq (ScriptDatum witctx) | |
|
||
deriving instance Show (ScriptDatum witctx) | ||
|
||
data KeyDatum witctx where | ||
KeyDatumForTxIn :: Maybe HashableScriptData -> KeyDatum WitCtxTxIn | ||
NoKeyDatumForStake :: KeyDatum WitCtxStake | ||
Comment on lines
+787
to
+789
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can you make this not a GADT? I know there are lots of them floating around but we are actually moving away from using GADTs when not needed. |
||
|
||
deriving instance Eq (KeyDatum witctx) | ||
|
||
deriving instance Show (KeyDatum witctx) | ||
|
||
-- We cannot always extract a script from a script witness due to reference scripts. | ||
-- Reference scripts exist in the UTxO, so without access to the UTxO we cannot | ||
-- retrieve the script. | ||
|
@@ -803,6 +822,7 @@ scriptWitnessScript (PlutusScriptWitness _ _ (PReferenceScript _ _) _ _ _) = | |
data Witness witctx era where | ||
KeyWitness | ||
:: KeyWitnessInCtx witctx | ||
-> PrivateKeyWitness witctx era | ||
-> Witness witctx era | ||
ScriptWitness | ||
:: ScriptWitnessInCtx witctx | ||
|
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you make this not a GADT? I know there are lots of them floating around but we are actually moving away from using GADTs when not needed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes i can. I basically just mimicked how other types around were defined. But indeed GADTs are not necessary there.