Skip to content

Commit 38a204f

Browse files
iohk-bors[bot]Soupstrawdisassembler
authored
Merge #4608
4608: Update ouroboros-network and cardano-ledger dependencies r=angerman a=Soupstraw This PR updates ouroboros-network and cardano-ledger dependencies. This bumps `cardano-ledger` to `0.1.1.1`, which is IntersectMBO/cardano-ledger#3080. This in turn is the `release/1.1.x` branch + heapword split compatibility introduced in `cardano-base`, which is in CHaP. It also bumps ouroboros-network to [a38f898a](https://github.com/input-output-hk/ouroboros-network/commits/a38f898a3740925ccaa0617fa870ca7054a485a6), which is 45 commits ahead of the old [c764553](https://github.com/input-output-hk/ouroboros-network/commits/c764553561bed8978d2c6753d1608dc65449617a) pin. This is one commit ahead of what IntersectMBO/ouroboros-network#3933 (on ouroboros-network/master), that made network compatible with IntersectMBO/cardano-ledger#2901 Co-authored-by: Joosep Jääger <[email protected]> Co-authored-by: Samuel Leathers <[email protected]>
2 parents db396b1 + 73f10c6 commit 38a204f

File tree

52 files changed

+1827
-1252
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1827
-1252
lines changed

‎bench/locli/locli.cabal

+1
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ library
133133
, unordered-containers
134134
, utf8-string
135135
, vector
136+
, cardano-strict-containers == 0.1.0.1
136137

137138
executable locli
138139
import: base

‎bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/NodeToNode.hs

+8-9
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ import Cardano.Prelude (forever, liftIO)
1414
import Prelude
1515

1616
import Codec.Serialise (DeserialiseFailure)
17+
import Control.Concurrent.Class.MonadSTM.Strict (newTVarIO)
1718
import Control.Monad.Class.MonadTimer (MonadTimer, threadDelay)
18-
import Control.Monad.Class.MonadSTM.Strict (newTVarIO)
1919
import Data.ByteString.Lazy (ByteString)
2020
import qualified Data.Map as Map
2121
import Data.Proxy (Proxy (..))
2222
import Network.Socket (AddrInfo (..))
2323
import System.Random (newStdGen)
2424

2525
import "contra-tracer" Control.Tracer (Tracer, nullTracer)
26-
import Ouroboros.Consensus.Byron.Ledger.Mempool (GenTx)
2726
import Ouroboros.Consensus.Block.Abstract
27+
import Ouroboros.Consensus.Byron.Ledger.Mempool (GenTx)
2828
import qualified Ouroboros.Consensus.Cardano as Consensus (CardanoBlock)
2929
import Ouroboros.Consensus.Ledger.SupportsMempool (GenTxId)
3030
import Ouroboros.Consensus.Network.NodeToNode (Codecs (..), defaultCodecs)
@@ -37,19 +37,18 @@ import Ouroboros.Network.DeltaQ (defaultGSV)
3737
import Ouroboros.Network.Driver (runPeerWithLimits)
3838
import Ouroboros.Network.KeepAlive
3939
import Ouroboros.Network.Magic
40-
import Ouroboros.Network.Mux (MuxPeer (..), OuroborosApplication (..),
41-
OuroborosBundle, RunMiniProtocol (..),
42-
continueForever)
43-
import Ouroboros.Network.NodeToClient (chainSyncPeerNull, IOManager)
40+
import Ouroboros.Network.Mux (MuxPeer (..), OuroborosApplication (..), OuroborosBundle,
41+
RunMiniProtocol (..), continueForever)
42+
import Ouroboros.Network.NodeToClient (IOManager, chainSyncPeerNull)
4443
import Ouroboros.Network.NodeToNode (NetworkConnectTracers (..))
4544
import qualified Ouroboros.Network.NodeToNode as NtN
4645
import Ouroboros.Network.Protocol.BlockFetch.Client (BlockFetchClient (..),
47-
blockFetchClientPeer)
46+
blockFetchClientPeer)
4847
import Ouroboros.Network.Protocol.Handshake.Version (simpleSingletonVersions)
49-
import Ouroboros.Network.Protocol.KeepAlive.Codec
5048
import Ouroboros.Network.Protocol.KeepAlive.Client
49+
import Ouroboros.Network.Protocol.KeepAlive.Codec
5150
import Ouroboros.Network.Protocol.TxSubmission2.Client (TxSubmissionClient,
52-
txSubmissionClientPeer)
51+
txSubmissionClientPeer)
5352

