diff --git a/cabal.project b/cabal.project index d92d23f6c9..7de1c13f0f 100644 --- a/cabal.project +++ b/cabal.project @@ -14,7 +14,7 @@ repository cardano-haskell-packages -- you need to run if you change them index-state: , hackage.haskell.org 2024-10-11T15:49:11Z - , cardano-haskell-packages 2024-10-16T12:44:42Z + , cardano-haskell-packages 2024-10-21T14:11:57Z packages: cardano-cli diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal index ee67fbc0e2..6a819b8235 100644 --- a/cardano-cli/cardano-cli.cabal +++ b/cardano-cli/cardano-cli.cabal @@ -196,7 +196,7 @@ library binary, bytestring, canonical-json, - cardano-api ^>=10.0, + cardano-api ^>=10.1, cardano-binary, cardano-crypto, cardano-crypto-class ^>=2.1.2, diff --git a/cardano-cli/src/Cardano/CLI/Byron/Tx.hs b/cardano-cli/src/Cardano/CLI/Byron/Tx.hs index 0fc3099ef4..0060876636 100644 --- a/cardano-cli/src/Cardano/CLI/Byron/Tx.hs +++ b/cardano-cli/src/Cardano/CLI/Byron/Tx.hs @@ -179,7 +179,7 @@ txSpendUTxOByronPBFT nId sk txIns outs = do in makeSignedByronTransaction [bWit] txBody fromByronWitness - :: Byron.SomeByronSigningKey -> NetworkId -> L.Annotated L.Tx ByteString -> KeyWitness ByronEra + :: Byron.SomeByronSigningKey -> NetworkId -> L.Annotated Byron.Tx ByteString -> KeyWitness ByronEra fromByronWitness bw nId txBody = case bw of Byron.AByronSigningKeyLegacy sk -> makeByronKeyWitness nId txBody sk diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/StakePool.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/StakePool.hs index b59ccee70b..406a40ed5a 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/StakePool.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/StakePool.hs @@ -19,7 +19,6 @@ import qualified Cardano.CLI.Commands.Hash as Cmd import Cardano.CLI.Environment (EnvCli (..)) import qualified Cardano.CLI.EraBased.Commands.StakePool as Cmd import Cardano.CLI.EraBased.Options.Common -import qualified Cardano.Ledger.SafeHash as L import qualified Data.Foldable as F import Options.Applicative hiding (help, str) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs index 8339e3e90a..e0527663f1 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs @@ -51,7 +51,6 @@ import Cardano.CLI.Types.Errors.TxCmdError import Cardano.CLI.Types.Errors.TxValidationError import Cardano.CLI.Types.Output (renderScriptCosts) import Cardano.CLI.Types.TxFeature -import qualified Cardano.Ledger.Api.PParams as L import qualified Ouroboros.Network.Protocol.LocalStateQuery.Type as Consensus import qualified Ouroboros.Network.Protocol.LocalTxSubmission.Client as Net.Tx diff --git a/cardano-cli/src/Cardano/CLI/Helpers.hs b/cardano-cli/src/Cardano/CLI/Helpers.hs index 1e0687b8ad..04a5be4852 100644 --- a/cardano-cli/src/Cardano/CLI/Helpers.hs +++ b/cardano-cli/src/Cardano/CLI/Helpers.hs @@ -126,7 +126,7 @@ validateCBOR cborObject bs = void $ decodeCBOR bs (L.fromCBOR :: L.Decoder s Byron.Certificate) Right "Valid Byron delegation certificate." CBORTxByron -> do - void $ decodeCBOR bs (L.fromCBOR :: L.Decoder s L.Tx) + void $ decodeCBOR bs (L.fromCBOR :: L.Decoder s Byron.Tx) Right "Valid Byron Tx." CBORUpdateProposalByron -> do void $ decodeCBOR bs (L.fromCBOR :: L.Decoder s Byron.Proposal) diff --git a/flake.lock b/flake.lock index f4f536210c..8b2a9304ee 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1729088390, - "narHash": "sha256-U3zbe5q7SvMHfUvcYfa/e4KXDHFWv6ru7Drwd1PGOx4=", + "lastModified": 1729520816, + "narHash": "sha256-LrNR6soL4RUXAbTJcDXzYaKDtJ5BwXV07Smz7GSRhGY=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "38257ddc6cc3e30a29c93c97cfbc0e1af2bb2db5", + "rev": "571d7ea3f5aaf7f3d7b50c4d746406ec54a2288f", "type": "github" }, "original": {