Skip to content

Commit

Permalink
Merge pull request #946 from IntersectMBO/mgalazyn/chore/upgrade-card…
Browse files Browse the repository at this point in the history
…ano-api-10.1.0.0

Upgrade cardano-api-10.1.0.0
  • Loading branch information
carbolymer authored Oct 21, 2024
2 parents 235cb3e + c87aa73 commit 96187e7
Show file tree
Hide file tree
Showing 8 changed files with 7 additions and 10 deletions.
2 changes: 1 addition & 1 deletion cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cardano-cli/cardano-cli.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion cardano-cli/src/Cardano/CLI/Byron/Tx.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion cardano-cli/src/Cardano/CLI/EraBased/Options/StakePool.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ import Cardano.CLI.Types.Output (QueryDRepStateOutput (..))
import qualified Cardano.CLI.Types.Output as O
import Cardano.Crypto.Hash (hashToBytesAsHex)
import qualified Cardano.Crypto.Hash.Blake2b as Blake2b
import qualified Cardano.Ledger.Shelley.LedgerState as L
import Cardano.Slotting.EpochInfo (EpochInfo (..), epochInfoSlotToUTCTime, hoistEpochInfo)
import Ouroboros.Consensus.BlockchainTime.WallClock.Types (RelativeTime (..),
toRelativeTime)
Expand Down
1 change: 0 additions & 1 deletion cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion cardano-cli/src/Cardano/CLI/Helpers.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 96187e7

Please sign in to comment.