Skip to content
Draft
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
56 changes: 56 additions & 0 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,52 @@ constraints:
package acts
flags: -finitary

-- BEGIN SRP STANZAS MANAGED BY STANZAMAN --

source-repository-package
type: git
location: https://github.com/IntersectMBO/cardano-api.git
tag: 13b452f32cf053a803988f455551a697726c65cc
subdir: cardano-api
--sha256: 1fq901pjq1k3hiqygnmifw6w9pydqb4xr4i987n69r2jp1k3025m

source-repository-package
type: git
location: https://github.com/IntersectMBO/ouroboros-network.git
tag: 65da1ad619473f9467d3336a6d6e9a2a8714913d
subdir: network-mux
--sha256: 1r5y5px0kj4nhb65s9i7pr0sikxghfqwfkzmsgiql2maic4nglwi

source-repository-package
type: git
location: https://github.com/IntersectMBO/ouroboros-network.git
tag: 65da1ad619473f9467d3336a6d6e9a2a8714913d
subdir: cardano-diffusion
--sha256: 1r5y5px0kj4nhb65s9i7pr0sikxghfqwfkzmsgiql2maic4nglwi

source-repository-package
type: git
location: https://github.com/IntersectMBO/ouroboros-network.git
tag: 65da1ad619473f9467d3336a6d6e9a2a8714913d
subdir: ouroboros-network
--sha256: 1r5y5px0kj4nhb65s9i7pr0sikxghfqwfkzmsgiql2maic4nglwi

source-repository-package
type: git
location: https://github.com/IntersectMBO/cardano-cli.git
tag: c632e6e114b1f2d7715afd34ec44750a0595efc1
subdir: cardano-cli
--sha256: 0d4vs59z3wlhnl2ns8g8lqrc7xgm2nfid5cfyq0kms2jgmi89wiz

source-repository-package
type: git
location: https://github.com/IntersectMBO/ouroboros-consensus.git
tag: bca18fd361d8342bdbfb8a08366e86479677ce30
subdir: .
--sha256: 11znnl9zk59bxr6dn76zrni6i0q32bqnlxqf4wprvxikg4r666pa

-- END SRP STANZAS MANAGED BY STANZAMAN --

packages:
cardano-node
cardano-node-capi
Expand Down Expand Up @@ -81,12 +127,22 @@ package plutus-scripts-bench
allow-newer:
, katip:Win32

-- The SRP stanza for cardano-api pins it to a version with plutus-{core,ledger-api} ^>=1.61,
-- while plutus-scripts-bench requires ^>=1.63. Allow the relaxation.
allow-newer:
, cardano-api:plutus-core
, cardano-api:plutus-ledger-api

-- There is a suspected bug in `cabal` (https://github.com/haskell/cabal/issues/11663)
-- that can be worked around with the following allow-newer stanzas
allow-newer:
, io-sim:time
, io-classes:time

allow-newer:
, cardano-diffusion:trace-dispatcher
, ouroboros-network:trace-dispatcher

-- IMPORTANT
-- Do NOT add more source-repository-package stanzas here unless they are strictly
-- temporary! Please read the section in CONTRIBUTING about updating dependencies.
Expand Down
1 change: 1 addition & 0 deletions cardano-node/src/Cardano/Node/Tracing/Tracers/Startup.hs
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,7 @@ nodeToClientVersionToInt = \case
NodeToClientV_21 -> 21
NodeToClientV_22 -> 22
NodeToClientV_23 -> 23
NodeToClientV_24 -> 24

nodeToNodeVersionToInt :: NodeToNodeVersion -> Int
nodeToNodeVersionToInt = \case
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1368,6 +1368,7 @@ instance ToJSON ShelleyNodeToClientVersion where
toJSON ShelleyNodeToClientVersion13 = String "ShelleyNodeToClientVersion13"
toJSON ShelleyNodeToClientVersion14 = String "ShelleyNodeToClientVersion14"
toJSON ShelleyNodeToClientVersion15 = String "ShelleyNodeToClientVersion15"
toJSON ShelleyNodeToClientVersion16 = String "ShelleyNodeToClientVersion16"

--------------------------------------------------------------------------------
-- Conway related
Expand Down
2 changes: 2 additions & 0 deletions cardano-testnet/cardano-testnet.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,8 @@ test-suite cardano-testnet-test
Cardano.Testnet.Test.Cli.Transaction
Cardano.Testnet.Test.Cli.Transaction.BuildEstimate
Cardano.Testnet.Test.Cli.Transaction.RegisterDeregisterStakeAddress
Cardano.Testnet.Test.Cli.Transaction.Validate
Cardano.Testnet.Test.Cli.Transaction.ValidateErrors
Cardano.Testnet.Test.Cli.Transaction.WithdrawalReward
Cardano.Testnet.Test.DumpConfig
Cardano.Testnet.Test.FoldEpochState
Expand Down
Loading
Loading