imp: inc relay to ~100% p2p, w/ 1 legacy topo canary

input-output-hk · Sep 7, 2023 · d3cce25 · d3cce25
1 parent 03e8e42
commit d3cce25
Showing 1 changed file with 7 additions and 12 deletions.
diff --git a/topologies/mainnet.nix b/topologies/mainnet.nix
@@ -26,27 +26,21 @@ let
   regions = {
     a = { name = "eu-central-1";   # Europe (Frankfurt);
       minRelays = 40;
-      nbRelaysExcludingThirdParty = 1;
     };
     b = { name = "us-east-2";      # US East (Ohio)
       minRelays = 25;
-      nbRelaysExcludingThirdParty = 1;
     };
     c = { name = "ap-southeast-1"; # Asia Pacific (Singapore)
       minRelays = 10;
-      nbRelaysExcludingThirdParty = 1;
     };
     d = { name = "eu-west-2";      # Europe (London)
       minRelays = 15;
-      nbRelaysExcludingThirdParty = 1;
     };
     e = { name = "us-west-1";      # US West (N. California)
       minRelays = 15;
-      nbRelaysExcludingThirdParty = 1;
     };
     f = { name = "ap-northeast-1"; # Asia Pacific (Tokyo)
       minRelays = 10;
-      nbRelaysExcludingThirdParty = 1;
     };
   };
 
@@ -184,12 +178,13 @@ let
       };
     } (lib.flatten [
       # See the nixops deploy [--build-only] [--include ...] trace for calculated p2p percentages per region.
-      (p2pRelayRegionList "a" 36) # Currently 40 total region a relays, each represents 2.5% of region total
-      (p2pRelayRegionList "b" 23) # Currently 25 total region b relays, each represents 4.0% of region total
-      (p2pRelayRegionList "c" 9) # Currently 10 total region c relays, each represents 10.0% of region total
-      (p2pRelayRegionList "d" 14) # Currently 15 total region d relays, each represents 6.67% of region total
-      (p2pRelayRegionList "e" 14) # Currently 15 total region e relays, each represents 6.67% of region total
-      (p2pRelayRegionList "f" 9) # Currently 10 total region f relays, each represents 10.0% of region total
+      # Leave one legacy topology relay as a canary, rel-a-1
+      (p2pRelayRegionList "a" 39) # Currently 40 total region a relays, each represents 2.5% of region total
+      (p2pRelayRegionList "b" 25) # Currently 25 total region b relays, each represents 4.0% of region total
+      (p2pRelayRegionList "c" 10) # Currently 10 total region c relays, each represents 10.0% of region total
+      (p2pRelayRegionList "d" 15) # Currently 15 total region d relays, each represents 6.67% of region total
+      (p2pRelayRegionList "e" 15) # Currently 15 total region e relays, each represents 6.67% of region total
+      (p2pRelayRegionList "f" 10) # Currently 10 total region f relays, each represents 10.0% of region total
     ]))
   ]) (
     map (withModule {