Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bench/plutus-scripts-bench/plutus-scripts-bench.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ library
-- IOG dependencies
--------------------------
build-depends:
, cardano-api ^>=11.5
, cardano-api ^>=11.6
, plutus-ledger-api ^>=1.65
, plutus-tx ^>=1.65
, plutus-tx-plugin ^>=1.65
Expand Down
4 changes: 2 additions & 2 deletions bench/tx-generator/tx-generator.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,9 @@ library
, attoparsec-aeson
, base16-bytestring
, bytestring
, cardano-api ^>= 11.5
, cardano-api ^>= 11.6
, cardano-binary
, cardano-cli ^>= 11.2.1
, cardano-cli ^>= 11.2.2
, cardano-crypto-class
, cardano-crypto-wrapper
, cardano-data
Expand Down
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 2026-08-14T13:38:07Z
, cardano-haskell-packages 2026-08-17T11:39:16Z
, cardano-haskell-packages 2026-08-25T16:32:51Z

constraints:
-- haskell.nix patch does not work for 1.6.8
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 6662
kind:
- maintenance
description: |
Bumped the `cardano-cli` dependency to `^>= 11.2.2`.
2 changes: 1 addition & 1 deletion cardano-node-chairman/cardano-node-chairman.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -86,5 +86,5 @@ test-suite chairman-tests
ghc-options: -threaded -rtsopts "-with-rtsopts=-N -T"

build-tool-depends: cardano-node:cardano-node
, cardano-cli:cardano-cli ^>= 11.2.1
, cardano-cli:cardano-cli ^>= 11.2.2
, cardano-node-chairman:cardano-node-chairman
4 changes: 2 additions & 2 deletions cardano-node/cardano-node.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ library
, async
, base16-bytestring
, bytestring
, cardano-api ^>= 11.5
, cardano-api ^>= 11.6
, cardano-data
, cardano-crypto-class ^>=2.5
, cardano-crypto-wrapper
Expand All @@ -152,7 +152,7 @@ library
, cardano-protocol ^>= 0.1
, cardano-protocol-tpraos >= 1.4
, cardano-slotting >= 0.2
, cardano-rpc ^>= 11.1
, cardano-rpc ^>= 11.2
, cborg ^>= 0.2.4
, containers
, contra-tracer >= 0.2.1
Expand Down
13 changes: 9 additions & 4 deletions cardano-node/src/Cardano/Node/Run.hs
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ handleNodeWithTracers cmdPc nc (SomeConsensusProtocol blockType runP) shelleyGen
then DisabledBlockForging
else EnabledBlockForging))

handleSimpleNode blockType shelleyGenesisHash runP pInfo mkBlockForging tracers nc cmdPc networkMagic
handleSimpleNode blockType shelleyGenesisHash pInfo mkBlockForging tracers nc cmdPc networkMagic
(\nk -> do
setNodeKernel nodeKernelData nk
traceWith (nodeStateTracer tracers) NodeKernelOnline)
Expand Down Expand Up @@ -289,7 +289,6 @@ handleSimpleNode
)
=> Api.BlockType blk
-> Api.GenesisHashShelley
-> Api.ProtocolInfoArgs IO blk
-> ProtocolInfo blk
-> (Tracer IO KESAgentClientTrace -> IO [MkBlockForging IO blk])
-> Tracers RemoteAddress LocalAddress blk IO
Expand All @@ -303,7 +302,7 @@ handleSimpleNode
-- layer is initialised. This implies this function must not block,
-- otherwise the node won't actually start.
-> IO ()
handleSimpleNode blockType shelleyGenesisHash runP pInfo mkBlockForging tracers nc cmdPc networkMagic onKernel = do
handleSimpleNode blockType shelleyGenesisHash pInfo mkBlockForging tracers nc cmdPc networkMagic onKernel = do
logStartupWarnings

logDeprecatedLedgerDBOptions
Expand Down Expand Up @@ -483,7 +482,7 @@ handleSimpleNode blockType shelleyGenesisHash runP pInfo mkBlockForging tracers
mkNodeKernelAccess
(rpcTracer tracers)
shelleyGenesisHash
runP
shelleyGenesisFile
blockType
nodeKernel
>>= writeIORef nodeKernelAccessRef
Expand All @@ -505,6 +504,12 @@ handleSimpleNode blockType shelleyGenesisHash runP pInfo mkBlockForging tracers
, srnLedgerDbBackendArgs = selectorToArgs ldbBackend (nonImmutableDbPath dbPath)
}
where
shelleyGenesisFile :: Api.ShelleyGenesisFile In
shelleyGenesisFile =
case ncProtocolConfig nc of
NodeProtocolConfigurationCardano _ shelleyConfig _ _ _ _ _ ->
File . unGenesisFile $ npcShelleyGenesisFile shelleyConfig

customizeChainSyncTimeout :: ChainSyncIdleTimeout
customizeChainSyncTimeout = case ncChainSyncIdleTimeout nc of
NoTimeoutOverride -> Configuration.defaultChainSyncIdleTimeout
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 6662
kind:
- maintenance
description: |
Bumped the `cardano-api` dependency to `^>= 11.6` and the `cardano-cli` dependency to `^>= 11.2.2`.
4 changes: 2 additions & 2 deletions cardano-submit-api/cardano-submit-api.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ library
, aeson
, async
, bytestring
, cardano-api ^>= 11.5
, cardano-api ^>= 11.6
, cardano-binary
, cardano-cli ^>= 11.2.1
, cardano-cli ^>= 11.2.2
, cardano-crypto-class ^>=2.5
, containers
, ekg-core
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 6662
kind:
- maintenance
description: |
Bumped the `cardano-api` dependency to `^>= 11.6` and the `cardano-cli` dependency to `^>= 11.2.2`.
4 changes: 2 additions & 2 deletions cardano-testnet/cardano-testnet.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ library
, annotated-exception
, ansi-terminal
, bytestring
, cardano-api ^>= 11.5
, cardano-cli:{cardano-cli, cardano-cli-test-lib} ^>= 11.2.1
, cardano-api ^>= 11.6
, cardano-cli:{cardano-cli, cardano-cli-test-lib} ^>= 11.2.2
, cardano-crypto-class ^>=2.5
, cardano-crypto-wrapper
, cardano-git-rev ^>= 0.2.2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
built against cardano-api 11.5.0.0
built against cardano-rpc 11.1.0.0
built against cardano-cli 11.2.1.0
built against cardano-api 11.6.0.0
built against cardano-rpc 11.2.0.0
built against cardano-cli 11.2.2.0
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.

Loading