Merge pull request #56 from input-output-hk/next-2024-12-19

Node 10.1.4, CLI 10.1/10.2, Mithril v2450

Author: johnalotoski

.github/workflows/nix-jobs-test.yaml

@@ -45,6 +45,8 @@ jobs:
 
           # Other params
           export BYRON_SIGNING_KEY="$KEY_DIR/utxo-keys/shelley.000.skey"
+          export CARDANO_NODE_NETWORK_ID="42"
+          export CARDANO_NODE_SOCKET_PATH="$DATA_DIR/node.socket"
           export ERA_CMD="alonzo"
           export MAJOR_VERSION="7"
           export NUM_GENESIS_KEYS="3"
@@ -78,13 +80,25 @@ jobs:
             "job-update-proposal-hard-fork"
           )
 
+          JOB_SEQ_NG=(
+            "job-gen-custom-node-config-data-ng"
+            "job-create-stake-pool-keys"
+            "job-register-stake-pools"
+            "job-delegate-rewards-stake-key"
+            "job-retire-bootstrap-pool"
+          )
+
           RUN_TESTS() {
             local JOBS=("$@")
 
             rm -rf workbench
             for i in ${JOBS[@]}; do
               echo "Running nix job .#$i"
-              nix run ".#$i"
+              if [ "$UNSTABLE" = "true" ] && [ "$i" = "job-gen-custom-node-config-data" ]; then
+                ERA_CMD="conway" nix run ".#$i"
+              else
+                nix run ".#$i"
+              fi
             done
           }
 
@@ -106,3 +120,11 @@ jobs:
 
           echo "Running sequence tests on pre-release..."
           RUN_TESTS "${JOB_SEQ[@]}"
+
+          echo "Running next-gen sequence tests with pre-release versioning..."
+          set -x
+          export BOOTSTRAP_POOL_DIR="$KEY_DIR/bootstrap-pool"
+          export ERA_CMD="conway"
+          export RICH_KEY="$KEY_DIR/utxo-keys/rich-utxo"
+          set +x
+          RUN_TESTS "${JOB_SEQ_NG[@]}"

flake.lock

@@ -5,7 +5,7 @@
     auth-keys-hub.url = "github:input-output-hk/auth-keys-hub";
     auth-keys-hub.inputs.nixpkgs.follows = "nixpkgs";
     colmena.inputs.nixpkgs.follows = "nixpkgs";
-    colmena.url = "github:zhaofengli/colmena/v0.4.0";
+    colmena.url = "github:zhaofengli/colmena";
     flake-parts.url = "github:hercules-ci/flake-parts";
     inputs-check.url = "github:input-output-hk/inputs-check";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";

flake.nix

@@ -365,6 +365,7 @@
           startLimitIntervalSec = 900;
 
           serviceConfig = {
+            # The ~2.3% difference between M and MiB units is already included in the scaling factor
             MemoryMax = "${toString (1.15 * cfg.totalMaxHeapSizeMiB / cfg.instances)}M";
             LimitNOFILE = "65535";
 
@@ -392,7 +393,7 @@
           "-N${toString cores}"
           "-A16m"
           "-I3"
-          "-M${toString (cfg.totalMaxHeapSizeMiB / cfg.instances)}M"
+          "-M${toString (1.024 * cfg.totalMaxHeapSizeMiB / cfg.instances)}M"
         ];
 
         systemdSocketActivation = false;

flake/nixosModules/profile-cardano-node-group.nix

@@ -301,6 +301,35 @@
                 SELECT 100 * (EXTRACT (epoch FROM (MAX (time) AT TIME ZONE 'UTC')) - EXTRACT (epoch FROM (MIN (time) AT TIME ZONE 'UTC')))
                   / (EXTRACT (epoch FROM (now () AT TIME ZONE 'UTC')) - EXTRACT (epoch FROM (MIN (time) AT TIME ZONE 'UTC')))
                   AS sync_percent FROM block;
+
+              -- Show the last month of voting activity by hour
+              PREPARE show_voting_by_hour AS
+                WITH
+                  cc AS (
+                    SELECT DATE_TRUNC('hour', time) AS time, count(*) AS cc_votes FROM block
+                      INNER JOIN tx ON block_id=block.id
+                      INNER JOIN voting_procedure ON tx_id=tx.id
+                      WHERE time BETWEEN (CURRENT_TIMESTAMP - INTERVAL '30 DAYS') AND CURRENT_TIMESTAMP
+                        AND voter_role='ConstitutionalCommittee'
+                      GROUP BY DATE_TRUNC('hour', time)),
+                  spo AS (
+                    SELECT DATE_TRUNC('hour', time) AS time, count(*) AS spo_votes FROM block
+                      INNER JOIN tx ON block_id=block.id
+                      INNER JOIN voting_procedure ON tx_id=tx.id
+                      WHERE time BETWEEN (CURRENT_TIMESTAMP - INTERVAL '30 DAYS') AND CURRENT_TIMESTAMP
+                        AND voter_role='SPO'
+                      GROUP BY DATE_TRUNC('hour', time)),
+                  drep AS (
+                    SELECT DATE_TRUNC('hour', time) AS time, count(*) AS drep_votes FROM block
+                      INNER JOIN tx ON block_id=block.id
+                      INNER JOIN voting_procedure ON tx_id=tx.id
+                      WHERE time BETWEEN (CURRENT_TIMESTAMP - INTERVAL '30 DAYS') AND CURRENT_TIMESTAMP
+                        AND voter_role='DRep'
+                      GROUP BY DATE_TRUNC('hour', time))
+                select COALESCE(cc.time, spo.time, drep.time) AS time, cc.cc_votes, spo.spo_votes, drep.drep_votes FROM cc
+                  FULL OUTER JOIN spo ON cc.time = spo.time
+                  FULL OUTER JOIN drep ON COALESCE(cc.time, spo.time) = drep.time
+                  ORDER BY time DESC;
             END IF;
           END IF;
         END$$;