Merge #2671

2671: Prepare 1.27.0 release. r=nc6 a=nc6



Co-authored-by: Nicholas Clarke <[email protected]>
Co-authored-by: Kosyrev Serge <[email protected]>
Co-authored-by: Nicholas Clarke <[email protected]>

Makefile

@@ -43,10 +43,10 @@ CLUSTER_PROFILE    = default-mary
 CLUSTER_ARGS_EXTRA =
 
 cluster-shell:
-	nix-shell --max-jobs 8 --cores 0 --argstr clusterProfile ${CLUSTER_PROFILE} --arg 'autoStartCluster' true --arg 'useCabalRun' true
+	nix-shell --max-jobs 8 --cores 0 --argstr clusterProfile ${CLUSTER_PROFILE} --arg 'autoStartCluster' true
 
 cluster-shell-dev:
-	nix-shell --max-jobs 8 --cores 0 --argstr clusterProfile ${CLUSTER_PROFILE} --arg 'autoStartCluster' true --arg 'useCabalRun' true --arg 'workbenchDevMode' true
+	nix-shell --max-jobs 8 --cores 0 --argstr clusterProfile ${CLUSTER_PROFILE} --arg 'autoStartCluster' true --arg 'workbenchDevMode' true
 
 cluster-shell-trace:             CLUSTER_ARGS_EXTRA = --trace
 large-state-cluster-shell-trace: CLUSTER_ARGS_EXTRA = --trace

cardano-api/ChangeLog.md

@@ -1,5 +1,10 @@
 # Changelog for cardano-api
 
