Merge pull request #6011 from IntersectMBO/jl/mn-relays-new

Drop legacy relay bootstrap filtering in nixos node svc
IntersectMBO · Oct 14, 2024 · 72642b5 · 72642b5
2 parents 6beea61 + ae057e1
commit 72642b5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/configuration/cardano/mainnet-topology.json b/configuration/cardano/mainnet-topology.json
@@ -5,11 +5,11 @@
       "port": 3001
     },
     {
-      "address": "backbone.mainnet.emurgornd.com",
+      "address": "backbone.mainnet.cardanofoundation.org",
       "port": 3001
     },
     {
-      "address": "backbone.mainnet.cardanofoundation.org",
+      "address": "backbone.mainnet.emurgornd.com",
       "port": 3001
     }
   ],

diff --git a/flake.lock b/flake.lock
diff --git a/nix/nixos/cardano-node-service.nix b/nix/nixos/cardano-node-service.nix
@@ -546,17 +546,7 @@ in {
 
       bootstrapPeers = mkOption {
         type = types.nullOr (types.listOf types.attrs);
-        default =
-          # Until legacy mainnet relays are deprecated and replaced by IOG bootstrap peers for relaysNew,
-          # filter the legacy relaysNew definition from the mainnet bootstrapPeers list.
-          #
-          # All other envs can use the edgeNodes list as bootstrapPeers.
-          if envConfig.name == "mainnet"
-          then
-            map (e: {address = e.addr; inherit (e) port;})
-              (builtins.filter (e: e.addr != envConfig.relaysNew) envConfig.edgeNodes)
-          else
-            map (e: {address = e.addr; inherit (e) port;}) envConfig.edgeNodes;
+        default = map (e: {address = e.addr; inherit (e) port;}) envConfig.edgeNodes;
         description = ''
           If set, it will enable bootstrap peers.
           To disable, set this to null.