diff --git a/cabal.project b/cabal.project index 85b168e602..47ebdfe3a0 100644 --- a/cabal.project +++ b/cabal.project @@ -13,8 +13,8 @@ repository cardano-haskell-packages -- See CONTRIBUTING for information about these, including some Nix commands -- you need to run if you change them index-state: - , hackage.haskell.org 2024-05-24T12:49:48Z - , cardano-haskell-packages 2024-05-24T09:29:56Z + , hackage.haskell.org 2024-06-12T10:10:17Z + , cardano-haskell-packages 2024-06-12T10:10:17Z packages: cardano-cli diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal index 3964bfbb9d..8d38cbe257 100644 --- a/cardano-cli/cardano-cli.cabal +++ b/cardano-cli/cardano-cli.cabal @@ -205,7 +205,7 @@ library , binary , bytestring , canonical-json - , cardano-api ^>= 8.46.0.0 + , cardano-api ^>= 8.47.0.0 , cardano-binary , cardano-crypto , cardano-crypto-class ^>= 2.1.2 diff --git a/cardano-cli/src/Cardano/CLI/Byron/Run.hs b/cardano-cli/src/Cardano/CLI/Byron/Run.hs index 12b9993e01..d97d98713a 100644 --- a/cardano-cli/src/Cardano/CLI/Byron/Run.hs +++ b/cardano-cli/src/Cardano/CLI/Byron/Run.hs @@ -192,7 +192,7 @@ runSpendGenesisUTxO genesisFile nw bKeyFormat (NewTxFile ctTx) ctKey genRichAddr let tx = txSpendGenesisUTxOByronPBFT genesis nw sk genRichAddr outs firstExceptT ByronCmdHelpersError . ensureNewFileLBS ctTx - $ teCddlRawCBOR $ serializeByronTx tx + $ teRawCBOR $ serializeByronTx tx -- Construct a Byron era tx runSpendUTxO @@ -208,4 +208,4 @@ runSpendUTxO nw bKeyFormat (NewTxFile ctTx) ctKey ins outs = do let gTx = txSpendUTxOByronPBFT nw sk ins outs firstExceptT ByronCmdHelpersError . ensureNewFileLBS ctTx - $ teCddlRawCBOR $ serializeByronTx gTx + $ teRawCBOR $ serializeByronTx gTx diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs index 2d55cd2bd6..713ef3d9bf 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs @@ -1305,8 +1305,6 @@ runTransactionCalculateMinValueCmd pp <- firstExceptT TxCmdProtocolParamsError (readProtocolParameters eon protocolParamsFile) out <- toTxOutInShelleyBasedEra eon txOut - firstExceptT TxCmdPParamsErr . hoistEither - $ checkProtocolParameters eon (fromLedgerPParams eon pp) let minValue = calculateMinimumUTxO eon out pp liftIO . IO.print $ minValue diff --git a/cardano-cli/src/Cardano/CLI/Read.hs b/cardano-cli/src/Cardano/CLI/Read.hs index d9ba0f0c00..f5056e93ea 100644 --- a/cardano-cli/src/Cardano/CLI/Read.hs +++ b/cardano-cli/src/Cardano/CLI/Read.hs @@ -1026,7 +1026,7 @@ readFileOrPipeTextEnvelopeAnyOf types file = do deserialiseFromTextEnvelopeAnyOf types te readFileOrPipeTextEnvelopeCddlAnyOf - :: [FromSomeTypeCDDL TextEnvelopeCddl b] + :: [FromSomeTypeCDDL TextEnvelope b] -> FileOrPipe -> IO (Either (FileError TextEnvelopeCddlError) b) readFileOrPipeTextEnvelopeCddlAnyOf types file = do @@ -1038,7 +1038,7 @@ readFileOrPipeTextEnvelopeCddlAnyOf types file = do readTextEnvelopeCddlFromFileOrPipe :: FileOrPipe - -> IO (Either (FileError TextEnvelopeCddlError) TextEnvelopeCddl) + -> IO (Either (FileError TextEnvelopeCddlError) TextEnvelope) readTextEnvelopeCddlFromFileOrPipe file = do let path = fileOrPipePath file runExceptT $ do diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/shelley/witness-out.json b/cardano-cli/test/cardano-cli-golden/files/golden/shelley/witness-out.json index dc72376a87..b068eaec86 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/shelley/witness-out.json +++ b/cardano-cli/test/cardano-cli-golden/files/golden/shelley/witness-out.json @@ -1,5 +1,5 @@ { "type": "TxWitness ShelleyEra", "description": "Key Witness ShelleyEra", - "cborHex": "8258208dc60533b5dfa60a530955a696323a2ef4f14e8bc95a8f84cf6c441fea4234275840a20a2c8b1ffc2151eee3f659fc4076f9859d7d4d073933275470f270128736d231a2fb5e1bc2a6058ef2e58bc98266d192c55d6435ab591ce72cb165a7ec4e03" + "cborHex": "82008258208dc60533b5dfa60a530955a696323a2ef4f14e8bc95a8f84cf6c441fea4234275840a20a2c8b1ffc2151eee3f659fc4076f9859d7d4d073933275470f270128736d231a2fb5e1bc2a6058ef2e58bc98266d192c55d6435ab591ce72cb165a7ec4e03" } diff --git a/flake.lock b/flake.lock index 06e66cab62..cc38db0d29 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1716544578, - "narHash": "sha256-Z9J23IQjRu4gKOI+jj6Rm8Bnza3CYHXLRLhNNg7QVkU=", + "lastModified": 1718200515, + "narHash": "sha256-LhZDhH/Ii4X7r+bo7LGC+Q//OiUJ8uRwCJ5ULNpbj00=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "19b29505e8d0a5bdd264db8911f88fcaa8a93090", + "rev": "b731179078dc9960d68c3d0297d1c26f69e33614", "type": "github" }, "original": {