Skip to content

Commit a160771

Browse files
johnalotoskijohnalotoski
authored
Merge pull request #49 from input-output-hk/next-2025-07-23
Node-ng 10.5.1, scripts/state for gov actions
2 parents 4924766 + 5c33197 commit a160771

File tree

1,251 files changed

+19168
-643
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,251 files changed

+19168
-643
lines changed

‎flake.lock‎

Lines changed: 21 additions & 61 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flake.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
nixpkgs.follows = "cardano-parts/nixpkgs";
66
nixpkgs-unstable.follows = "cardano-parts/nixpkgs-unstable";
77
flake-parts.follows = "cardano-parts/flake-parts";
8-
cardano-parts.url = "github:input-output-hk/cardano-parts/v2025-06-24";
9-
# cardano-parts.url = "path:/home/jlotoski/work/iohk/cardano-parts-wt/v2025-06-24";
8+
cardano-parts.url = "github:input-output-hk/cardano-parts/v2025-07-23";
9+
# cardano-parts.url = "path:/home/jlotoski/work/iohk/cardano-parts-wt/v2025-07-23";
1010

1111
# Local pins for additional customization:
1212
# cardanoTest.url = "github:IntersectMBO/cardano-node/mgalazyn/feature/make-peer-snapshot-file-path-relative-to-topology-file";

‎flake/colmena.nix‎

Lines changed: 55 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ in
8383
node = {
8484
imports = [
8585
# Base cardano-node service
86-
config.flake.cardano-parts.cluster.groups.default.meta.cardano-node-service-ng
86+
config.flake.cardano-parts.cluster.groups.default.meta.cardano-node-service
8787

8888
# Config for cardano-node group deployments
8989
inputs.cardano-parts.nixosModules.profile-cardano-node-group
@@ -95,6 +95,20 @@ in
9595
];
9696
};
9797

