From a7762349a1d11119cdf73cf92af2bf167346f3ac Mon Sep 17 00:00:00 2001 From: Duncan Coutts Date: Fri, 3 Jan 2020 16:59:52 +0000 Subject: [PATCH 1/4] Update to latest ledger specs No real changes, just updating to the latest ledger specs repo (and a version of the ledger lib that is also updated). --- cabal.project | 14 +++++++------- stack.yaml | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cabal.project b/cabal.project index 13f332ca05e..a8463e2d498 100644 --- a/cabal.project +++ b/cabal.project @@ -40,43 +40,43 @@ source-repository-package source-repository-package type: git location: https://github.com/input-output-hk/cardano-ledger - tag: a773ba71eb9a6fb91dda2cdf6c41b2280f2acf7d + tag: d1b4f6520692d7478d81b050385e0a9b71a0c62b subdir: cardano-ledger source-repository-package type: git location: https://github.com/input-output-hk/cardano-ledger - tag: a773ba71eb9a6fb91dda2cdf6c41b2280f2acf7d + tag: d1b4f6520692d7478d81b050385e0a9b71a0c62b subdir: crypto source-repository-package type: git location: https://github.com/input-output-hk/cardano-ledger - tag: a773ba71eb9a6fb91dda2cdf6c41b2280f2acf7d + tag: d1b4f6520692d7478d81b050385e0a9b71a0c62b subdir: cardano-ledger/test source-repository-package type: git location: https://github.com/input-output-hk/cardano-ledger - tag: a773ba71eb9a6fb91dda2cdf6c41b2280f2acf7d + tag: d1b4f6520692d7478d81b050385e0a9b71a0c62b subdir: crypto/test source-repository-package type: git location: https://github.com/input-output-hk/cardano-ledger-specs - tag: d8e06467844f8612b167f25214f243e02560468b + tag: bcba1d2d10004f1ce14c5c53478f656deffd4c38 subdir: byron/chain/executable-spec source-repository-package type: git location: https://github.com/input-output-hk/cardano-ledger-specs - tag: d8e06467844f8612b167f25214f243e02560468b + tag: bcba1d2d10004f1ce14c5c53478f656deffd4c38 subdir: byron/ledger/executable-spec source-repository-package type: git location: https://github.com/input-output-hk/cardano-ledger-specs - tag: d8e06467844f8612b167f25214f243e02560468b + tag: bcba1d2d10004f1ce14c5c53478f656deffd4c38 subdir: byron/semantics/executable-spec source-repository-package diff --git a/stack.yaml b/stack.yaml index eb0084dfe96..648ed749a7b 100644 --- a/stack.yaml +++ b/stack.yaml @@ -28,7 +28,7 @@ extra-deps: # Cardano-ledger dependencies - git: https://github.com/input-output-hk/cardano-ledger - commit: a773ba71eb9a6fb91dda2cdf6c41b2280f2acf7d + commit: d1b4f6520692d7478d81b050385e0a9b71a0c62b subdirs: - cardano-ledger - cardano-ledger/test @@ -36,7 +36,7 @@ extra-deps: - crypto/test - git: https://github.com/input-output-hk/cardano-ledger-specs - commit: d8e06467844f8612b167f25214f243e02560468b + commit: bcba1d2d10004f1ce14c5c53478f656deffd4c38 subdirs: # small-steps - byron/semantics/executable-spec From 09310e6598d7668557b12575191fa7f92a221e70 Mon Sep 17 00:00:00 2001 From: Duncan Coutts Date: Fri, 3 Jan 2020 17:01:58 +0000 Subject: [PATCH 2/4] Bump node version to 1.3.0 Including placeholder for changelog updates. --- cardano-node/ChangeLog.md | 7 +++++++ cardano-node/cardano-node.cabal | 2 +- nix/.stack.nix/cardano-node.nix | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/cardano-node/ChangeLog.md b/cardano-node/ChangeLog.md index 56d9e935512..f7b45fed84c 100644 --- a/cardano-node/ChangeLog.md +++ b/cardano-node/ChangeLog.md @@ -2,6 +2,13 @@ ## Unreleased changes +## 1.3.0 -- January 2020 + +### node changes +### consensus changes +### ledger changes +### network changes + ## 1.2.0 -- December 2019 ### node changes diff --git a/cardano-node/cardano-node.cabal b/cardano-node/cardano-node.cabal index 7ee2bce8013..fe28ac1c559 100644 --- a/cardano-node/cardano-node.cabal +++ b/cardano-node/cardano-node.cabal @@ -1,5 +1,5 @@ name: cardano-node -version: 1.2.0 +version: 1.3.0 description: The cardano full node author: IOHK maintainer: operations@iohk.io diff --git a/nix/.stack.nix/cardano-node.nix b/nix/.stack.nix/cardano-node.nix index 92e190af938..738ea1159ec 100644 --- a/nix/.stack.nix/cardano-node.nix +++ b/nix/.stack.nix/cardano-node.nix @@ -3,7 +3,7 @@ flags = {}; package = { specVersion = "1.10"; - identifier = { name = "cardano-node"; version = "1.2.0"; }; + identifier = { name = "cardano-node"; version = "1.3.0"; }; license = "Apache-2.0"; copyright = ""; maintainer = "operations@iohk.io"; From 7a3c885e04af7979b96cfc47b4d9e20e7c67d1b8 Mon Sep 17 00:00:00 2001 From: Duncan Coutts Date: Fri, 3 Jan 2020 17:05:11 +0000 Subject: [PATCH 3/4] Update generated nix files --- nix/.stack.nix/cardano-crypto-test.nix | 4 ++-- nix/.stack.nix/cardano-crypto-wrapper.nix | 4 ++-- nix/.stack.nix/cardano-ledger-test.nix | 4 ++-- nix/.stack.nix/cardano-ledger.nix | 4 ++-- nix/.stack.nix/cs-blockchain.nix | 4 ++-- nix/.stack.nix/cs-ledger.nix | 4 ++-- nix/.stack.nix/small-steps.nix | 6 ++++-- 7 files changed, 16 insertions(+), 14 deletions(-) diff --git a/nix/.stack.nix/cardano-crypto-test.nix b/nix/.stack.nix/cardano-crypto-test.nix index 972b1d721b6..71bae7d8e6e 100644 --- a/nix/.stack.nix/cardano-crypto-test.nix +++ b/nix/.stack.nix/cardano-crypto-test.nix @@ -34,8 +34,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger"; - rev = "a773ba71eb9a6fb91dda2cdf6c41b2280f2acf7d"; - sha256 = "0gbh82r9zd7k61hbj96vmh7jd2lrj4xg0hz1058qs7yraf5pjif2"; + rev = "d1b4f6520692d7478d81b050385e0a9b71a0c62b"; + sha256 = "10dv4zfrih2f6ymmgb6w0kaj6iw4kz79bps193v2f3md10wzgn4r"; }); postUnpack = "sourceRoot+=/crypto/test; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-crypto-wrapper.nix b/nix/.stack.nix/cardano-crypto-wrapper.nix index 39b0eff59d3..97e1ed6ba29 100644 --- a/nix/.stack.nix/cardano-crypto-wrapper.nix +++ b/nix/.stack.nix/cardano-crypto-wrapper.nix @@ -59,8 +59,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger"; - rev = "a773ba71eb9a6fb91dda2cdf6c41b2280f2acf7d"; - sha256 = "0gbh82r9zd7k61hbj96vmh7jd2lrj4xg0hz1058qs7yraf5pjif2"; + rev = "d1b4f6520692d7478d81b050385e0a9b71a0c62b"; + sha256 = "10dv4zfrih2f6ymmgb6w0kaj6iw4kz79bps193v2f3md10wzgn4r"; }); postUnpack = "sourceRoot+=/crypto; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-ledger-test.nix b/nix/.stack.nix/cardano-ledger-test.nix index f398d81de13..4d521b36c9d 100644 --- a/nix/.stack.nix/cardano-ledger-test.nix +++ b/nix/.stack.nix/cardano-ledger-test.nix @@ -55,8 +55,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger"; - rev = "a773ba71eb9a6fb91dda2cdf6c41b2280f2acf7d"; - sha256 = "0gbh82r9zd7k61hbj96vmh7jd2lrj4xg0hz1058qs7yraf5pjif2"; + rev = "d1b4f6520692d7478d81b050385e0a9b71a0c62b"; + sha256 = "10dv4zfrih2f6ymmgb6w0kaj6iw4kz79bps193v2f3md10wzgn4r"; }); postUnpack = "sourceRoot+=/cardano-ledger/test; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-ledger.nix b/nix/.stack.nix/cardano-ledger.nix index 16d9c46beb4..0c19ed224be 100644 --- a/nix/.stack.nix/cardano-ledger.nix +++ b/nix/.stack.nix/cardano-ledger.nix @@ -117,8 +117,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger"; - rev = "a773ba71eb9a6fb91dda2cdf6c41b2280f2acf7d"; - sha256 = "0gbh82r9zd7k61hbj96vmh7jd2lrj4xg0hz1058qs7yraf5pjif2"; + rev = "d1b4f6520692d7478d81b050385e0a9b71a0c62b"; + sha256 = "10dv4zfrih2f6ymmgb6w0kaj6iw4kz79bps193v2f3md10wzgn4r"; }); postUnpack = "sourceRoot+=/cardano-ledger; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cs-blockchain.nix b/nix/.stack.nix/cs-blockchain.nix index 8f6d73477a5..686ff46edf5 100644 --- a/nix/.stack.nix/cs-blockchain.nix +++ b/nix/.stack.nix/cs-blockchain.nix @@ -50,8 +50,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "d8e06467844f8612b167f25214f243e02560468b"; - sha256 = "1xb9yia8r6biyc23c2jz62mxdbqqbsrz9rn5r7ij7rgf411c069x"; + rev = "bcba1d2d10004f1ce14c5c53478f656deffd4c38"; + sha256 = "0xn1x9dp52frd18jg9i4hvkgaffx3hr64ny87mvmsgg2xbq41a5v"; }); postUnpack = "sourceRoot+=/byron/chain/executable-spec; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cs-ledger.nix b/nix/.stack.nix/cs-ledger.nix index 8439ed00389..524fe7659ff 100644 --- a/nix/.stack.nix/cs-ledger.nix +++ b/nix/.stack.nix/cs-ledger.nix @@ -69,8 +69,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "d8e06467844f8612b167f25214f243e02560468b"; - sha256 = "1xb9yia8r6biyc23c2jz62mxdbqqbsrz9rn5r7ij7rgf411c069x"; + rev = "bcba1d2d10004f1ce14c5c53478f656deffd4c38"; + sha256 = "0xn1x9dp52frd18jg9i4hvkgaffx3hr64ny87mvmsgg2xbq41a5v"; }); postUnpack = "sourceRoot+=/byron/ledger/executable-spec; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/small-steps.nix b/nix/.stack.nix/small-steps.nix index 482299e0056..fa896b3b071 100644 --- a/nix/.stack.nix/small-steps.nix +++ b/nix/.stack.nix/small-steps.nix @@ -57,11 +57,13 @@ (hsPkgs.base) (hsPkgs.containers) (hsPkgs.hedgehog) + (hsPkgs.mtl) (hsPkgs.tasty) (hsPkgs.tasty-hedgehog) (hsPkgs.tasty-expected-failure) (hsPkgs.QuickCheck) (hsPkgs.tasty-quickcheck) + (hsPkgs.tasty-hunit) (hsPkgs.Unique) (hsPkgs.cardano-crypto-class) (hsPkgs.cardano-binary) @@ -73,8 +75,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "d8e06467844f8612b167f25214f243e02560468b"; - sha256 = "1xb9yia8r6biyc23c2jz62mxdbqqbsrz9rn5r7ij7rgf411c069x"; + rev = "bcba1d2d10004f1ce14c5c53478f656deffd4c38"; + sha256 = "0xn1x9dp52frd18jg9i4hvkgaffx3hr64ny87mvmsgg2xbq41a5v"; }); postUnpack = "sourceRoot+=/byron/semantics/executable-spec; echo source root reset to \$sourceRoot"; } \ No newline at end of file From 05c1a05d9034d1c81e02d580f3776dd5fe594071 Mon Sep 17 00:00:00 2001 From: Duncan Coutts Date: Fri, 3 Jan 2020 18:42:18 +0000 Subject: [PATCH 4/4] Update changelog Apart from consensus where there's been lots of activitiy, it's a light release due to the holidays. --- cardano-node/ChangeLog.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/cardano-node/ChangeLog.md b/cardano-node/ChangeLog.md index f7b45fed84c..6f8d43f267b 100644 --- a/cardano-node/ChangeLog.md +++ b/cardano-node/ChangeLog.md @@ -5,9 +5,21 @@ ## 1.3.0 -- January 2020 ### node changes +- Update to latest dependencies (consensus, ledger, logging etc) + ### consensus changes +- Add initial support for multiple slot lengths (for hard forks) (#282, #1385) +- Do chain selection based only on the latest header in each chain (#1227) +- Significant performance improvements in serving headers and blocks (#1378) +- Snapshot ledger state on shutdown to avoid long restart times (1388) +- Fix garbage collection of previously applied points in the ledger DB (#1381) +- Fix unnecessary memory retention in the volatile DB indices (#1379) + ### ledger changes +- Update to latest version of cardano-ledger-specs + ### network changes +- None ## 1.2.0 -- December 2019