Skip to content

Commit 7607205

Browse files
johnalotoskijohnalotoski
committed
simplify cfgs: remove forger/non-forger config diff for 10.6.0
1 parent 337907a commit 7607205

File tree

7 files changed

+69
-95
lines changed

7 files changed

+69
-95
lines changed

‎cardano-lib/default.nix‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,6 @@ let
149149
# default derived configs:
150150
nodeConfig = mergeTraceOpts (defaultLogConfig // env.networkConfig) (env.extraTracerConfig or {});
151151
nodeConfigLegacy = defaultLogConfigLegacy // env.networkConfig // (env.extraTracerConfigLegacy or {});
152-
nodeConfigBp = mergeTraceOpts (defaultLogConfig // env.networkConfigBp) (env.extraTracerConfig or {});
153-
nodeConfigBpLegacy = defaultLogConfigLegacy // env.networkConfigBp // (env.extraTracerConfigLegacy or {});
154152
tracerConfig = defaultTracerConfig // {inherit (fromJSON (readFile ./${name}/shelley-genesis.json)) networkMagic;};
155153
consensusProtocol = env.networkConfig.Protocol;
156154
submitApiConfig = mkSubmitApiConfig name environments.${name}.nodeConfig;
@@ -192,7 +190,6 @@ let
192190
edgePort = 3001;
193191
confKey = "mainnet_full";
194192
networkConfig = import ./mainnet-config.nix // minNodeVersion;
195-
networkConfigBp = import ./mainnet-config-bp.nix // minNodeVersion;
196193
useLedgerAfterSlot = 157852837;
197194
extraDbSyncConfig = {
198195
enableFutureGenesis = true;
@@ -226,7 +223,6 @@ let
226223
];
227224
edgePort = 3001;
228225
networkConfig = import ./preprod-config.nix // minNodeVersion;
229-
networkConfigBp = import ./preprod-config-bp.nix // minNodeVersion;
230226
useLedgerAfterSlot = 93830456;
231227
extraDbSyncConfig = {
232228
enableFutureGenesis = true;
@@ -256,7 +252,6 @@ let
256252
];
257253
edgePort = 3001;
258254
networkConfig = import ./preview-config.nix // minNodeVersion;
259-
networkConfigBp = import ./preview-config-bp.nix // minNodeVersion;
260255
useLedgerAfterSlot = 83116868;
261256
extraDbSyncConfig = {
262257
enableFutureGenesis = true;
@@ -332,9 +327,7 @@ let
332327
<td>
333328
<div class="buttons has-addons">
334329
<a class="button is-primary" href="${env}-config.json">config</a>
335-
<a class="button is-primary" href="${env}-config-bp.json">block-producer config</a>
336330
<a class="button is-primary" href="${env}-config-legacy.json">config (legacy)</a>
337-
<a class="button is-primary" href="${env}-config-bp-legacy.json">block-producer config (legacy)</a>
338331
<a class="button is-info" href="${env}-${protNames.${p}.n}-genesis.json">${protNames.${p}.n}Genesis</a>
339332
${optionalString (p == "Cardano") ''
340333
<a class="button is-info" href="${env}-${protNames.${p}.shelley}-genesis.json">${protNames.${p}.shelley}Genesis</a>
@@ -386,14 +379,10 @@ let
386379
in ''
387380
${if p != "Cardano" then ''
388381
${jq}/bin/jq . < ${toFile "${env}-config.json" (toJSON (value.nodeConfig // genesisFile))} > $out/${env}-config.json
389-
${jq}/bin/jq . < ${toFile "${env}-config-bp.json" (toJSON (value.nodeConfigBp // genesisFile))} > $out/${env}-config-bp.json
390382
${jq}/bin/jq . < ${toFile "${env}-config-legacy.json" (toJSON (value.nodeConfigLegacy // genesisFile))} > $out/${env}-config-legacy.json
391-
${jq}/bin/jq . < ${toFile "${env}-config-bp-legacy.json" (toJSON (value.nodeConfigBpLegacy // genesisFile))} > $out/${env}-config-bp-legacy.json
392383
'' else ''
393384
${jq}/bin/jq . < ${toFile "${env}-config.json" (toJSON (value.nodeConfig // genesisFiles))} > $out/${env}-config.json
394-
${jq}/bin/jq . < ${toFile "${env}-config-bp.json" (toJSON (value.nodeConfigBp // genesisFiles))} > $out/${env}-config-bp.json
395385
${jq}/bin/jq . < ${toFile "${env}-config-legacy.json" (toJSON (value.nodeConfigLegacy // genesisFiles))} > $out/${env}-config-legacy.json
396-
${jq}/bin/jq . < ${toFile "${env}-config-bp-legacy.json" (toJSON (value.nodeConfigBpLegacy // genesisFiles))} > $out/${env}-config-bp-legacy.json
397386
''}
398387
${optionalString (p == "RealPBFT" || p == "Byron") ''
399388
cp ${value.nodeConfig.GenesisFile} $out/${env}-${protNames.${p}.n}-genesis.json

‎cardano-lib/mainnet-config-bp.nix‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎cardano-lib/mainnet-config.nix‎

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ with builtins; {
2828
# The mainnet does not include the network magic into addresses. Testnets do.
2929
RequiresNetworkMagic = "RequiresNoMagic";
3030
EnableP2P = true;
31-
PeerSharing = true;
3231

3332
MaxKnownMajorProtocolVersion = 2;
3433

@@ -38,26 +37,33 @@ with builtins; {
3837
# `peerSnapshotFile`.
3938
ConsensusMode = "PraosMode";
4039

41-
# Network Deadline and Sync Target Configuration
40+
# Peer Sharing Mode, Network Deadline and Sync Target Configuration
4241
# To avoid config drift these will use ouroboros-network defaults which may change over time.
4342
# The values shown below are examples.
4443
# See: https://developers.cardano.org/docs/get-started/cardano-node/p2p
4544
#
46-
# MinBigLedgerPeersForTrustedState: 5
47-
# SyncTargetNumberOfActiveBigLedgerPeers: 30
48-
# SyncTargetNumberOfActivePeers: 5
49-
# SyncTargetNumberOfEstablishedBigLedgerPeers: 40
50-
# SyncTargetNumberOfEstablishedPeers: 10
51-
# SyncTargetNumberOfKnownBigLedgerPeers: 100
52-
# SyncTargetNumberOfKnownPeers: 150
53-
# SyncTargetNumberOfRootPeers: 0
54-
# TargetNumberOfActiveBigLedgerPeers: 5
55-
# TargetNumberOfActivePeers: 20
56-
# TargetNumberOfEstablishedBigLedgerPeers: 10
57-
# TargetNumberOfEstablishedPeers: 30
58-
# TargetNumberOfKnownBigLedgerPeers: 15
59-
# TargetNumberOfKnownPeers: 150
60-
# TargetNumberOfRootPeers: 60
45+
# MinBigLedgerPeersForTrustedState = 5;
46+
# SyncTargetNumberOfActiveBigLedgerPeers = 30;
47+
# SyncTargetNumberOfActivePeers = 5;
48+
# SyncTargetNumberOfEstablishedBigLedgerPeers = 40;
49+
# SyncTargetNumberOfEstablishedPeers = 10;
50+
# SyncTargetNumberOfKnownBigLedgerPeers = 100;
51+
# SyncTargetNumberOfKnownPeers = 150;
52+
# SyncTargetNumberOfRootPeers = 0;
53+
# TargetNumberOfActiveBigLedgerPeers = 5;
54+
# TargetNumberOfActivePeers = 20;
55+
# TargetNumberOfEstablishedBigLedgerPeers = 10;
56+
# TargetNumberOfEstablishedPeers = 30;
57+
# TargetNumberOfKnownBigLedgerPeers = 15;
58+
#
59+
# Additionally, as of ouroboros-network `0.22.2` with cardano-node `10.6.0`,
60+
# the following three node config parameters which previously required
61+
# explicit configuration depending on whether the node is a forger are now
62+
# handled automatically.
63+
#
64+
# PeerSharing: false for forgers, true for non-forgers
65+
# TargetNumberOfKnownPeers: set according to forging status
66+
# TargetNumberOfRootPeers: set according to forging status
6167

6268
# Default Ledger Configuration
6369
# Additional configuration options can be found at:

‎cardano-lib/preprod-config-bp.nix‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎cardano-lib/preprod-config.nix‎

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,34 +26,40 @@ with builtins; {
2626
# The mainnet does not include the network magic into addresses. Testnets do.
2727
RequiresNetworkMagic = "RequiresMagic";
2828
EnableP2P = true;
29-
PeerSharing = true;
3029

3130
# The consensus mode. If set to "GenesisMode", a path to a peer snapshot
3231
# file will need to be declared in the p2p topology file under key
3332
# `peerSnapshotFile`. A `CheckpointsFile` and corresponding
3433
# `CheckpointsFileHash` is not required for preprod.
3534
ConsensusMode = "GenesisMode";
3635

37-
# Network Deadline and Sync Target Configuration
36+
# Peer Sharing Mode, Network Deadline and Sync Target Configuration
3837
# To avoid config drift these will use ouroboros-network defaults which may change over time.
3938
# The values shown below are examples.
4039
# See: https://developers.cardano.org/docs/get-started/cardano-node/p2p
4140
#
42-
# MinBigLedgerPeersForTrustedState: 5
43-
# SyncTargetNumberOfActiveBigLedgerPeers: 30
44-
# SyncTargetNumberOfActivePeers: 5
45-
# SyncTargetNumberOfEstablishedBigLedgerPeers: 40
46-
# SyncTargetNumberOfEstablishedPeers: 10
47-
# SyncTargetNumberOfKnownBigLedgerPeers: 100
48-
# SyncTargetNumberOfKnownPeers: 150
49-
# SyncTargetNumberOfRootPeers: 0
50-
# TargetNumberOfActiveBigLedgerPeers: 5
51-
# TargetNumberOfActivePeers: 20
52-
# TargetNumberOfEstablishedBigLedgerPeers: 10
53-
# TargetNumberOfEstablishedPeers: 30
54-
# TargetNumberOfKnownBigLedgerPeers: 15
55-
# TargetNumberOfKnownPeers: 150
56-
# TargetNumberOfRootPeers: 60
41+
# MinBigLedgerPeersForTrustedState = 5;
42+
# SyncTargetNumberOfActiveBigLedgerPeers = 30;
43+
# SyncTargetNumberOfActivePeers = 5;
44+
# SyncTargetNumberOfEstablishedBigLedgerPeers = 40;
45+
# SyncTargetNumberOfEstablishedPeers = 10;
46+
# SyncTargetNumberOfKnownBigLedgerPeers = 100;
47+
# SyncTargetNumberOfKnownPeers = 150;
48+
# SyncTargetNumberOfRootPeers = 0;
49+
# TargetNumberOfActiveBigLedgerPeers = 5;
50+
# TargetNumberOfActivePeers = 20;
51+
# TargetNumberOfEstablishedBigLedgerPeers = 10;
52+
# TargetNumberOfEstablishedPeers = 30;
53+
# TargetNumberOfKnownBigLedgerPeers = 15;
54+
#
55+
# Additionally, as of ouroboros-network `0.22.2` with cardano-node `10.6.0`,
56+
# the following three node config parameters which previously required
57+
# explicit configuration depending on whether the node is a forger are now
58+
# handled automatically.
59+
#
60+
# PeerSharing: false for forgers, true for non-forgers
61+
# TargetNumberOfKnownPeers: set according to forging status
62+
# TargetNumberOfRootPeers: set according to forging status
5763

5864
# Default Ledger Configuration
5965
# Additional configuration options can be found at:

‎cardano-lib/preview-config-bp.nix‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎cardano-lib/preview-config.nix‎

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ with builtins; {
2020

2121
RequiresNetworkMagic = "RequiresMagic";
2222
EnableP2P = true;
23-
PeerSharing = true;
2423

2524
ExperimentalHardForksEnabled = false;
2625
ExperimentalProtocolsEnabled = false;
@@ -35,26 +34,33 @@ with builtins; {
3534
# `CheckpointsFileHash` is not required for preview.
3635
ConsensusMode = "GenesisMode";
3736

38-
# Network Deadline and Sync Target Configuration
37+
# Peer Sharing Mode, Network Deadline and Sync Target Configuration
3938
# To avoid config drift these will use ouroboros-network defaults which may change over time.
4039
# The values shown below are examples.
4140
# See: https://developers.cardano.org/docs/get-started/cardano-node/p2p
4241
#
43-
# MinBigLedgerPeersForTrustedState: 5
44-
# SyncTargetNumberOfActiveBigLedgerPeers: 30
45-
# SyncTargetNumberOfActivePeers: 5
46-
# SyncTargetNumberOfEstablishedBigLedgerPeers: 40
47-
# SyncTargetNumberOfEstablishedPeers: 10
48-
# SyncTargetNumberOfKnownBigLedgerPeers: 100
49-
# SyncTargetNumberOfKnownPeers: 150
50-
# SyncTargetNumberOfRootPeers: 0
51-
# TargetNumberOfActiveBigLedgerPeers: 5
52-
# TargetNumberOfActivePeers: 20
53-
# TargetNumberOfEstablishedBigLedgerPeers: 10
54-
# TargetNumberOfEstablishedPeers: 30
55-
# TargetNumberOfKnownBigLedgerPeers: 15
56-
# TargetNumberOfKnownPeers: 150
57-
# TargetNumberOfRootPeers: 60
42+
# MinBigLedgerPeersForTrustedState = 5;
43+
# SyncTargetNumberOfActiveBigLedgerPeers = 30;
44+
# SyncTargetNumberOfActivePeers = 5;
45+
# SyncTargetNumberOfEstablishedBigLedgerPeers = 40;
46+
# SyncTargetNumberOfEstablishedPeers = 10;
47+
# SyncTargetNumberOfKnownBigLedgerPeers = 100;
48+
# SyncTargetNumberOfKnownPeers = 150;
49+
# SyncTargetNumberOfRootPeers = 0;
50+
# TargetNumberOfActiveBigLedgerPeers = 5;
51+
# TargetNumberOfActivePeers = 20;
52+
# TargetNumberOfEstablishedBigLedgerPeers = 10;
53+
# TargetNumberOfEstablishedPeers = 30;
54+
# TargetNumberOfKnownBigLedgerPeers = 15;
55+
#
56+
# Additionally, as of ouroboros-network `0.22.2` with cardano-node `10.6.0`,
57+
# the following three node config parameters which previously required
58+
# explicit configuration depending on whether the node is a forger are now
59+
# handled automatically.
60+
#
61+
# PeerSharing: false for forgers, true for non-forgers
62+
# TargetNumberOfKnownPeers: set according to forging status
63+
# TargetNumberOfRootPeers: set according to forging status
5864

5965
# Default Ledger Configuration
6066
# Additional configuration options can be found at:

0 commit comments

Comments
 (0)