-
Notifications
You must be signed in to change notification settings - Fork 24
Fix supplemental datum propagation in transaction build #1341
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
Open
Jimbo4350
wants to merge
1
commit into
master
Choose a base branch
from
jordan/supplemental-datum-fix
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+50
−16
Open
Changes from all commits
Commits
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 hidden or 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 hidden or 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 | ||||
|---|---|---|---|---|---|---|
|
|
@@ -43,6 +43,7 @@ import Cardano.Api.Experimental.AnyScript qualified as Exp | |||||
| import Cardano.Api.Experimental.AnyScriptWitness qualified as Exp | ||||||
| import Cardano.Api.Experimental.Tx qualified as Exp | ||||||
| import Cardano.Api.Ledger qualified as L | ||||||
| import Cardano.Ledger.Hashes (DataHash) | ||||||
| import Cardano.Api.Network qualified as Consensus | ||||||
| import Cardano.Api.Network qualified as Net.Tx | ||||||
|
|
||||||
|
|
@@ -203,13 +204,14 @@ runTransactionBuildCmd | |||||
|
|
||||||
| requiredSigners <- | ||||||
| mapM (fromEitherIOCli . readRequiredSigner) reqSigners | ||||||
| mReturnCollateral :: Maybe (Exp.TxOut (Exp.LedgerEra era)) <- | ||||||
| mReturnCollateralAndDatums <- | ||||||
| forM mReturnColl toTxOutInShelleyBasedEra | ||||||
| let mReturnCollateral = fst <$> mReturnCollateralAndDatums | ||||||
| returnCollDatums = maybe mempty snd mReturnCollateralAndDatums | ||||||
|
|
||||||
| txOuts <- | ||||||
| mapM | ||||||
| toTxOutInEra | ||||||
| txouts | ||||||
| txOutsAndDatums <- mapM toTxOutInEra txouts | ||||||
| let txOuts = map fst txOutsAndDatums | ||||||
| supplementalDatums = mconcat (map snd txOutsAndDatums) <> returnCollDatums | ||||||
|
|
||||||
| -- Conway related | ||||||
| votingProceduresAndMaybeScriptWits :: [(VotingProcedures era, Exp.AnyWitness (Exp.LedgerEra era))] <- | ||||||
|
|
@@ -321,6 +323,7 @@ runTransactionBuildCmd | |||||
| votingProceduresAndMaybeScriptWits | ||||||
| proposals | ||||||
| currentTreasuryValueAndDonation | ||||||
| supplementalDatums | ||||||
|
|
||||||
| -- TODO: Calculating the script cost should live as a different command. | ||||||
| -- Why? Because then we can simply read a txbody and figure out | ||||||
|
|
@@ -374,7 +377,7 @@ runTransactionBuildCmd | |||||
| toTxOutInEra | ||||||
| :: Exp.IsEra era | ||||||
| => TxOutAnyEra | ||||||
| -> CIO e (Exp.TxOut (Exp.LedgerEra era)) | ||||||
| -> CIO e (Exp.TxOut (Exp.LedgerEra era), Map.Map DataHash (L.Data (Exp.LedgerEra era))) | ||||||
| toTxOutInEra (TxOutAnyEra addr' val' mDatumHash refScriptFp) = do | ||||||
| let addr = anyAddressInShelleyBasedEra (convert Exp.useEra) addr' | ||||||
| o <- mkTxOut (convert Exp.useEra) addr val' mDatumHash refScriptFp | ||||||
|
|
@@ -445,9 +448,13 @@ runTransactionBuildEstimateCmd -- TODO change type | |||||
| requiredSigners <- | ||||||
| mapM (fromEitherIOCli . readRequiredSigner) reqSigners | ||||||
|
|
||||||
| mReturnCollateral <- mapM toTxOutInShelleyBasedEra mReturnColl | ||||||
| mReturnCollateralAndDatums <- mapM toTxOutInShelleyBasedEra mReturnColl | ||||||
| let mReturnCollateral = fst <$> mReturnCollateralAndDatums | ||||||
| returnCollDatums = maybe mempty snd mReturnCollateralAndDatums | ||||||
|
|
||||||
| txOuts <- mapM toTxOutInEra txouts | ||||||
| txOutsAndDatums <- mapM toTxOutInEra txouts | ||||||
| let txOuts = map fst txOutsAndDatums | ||||||
| supplementalDatums = mconcat (map snd txOutsAndDatums) <> returnCollDatums | ||||||
|
|
||||||
| -- the same collateral input can be used for several plutus scripts | ||||||
| let filteredTxinsc = nubOrd txInsCollateral | ||||||
|
|
@@ -498,6 +505,7 @@ runTransactionBuildEstimateCmd -- TODO change type | |||||
| votingProceduresAndMaybeScriptWits | ||||||
| proposals | ||||||
| currentTreasuryValueAndDonation | ||||||
| supplementalDatums | ||||||
|
|
||||||
| let stakeCredentialsToDeregisterMap = fromList $ catMaybes [getStakeDeregistrationInfo cert | (cert, _) <- certsAndMaybeScriptWits] | ||||||
| drepsToDeregisterMap = | ||||||
|
|
@@ -653,9 +661,13 @@ runTransactionBuildRawCmd | |||||
| requiredSigners <- | ||||||
| mapM (fromEitherIOCli . readRequiredSigner) reqSigners | ||||||
|
|
||||||
| mReturnCollateral <- mapM toTxOutInShelleyBasedEra mReturnColl | ||||||
| mReturnCollateralAndDatums <- mapM toTxOutInShelleyBasedEra mReturnColl | ||||||
| let mReturnCollateral = fst <$> mReturnCollateralAndDatums | ||||||
| returnCollDatums = maybe mempty snd mReturnCollateralAndDatums | ||||||
|
|
||||||
| txOuts <- mapM toTxOutInEra txouts | ||||||
| txOutsAndDatums <- mapM toTxOutInEra txouts | ||||||
| let txOuts = map fst txOutsAndDatums | ||||||
| supplementalDatums = mconcat (map snd txOutsAndDatums) <> returnCollDatums | ||||||
|
|
||||||
| -- the same collateral input can be used for several plutus scripts | ||||||
| let filteredTxinsc = toList @(Set _) $ fromList txInsCollateral | ||||||
|
|
@@ -700,6 +712,7 @@ runTransactionBuildRawCmd | |||||
| votingProceduresAndMaybeScriptWits | ||||||
| proposals | ||||||
| currentTreasuryValueAndDonation | ||||||
| supplementalDatums | ||||||
| let Exp.UnsignedTx lTx = txBody | ||||||
| noWitTx = ShelleyTx (convert eon) lTx | ||||||
| fromEitherIOCli $ | ||||||
|
|
@@ -741,6 +754,8 @@ runTxBuildRaw | |||||
| -> [(VotingProcedures era, Exp.AnyWitness (Exp.LedgerEra era))] | ||||||
| -> [(Proposal era, Exp.AnyWitness (Exp.LedgerEra era))] | ||||||
| -> Maybe (TxCurrentTreasuryValue, TxTreasuryDonation) | ||||||
| -> Map.Map DataHash (L.Data (Exp.LedgerEra era)) | ||||||
| -- ^ Supplemental datums | ||||||
| -> Either TxCmdError (Exp.UnsignedTx (Exp.LedgerEra era)) | ||||||
| runTxBuildRaw | ||||||
| mScriptValidity | ||||||
|
|
@@ -762,7 +777,8 @@ runTxBuildRaw | |||||
| mpparams | ||||||
| votingProcedures | ||||||
| proposals | ||||||
| mCurrentTreasuryValueAndDonation = do | ||||||
| mCurrentTreasuryValueAndDonation | ||||||
| suppDatums = do | ||||||
| txBodyContent <- | ||||||
| constructTxBodyContent | ||||||
| mScriptValidity | ||||||
|
|
@@ -785,6 +801,7 @@ runTxBuildRaw | |||||
| votingProcedures | ||||||
| proposals | ||||||
| mCurrentTreasuryValueAndDonation | ||||||
| suppDatums | ||||||
|
|
||||||
| return $ Exp.makeUnsignedTx Exp.useEra txBodyContent | ||||||
|
|
||||||
|
|
@@ -827,6 +844,8 @@ constructTxBodyContent | |||||
| -- ^ The current treasury value and the donation. This is a stop gap as the | ||||||
| -- semantics of the donation and treasury value depend on the script languages | ||||||
| -- being used. | ||||||
| -> Map.Map DataHash (L.Data (Exp.LedgerEra era)) | ||||||
| -- ^ Supplemental datums | ||||||
| -> Either TxCmdError (Exp.TxBodyContent (Exp.LedgerEra era)) | ||||||
| constructTxBodyContent | ||||||
| mScriptValidity | ||||||
|
|
@@ -848,7 +867,8 @@ constructTxBodyContent | |||||
| txMetadata | ||||||
| votingProcedures | ||||||
| proposals | ||||||
| mCurrentTreasuryValueAndDonation = | ||||||
| mCurrentTreasuryValueAndDonation | ||||||
| suppDatums = | ||||||
| do | ||||||
| let allReferenceInputs = | ||||||
| getAllReferenceInputs | ||||||
|
|
@@ -912,6 +932,7 @@ constructTxBodyContent | |||||
| & Exp.setTxProposalProcedures validatedTxProposals | ||||||
| & maybe id Exp.setTxCurrentTreasuryValue validatedCurrentTreasuryValue | ||||||
| & maybe id Exp.setTxTreasuryDonation validatedTreasuryDonation | ||||||
| & Exp.setTxSupplementalDatums suppDatums | ||||||
| ) | ||||||
|
|
||||||
| convertWithdrawals | ||||||
|
|
@@ -978,6 +999,8 @@ runTxBuild | |||||
| -> [(Proposal era, Exp.AnyWitness (Exp.LedgerEra era))] | ||||||
| -> Maybe (TxCurrentTreasuryValue, TxTreasuryDonation) | ||||||
| -- ^ The current treasury value and the donation. | ||||||
| -> Map.Map DataHash (L.Data (Exp.LedgerEra era)) | ||||||
| -- ^ Supplemental datums | ||||||
| -> ExceptT TxCmdError IO (Exp.UnsignedTx (Exp.LedgerEra era), Exp.TxBodyContent (Exp.LedgerEra era)) | ||||||
| runTxBuild | ||||||
| socketPath | ||||||
|
|
@@ -1002,7 +1025,8 @@ runTxBuild | |||||
| mOverrideWits | ||||||
| votingProcedures | ||||||
| proposals | ||||||
| mCurrentTreasuryValueAndDonation = do | ||||||
| mCurrentTreasuryValueAndDonation | ||||||
| suppDatums = do | ||||||
| let sbe = convert (Exp.useEra @era) | ||||||
| shelleyBasedEraConstraints sbe $ do | ||||||
| -- TODO: All functions should be parameterized by ShelleyBasedEra | ||||||
|
|
@@ -1068,6 +1092,7 @@ runTxBuild | |||||
| votingProcedures | ||||||
| proposals | ||||||
| mCurrentTreasuryValueAndDonation | ||||||
| suppDatums | ||||||
|
|
||||||
| firstExceptT TxCmdTxInsDoNotExist | ||||||
| . hoistEither | ||||||
|
|
@@ -1156,7 +1181,7 @@ getAllReferenceInputs | |||||
| toTxOutInShelleyBasedEra | ||||||
| :: Exp.IsEra era | ||||||
| => TxOutShelleyBasedEra | ||||||
| -> CIO e (Exp.TxOut (Exp.LedgerEra era)) | ||||||
| -> CIO e (Exp.TxOut (Exp.LedgerEra era), Map.Map DataHash (L.Data (Exp.LedgerEra era))) | ||||||
| toTxOutInShelleyBasedEra (TxOutShelleyBasedEra addr' val' mDatumHash refScriptFp) = do | ||||||
| let sbe = convert Exp.useEra | ||||||
| addr = shelleyAddressInEra sbe addr' | ||||||
|
|
@@ -1439,7 +1464,8 @@ runTransactionCalculateMinValueCmd | |||||
| pp :: L.PParams (Exp.LedgerEra era) <- | ||||||
| fromExceptTCli @ProtocolParamsError | ||||||
| (obtainCommonConstraints era $ readProtocolParameters protocolParamsFile) | ||||||
| out <- obtainCommonConstraints era $ toTxOutInShelleyBasedEra txOut | ||||||
| (out, _suppDatums :: Map.Map DataHash (L.Data (Exp.LedgerEra era))) <- | ||||||
|
||||||
| (out, _suppDatums :: Map.Map DataHash (L.Data (Exp.LedgerEra era))) <- | |
| (out, _suppDatums) <- |
2 changes: 1 addition & 1 deletion
2
cardano-cli/test/cardano-cli-golden/files/golden/shelley/build-raw-tx-body-out-6.json
This file contains hidden or 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 |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| { | ||
| "type": "Tx ConwayEra", | ||
| "description": "Ledger Cddl Format", | ||
| "cborHex": "84a300d90102818258202392d2b1200b5139fe555c81261697b29a8ccf561c5c783d46e78a479d977053000181a3005839016b837ca50316ee4e00033482ed128887d72c2bae5b0438d692dc1251b0c8b17595ebdb93c1f974be0a9b1ef26c474649d9c2ae766ed135cf011864028201d81842182a020ca104d9010281182af5f6" | ||
| "cborHex": "84a300d90102818258202392d2b1200b5139fe555c81261697b29a8ccf561c5c783d46e78a479d977053000181a3005839016b837ca50316ee4e00033482ed128887d72c2bae5b0438d692dc1251b0c8b17595ebdb93c1f974be0a9b1ef26c474649d9c2ae766ed135cf011864028201d81842182a020ca0f5f6" | ||
| } |
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.
The new import for
DataHashis inserted between two qualified imports with different prefixes (Cardano.Api.Experimental.TxasExpandCardano.Api.NetworkasConsensus), breaking the grouping pattern. Consider placing this import with otherCardano.Ledgerimports or in a separate unqualified import group to maintain consistency with the existing import organization.