5453
import Ouroboros.Network.Snocket (socketSnocket)
5554

‎bench/tx-generator/tx-generator.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ library
103103
, formatting
104104
, generic-monoid
105105
, ghc-prim
106-
, io-classes
106+
, io-classes ^>= 0.3
107107
, network
108108
, network-mux
109109
, optparse-applicative-fork

‎cabal.project

+33-80
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ repository cardano-haskell-packages
1010
c00aae8461a256275598500ea0e187588c35a5d5d7454fb57eac18d9edb86a56
1111
d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee
1212

13-
-- See CONTRIBUTING for information about these, including some Nix commands
13+
-- See CONTRIBUTING for information about these, including some Nix commands
1414
-- you need to run if you change them
15-
index-state: 2022-07-01T00:00:00Z
16-
index-state: cardano-haskell-packages 2022-10-20T00:00:00Z
15+
index-state: 2022-11-11T00:00:00Z
16+
index-state: cardano-haskell-packages 2022-11-12T20:00:00Z
1717

1818
packages:
1919
cardano-api
@@ -81,30 +81,17 @@ constraints:
8181
-- that dependency
8282
, network >= 3.1.1.0
8383
, HSOpenSSL >= 0.11.7.2
84-
85-
-- CONSTRAINTS FOR UPSTREAM CARDANO PACKAGES
86-
-- These should all be constraints in upstream packages, but are currently missing.
87-
-- We should a) fix these upstream and b) revise the constraints on the released
88-
-- version in CHaP. Unfortunately revisions in CHaP don't work yet, revisit this
89-
-- when we fix it.
90-
91-
-- cardano-prelude: newer protolude changes some signatures in a breaking way, fixed
92-
-- in newer cardano-prelude which we can't use yet
93-
, protolude < 0.3.1
94-
-- cardano-crypto-wrapper: broken by cardano-prelude-0.1.0.1 which moves HeapWords out
95-
, cardano-prelude < 0.1.0.1
96-
-- cardano-ledger-byron: broken by cardano-binary-1.5.0.1 which includes some functions
97-
-- that used to be in cardano-prelude
98-
, cardano-binary < 1.5.0.1
99-
-- ledger: cardano-crypto-class-2.0.0.1 is missing some instances needed by the ledger
100-
, cardano-crypto-class < 2.0.0.1
101-
-- cardano-crypto-tests: we required cardano-crypto-class-2.0.0.0 above, which is broken with
102-
-- newer cardano-crypto-tests
103-
, cardano-crypto-tests < 2.0.0.1
104-
-- plutus-core 1.0.0.1 has the fixed SECP primitives which relies on the newer cardano-crypto-class
105-
, plutus-core < 1.0.0.1
106-
-- plutus-core: needs a constraint here, fixed on plutus master but not in the released version
10784
, algebraic-graphs < 0.7
85+
, protolude >= 0.3.2
86+
87+
-- TODO: these should be set in cabal files, but avoiding setting them in lower dependencies for initial CHaP release
88+
89+
-- Needed until ouroboros-network gets proper bounds
90+
, cardano-binary == 1.5.0
91+
92+
-- We'll need this once ouroboros has been pushed into CHaP
93+
-- extra-packages:
94+
-- ouroboros-consensus-cardano-tools == 0.1.0.0
10895

10996
package snap-server
11097
flags: +openssl
@@ -113,7 +100,9 @@ package comonad
113100
flags: -test-doctests
114101