+## 1.27 -- April 2021
+
+- Add initial support for the ledger state and folding over blocks to the API.
+  (#2633)
+
 ## 1.26.1 -- March 2021
 
 - The cardano-submit-api now takes transactions encoded as CBOR rather than

cardano-api/cardano-api.cabal

@@ -1,7 +1,7 @@
 cabal-version: 2.4
 
 name:                   cardano-api
-version:                1.26.1
+version:                1.27.0
 description:            The cardano api
 author:                 IOHK
 maintainer:             [email protected]
@@ -114,7 +114,6 @@ library
                       , formatting
                       , iproute
                       , memory
-                      , mtl
                       , network
                       , nothunks
                       , ouroboros-consensus

cardano-cli/ChangeLog.md

@@ -1,5 +1,29 @@
 # Changelog for cardano-cli
 
+## 1.27 -- April 2021
+
+- The query tip now also returns the era (e.g. Shelley, Allegra, Alonzo).
+  (#2561, #2562, #2598)
+- The `address build` command now incorporates the functionality of the script
+  address build command, which is now deprecated. (#2486, #2587)
+- Add additional commands for creating MIR certificates to the CLI. This
+  supports the ability to transfer funds to the treasury for Catalyst projects.
+  (#2503)
+- The transaction view command now additionally shows detailed of minted
+  non-native tokens. (#2550)
+- Removed support for Byron addresses using the Bech32 encoding. The only
+  supported way to use Byron-era addresses is through a file, using the text
+  envelope format. (#2605)
+- Add a new command which computes the minimum ADA value/deposit for a
+  multi-asset value. (#2612)
+- Add two new query commands:
+  - `query stake-snapshot` allows querying the three stake snapshots for a given
+    stake pool.
+  - `query pool-params` returns the current and future parameters, as well as
+    the retiring information.
+  (#2560)
+- Updated the CLI reference documentation. (#2665)
+
 ## 1.26.1 -- March 2021
 - It's no longer necessary to specify the era when making a CLI query. When not
   specified, the current era will be used as a default. (#2470)

cardano-cli/cardano-cli.cabal

@@ -1,7 +1,7 @@
 cabal-version: 2.4
 
 name:                   cardano-cli
-version:                1.26.1
+version:                1.27.0
 description:            The Cardano command-line interface.
 author:                 IOHK
 maintainer:             [email protected]

cardano-node-chairman/cardano-node-chairman.cabal

@@ -1,7 +1,7 @@
 cabal-version: 2.4
 
 name:                   cardano-node-chairman
-version:                1.26.1
+version:                1.27.0
 description:            The cardano full node
 author:                 IOHK
 maintainer:             [email protected]

cardano-node/ChangeLog.md

@@ -1,5 +1,63 @@
 # Changelog for cardano-node
 
+## 1.27 -- April 2021
+
+### node changes
+
+- Add an additional GC heap metric to RTS. (#2592)
+- Add details about registering relays on-chain to SPO documentation. (#2591)
+- Improved installation documentation. (#2624)
+- Preparatory support for Alonzo. (#2547)
+- Preparatory support for Voltaire. (#2498)
+- Add a docker image option for downloading cardano-node. (#2632)
+- Miscellaneous internal improvements. (#2644, #2645, #2646)
+
+### consensus changes
+
+- Some preparation for upcoming work on Voltaire. (#2978)
+- Drop support for GHC 8.6.5. Note that support had already been dropped in the
+  node. (#3004)
+- Introduce an option to configure the snapshot interval. This will primarily be
+  used by downstream teams for testing and benchmarking. (#2966, #3092)
+- Preparatory work for the implementation of Ouroboros Genesis. (#3002)
+- Test varying stake distributions in the automated tests. (#3072)
+- Add a peer label to chain sync client traces, allowing us to view which peer
+  supplied which header and when. (#3091)
+- Provide the ledger with the ability to perform slot to time conversion. This
+  will be needed for Plutus scripts in the upcoming Alonzo release. (#3036, #3098)
+### ledger changes
+
+- Work on implementing the upcoming Alonzo era. (#2192, #2198, #2200, #2204,
+  #2210, #2211, #2212, #2214, #2215, #2216, #2218, #2220, #2221, #2222, #2225,
+  #2226, #2227, #2229, #2231, #2235, #2237, #2242, #2243, #2251, #2256, #2260,
+  #2264)
+- Released the CDDL spec for Alonzo. (#2228)
+- Add an optional network ID field to the transaction body. This will only come
+  into use in the Alonzo era. (#2219, #2254)
+- Define a cardano-ledger-core package containing era-independent primitives.
+  (#2207)
+- Fixes to the ShelleyMA formal specification. (#2181)
+- Various internal refactorings and improvements. (#2191, #2202, #2206, #2217,
+  #2233, #2247, #2257)
+- Fix a bug in reward update application which could have resulted in the wrong
+  amount of funds being added to the treasury. (#2238)
+- Some work to reduce the extra CPU load at an epoch boundary, and reduce the
+  resulting "pause" in normal operation. (#2240, #2241, #2250, #2262)
+- Added formal definitions for much of the crypto used to the Shelley spec.
+  (#2236, #2252)
+- Expose AdaPots for use in downstream projects. (#2208)
+- Some Byron-era serialisation testing. (#2217)
+- Some preparation for upcoming work on Voltaire. (#2135)
+
+### network changes
+
+- Removed the deprecated 'KThxBye' message from the TxSubmission protocol.
+  (#2238)
+- Introduce new representation for local root peers. This is in preparation for
+  P2P support. (#3006)
+- Add a new KeepAlive codec that produces a valid CBOR encoding. (#3062)
+- Various internal updates and refactorings. (#3003, #3077)
+
 ## 1.26.1 -- March 2021
 
 ### node changes

cardano-node/cardano-node.cabal

@@ -1,7 +1,7 @@
 cabal-version: 2.4
 
 name:                   cardano-node
-version:                1.26.1
+version:                1.27.0
 description:            The cardano full node
 author:                 IOHK
 maintainer:             [email protected]

default.nix

@@ -26,7 +26,7 @@ let
     inherit haskellPackages
       cardano-node cardano-node-profiled cardano-node-eventlogged
       cardano-cli db-converter cardano-ping
-      scripts environments dockerImage submitApiDockerImage mkCluster bech32;
+      scripts environments dockerImage submitApiDockerImage bech32;
 
     nixosTests = recRecurseIntoAttrs nixosTests;
 
@@ -51,8 +51,6 @@ let
       };
     };
 
-    profiles = (mkCluster customConfig).profilesJSON;
-
     shell = import ./shell.nix {
       inherit pkgs;
       withHoogle = true;

flake.nix

@@ -26,7 +26,6 @@
         cardano-lib
         (final: prev: {
           customConfig = import ./custom-config.nix;
-          workbenchConfig =  import ./workbench-config.nix;
           gitrev = self.rev or "dirty";
           commonLib = lib
             // iohkNix.lib

nix/default.nix

@@ -4,7 +4,6 @@
 , customConfig ? import ./custom-config.nix
 , sourcesOverride ? {}
 , gitrev ? null
-, workbenchConfig ? import ../workbench-config.nix
 }:
 let
   gitrev' = if gitrev == null
@@ -38,7 +37,7 @@ let
     ++ [
       (pkgs: _: with pkgs; {
         gitrev = gitrev';
-        inherit customConfig workbenchConfig;
+        inherit customConfig;
 
         inherit (iohkNix) cardanoLib;
         # commonLib: mix pkgs.lib with iohk-nix utils and our own:

nix/pkgs.nix

@@ -69,8 +69,6 @@ final: prev: with final;
   inherit (cardanoNodeHaskellPackages.ouroboros-consensus-byron.components.exes) db-converter;
   inherit (cardanoNodeHaskellPackages.network-mux.components.exes) cardano-ping;
 
-  mkCluster = cfg: callPackage ./supervisord-cluster cfg;
-
   cabal = haskell-nix.tool compiler "cabal" {
     version = "latest";
     inherit (cardanoNodeProject) index-state;
@@ -117,7 +115,4 @@ final: prev: with final;
   };
 
   clusterTests = import ./supervisord-cluster/tests { inherit pkgs; };
-
-  workbench = callPackage ./workbench workbenchConfig;
-  inherit (workbench) runWorkbench runJq;
 }

nix/supervisord-cluster/default.nix

@@ -5,6 +5,7 @@ let
   profileNameDefault = "default-mary";
 in
 { pkgs
+, workbench
 , lib
 , bech32
 , basePort              ? basePortDefault
@@ -29,7 +30,7 @@ let
       topologyForNode =
         { profile, nodeSpec }:
         let inherit (nodeSpec) name i; in
-        pkgs.runWorkbench "topology-${name}.json"
+        workbench.runWorkbench "topology-${name}.json"
           (if nodeSpec.isProducer
            then "topology for-local-node     ${toString i}   ${profile.topology.files} ${toString basePort}"
            else "topology for-local-observer ${profile.name} ${profile.topology.files} ${toString basePort}");
@@ -140,7 +141,7 @@ EOF
         basePort;
     };
 
-  workbenchProfiles = pkgs.workbench.generateProfiles
+  workbenchProfiles = workbench.generateProfiles
     { inherit pkgs backend environment; };
 in
 
@@ -156,7 +157,7 @@ let
     ]
     ## In dev mode, call the script directly:
     ++ optionals (!workbenchDevMode)
-    [ pkgs.workbench.workbench ];
+    [ workbench.workbench ];
 
   start = pkgs.writeScriptBin "start-cluster" ''
     set -euo pipefail
@@ -174,6 +175,8 @@ let
 
     wb local assert-stopped
 
+    workbench-prebuild-executables || return 1
+
     wb profile describe ${profileName}
 
     ${optionalString (stateDir != stateDirDefault)
@@ -190,8 +193,6 @@ let
 
     ln -s ${profile.topology.files} "${stateDir}"/topology
 
-    workbench-prebuild-executables
-
     genesis_args+=(
         ## Positionals:
         ${profile.JSON}
@@ -227,7 +228,7 @@ let
 
 in
 {
-  inherit (pkgs) workbench;
+  inherit workbench;
   inherit (workbenchProfiles) profilesJSON;
   inherit profile stateDir start stop;
 }

nix/workbench/cardano-topology/cardano-topology.cabal

@@ -1,7 +1,7 @@
 cabal-version: 2.4
 
 name:                  cardano-topology
-version:               1.26.1
+version:               1.27.0
 description:           A cardano topology generator
 author:                IOHK
 maintainer:            [email protected]

nix/workbench/default.nix

@@ -71,7 +71,7 @@ let
     '';
 
   exeCabalOp = op: exe:
-    toString [ "${cabal-install}/bin/cabal" "-v0" op "exe:${exe}" "--"];
+    toString [ "${cabal-install}/bin/cabal" op "${exe}" "--"];
 
   checkoutWbMode =
     if useCabalRun
@@ -97,18 +97,20 @@ let
 
     ${optionalString useCabalRun
     ''
+    ./scripts/cabal-inside-nix-shell.sh
+
     echo 'workbench:  cabal-inside-nix-shell mode enabled, calling cardano-* via 'cabal run' (instead of using Nix store)' >&2
 
     function cardano-cli() {
-      ${exeCabalOp "run" "cardano-cli"} "$@"
+      ${exeCabalOp "exec" "cardano-cli"} "$@"
     }
 
     function cardano-node() {
-      ${exeCabalOp "run" "cardano-node"} "$@"
+      ${exeCabalOp "exec" "cardano-node"} "$@"
     }
 
     function cardano-topology() {
-      ${exeCabalOp "run" "cardano-topology"} "$@"
+      ${exeCabalOp "exec" "cardano-topology"} "$@"
     }
 
     export -f cardano-cli cardano-node cardano-topology
@@ -118,13 +120,14 @@ let
     function workbench-prebuild-executables() {
       ${optionalString useCabalRun
         ''
-      echo -n "workbench:  prebuilding executables:"
+      echo -n "workbench:  prebuilding executables (because of useCabalRun):"
       for exe in cardano-cli cardano-node cardano-topology
       do echo -n " $exe"
-         $exe --help >/dev/null || true
+         cabal -v0 build exe:$exe >/dev/null || return 1
       done
-        ''}
       echo
+        ''}
+      true
     }
     export -f workbench-prebuild-executables
 
@@ -153,6 +156,7 @@ let
         pkgs.callPackage ./profiles
           { inherit
               pkgs
+              runWorkbench runJq workbench
               backend
               environment
               profileName;

nix/workbench/profiles/default.nix

@@ -1,5 +1,5 @@
 { pkgs
-, runCommand, runJq, runWorkbench, writeText
+, runCommand, runWorkbench, runJq, workbench, writeText
 
 ## The backend is an attrset of AWS/supervisord-specific methods and parameters.
 , backend
@@ -38,14 +38,14 @@ let
       inherit JSON value;
 
       topology    = pkgs.callPackage
-        ./topology.nix   { inherit profile; };
+        ./topology.nix   { inherit workbench profile; };
 
       node-specs  = pkgs.callPackage
-        ./node-specs.nix { inherit backend profile; };
+        ./node-specs.nix { inherit runWorkbench profile backend; };
 
      inherit (pkgs.callPackage
                ./node-services.nix
-               { inherit backend environment profile; })
+               { inherit runJq runWorkbench backend environment profile; })
         node-services;
     };
 

nix/workbench/profiles/node-services.nix

@@ -1,4 +1,5 @@
 { pkgs
+, runJq, runWorkbench
 
 ## The backend is an attrset of AWS/supervisord-specific methods and parameters.
 , backend
@@ -122,8 +123,6 @@ let
     };
     in eval.config.services.cardano-node;
 
-  inherit (pkgs) runJq runWorkbench;
-
   ##
   ## node-services :: Map NodeName (NodeSpec, ServiceConfig, Service, NodeConfig, Script)
   ##