Skip to content

Commit

Permalink
Try #4608:
Browse files Browse the repository at this point in the history
  • Loading branch information
@iohk-bors
iohk-bors[bot] authored Dec 7, 2022
2 parents db396b1 + 73f10c6 commit 6523aea
Show file tree
Hide file tree
Showing 52 changed files with 1,827 additions and 1,252 deletions.
1 change: 1 addition & 0 deletions bench/locli/locli.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ library
, unordered-containers
, utf8-string
, vector
, cardano-strict-containers == 0.1.0.1

executable locli
import: base
Expand Down
17 changes: 8 additions & 9 deletions bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/NodeToNode.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ import Cardano.Prelude (forever, liftIO)
import Prelude

import Codec.Serialise (DeserialiseFailure)
import Control.Concurrent.Class.MonadSTM.Strict (newTVarIO)
import Control.Monad.Class.MonadTimer (MonadTimer, threadDelay)
import Control.Monad.Class.MonadSTM.Strict (newTVarIO)
import Data.ByteString.Lazy (ByteString)
import qualified Data.Map as Map
import Data.Proxy (Proxy (..))
import Network.Socket (AddrInfo (..))
import System.Random (newStdGen)

import "contra-tracer" Control.Tracer (Tracer, nullTracer)
import Ouroboros.Consensus.Byron.Ledger.Mempool (GenTx)
import Ouroboros.Consensus.Block.Abstract
import Ouroboros.Consensus.Byron.Ledger.Mempool (GenTx)
import qualified Ouroboros.Consensus.Cardano as Consensus (CardanoBlock)
import Ouroboros.Consensus.Ledger.SupportsMempool (GenTxId)
import Ouroboros.Consensus.Network.NodeToNode (Codecs (..), defaultCodecs)
Expand All @@ -37,19 +37,18 @@ import Ouroboros.Network.DeltaQ (defaultGSV)
import Ouroboros.Network.Driver (runPeerWithLimits)
import Ouroboros.Network.KeepAlive
import Ouroboros.Network.Magic
import Ouroboros.Network.Mux (MuxPeer (..), OuroborosApplication (..),
OuroborosBundle, RunMiniProtocol (..),
continueForever)
import Ouroboros.Network.NodeToClient (chainSyncPeerNull, IOManager)
import Ouroboros.Network.Mux (MuxPeer (..), OuroborosApplication (..), OuroborosBundle,
RunMiniProtocol (..), continueForever)
import Ouroboros.Network.NodeToClient (IOManager, chainSyncPeerNull)
import Ouroboros.Network.NodeToNode (NetworkConnectTracers (..))
import qualified Ouroboros.Network.NodeToNode as NtN
import Ouroboros.Network.Protocol.BlockFetch.Client (BlockFetchClient (..),
blockFetchClientPeer)
blockFetchClientPeer)
import Ouroboros.Network.Protocol.Handshake.Version (simpleSingletonVersions)
import Ouroboros.Network.Protocol.KeepAlive.Codec
import Ouroboros.Network.Protocol.KeepAlive.Client
import Ouroboros.Network.Protocol.KeepAlive.Codec
import Ouroboros.Network.Protocol.TxSubmission2.Client (TxSubmissionClient,
txSubmissionClientPeer)
txSubmissionClientPeer)

import Ouroboros.Network.Snocket (socketSnocket)

Expand Down
2 changes: 1 addition & 1 deletion bench/tx-generator/tx-generator.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ library
, formatting
, generic-monoid
, ghc-prim
, io-classes
, io-classes ^>= 0.3
, network
, network-mux
, optparse-applicative-fork
Expand Down
113 changes: 33 additions & 80 deletions cabal.project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ repository cardano-haskell-packages
c00aae8461a256275598500ea0e187588c35a5d5d7454fb57eac18d9edb86a56
d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee

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

packages:
cardano-api
Expand Down Expand Up @@ -81,30 +81,17 @@ constraints:
-- that dependency
, network >= 3.1.1.0
, HSOpenSSL >= 0.11.7.2

-- CONSTRAINTS FOR UPSTREAM CARDANO PACKAGES
-- These should all be constraints in upstream packages, but are currently missing.
-- We should a) fix these upstream and b) revise the constraints on the released
-- version in CHaP. Unfortunately revisions in CHaP don't work yet, revisit this
-- when we fix it.

