diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs index a84a573e6..7b6c91d94 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs @@ -1516,7 +1516,7 @@ pPlutusStakeReferenceScriptWitnessFilesVotingProposing prefix autoBalanceExecUni AutoBalance -> pure (ExecutionUnits 0 0) ManualBalance -> pExecutionUnits $ prefix ++ "reference-tx-in" ) - <*> pure Nothing + <*> pure NoPolicyIdSource pPlutusStakeReferenceScriptWitnessFiles :: String @@ -1533,7 +1533,7 @@ pPlutusStakeReferenceScriptWitnessFiles prefix autoBalanceExecUnits = AutoBalance -> pure (ExecutionUnits 0 0) ManualBalance -> pExecutionUnits $ prefix ++ "reference-tx-in" ) - <*> pure Nothing + <*> pure NoPolicyIdSource pPlutusScriptLanguage :: String -> Parser AnyScriptLanguage pPlutusScriptLanguage prefix = plutusP prefix PlutusScriptV2 "v2" <|> plutusP prefix PlutusScriptV3 "v3" @@ -1922,7 +1922,7 @@ pTxIn sbe balance = -> ScriptWitnessFiles WitCtxTxIn createSimpleReferenceScriptWitnessFiles refTxIn = let simpleLang = AnyScriptLanguage SimpleScriptLanguage - in SimpleReferenceScriptWitnessFiles refTxIn simpleLang Nothing + in SimpleReferenceScriptWitnessFiles refTxIn simpleLang NoPolicyIdSource pPlutusReferenceScriptWitness :: ShelleyBasedEra era -> BalanceTxExecUnits -> Parser (ScriptWitnessFiles WitCtxTxIn) @@ -1960,7 +1960,7 @@ pTxIn sbe balance = -> ExecutionUnits -> ScriptWitnessFiles WitCtxTxIn createPlutusReferenceScriptWitnessFiles refIn sLang sDatum sRedeemer execUnits = - PlutusReferenceScriptWitnessFiles refIn sLang sDatum sRedeemer execUnits Nothing + PlutusReferenceScriptWitnessFiles refIn sLang sDatum sRedeemer execUnits NoPolicyIdSource pEmbeddedPlutusScriptWitness :: Parser (ScriptWitnessFiles WitCtxTxIn) pEmbeddedPlutusScriptWitness = @@ -2170,7 +2170,7 @@ pMintMultiAsset sbe balanceExecUnits = -> ScriptWitnessFiles WitCtxMint createSimpleMintingReferenceScriptWitnessFiles refTxIn pid = let simpleLang = AnyScriptLanguage SimpleScriptLanguage - in SimpleReferenceScriptWitnessFiles refTxIn simpleLang (Just pid) + in SimpleReferenceScriptWitnessFiles refTxIn simpleLang (ConcretePolicyId pid) pPlutusMintReferenceScriptWitnessFiles :: BalanceTxExecUnits -> Parser (ScriptWitnessFiles WitCtxMint) @@ -2184,7 +2184,7 @@ pMintMultiAsset sbe balanceExecUnits = AutoBalance -> pure (ExecutionUnits 0 0) ManualBalance -> pExecutionUnits "mint-reference-tx-in" ) - <*> (Just <$> pPolicyId) + <*> (ConcretePolicyId <$> pPolicyId) helpText = mconcat diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs index c59ace374..ff315322d 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs @@ -3,6 +3,7 @@ {-# LANGUAGE EmptyCase #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE GADTs #-} +{-# LANGUAGE KindSignatures #-} {-# LANGUAGE LambdaCase #-} {-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE RankNTypes #-} @@ -56,6 +57,7 @@ import Cardano.CLI.Types.TxFeature import qualified Ouroboros.Network.Protocol.LocalStateQuery.Type as Consensus import qualified Ouroboros.Network.Protocol.LocalTxSubmission.Client as Net.Tx +import Control.Applicative import Control.Monad (forM) import Data.Aeson ((.=)) import qualified Data.Aeson as Aeson @@ -71,7 +73,8 @@ import Data.Function ((&)) import qualified Data.List as List import Data.Map.Strict (Map) import qualified Data.Map.Strict as Map -import Data.Maybe (catMaybes, fromMaybe, mapMaybe) +import Data.Maybe (catMaybes, fromMaybe, mapMaybe, maybeToList) +import Data.Proxy import Data.Set (Set) import qualified Data.Set as Set import qualified Data.Text as Text @@ -168,7 +171,7 @@ runTransactionBuildCmd txMetadata <- firstExceptT TxCmdMetadataError . newExceptT $ readTxMetadata eon metadataSchema metadataFiles - valuesWithScriptWits <- readValueScriptWitnesses eon $ fromMaybe mempty mValue + valuesWithScriptWits <- readMintScriptWitnesses eon $ fromMaybe mempty mValue scripts <- firstExceptT TxCmdScriptFileError $ mapM (readFileScriptInAnyLang . unFile) scriptFiles @@ -359,7 +362,7 @@ runTransactionBuildEstimateCmd -- TODO change type firstExceptT TxCmdMetadataError . newExceptT $ readTxMetadata sbe metadataSchema metadataFiles - valuesWithScriptWits <- readValueScriptWitnesses sbe $ fromMaybe mempty mValue + valuesWithScriptWits <- readMintScriptWitnesses sbe $ fromMaybe mempty mValue scripts <- firstExceptT TxCmdScriptFileError $ mapM (readFileScriptInAnyLang . unFile) scriptFiles @@ -593,7 +596,7 @@ runTransactionBuildRawCmd firstExceptT TxCmdMetadataError . newExceptT $ readTxMetadata eon metadataSchema metadataFiles - valuesWithScriptWits <- readValueScriptWitnesses eon $ fromMaybe mempty mValue + valuesWithScriptWits <- readMintScriptWitnesses eon $ fromMaybe mempty mValue scripts <- firstExceptT TxCmdScriptFileError $ mapM (readFileScriptInAnyLang . unFile) scriptFiles @@ -697,7 +700,7 @@ runTxBuildRaw -- ^ Tx upper bound -> Lovelace -- ^ Tx fee - -> (Value, [ScriptWitness WitCtxMint era]) + -> (Value, [UpdatedReferenceScriptWitness era]) -- ^ Multi-Asset value(s) -> [(Certificate era, Maybe (ScriptWitness WitCtxStake era))] -- ^ Certificate with potential script witness @@ -783,7 +786,7 @@ constructTxBodyContent -- ^ Tx lower bound -> TxValidityUpperBound era -- ^ Tx upper bound - -> (Value, [ScriptWitness WitCtxMint era]) + -> (Value, [UpdatedReferenceScriptWitness era]) -- ^ Multi-Asset value(s) -> [(Certificate era, Maybe (ScriptWitness WitCtxStake era))] -- ^ Certificate with potential script witness @@ -923,7 +926,7 @@ runTxBuild -- ^ Normal outputs -> TxOutChangeAddress -- ^ A change output - -> (Value, [ScriptWitness WitCtxMint era]) + -> (Value, [UpdatedReferenceScriptWitness era]) -- ^ Multi-Asset value(s) -> Maybe SlotNo -- ^ Tx lower bound @@ -1144,7 +1147,7 @@ validateTxInsReference sbe allRefIns = do getAllReferenceInputs :: [(TxIn, Maybe (ScriptWitness WitCtxTxIn era))] - -> [ScriptWitness WitCtxMint era] + -> [UpdatedReferenceScriptWitness era] -> [(Certificate era, Maybe (ScriptWitness WitCtxStake era))] -> [(StakeAddress, Lovelace, Maybe (ScriptWitness WitCtxStake era))] -> [(VotingProcedures era, Maybe (ScriptWitness WitCtxStake era))] @@ -1161,7 +1164,7 @@ getAllReferenceInputs propProceduresAnMaybeScriptWits readOnlyRefIns = do let txinsWitByRefInputs = [getReferenceInput sWit | (_, Just sWit) <- txins] - mintingRefInputs = map getReferenceInput mintWitnesses + mintingRefInputs = [getReferenceInput sWit | UpdatedReferenceScriptWitness _ sWit <- mintWitnesses] certsWitByRefInputs = [getReferenceInput sWit | (_, Just sWit) <- certFiles] withdrawalsWitByRefInputs = [getReferenceInput sWit | (_, _, Just sWit) <- withdrawals] votesWitByRefInputs = [getReferenceInput sWit | (_, Just sWit) <- votingProceduresAndMaybeScriptWits] @@ -1182,9 +1185,9 @@ getAllReferenceInputs :: ScriptWitness witctx era -> Maybe TxIn getReferenceInput sWit = case sWit of - PlutusScriptWitness _ _ (PReferenceScript refIn _) _ _ _ -> Just refIn + PlutusScriptWitness _ _ (PReferenceScript refIn) _ _ _ -> Just refIn PlutusScriptWitness _ _ PScript{} _ _ _ -> Nothing - SimpleScriptWitness _ (SReferenceScript refIn _) -> Just refIn + SimpleScriptWitness _ (SReferenceScript refIn) -> Just refIn SimpleScriptWitness _ SScript{} -> Nothing toAddressInAnyEra @@ -1328,7 +1331,7 @@ toTxAlonzoDatum supp cliDatum = createTxMintValue :: forall era . ShelleyBasedEra era - -> (Value, [ScriptWitness WitCtxMint era]) + -> (Value, [UpdatedReferenceScriptWitness era]) -> Either TxCmdError (TxMintValue BuildTx era) createTxMintValue era (val, scriptWitnesses) = if List.null (toList val) && List.null scriptWitnesses @@ -1337,28 +1340,41 @@ createTxMintValue era (val, scriptWitnesses) = caseShelleyToAllegraOrMaryEraOnwards (const (txFeatureMismatchPure (toCardanoEra era) TxFeatureMintValue)) ( \w -> do - -- The set of policy ids for which we need witnesses: - let witnessesNeededSet :: Set PolicyId - witnessesNeededSet = - fromList [pid | (AssetId pid _, _) <- toList val] + let policiesWithAssets :: [(PolicyId, AssetName, Quantity)] + policiesWithAssets = [(pid, assetName, quantity) | (AssetId pid assetName, quantity) <- toList val] - let witnessesProvidedMap :: Map PolicyId (ScriptWitness WitCtxMint era) + -- The set of policy ids for which we need witnesses: + witnessesNeededSet :: Set PolicyId + witnessesNeededSet = fromList [pid | (pid, _, _) <- policiesWithAssets] + + witnessesProvidedMap :: Map PolicyId (ScriptWitness WitCtxMint era) witnessesProvidedMap = fromList $ gatherMintingWitnesses scriptWitnesses witnessesProvidedSet = Map.keysSet witnessesProvidedMap - -- Check not too many, nor too few: + policiesWithWitnesses = + Map.fromListWith + (<>) + [ (pid, [(assetName, quantity, BuildTxWith witness)]) + | (pid, assetName, quantity) <- policiesWithAssets + , witness <- maybeToList $ Map.lookup pid witnessesProvidedMap + ] + validateAllWitnessesProvided witnessesNeededSet witnessesProvidedSet validateNoUnnecessaryWitnesses witnessesNeededSet witnessesProvidedSet - return (TxMintValue w val (BuildTxWith witnessesProvidedMap)) + pure $ TxMintValue w policiesWithWitnesses ) era where gatherMintingWitnesses - :: [ScriptWitness WitCtxMint era] + :: [UpdatedReferenceScriptWitness era] -> [(PolicyId, ScriptWitness WitCtxMint era)] gatherMintingWitnesses [] = [] - gatherMintingWitnesses (sWit : rest) = - case scriptWitnessPolicyId sWit of + gatherMintingWitnesses (UpdatedReferenceScriptWitness mPidSource sWit : rest) = do + let mPid = + mPidSource >>= \case + ConcretePolicyId pid -> Just pid + QueryUtxoPolicyId _ -> Nothing -- TODO + case scriptWitnessPolicyId sWit <|> mPid of Nothing -> gatherMintingWitnesses rest Just pid -> (pid, sWit) : gatherMintingWitnesses rest @@ -1374,23 +1390,45 @@ createTxMintValue era (val, scriptWitnesses) = where witnessesExtra = Set.elems (witnessesProvided Set.\\ witnessesNeeded) -scriptWitnessPolicyId :: ScriptWitness witctx era -> Maybe PolicyId -scriptWitnessPolicyId (SimpleScriptWitness _ (SScript script)) = - Just . scriptPolicyId $ SimpleScript script -scriptWitnessPolicyId (SimpleScriptWitness _ (SReferenceScript _ mPid)) = - PolicyId <$> mPid -scriptWitnessPolicyId (PlutusScriptWitness _ version (PScript script) _ _ _) = - Just . scriptPolicyId $ PlutusScript version script -scriptWitnessPolicyId (PlutusScriptWitness _ _ (PReferenceScript _ mPid) _ _ _) = - PolicyId <$> mPid - -readValueScriptWitnesses +-- TOOD remove +scriptWitnessPolicyId :: ScriptWitness WitCtxMint era -> Maybe PolicyId +scriptWitnessPolicyId = \case + SimpleScriptWitness _ (SScript script) -> Just . scriptPolicyId $ SimpleScript script + SimpleScriptWitness _ (SReferenceScript _) -> Nothing + PlutusScriptWitness _ version (PScript script) _ _ _ -> Just . scriptPolicyId $ PlutusScript version script + PlutusScriptWitness _ _ (PReferenceScript _) _ _ _ -> Nothing + +readMintScriptWitnesses :: ShelleyBasedEra era - -> (Value, [ScriptWitnessFiles WitCtxMint]) - -> ExceptT TxCmdError IO (Value, [ScriptWitness WitCtxMint era]) -readValueScriptWitnesses era (v, sWitFiles) = do - sWits <- mapM (firstExceptT TxCmdScriptWitnessError . readScriptWitness era) sWitFiles - return (v, sWits) + -> (a, [ScriptWitnessFiles WitCtxMint]) + -> (TxIn -> ExceptT QueryConvenienceError IO (UTxO era)) + -> ExceptT + TxCmdError + IO + (a, [UpdatedReferenceScriptWitness era]) +readMintScriptWitnesses era getUtxo (v, sWitFiles) = + fmap (v,) . forM sWitFiles $ \witFile -> do + wit <- firstExceptT TxCmdScriptWitnessError $ readScriptWitness era witFile + mPid <- case witFile of + SimpleScriptWitnessFile{} -> Nothing + PlutusScriptWitnessFiles{} -> Nothing + PlutusReferenceScriptWitnessFiles _ _ _ _ _ (ConcretePolicyId pid) -> Just pid + PlutusReferenceScriptWitnessFiles txIn _ _ _ _ QueryUtxoPolicyId -> do + utxo <- getUtxo txIn + undefined + SimpleReferenceScriptWitnessFiles _ _ (ConcretePolicyId pid) -> Just pid + SimpleReferenceScriptWitnessFiles txIn _ QueryUtxoPolicyId -> do + utxo <- getUtxo txIn + undefined + let mFilePid = scriptWitnessPolicyId wit + -- todo read pid from a file here + pure $ UpdatedReferenceScriptWitness (mPid <|> mFilePid) wit + +getpid = undefined :: ScriptWitness WitCtxMint era -> PolicyId + +setpid = undefined :: PolicyId -> ScriptWitness WitCtxMint era -> ScriptWitness WitCtxMint era + +foo = Proxy @SimpleScriptWitness -- ---------------------------------------------------------------------------- -- Transaction signing diff --git a/cardano-cli/src/Cardano/CLI/Json/Friendly.hs b/cardano-cli/src/Cardano/CLI/Json/Friendly.hs index 8549ae2a2..45b9c156b 100644 --- a/cardano-cli/src/Cardano/CLI/Json/Friendly.hs +++ b/cardano-cli/src/Cardano/CLI/Json/Friendly.hs @@ -804,7 +804,8 @@ friendlyLovelace value = String $ docToText (pretty value) friendlyMintValue :: TxMintValue ViewTx era -> Aeson.Value friendlyMintValue = \case TxMintNone -> Null - TxMintValue sbe v _ -> friendlyValue (maryEraOnwardsToShelleyBasedEra sbe) v + txMintValue@(TxMintValue w _) -> + friendlyValue (maryEraOnwardsToShelleyBasedEra w) (txMintValueToValue txMintValue) friendlyTxOutValue :: TxOutValue era -> Aeson.Value friendlyTxOutValue = \case diff --git a/cardano-cli/src/Cardano/CLI/Read.hs b/cardano-cli/src/Cardano/CLI/Read.hs index 204e9672b..b9911aca4 100644 --- a/cardano-cli/src/Cardano/CLI/Read.hs +++ b/cardano-cli/src/Cardano/CLI/Read.hs @@ -290,7 +290,10 @@ readScriptWitnessFilesTuple era = mapM readSwitFile readScriptWitness :: ShelleyBasedEra era -> ScriptWitnessFiles witctx - -> ExceptT ScriptWitnessError IO (ScriptWitness witctx era) + -> ExceptT + ScriptWitnessError + IO + (ScriptWitness witctx era) readScriptWitness era (SimpleScriptWitnessFile (File scriptFile)) = do script@(ScriptInAnyLang lang _) <- firstExceptT ScriptWitnessErrorFile $ @@ -327,7 +330,7 @@ readScriptWitness redeemer <- firstExceptT ScriptWitnessErrorScriptData $ readScriptRedeemerOrFile redeemerOrFile - return $ + pure $ PlutusScriptWitness langInEra version @@ -352,7 +355,7 @@ readScriptWitness datumOrFile redeemerOrFile execUnits - mPid + _ ) = do caseShelleyToAlonzoOrBabbageEraOnwards ( const $ @@ -379,7 +382,7 @@ readScriptWitness PlutusScriptWitness sLangInEra version - (PReferenceScript refTxIn (unPolicyId <$> mPid)) + (PReferenceScript refTxIn) datum redeemer execUnits @@ -393,7 +396,7 @@ readScriptWitness ( SimpleReferenceScriptWitnessFiles refTxIn anyScrLang@(AnyScriptLanguage anyScriptLanguage) - mPid + _pid ) = do caseShelleyToAlonzoOrBabbageEraOnwards ( const $ @@ -407,7 +410,7 @@ readScriptWitness case languageOfScriptLanguageInEra sLangInEra of SimpleScriptLanguage -> return . SimpleScriptWitness sLangInEra $ - SReferenceScript refTxIn (unPolicyId <$> mPid) + SReferenceScript refTxIn PlutusScriptLanguage{} -> error "readScriptWitness: Should not be possible to specify a plutus script" Nothing -> diff --git a/cardano-cli/src/Cardano/CLI/Types/Common.hs b/cardano-cli/src/Cardano/CLI/Types/Common.hs index c765ac64a..2450b1943 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Common.hs +++ b/cardano-cli/src/Cardano/CLI/Types/Common.hs @@ -2,8 +2,10 @@ {-# LANGUAGE DerivingStrategies #-} {-# LANGUAGE GADTs #-} {-# LANGUAGE GeneralisedNewtypeDeriving #-} +{-# LANGUAGE KindSignatures #-} {-# LANGUAGE RankNTypes #-} {-# LANGUAGE StandaloneDeriving #-} +{-# LANGUAGE TypeOperators #-} module Cardano.CLI.Types.Common ( AllOrOnly (..) @@ -58,6 +60,8 @@ module Cardano.CLI.Types.Common , ScriptFile , ScriptRedeemerOrFile , ScriptWitnessFiles (..) + , MintingPolicyIdSource (..) + , UpdatedReferenceScriptWitness (..) , SigningKeyFile , SlotsTillKesKeyExpiry (..) , SomeKeyFile (..) @@ -101,8 +105,11 @@ import qualified Data.Aeson as Aeson import Data.String (IsString) import Data.Text (Text) import qualified Data.Text as Text +import Data.Type.Equality (type (==)) import Data.Word (Word64) +data IsOnlineCommand = OnlineCommand | OfflineCommand + -- | Determines the direction in which the MIR certificate will transfer ADA. data TransferDirection = TransferToReserves @@ -417,18 +424,31 @@ data ScriptWitnessFiles witctx where -> ScriptDatumOrFile witctx -> ScriptRedeemerOrFile -> ExecutionUnits - -> Maybe PolicyId - -- ^ For minting reference scripts + -> MintingPolicyIdSource witctx -> ScriptWitnessFiles witctx SimpleReferenceScriptWitnessFiles :: TxIn -> AnyScriptLanguage - -> Maybe PolicyId - -- ^ For minting reference scripts + -> MintingPolicyIdSource witctx -> ScriptWitnessFiles witctx deriving instance Show (ScriptWitnessFiles witctx) +data MintingPolicyIdSource witctx where + -- | A concrete policy Id + ConcretePolicyId :: PolicyId -> MintingPolicyIdSource WitCtxMint + -- | Query policy Id from the UTxO set, only for an online command + QueryUtxoPolicyId :: MintingPolicyIdSource WitCtxMint + -- | No policy Id is provided for nonminting contexts + NoPolicyIdSource :: (witctx == WitCtxMint) ~ False => MintingPolicyIdSource witctx + +deriving instance Show (MintingPolicyIdSource witctx) + +data UpdatedReferenceScriptWitness era + = UpdatedReferenceScriptWitness + (Maybe PolicyId) -- todo refine type, remove Maybe + (ScriptWitness WitCtxMint era) + data ScriptDatumOrFile witctx where ScriptDatumOrFileForTxIn :: Maybe ScriptDataOrFile -- CIP-0069 - Spending datums optional in Conway era onwards diff --git a/cardano-cli/src/Cardano/CLI/Types/Output.hs b/cardano-cli/src/Cardano/CLI/Types/Output.hs index 1e9c5d124..4f47c4ad9 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Output.hs +++ b/cardano-cli/src/Cardano/CLI/Types/Output.hs @@ -383,7 +383,7 @@ renderScriptCosts (UTxO utxo) eUnitPrices scriptMapping executionCostMapping = Left err -> Left (PlutusScriptCostErrExecError sWitInd (Just scriptHash) err) : accum -- TODO: Create a new sum type to encapsulate the fact that we can also -- have a txin and render the txin in the case of reference scripts. - Just (AnyScriptWitness (PlutusScriptWitness _ _ (PReferenceScript refTxIn _) _ _ _)) -> + Just (AnyScriptWitness (PlutusScriptWitness _ _ (PReferenceScript refTxIn) _ _ _)) -> case Map.lookup refTxIn utxo of Nothing -> Left (PlutusScriptCostErrRefInputNotInUTxO refTxIn) : accum Just (TxOut _ _ _ refScript) ->