From 5623e0b82c56cf8e8123559c0515dc8fa58c0a4c Mon Sep 17 00:00:00 2001 From: Damian Nadales Date: Wed, 29 May 2024 16:35:15 +0200 Subject: [PATCH 1/2] [Do not merge] Temporary s-r-p to revert ouroboros-network to 0.15 for Node 8.11.0 --- bench/locli/locli.cabal | 2 +- cabal.project | 11 +++++++++++ cardano-node/cardano-node.cabal | 2 +- cardano-submit-api/cardano-submit-api.cabal | 2 +- cardano-testnet/cardano-testnet.cabal | 2 +- cardano-tracer/cardano-tracer.cabal | 2 +- trace-dispatcher/trace-dispatcher.cabal | 2 +- 7 files changed, 17 insertions(+), 6 deletions(-) diff --git a/bench/locli/locli.cabal b/bench/locli/locli.cabal index eb5aac02216..ab94070762a 100644 --- a/bench/locli/locli.cabal +++ b/bench/locli/locli.cabal @@ -121,7 +121,7 @@ library , optparse-generic , ouroboros-consensus -- for Data.SOP.Strict: - , ouroboros-network ^>= 0.16 + , ouroboros-network ^>= 0.15 , ouroboros-network-api , process , quiet diff --git a/cabal.project b/cabal.project index 2a5232cf9a8..490425dcbf4 100644 --- a/cabal.project +++ b/cabal.project @@ -59,3 +59,14 @@ package plutus-scripts-bench -- temporary! Please read the section in CONTRIBUTING about updating dependencies. -- `smtp-mail` should depend on `crypton-connection` rather than `connection`! + +source-repository-package + type: git + location: https://github.com/IntersectMBO/ouroboros-consensus + tag: b7aabe380d9378934f3d4f4212a8a8f9ff678e48 + --sha256: 0hda5y9y0b8dlcpiabjcl2gsffxnpdhj2jqpkldhid96r1m3d81c + subdir: + ouroboros-consensus + ouroboros-consensus-cardano + ouroboros-consensus-diffusion + ouroboros-consensus-protocol diff --git a/cardano-node/cardano-node.cabal b/cardano-node/cardano-node.cabal index d3f54f39243..4fd5f689900 100644 --- a/cardano-node/cardano-node.cabal +++ b/cardano-node/cardano-node.cabal @@ -188,7 +188,7 @@ library , ouroboros-consensus-diffusion ^>= 0.16 , ouroboros-consensus-protocol , ouroboros-network-api ^>= 0.7.1 - , ouroboros-network ^>= 0.16 + , ouroboros-network ^>= 0.15 , ouroboros-network-framework , ouroboros-network-protocols ^>= 0.8 , prettyprinter diff --git a/cardano-submit-api/cardano-submit-api.cabal b/cardano-submit-api/cardano-submit-api.cabal index 18fc9c6be7d..2778223bf55 100644 --- a/cardano-submit-api/cardano-submit-api.cabal +++ b/cardano-submit-api/cardano-submit-api.cabal @@ -49,7 +49,7 @@ library , network , optparse-applicative-fork , ouroboros-consensus-cardano - , ouroboros-network ^>= 0.16 + , ouroboros-network ^>= 0.15 , ouroboros-network-protocols , prometheus >= 2.2.4 , servant diff --git a/cardano-testnet/cardano-testnet.cabal b/cardano-testnet/cardano-testnet.cabal index d34ff4a71e1..a3cc6e5de5e 100644 --- a/cardano-testnet/cardano-testnet.cabal +++ b/cardano-testnet/cardano-testnet.cabal @@ -68,7 +68,7 @@ library , network , network-mux , optparse-applicative-fork - , ouroboros-network ^>= 0.16 + , ouroboros-network ^>= 0.15 , ouroboros-network-api , prettyprinter , process diff --git a/cardano-tracer/cardano-tracer.cabal b/cardano-tracer/cardano-tracer.cabal index 27dc15f9077..afbac0709d0 100644 --- a/cardano-tracer/cardano-tracer.cabal +++ b/cardano-tracer/cardano-tracer.cabal @@ -155,7 +155,7 @@ library , filepath , mime-mail , optparse-applicative - , ouroboros-network ^>= 0.16 + , ouroboros-network ^>= 0.15 , ouroboros-network-api , ouroboros-network-framework , signal diff --git a/trace-dispatcher/trace-dispatcher.cabal b/trace-dispatcher/trace-dispatcher.cabal index 2bfcfac29cf..bd8dbadf135 100644 --- a/trace-dispatcher/trace-dispatcher.cabal +++ b/trace-dispatcher/trace-dispatcher.cabal @@ -60,7 +60,7 @@ library , hostname , network , optparse-applicative-fork - , ouroboros-network ^>= 0.16 + , ouroboros-network ^>= 0.15 , ouroboros-network-api , ouroboros-network-framework , serialise From f46e6db57b5cf69c7352c361c4586b76cf16ffc2 Mon Sep 17 00:00:00 2001 From: Damian Nadales Date: Thu, 30 May 2024 11:58:15 +0200 Subject: [PATCH 2/2] Update Consensus commit --- cabal.project | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cabal.project b/cabal.project index 490425dcbf4..ad3cda8e8e4 100644 --- a/cabal.project +++ b/cabal.project @@ -63,8 +63,8 @@ package plutus-scripts-bench source-repository-package type: git location: https://github.com/IntersectMBO/ouroboros-consensus - tag: b7aabe380d9378934f3d4f4212a8a8f9ff678e48 - --sha256: 0hda5y9y0b8dlcpiabjcl2gsffxnpdhj2jqpkldhid96r1m3d81c + tag: df23ef6e7e269011318c82d001a6b894cd719571 + --sha256: 1iiv36cj282zw5nzwpf6n96h1hbzcv8v0cg17dv1zyrchsmclwdj subdir: ouroboros-consensus ouroboros-consensus-cardano