-- cardano-prelude: newer protolude changes some signatures in a breaking way, fixed
-- in newer cardano-prelude which we can't use yet
, protolude < 0.3.1
-- cardano-crypto-wrapper: broken by cardano-prelude-0.1.0.1 which moves HeapWords out
, cardano-prelude < 0.1.0.1
-- cardano-ledger-byron: broken by cardano-binary-1.5.0.1 which includes some functions
-- that used to be in cardano-prelude
, cardano-binary < 1.5.0.1
-- ledger: cardano-crypto-class-2.0.0.1 is missing some instances needed by the ledger
, cardano-crypto-class < 2.0.0.1
-- cardano-crypto-tests: we required cardano-crypto-class-2.0.0.0 above, which is broken with
-- newer cardano-crypto-tests
, cardano-crypto-tests < 2.0.0.1
-- plutus-core 1.0.0.1 has the fixed SECP primitives which relies on the newer cardano-crypto-class
, plutus-core < 1.0.0.1
-- plutus-core: needs a constraint here, fixed on plutus master but not in the released version
, algebraic-graphs < 0.7
, protolude >= 0.3.2

-- TODO: these should be set in cabal files, but avoiding setting them in lower dependencies for initial CHaP release

-- Needed until ouroboros-network gets proper bounds
, cardano-binary == 1.5.0

-- We'll need this once ouroboros has been pushed into CHaP
-- extra-packages:
-- ouroboros-consensus-cardano-tools == 0.1.0.0

package snap-server
flags: +openssl
Expand All @@ -113,7 +100,9 @@ package comonad
flags: -test-doctests

allow-newer:
*:aeson,
ekg:aeson,
ekg-json:aeson,
threepenny-gui:aeson,
monoidal-containers:aeson,
size-based:template-haskell,
snap-server:attoparsec,
Expand All @@ -128,58 +117,22 @@ source-repository-package
tag: 4ec92ded05ccf59ba4a874be4b404ac1b6d666b6
--sha256: 00fvvaf4ir4hskq4a6gggbh2wmdvy8j8kn6s4m1p1vlh8m8mq514

