Skip to content

Commit 72642b5

Browse files
authored
Merge pull request #6011 from IntersectMBO/jl/mn-relays-new
Drop legacy relay bootstrap filtering in nixos node svc
2 parents 6beea61 + ae057e1 commit 72642b5

File tree

3 files changed

+6
-16
lines changed

3 files changed

+6
-16
lines changed

configuration/cardano/mainnet-topology.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
"port": 3001
66
},
77
{
8-
"address": "backbone.mainnet.emurgornd.com",
8+
"address": "backbone.mainnet.cardanofoundation.org",
99
"port": 3001
1010
},
1111
{
12-
"address": "backbone.mainnet.cardanofoundation.org",
12+
"address": "backbone.mainnet.emurgornd.com",
1313
"port": 3001
1414
}
1515
],

flake.lock

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

nix/nixos/cardano-node-service.nix

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -546,17 +546,7 @@ in {
546546

547547
bootstrapPeers = mkOption {
548548
type = types.nullOr (types.listOf types.attrs);
549-
default =
550-
# Until legacy mainnet relays are deprecated and replaced by IOG bootstrap peers for relaysNew,
551-
# filter the legacy relaysNew definition from the mainnet bootstrapPeers list.
552-
#
553-
# All other envs can use the edgeNodes list as bootstrapPeers.
554-
if envConfig.name == "mainnet"
555-
then
556-
map (e: {address = e.addr; inherit (e) port;})
557-
(builtins.filter (e: e.addr != envConfig.relaysNew) envConfig.edgeNodes)
558-
else
559-
map (e: {address = e.addr; inherit (e) port;}) envConfig.edgeNodes;
549+
default = map (e: {address = e.addr; inherit (e) port;}) envConfig.edgeNodes;
560550
description = ''
561551
If set, it will enable bootstrap peers.
562552
To disable, set this to null.

0 commit comments

Comments
 (0)