98+
node-pre = {
99+
imports = [
100+
# Base cardano-node service
101+
config.flake.cardano-parts.cluster.groups.default.meta.cardano-node-service-ng
102+
103+
# Config for cardano-node group deployments
104+
inputs.cardano-parts.nixosModules.profile-cardano-node-group
105+
inputs.cardano-parts.nixosModules.profile-cardano-custom-metrics
106+
bperfNoPublish
107+
108+
pre
109+
];
110+
};
111+
98112
# Include blockPerf by default with no upstream push to CF -- only push prom metrics
99113
bperfNoPublish = {
100114
imports = [
@@ -257,6 +271,7 @@ in
257271
# };
258272

259273
mithrilRelease = {imports = [nixosModules.mithril-release-pin];};
274+
mithrilSignerDisable = {services.mithril-signer.enable = false;};
260275

261276
dbsyncPub = {
262277
pkgs,
@@ -577,6 +592,25 @@ in
577592
};
578593
};
579594

595+
# Non-default accepted connection limits for high load relays
596+
hiConn = {
597+
services.cardano-node.extraNodeConfig = {
598+
AcceptedConnectionsLimit = {
599+
# Default node process NOFILE limit is 65535
600+
# If machines support sufficient bandwidth and CPU, defaults can be raised
601+
602+
# Following are the node defaults:
603+
# hardLimit = 512
604+
# softLimit = 384
605+
# delay = 5;
606+
607+
hardLimit = 1024;
608+
softLimit = 768;
609+
delay = 5;
610+
};
611+
};
612+
};
613+
580614
buildkite = {imports = [nixosModules.buildkite-agent-containers];};
581615

582616
bkCfg = queue: {
@@ -738,21 +772,21 @@ in
738772
# ---------------------------------------------------------------------------------------------------------
739773
# Preprod, two-thirds on release tag, one-third on pre-release tag
740774
preprod1-bp-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod1") node bp mithrilRelease (declMRel "preprod1-rel-a-1")];};
741-
preprod1-rel-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod1") node rel preprodRelMig mithrilRelay (declMSigner "preprod1-bp-a-1")];};
742-
preprod1-rel-b-1 = {imports = [eu-west-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod1") node rel preprodRelMig];};
743-
preprod1-rel-c-1 = {imports = [us-east-2 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod1") node rel preprodRelMig tcpTxOpt];};
775+
preprod1-rel-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod1") node rel hiConn preprodRelMig mithrilRelay (declMSigner "preprod1-bp-a-1")];};
776+
preprod1-rel-b-1 = {imports = [eu-west-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod1") node rel hiConn preprodRelMig];};
777+
preprod1-rel-c-1 = {imports = [us-east-2 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod1") node rel hiConn preprodRelMig tcpTxOpt];};
744778
preprod1-dbsync-a-1 = {imports = [eu-central-1 r6a-xlarge (ebs 200) (group "preprod1") dbsync pre smash preprodSmash];};
745779
preprod1-faucet-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod1") node faucet preprodFaucet];};
746780

747781
preprod2-bp-b-1 = {imports = [eu-west-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod2") node bp mithrilRelease (declMRel "preprod2-rel-b-1")];};
748-
preprod2-rel-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod2") node rel preprodRelMig];};
749-
preprod2-rel-b-1 = {imports = [eu-west-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod2") node rel preprodRelMig mithrilRelay (declMSigner "preprod2-bp-b-1")];};
750-
preprod2-rel-c-1 = {imports = [us-east-2 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod2") node rel preprodRelMig tcpTxOpt];};
751-
752-
preprod3-bp-c-1 = {imports = [us-east-2 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod3") node bp pre mithrilRelease (declMRel "preprod3-rel-c-1")];};
753-
preprod3-rel-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod3") node rel pre preprodRelMig];};
754-
preprod3-rel-b-1 = {imports = [eu-west-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod3") node rel pre preprodRelMig];};
755-
preprod3-rel-c-1 = {imports = [us-east-2 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod3") node rel pre preprodRelMig mithrilRelay (declMSigner "preprod3-bp-c-1") tcpTxOpt];};
782+
preprod2-rel-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod2") node hiConn rel preprodRelMig];};
783+
preprod2-rel-b-1 = {imports = [eu-west-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod2") node hiConn rel preprodRelMig mithrilRelay (declMSigner "preprod2-bp-b-1")];};
784+
preprod2-rel-c-1 = {imports = [us-east-2 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod2") node hiConn rel preprodRelMig tcpTxOpt];};
785+
786+
preprod3-bp-c-1 = {imports = [us-east-2 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod3") node-pre bp mithrilRelease (declMRel "preprod3-rel-c-1")];};
787+
preprod3-rel-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod3") node-pre hiConn rel preprodRelMig];};
788+
preprod3-rel-b-1 = {imports = [eu-west-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod3") node-pre hiConn rel preprodRelMig];};
789+
preprod3-rel-c-1 = {imports = [us-east-2 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod3") node-pre hiConn rel preprodRelMig mithrilRelay (declMSigner "preprod3-bp-c-1") tcpTxOpt];};
756790
# ---------------------------------------------------------------------------------------------------------
757791

758792
# ---------------------------------------------------------------------------------------------------------
@@ -766,43 +800,17 @@ in
766800
preview1-faucet-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview1") node faucet previewFaucet];};
767801

768802
# Smallest d variant for testing
769-
preview1-test-a-1 = {
770-
imports = [
771-
eu-central-1
772-
m5ad-large
773-
# i7ie-2xlarge
774-
(ebs 80)
775-
(nodeRamPct 70)
776-
(group "preview1")
777-
node
778-
# pparamsApi
779-
# tcpTxOpt
780-
bp
781-
pre
782-
# config.flake.cardano-parts.cluster.groups.default.meta.cardano-tracer-service-ng
783-
{
784-
services.mithril-signer.enable = false;
785-
# services.cardano-node = {
786-
# useLegacyTracing = false;
787-
# ngTracer = true;
788-
# # profiling = "space-cost";
789-
# };
790-
# services.cardano-tracer = {
791-
# # profiling = "space-cost";
792-
# };
793-
}
794-
];
795-
};
803+
preview1-test-a-1 = {imports = [eu-central-1 m5ad-large (ebs 80) (nodeRamPct 70) (group "preview1") node-pre bp mithrilSignerDisable tcpTxOpt];};
796804

797-
preview2-bp-b-1 = {imports = [eu-west-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview2") node bp pre mithrilRelease (declMRel "preview2-rel-b-1")];};
798-
preview2-rel-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview2") node traceTxs rel pre previewRelMig];};
799-
preview2-rel-b-1 = {imports = [eu-west-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview2") node rel pre previewRelMig mithrilRelay (declMSigner "preview2-bp-b-1")];};
800-
preview2-rel-c-1 = {imports = [us-east-2 r6a-large (ebs 80) (nodeRamPct 70) (group "preview2") node rel pre previewRelMig tcpTxOpt];};
805+
preview2-bp-b-1 = {imports = [eu-west-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview2") node-pre bp mithrilRelease (declMRel "preview2-rel-b-1")];};
806+
preview2-rel-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview2") node-pre traceTxs rel previewRelMig];};
807+
preview2-rel-b-1 = {imports = [eu-west-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview2") node-pre rel previewRelMig mithrilRelay (declMSigner "preview2-bp-b-1")];};
808+
preview2-rel-c-1 = {imports = [us-east-2 r6a-large (ebs 80) (nodeRamPct 70) (group "preview2") node-pre rel previewRelMig tcpTxOpt];};
801809

802-
preview3-bp-c-1 = {imports = [us-east-2 r6a-large (ebs 80) (nodeRamPct 70) (group "preview3") node bp pre mithrilRelease (declMRel "preview3-rel-c-1")];};
803-
preview3-rel-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview3") node rel pre previewRelMig];};
804-
preview3-rel-b-1 = {imports = [eu-west-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview3") node rel pre previewRelMig];};
805-
preview3-rel-c-1 = {imports = [us-east-2 r6a-large (ebs 80) (nodeRamPct 70) (group "preview3") node rel pre previewRelMig mithrilRelay (declMSigner "preview3-bp-c-1") tcpTxOpt];};
810+
preview3-bp-c-1 = {imports = [us-east-2 r6a-large (ebs 80) (nodeRamPct 70) (group "preview3") node-pre bp mithrilRelease (declMRel "preview3-rel-c-1")];};
811+
preview3-rel-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview3") node-pre rel previewRelMig];};
812+
preview3-rel-b-1 = {imports = [eu-west-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview3") node-pre rel previewRelMig];};
813+
preview3-rel-c-1 = {imports = [us-east-2 r6a-large (ebs 80) (nodeRamPct 70) (group "preview3") node-pre rel previewRelMig mithrilRelay (declMSigner "preview3-bp-c-1") tcpTxOpt];};
806814
# ---------------------------------------------------------------------------------------------------------
807815

808816
# ---------------------------------------------------------------------------------------------------------

‎mdbook/README-book.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ _Use the nagivation panel on the left to explore [The Cardano Book][book]._
2424

2525
<br />
2626

27-
<center><sub><sup><span style="color:lightgray; font-style:italic">c6aba64fe2fa238a99eb47f6847534c06b6e7694</span></sup></sub></center>
27+
<center><sub><sup><span style="color:lightgray; font-style:italic">0a9e67e887052d1db931483319073e74f2dd3abb</span></sup></sub></center>

‎mdbook/adv-preprod.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
Users wanting to test a cardano-node pre-release version on the pre-production
44
environment may obtain compatible configuration files below.
55

6-
The latest version available is cardano-node pre-release `10.5.0`.
6+
The latest version available is cardano-node pre-release `10.5.1`.
77

88
#### Configuration files
99

10-
Compatible with cardano-node pre-release [10.5.0](https://github.com/IntersectMBO/cardano-node/releases/tag/10.5.0)
10+
Compatible with cardano-node pre-release [10.5.1](https://github.com/IntersectMBO/cardano-node/releases/tag/10.5.1)
1111

1212
```
1313
NOTE:

‎mdbook/adv-preview.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
Users wanting to test a cardano-node pre-release version on the preview
44
environment may obtain compatible configuration files below.
55

6-
The latest version available is cardano-node pre-release `10.5.0`.
6+
The latest version available is cardano-node pre-release `10.5.1`.
77

88
#### Configuration files
99

10-
Compatible with cardano-node pre-release [10.5.0](https://github.com/IntersectMBO/cardano-node/releases/tag/10.5.0)
10+
Compatible with cardano-node pre-release [10.5.1](https://github.com/IntersectMBO/cardano-node/releases/tag/10.5.1)
1111

1212
```
1313
NOTE:

0 commit comments

Comments
 (0)