From 9c48c3e1aef94bb2ea2419dac68f3dab881672d5 Mon Sep 17 00:00:00 2001 From: Marcin Szamotulski Date: Thu, 16 Feb 2023 15:03:00 +0100 Subject: [PATCH 1/4] Require ouroboros-network-0.3.0.1 --- cabal.project | 2 +- cardano-node/cardano-node.cabal | 2 +- cardano-submit-api/cardano-submit-api.cabal | 2 +- flake.lock | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cabal.project b/cabal.project index 28969f2592c..eac67d614b8 100644 --- a/cabal.project +++ b/cabal.project @@ -13,7 +13,7 @@ repository cardano-haskell-packages -- See CONTRIBUTING for information about these, including some Nix commands -- you need to run if you change them index-state: 2022-09-27T18:00:00Z -index-state: cardano-haskell-packages 2023-01-26T18:00:00Z +index-state: cardano-haskell-packages 2023-02-16T13:42:30Z packages: cardano-api diff --git a/cardano-node/cardano-node.cabal b/cardano-node/cardano-node.cabal index f63d627836b..4c68448441b 100644 --- a/cardano-node/cardano-node.cabal +++ b/cardano-node/cardano-node.cabal @@ -169,7 +169,7 @@ library , ouroboros-consensus-cardano ^>= 0.2 , ouroboros-consensus-protocol , ouroboros-consensus-shelley - , ouroboros-network ^>= 0.3 + , ouroboros-network ^>= 0.3.0.1 , ouroboros-network-framework ^>= 0.2 , psqueues , safe-exceptions diff --git a/cardano-submit-api/cardano-submit-api.cabal b/cardano-submit-api/cardano-submit-api.cabal index ecd736dc5b6..7a3c5c05ac0 100644 --- a/cardano-submit-api/cardano-submit-api.cabal +++ b/cardano-submit-api/cardano-submit-api.cabal @@ -33,7 +33,7 @@ common mtl { build-depends: mtl common network { build-depends: network >= 3.1.2.1 } common optparse-applicative-fork { build-depends: optparse-applicative-fork >= 0.16.1.0 } common ouroboros-consensus-cardano { build-depends: ouroboros-consensus-cardano >= 0.1.0.0 } -common ouroboros-network { build-depends: ouroboros-network >= 0.3.0.0 } +common ouroboros-network { build-depends: ouroboros-network >= 0.3.0.1 } common prometheus { build-depends: prometheus >= 2.2.2 } common protolude { build-depends: protolude >= 0.3.0 } common servant { build-depends: servant >= 0.18.2 } diff --git a/flake.lock b/flake.lock index 71aae9b6e42..4a2c4f4991f 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1674756171, - "narHash": "sha256-edcHqVXXg11ueHMYhUzA4Cp9FgrhV/IbvA4XCB8DwFU=", + "lastModified": 1676645006, + "narHash": "sha256-zsWQSWhH0KgEjh78AopPT99/s/ECTYd6Xfvst8zNt20=", "owner": "input-output-hk", "repo": "cardano-haskell-packages", - "rev": "bedbed3bcca19ef64b8a776bceeea052c2b69ea5", + "rev": "dc7ca5bd82be20fd8e8196fabb9c17a86e8e14de", "type": "github" }, "original": { @@ -2985,11 +2985,11 @@ "hackageNix": { "flake": false, "locked": { - "lastModified": 1665882657, - "narHash": "sha256-3eiHY9Lt2vTeMsrT6yssbd+nfx/i5avfxosigx7bCxU=", + "lastModified": 1676507482, + "narHash": "sha256-cR17G3RVgD73a+fPlIlbP8fvOfW+osLJFIAvGz+8250=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "8e5b6856f99ed790c387fa76bdad9dcc94b3a54c", + "rev": "72c59b47139072e1e768b2896a8a874ae1e08efe", "type": "github" }, "original": { From b078d093ab75f2fe2402b3ca9417e87416866fac Mon Sep 17 00:00:00 2001 From: Marcin Szamotulski Date: Thu, 16 Feb 2023 15:09:31 +0100 Subject: [PATCH 2/4] Updated cardano-node changelog file for 1.35.6 release --- cardano-node/ChangeLog.md | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/cardano-node/ChangeLog.md b/cardano-node/ChangeLog.md index 09ed1a9a716..f320fe2541b 100644 --- a/cardano-node/ChangeLog.md +++ b/cardano-node/ChangeLog.md @@ -1,12 +1,12 @@ # Changelog for cardano-node -## 1.35.5 -- January 2023 +## 1.35.6 -- Febuary 2023 -### node changes +### consensus changes None -### consensus changes +### ledger changes None @@ -25,13 +25,30 @@ None format will be supported for next two major releases of the node (the last major version which will support it is `1.37`). (#4563) +- Fixed a tight loop when demoting a peer from hot to warm timeouts + (input-output-hk/ouroboros-network#4357). + [#4563]: https://github.com/input-output-hk/cardano-node/issues/4563 [understanding-config-files]: https://github.com/input-output-hk/cardano-node/blob/master/doc/getting-started/understanding-config-files.md +## 1.35.5 -- January 2023 + +### node changes + +None + +### consensus changes + +None + ### ledger changes None +### network changes + +None + ## 1.35.4 -- October 2022 ### node changes From 9c37dfdd49f92e40b7b03ed3cd4705901bd7305d Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Tue, 21 Feb 2023 11:10:28 +0800 Subject: [PATCH 3/4] Update haskell.yml --- .github/workflows/haskell.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 15acb105158..e194bcc83fc 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -128,6 +128,12 @@ jobs: if: runner.os == 'Linux' run: sudo apt-get -y install autoconf automake libtool + # macOS doesn't come with pkg-config out of the box. + - name: "MAC: Install pkg-config (brew)" + if: runner.os == 'macOS' + run: | + brew install pkg-config + - name: "MAC: Install build environment (brew)" if: runner.os == 'macOS' run: | From 8c06bf95aa099d8576a561f072334a5d7e3e6a0f Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Wed, 22 Feb 2023 11:17:20 -0500 Subject: [PATCH 4/4] hackage.nix: revert update --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 4a2c4f4991f..dacfdc52d00 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1676645006, - "narHash": "sha256-zsWQSWhH0KgEjh78AopPT99/s/ECTYd6Xfvst8zNt20=", + "lastModified": 1677023020, + "narHash": "sha256-atmXgJuHvx8Rg6sCQ9xbLPFQLKV66DkHukrSI+VTczU=", "owner": "input-output-hk", "repo": "cardano-haskell-packages", - "rev": "dc7ca5bd82be20fd8e8196fabb9c17a86e8e14de", + "rev": "9b75e507146622c1b6cb5a38faa84e2a47c367b4", "type": "github" }, "original": { @@ -2985,11 +2985,11 @@ "hackageNix": { "flake": false, "locked": { - "lastModified": 1676507482, - "narHash": "sha256-cR17G3RVgD73a+fPlIlbP8fvOfW+osLJFIAvGz+8250=", + "lastModified": 1665882657, + "narHash": "sha256-3eiHY9Lt2vTeMsrT6yssbd+nfx/i5avfxosigx7bCxU=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "72c59b47139072e1e768b2896a8a874ae1e08efe", + "rev": "8e5b6856f99ed790c387fa76bdad9dcc94b3a54c", "type": "github" }, "original": {