diff --git a/cardano-api/internal/Cardano/Api/Experimental/Tx.hs b/cardano-api/internal/Cardano/Api/Experimental/Tx.hs index 3aaf71e9b..aff02992e 100644 --- a/cardano-api/internal/Cardano/Api/Experimental/Tx.hs +++ b/cardano-api/internal/Cardano/Api/Experimental/Tx.hs @@ -76,7 +76,6 @@ makeUnsignedTx era bc = obtainCommonConstraints era $ do apiExtraKeyWitnesses = txExtraKeyWits bc apiReturnCollateral = txReturnCollateral bc apiTotalCollateral = txTotalCollateral bc - apiSupplementaryData = txSupplementalData bc -- Ledger types txins = convTxIns $ txIns bc @@ -91,7 +90,7 @@ makeUnsignedTx era bc = obtainCommonConstraints era $ do txAuxData = toAuxiliaryData sbe (txMetadata bc) (txAuxScripts bc) scripts = convScripts apiScriptWitnesses languages = convLanguages apiScriptWitnesses - sData = convScriptData sbe apiTxOuts apiScriptWitnesses apiSupplementaryData + sData = convScriptData sbe apiTxOuts apiScriptWitnesses (datums, redeemers) = case sData of TxBodyScriptData _ ds rs -> (ds, rs) TxBodyNoScriptData -> (mempty, L.Redeemers mempty) diff --git a/cardano-api/internal/Cardano/Api/Fees.hs b/cardano-api/internal/Cardano/Api/Fees.hs index ca4a94c5b..eb0b91771 100644 --- a/cardano-api/internal/Cardano/Api/Fees.hs +++ b/cardano-api/internal/Cardano/Api/Fees.hs @@ -1438,7 +1438,6 @@ substituteExecutionUnits _ _ _ - _ txWithdrawals txCertificates _ diff --git a/cardano-api/internal/Cardano/Api/Tx/Body.hs b/cardano-api/internal/Cardano/Api/Tx/Body.hs index c0889a431..36671f265 100644 --- a/cardano-api/internal/Cardano/Api/Tx/Body.hs +++ b/cardano-api/internal/Cardano/Api/Tx/Body.hs @@ -57,7 +57,6 @@ module Cardano.Api.Tx.Body , setTxVotingProcedures , setTxMintValue , setTxScriptValidity - , setTxSupplementalDatums , setTxCurrentTreasuryValue , setTxTreasuryDonation , TxBodyError (..) @@ -106,7 +105,6 @@ module Cardano.Api.Tx.Body , TxValidityLowerBound (..) , TxValidityUpperBound (..) , TxMetadataInEra (..) - , TxSupplementalDatums (..) , TxAuxScripts (..) , TxExtraKeyWitnesses (..) , TxWithdrawals (..) @@ -145,7 +143,6 @@ module Cardano.Api.Tx.Body , convReturnCollateral , convScripts , convScriptData - , convSupplementalDatums , convTotalCollateral , convTransactionFee , convTxIns @@ -1166,21 +1163,6 @@ deriving instance Eq (TxMetadataInEra era) deriving instance Show (TxMetadataInEra era) --- ---------------------------------------------------------------------------- --- Transaction supplemental data (era-dependent) --- --- Supplemental datums can be added to the transaction if the corresponding --- datum hash exists at a input in that transaction. -data TxSupplementalDatums era where - TxSupplementalDataNone :: TxSupplementalDatums era - TxSupplementalDatums - :: [HashableScriptData] - -> TxSupplementalDatums era - -deriving instance Eq (TxSupplementalDatums era) - -deriving instance Show (TxSupplementalDatums era) - -- ---------------------------------------------------------------------------- -- Auxiliary scripts (era-dependent) -- @@ -1389,7 +1371,6 @@ data TxBodyContent build era , txValidityUpperBound :: TxValidityUpperBound era , txMetadata :: TxMetadataInEra era , txAuxScripts :: TxAuxScripts era - , txSupplementalData :: BuildTxWith build (TxSupplementalDatums era) , txExtraKeyWits :: TxExtraKeyWitnesses era , txProtocolParams :: BuildTxWith build (Maybe (LedgerProtocolParameters era)) , txWithdrawals :: TxWithdrawals build era @@ -1421,7 +1402,6 @@ defaultTxBodyContent era = , txFee = defaultTxFee era , txValidityLowerBound = TxValidityNoLowerBound , txValidityUpperBound = defaultTxValidityUpperBound era - , txSupplementalData = BuildTxWith TxSupplementalDataNone , txMetadata = TxMetadataNone , txAuxScripts = TxAuxScriptsNone , txExtraKeyWits = TxExtraKeyWitnessesNone @@ -1514,10 +1494,6 @@ setTxMintValue v txBodyContent = txBodyContent{txMintValue = v} setTxScriptValidity :: TxScriptValidity era -> TxBodyContent build era -> TxBodyContent build era setTxScriptValidity v txBodyContent = txBodyContent{txScriptValidity = v} -setTxSupplementalDatums - :: TxSupplementalDatums era -> TxBodyContent BuildTx era -> TxBodyContent BuildTx era -setTxSupplementalDatums v txBodyContent = txBodyContent{txSupplementalData = BuildTxWith v} - setTxProposalProcedures :: Maybe (Featured ConwayEraOnwards era (TxProposalProcedures build era)) -> TxBodyContent build era @@ -1647,7 +1623,6 @@ createTransactionBody sbe bc = apiExtraKeyWitnesses = txExtraKeyWits bc apiReturnCollateral = txReturnCollateral bc apiTotalCollateral = txTotalCollateral bc - apiSupplementalData = txSupplementalData bc -- Ledger types collTxIns = convCollateralTxIns apiCollateralTxIns @@ -1658,7 +1633,7 @@ createTransactionBody sbe bc = txAuxData = toAuxiliaryData sbe (txMetadata bc) (txAuxScripts bc) scripts = convScripts apiScriptWitnesses languages = convLanguages apiScriptWitnesses - sData = convScriptData sbe apiTxOuts apiScriptWitnesses apiSupplementalData + sData = convScriptData sbe apiTxOuts apiScriptWitnesses proposalProcedures = convProposalProcedures $ maybe TxProposalProceduresNone unFeatured (txProposalProcedures bc) votingProcedures = convVotingProcedures $ maybe TxVotingProceduresNone unFeatured (txVotingProcedures bc) currentTreasuryValue = Ledger.maybeToStrictMaybe $ unFeatured =<< txCurrentTreasuryValue bc @@ -1934,7 +1909,6 @@ fromLedgerTxBody sbe scriptValidity body scriptdata mAux = , txMintValue = fromLedgerTxMintValue sbe body , txExtraKeyWits = fromLedgerTxExtraKeyWitnesses sbe body , txProtocolParams = ViewTx - , txSupplementalData = ViewTx , txMetadata , txAuxScripts , txScriptValidity = scriptValidity @@ -2474,9 +2448,8 @@ convScriptData => ShelleyBasedEra era -> [TxOut CtxTx era] -> [(ScriptWitnessIndex, AnyScriptWitness era)] - -> BuildTxWith BuildTx (TxSupplementalDatums era) -> TxBodyScriptData era -convScriptData sbe txOuts scriptWitnesses (BuildTxWith txSuppDatums) = +convScriptData sbe txOuts scriptWitnesses = caseShelleyToMaryOrAlonzoEraOnwards (const TxBodyNoScriptData) ( \w -> @@ -2500,8 +2473,6 @@ convScriptData sbe txOuts scriptWitnesses (BuildTxWith txSuppDatums) = , let d' = toAlonzoData d ] - supplementalDatums = convSupplementalDatums sbe txSuppDatums - scriptdata :: [HashableScriptData] scriptdata = [d | TxOut _ _ (TxOutSupplementalDatum _ d) _ <- txOuts] @@ -2519,7 +2490,7 @@ convScriptData sbe txOuts scriptWitnesses (BuildTxWith txSuppDatums) = ) <- scriptWitnesses ] - in TxBodyScriptData w (datums <> supplementalDatums) redeemers + in TxBodyScriptData w datums redeemers ) sbe @@ -3420,20 +3391,6 @@ fromShelleyWithdrawal (L.Withdrawals withdrawals) = | (stakeAddr, value) <- Map.assocs withdrawals ] -convSupplementalDatums - :: ShelleyBasedEra era - -> TxSupplementalDatums era - -> L.TxDats (ShelleyLedgerEra era) -convSupplementalDatums sbe TxSupplementalDataNone = - shelleyBasedEraConstraints sbe mempty -convSupplementalDatums sbe (TxSupplementalDatums datums) = - shelleyBasedEraConstraints sbe $ - L.TxDats $ - fromList - [ (L.hashData d, d) - | d <- map toAlonzoData datums - ] - -- | In the Allegra and Mary eras the auxiliary data consists of the tx metadata -- and the axiliary scripts. In the Alonzo and later eras the auxiliary data consists of the tx metadata -- and the axiliary scripts, and the axiliary script data. diff --git a/cardano-api/internal/Cardano/Api/Tx/Compatible.hs b/cardano-api/internal/Cardano/Api/Tx/Compatible.hs index e77d8e558..b1f43db8f 100644 --- a/cardano-api/internal/Cardano/Api/Tx/Compatible.hs +++ b/cardano-api/internal/Cardano/Api/Tx/Compatible.hs @@ -92,7 +92,7 @@ createCompatibleSignedTx sbeF ins outs witnesses txFee' anyProtocolUpdate anyVot referenceInputs = map toShelleyTxIn $ catMaybes [getScriptWitnessReferenceInput sWit | (_, AnyScriptWitness sWit) <- apiScriptWitnesses] - sData = convScriptData sbe outs apiScriptWitnesses (BuildTxWith TxSupplementalDataNone) + sData = convScriptData sbe outs apiScriptWitnesses txbody = conwayEraOnwardsConstraints conwayOnwards $ createCommonTxBody sbe ins outs txFee' diff --git a/cardano-api/src/Cardano/Api.hs b/cardano-api/src/Cardano/Api.hs index 08f681038..6674354c2 100644 --- a/cardano-api/src/Cardano/Api.hs +++ b/cardano-api/src/Cardano/Api.hs @@ -313,7 +313,6 @@ module Cardano.Api , setTxUpdateProposal , setTxMintValue , setTxScriptValidity - , setTxSupplementalDatums , setTxProposalProcedures , setTxVotingProcedures , setTxCurrentTreasuryValue @@ -358,7 +357,6 @@ module Cardano.Api , EpochSlots (..) , TxMetadataInEra (..) , TxAuxScripts (..) - , TxSupplementalDatums (..) , TxExtraKeyWitnesses (..) , TxWithdrawals (..) , TxCertificates (..)