115102
allow-newer:
116-
*:aeson,
103+
ekg:aeson,
104+
ekg-json:aeson,
105+
threepenny-gui:aeson,
117106
monoidal-containers:aeson,
118107
size-based:template-haskell,
119108
snap-server:attoparsec,
@@ -128,58 +117,22 @@ source-repository-package
128117
tag: 4ec92ded05ccf59ba4a874be4b404ac1b6d666b6
129118
--sha256: 00fvvaf4ir4hskq4a6gggbh2wmdvy8j8kn6s4m1p1vlh8m8mq514
130119

120+
-- And has the adjustments for the ledger refactor
131121
source-repository-package
132-
type: git
133-
location: https://github.com/input-output-hk/ouroboros-network
134-
tag: c764553561bed8978d2c6753d1608dc65449617a
135-
--sha256: 0hdh7xdrvxw943r6qr0xr4kwszindh5mnsn1lww6qdnxnmn7wcsc
136-
subdir:
137-
monoidal-synchronisation
138-
network-mux
139-
ouroboros-consensus
140-
ouroboros-consensus-byron
141-
ouroboros-consensus-cardano
142-
ouroboros-consensus-protocol
143-
ouroboros-consensus-shelley
144-
ouroboros-network
145-
ouroboros-network-framework
146-
ouroboros-network-testing
147-
148-
source-repository-package
149-
type: git
150-
location: https://github.com/input-output-hk/cardano-ledger
151-
tag: f49879a79098d9372d63baa13b94a941a56eda34
152-
--sha256: 0i9x66yqkrvx2w79dy6lzlya82yxc8567rgjj828vc2d46d6nvx6
153-
subdir:
154-
eras/alonzo/impl
155-
eras/alonzo/test-suite
156-
eras/babbage/impl
157-
eras/babbage/test-suite
158-
eras/byron/chain/executable-spec
159-
eras/byron/crypto
160-
eras/byron/crypto/test
161-
eras/byron/ledger/executable-spec
162-
eras/byron/ledger/impl
163-
eras/byron/ledger/impl/test
164-
eras/shelley/impl
165-
eras/shelley/test-suite
166-
eras/shelley-ma/impl
167-
eras/shelley-ma/test-suite
168-
libs/cardano-ledger-core
169-
libs/cardano-ledger-pretty
170-
libs/cardano-protocol-tpraos
171-
libs/cardano-data
172-
libs/vector-map
173-
libs/set-algebra
174-
libs/small-steps
175-
libs/small-steps-test
176-
libs/non-integral
122+
type: git
123+
location: https://github.com/input-output-hk/ouroboros-network
124+
tag: 72863b0fc78abdc2b8e29f0dda96c06da3dd11d0
125+
--sha256: 0qwvx04l9q3h7acb0a3b8iarqcn5bkqhwaplbga5pvryqp3lhn00
126+
subdir:
127+
monoidal-synchronisation
128+
network-mux
129+
ouroboros-consensus
130+
ouroboros-consensus-byron
131+
ouroboros-consensus-cardano
132+
ouroboros-consensus-protocol
133+
ouroboros-consensus-shelley
134+
ouroboros-network
135+
ouroboros-network-framework
136+
ouroboros-network-testing
137+
ouroboros-consensus-cardano-tools
177138

178-
source-repository-package
179-
type: git
180-
location: https://github.com/input-output-hk/cardano-prelude
181-
tag: 6ea36cf2247ac0bc33e08c327abec34dfd05bd99
182-
--sha256: 0z2y3wzppc12bpn9bl48776ms3nszw8j58xfsdxf97nzjgrmd62g
183-
subdir:
184-
cardano-prelude
185-
cardano-prelude-test

‎cardano-api/cardano-api.cabal

