Skip to content

Commit 23bb477

Browse files
authored
Merge pull request #6424 from IntersectMBO/jl/10.6.2-prep
Node cabal ver -> 10.6.2, bump iohkNix, update CI
2 parents 4f02648 + ce21d30 commit 23bb477

7 files changed

Lines changed: 2825 additions & 2983 deletions

File tree

cardano-node/cardano-node.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: 3.8
22

33
name: cardano-node
4-
version: 10.6.1
4+
version: 10.6.2
55
synopsis: The cardano full node
66
description: The cardano full node.
77
category: Cardano,

configuration/cardano/mainnet-config-legacy.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"SnapshotInterval": 4320
1919
},
2020
"MaxKnownMajorProtocolVersion": 2,
21-
"MinNodeVersion": "10.6.0",
21+
"MinNodeVersion": "10.6.2",
2222
"Protocol": "Cardano",
2323
"RequiresNetworkMagic": "RequiresNoMagic",
2424
"ShelleyGenesisFile": "mainnet-shelley-genesis.json",

configuration/cardano/mainnet-config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"SnapshotInterval": 4320
1919
},
2020
"MaxKnownMajorProtocolVersion": 2,
21-
"MinNodeVersion": "10.6.0",
21+
"MinNodeVersion": "10.6.2",
2222
"Protocol": "Cardano",
2323
"RequiresNetworkMagic": "RequiresNoMagic",
2424
"ShelleyGenesisFile": "mainnet-shelley-genesis.json",

configuration/cardano/mainnet-config.yaml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,13 @@ MaxKnownMajorProtocolVersion: 2
6868

6969
ConsensusMode: PraosMode
7070

71+
# Mempool timeout parameters must be either all set or all unset.
72+
# When unset cardano-node will use default values.
73+
# Default example values are:
74+
# MempoolTimeoutSoft = 1.0;
75+
# MempoolTimeoutHard = 1.5;
76+
# MempoolTimeoutCapacity = 5.0;
77+
7178
##### Ledger Configuration #####
7279

7380
# Additional configuration options can be found at:
@@ -89,11 +96,9 @@ LedgerDB:
8996

9097
##### Version Information #####
9198

92-
# Min is currently 10.6.0 for proper default handling of PeerSharing,
93-
# TargetNumberOfKnownPeers and TargetNumberOfRootPeers parameters depending
94-
# on whether node is a forger or not, as well as removal of legacy
95-
# networking mode.
96-
MinNodeVersion: 10.6.0
99+
# Min is currently 10.6.2 for proper default handling of mempool timeout
100+
# parameters.
101+
MinNodeVersion: 10.6.2
97102

98103
##### Logging configuration #####
99104

0 commit comments

Comments
 (0)