-- And has the adjustments for the ledger refactor
source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: c764553561bed8978d2c6753d1608dc65449617a
--sha256: 0hdh7xdrvxw943r6qr0xr4kwszindh5mnsn1lww6qdnxnmn7wcsc
subdir:
monoidal-synchronisation
network-mux
ouroboros-consensus
ouroboros-consensus-byron
ouroboros-consensus-cardano
ouroboros-consensus-protocol
ouroboros-consensus-shelley
ouroboros-network
ouroboros-network-framework
ouroboros-network-testing

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-ledger
tag: f49879a79098d9372d63baa13b94a941a56eda34
--sha256: 0i9x66yqkrvx2w79dy6lzlya82yxc8567rgjj828vc2d46d6nvx6
subdir:
eras/alonzo/impl
eras/alonzo/test-suite
eras/babbage/impl
eras/babbage/test-suite
eras/byron/chain/executable-spec
eras/byron/crypto
eras/byron/crypto/test
eras/byron/ledger/executable-spec
eras/byron/ledger/impl
eras/byron/ledger/impl/test
eras/shelley/impl
eras/shelley/test-suite
eras/shelley-ma/impl
eras/shelley-ma/test-suite
libs/cardano-ledger-core
libs/cardano-ledger-pretty
libs/cardano-protocol-tpraos
libs/cardano-data
libs/vector-map
libs/set-algebra
libs/small-steps
libs/small-steps-test
libs/non-integral
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: 72863b0fc78abdc2b8e29f0dda96c06da3dd11d0
--sha256: 0qwvx04l9q3h7acb0a3b8iarqcn5bkqhwaplbga5pvryqp3lhn00
subdir:
monoidal-synchronisation
network-mux
ouroboros-consensus
ouroboros-consensus-byron
ouroboros-consensus-cardano
ouroboros-consensus-protocol
ouroboros-consensus-shelley
ouroboros-network
ouroboros-network-framework
ouroboros-network-testing
ouroboros-consensus-cardano-tools

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-prelude
tag: 6ea36cf2247ac0bc33e08c327abec34dfd05bd99
--sha256: 0z2y3wzppc12bpn9bl48776ms3nszw8j58xfsdxf97nzjgrmd62g
subdir:
cardano-prelude
cardano-prelude-test
67 changes: 34 additions & 33 deletions cardano-api/cardano-api.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,17 +112,17 @@ library
, bytestring
, cardano-binary
, cardano-crypto
, cardano-crypto-class
, cardano-crypto-wrapper
, cardano-data
, cardano-ledger-alonzo
, cardano-ledger-babbage
, cardano-ledger-byron
, cardano-ledger-core
, cardano-ledger-shelley-ma
, cardano-crypto-class ^>= 2.0
, cardano-crypto-wrapper ^>= 1.4
, cardano-data ^>= 0.1
, cardano-ledger-alonzo ^>= 0.1
, cardano-ledger-babbage ^>= 0.1
, cardano-ledger-byron ^>= 0.1
, cardano-ledger-core ^>= 0.1
, cardano-ledger-shelley-ma ^>= 0.1
, cardano-prelude
, cardano-protocol-tpraos
, cardano-slotting
, cardano-protocol-tpraos >= 0.1
, cardano-slotting >= 0.1
, cborg
, contra-tracer
, containers
Expand All @@ -133,6 +133,7 @@ library
, formatting
, iproute
, memory
, microlens
, network
, nothunks
, optparse-applicative-fork
Expand All @@ -144,25 +145,25 @@ library
, ouroboros-network
, ouroboros-network-framework
, parsec
, plutus-ledger-api
, plutus-ledger-api ^>= 1.0
, prettyprinter
, prettyprinter-configurable
, prettyprinter-configurable ^>= 0.1
, random
, scientific
, serialise
, small-steps
, cardano-ledger-shelley
, small-steps
, small-steps ^>= 0.1
, cardano-ledger-shelley ^>= 0.1
, small-steps ^>= 0.1
, stm
, strict-containers
, cardano-strict-containers ^>= 0.1
, text
, time
, transformers
, transformers-except
, typed-protocols
, typed-protocols ^>= 0.1
, unordered-containers >= 0.2.11
, vector
, vector-map
, vector-map ^>= 0.1
, yaml

library gen
Expand All @@ -184,16 +185,16 @@ library gen
, bytestring
, cardano-api
, cardano-binary
, cardano-crypto-class
, cardano-crypto-test
, cardano-ledger-alonzo
, cardano-ledger-byron-test
, cardano-ledger-core
, cardano-crypto-class ^>= 2.0
, cardano-crypto-test ^>= 1.4
, cardano-ledger-alonzo ^>= 0.1
, cardano-ledger-byron-test ^>= 1.4
, cardano-ledger-core ^>= 0.1
, cardano-prelude
, containers
, hedgehog
, plutus-core
, cardano-ledger-shelley
, plutus-core ^>= 1.0
, cardano-ledger-shelley ^>= 0.1
, text

test-suite cardano-api-test
Expand All @@ -205,22 +206,22 @@ test-suite cardano-api-test
build-depends: aeson >= 1.5.6.0
, cardano-api
, cardano-api:gen
, cardano-data
, cardano-data ^>= 0.1
, cardano-crypto
, cardano-crypto-class
, cardano-crypto-test
, cardano-crypto-tests
, cardano-ledger-core
, cardano-crypto-class ^>= 2.0
, cardano-crypto-test ^>= 1.4
, cardano-crypto-tests ^>= 2.0
, cardano-ledger-core ^>= 0.1
, cardano-prelude
, cardano-slotting
, cardano-slotting ^>= 0.1
, containers
, hedgehog
, hedgehog-extras
, ouroboros-consensus
, ouroboros-consensus-shelley
, QuickCheck
, cardano-ledger-shelley
, cardano-ledger-shelley-test
, cardano-ledger-shelley ^>= 0.1
, cardano-ledger-shelley-test ^>= 0.1
, tasty
, tasty-hedgehog
, tasty-quickcheck
Expand Down
Loading

0 comments on commit 6523aea

Please sign in to comment.