+34-33
Original file line numberDiff line numberDiff line change
@@ -112,17 +112,17 @@ library
112112
, bytestring
113113
, cardano-binary
114114
, cardano-crypto
115-
, cardano-crypto-class
116-
, cardano-crypto-wrapper
117-
, cardano-data
118-
, cardano-ledger-alonzo
119-
, cardano-ledger-babbage
120-
, cardano-ledger-byron
121-
, cardano-ledger-core
122-
, cardano-ledger-shelley-ma
115+
, cardano-crypto-class ^>= 2.0
116+
, cardano-crypto-wrapper ^>= 1.4
117+
, cardano-data ^>= 0.1
118+
, cardano-ledger-alonzo ^>= 0.1
119+
, cardano-ledger-babbage ^>= 0.1
120+
, cardano-ledger-byron ^>= 0.1
121+
, cardano-ledger-core ^>= 0.1
122+
, cardano-ledger-shelley-ma ^>= 0.1
123123
, cardano-prelude
124-
, cardano-protocol-tpraos
125-
, cardano-slotting
124+
, cardano-protocol-tpraos >= 0.1
125+
, cardano-slotting >= 0.1
126126
, cborg
127127
, contra-tracer
128128
, containers
@@ -133,6 +133,7 @@ library
133133
, formatting
134134
, iproute
135135
, memory
136+
, microlens
136137
, network
137138
, nothunks
138139
, optparse-applicative-fork
@@ -144,25 +145,25 @@ library
144145
, ouroboros-network
145146
, ouroboros-network-framework
146147
, parsec
147-
, plutus-ledger-api
148+
, plutus-ledger-api ^>= 1.0
148149
, prettyprinter
149-
, prettyprinter-configurable
150+
, prettyprinter-configurable ^>= 0.1
150151
, random
151152
, scientific
152153
, serialise
153-
, small-steps
154-
, cardano-ledger-shelley
155-
, small-steps
154+
, small-steps ^>= 0.1
155+
, cardano-ledger-shelley ^>= 0.1
156+
, small-steps ^>= 0.1
156157
, stm
157-
, strict-containers
158+
, cardano-strict-containers ^>= 0.1
158159
, text
159160
, time
160161
, transformers
161162
, transformers-except
162-
, typed-protocols
163+
, typed-protocols ^>= 0.1
163164
, unordered-containers >= 0.2.11
164165
, vector
165-
, vector-map
166+
, vector-map ^>= 0.1
166167
, yaml
167168

168169
library gen
@@ -184,16 +185,16 @@ library gen
184185
, bytestring
185186
, cardano-api
186187
, cardano-binary
187-
, cardano-crypto-class
188-
, cardano-crypto-test
189-
, cardano-ledger-alonzo
190-
, cardano-ledger-byron-test
191-
, cardano-ledger-core
188+
, cardano-crypto-class ^>= 2.0
189+
, cardano-crypto-test ^>= 1.4
190+
, cardano-ledger-alonzo ^>= 0.1
191+
, cardano-ledger-byron-test ^>= 1.4
192+
, cardano-ledger-core ^>= 0.1
192193
, cardano-prelude
193194
, containers
194195
, hedgehog
195-
, plutus-core
196-
, cardano-ledger-shelley
196+
, plutus-core ^>= 1.0
197+
, cardano-ledger-shelley ^>= 0.1
197198
, text
198199

199200
test-suite cardano-api-test
@@ -205,22 +206,22 @@ test-suite cardano-api-test
205206
build-depends: aeson >= 1.5.6.0
206207
, cardano-api
207208
, cardano-api:gen
208-
, cardano-data
209+
, cardano-data ^>= 0.1
209210
, cardano-crypto
210-
, cardano-crypto-class
211-
, cardano-crypto-test
212-
, cardano-crypto-tests
213-
, cardano-ledger-core
211+
, cardano-crypto-class ^>= 2.0
212+
, cardano-crypto-test ^>= 1.4
213+
, cardano-crypto-tests ^>= 2.0
214+
, cardano-ledger-core ^>= 0.1
214215
, cardano-prelude
215-
, cardano-slotting
216+
, cardano-slotting ^>= 0.1
216217
, containers
217218
, hedgehog
218219
, hedgehog-extras
219220
, ouroboros-consensus
220221
, ouroboros-consensus-shelley
221222
, QuickCheck
222-
, cardano-ledger-shelley
223-
, cardano-ledger-shelley-test
223+
, cardano-ledger-shelley ^>= 0.1
224+
, cardano-ledger-shelley-test ^>= 0.1
224225
, tasty
225226
, tasty-hedgehog
226227
, tasty-quickcheck

0 commit comments

Comments
 (0)