Merge #728

728: Default dns relays r=disassembler a=disassembler

Issue
-----------

-

- This PR **results**/**does not result** in breaking changes to upstream dependencies.

Checklist
---------
- [ ] This PR contains all the work required to resolve the linked issue.

- [ ] The work contained has sufficient documentation to describe what it does and how to do it.

- [ ] The work has sufficient tests and/or testing.

- [ ] I have committed clear and descriptive commits. Be considerate as somebody else will have to read these.

- [ ] I have added the appropriate labels to this PR.


Co-authored-by: Samuel Leathers <[email protected]>

nix/nixos/cardano-node-service.nix

@@ -210,7 +210,7 @@ in {
         type = types.path;
         default = commonLib.mkEdgeTopology {
           inherit (cfg) port;
-          inherit (envConfig) edgeNodes;
+          edgeNodes = [ envConfig.relaysNew ];
         };
         description = ''
           Cluster topology

nix/scripts.nix

@@ -44,7 +44,12 @@ let
     topologyFile = let
       edgePort = if config.useProxy then config.proxyPort else config.edgePort;
       edgeHost = if config.useProxy then config.proxyHost else config.edgeHost;
-      edgeNodes = if config.useProxy then [] else config.edgeNodes;
+      hasCustomEdgeNodes = __hasAttr "edgeNodes" customConfig;
+      hasRelaysNew = __hasAttr "relaysNew" config;
+      edgeNodes = let
+        relaysNodes = [ config.relaysNew ];
+        edgeNodes' = if (hasCustomEdgeNodes || !hasRelaysNew) then config.edgeNodes else relaysNodes;
+      in if config.useProxy then [] else edgeNodes';
     in config.topologyFile or mkEdgeTopology {
       inherit (config) hostAddr port;
       inherit edgeNodes edgeHost edgePort;