refactor(core): consolidate Cluster and ClusterType into single enum

- Merge sig.core.Cluster into ClusterType in genesis_config.zig
- Move entrypoints and RPC URLs to ClusterType methods
- Rename localnet to development to match Agave naming
- Lift cluster config from gossip to top-level Cmd config
- Fix duplicate rpc_client.deinit() call in cmd.zig

Author: Ubuntu

src/accountsdb/db.zig

@@ -3305,7 +3305,7 @@ pub fn indexAndValidateAccountFile(
 }
 
 pub fn getAccountPerFileEstimateFromCluster(
-    cluster: sig.core.Cluster,
+    cluster: sig.core.ClusterType,
 ) error{NotImplementedYet}!u64 {
     return switch (cluster) {
         .testnet => 500,
@@ -4178,7 +4178,7 @@ pub const BenchmarkAccountsDBSnapshotLoad = struct {
         use_disk: bool,
         n_threads: u32,
         name: []const u8,
-        cluster: sig.core.Cluster,
+        cluster: sig.core.ClusterType,
     };
 
     pub const inputs = [_]BenchInputs{.{

src/cmd.zig

@@ -209,7 +209,7 @@ pub fn main() !void {
             );
             current_config.genesis_file_path = params.genesis_file_path;
             params.accountsdb_base.apply(&current_config);
-            current_config.gossip.cluster = params.gossip_cluster;
+            current_config.cluster = params.gossip_cluster;
             params.geyser.apply(&current_config);
             current_config.geyser.pipe_path = try current_config.derivePathFromValidatorDir(
                 gpa,
@@ -556,7 +556,7 @@ const Cmd = struct {
             cfg.gossip.host = args.host;
             cfg.gossip.port = args.port;
             cfg.gossip.entrypoints = args.entrypoints;
-            cfg.gossip.cluster = args.network;
+            cfg.cluster = args.network;
         }
     };
     const GossipArgumentsNode = struct {
@@ -1335,19 +1335,8 @@ fn ensureGenesis(
         return try allocator.dupe(u8, provided_path);
     }
 
-    // If genesis already exists in validator dir, use it
-    const existing_path = try std.fs.path.join(
-        allocator,
-        &.{ cfg.validator_dir, "genesis.bin" },
-    );
-    errdefer allocator.free(existing_path);
-    if (!std.meta.isError(std.fs.cwd().access(existing_path, .{}))) {
-        logger.info().logf("Using existing genesis file: {s}", .{existing_path});
-        return existing_path;
-    }
-
     // Determine cluster for genesis
-    const cluster = try cfg.gossip.getCluster() orelse {
+    const cluster = try cfg.getCluster() orelse {
         logger.err().log(
             \\No genesis file path provided and no cluster specified. 
             \\Use --genesis-file-path or --cluster"
@@ -1357,12 +1346,7 @@ fn ensureGenesis(
 
     // Otherwise, download genesis from network
     logger.info().logf("Downloading genesis from {s} cluster...", .{@tagName(cluster)});
-    const cluster_url = switch (cluster) {
-        .mainnet => "https://api.mainnet-beta.solana.com",
-        .testnet => "https://api.testnet.solana.com",
-        .devnet => "https://api.devnet.solana.com",
-        .localnet => unreachable,
-    };
+    const cluster_url = cluster.getRpcUrl();
     const genesis_path = downloadAndExtractGenesis(
         allocator,
         cluster_url,
@@ -2118,18 +2102,12 @@ fn printLeaderSchedule(allocator: std.mem.Allocator, cfg: config.Cmd) !void {
 
     const leader_schedule //
     = try getLeaderScheduleFromCli(allocator, cfg) orelse b: {
-        const cluster = try cfg.gossip.getCluster() orelse
+        const cluster_type = try cfg.getCluster() orelse
             return error.ClusterNotProvided;
 
-        const cluster_type: ClusterType = switch (cluster) {
-            .mainnet => .MainnetBeta,
-            .devnet => .Devnet,
-            .testnet => .Testnet,
-            .localnet => .LocalHost,
-        };
-
         var rpc_client = try sig.rpc.Client.init(allocator, cluster_type, .{});
         defer rpc_client.deinit();
+        defer rpc_client.deinit();
 
         const slot = blk: {
             const response = try rpc_client.getSlot(.{});
@@ -2201,12 +2179,7 @@ fn testTransactionSenderService(
     }
 
     // define cluster of where to land transactions
-    const rpc_cluster: ClusterType = if (try cfg.gossip.getCluster()) |n| switch (n) {
-        .mainnet => .MainnetBeta,
-        .devnet => .Devnet,
-        .testnet => .Testnet,
-        .localnet => .LocalHost,
-    } else {
+    const rpc_cluster: ClusterType = try cfg.getCluster() orelse {
         @panic("cluster option (-c) not provided");
     };
     app_base.logger.warn().logf(
@@ -2455,7 +2428,7 @@ const AppBase = struct {
         const my_keypair = try sig.identity.getOrInit(allocator, .from(logger));
         const my_pubkey = Pubkey.fromPublicKey(&my_keypair.public_key);
 
-        const entrypoints = try cfg.gossip.getEntrypointAddrs(allocator);
+        const entrypoints = try cfg.gossip.getEntrypointAddrs(try cfg.getCluster(), allocator);
 
         const echo_data = try getShredAndIPFromEchoServer(.from(logger), entrypoints);
 

src/config.zig

@@ -19,6 +19,7 @@ pub const Cmd = struct {
     max_shreds: u64 = 5_000_000,
     leader_schedule_path: ?[]const u8 = null,
     genesis_file_path: ?[]const u8 = null,
+    cluster: ?[]const u8 = null,
     // general config
     log_filters: sig.trace.Filters = .debug,
     log_file: ?[]const u8 = null,
@@ -32,20 +33,29 @@ pub const Cmd = struct {
     vote_account: ?[]const u8 = null,
     stop_at_slot: ?sig.core.Slot = null,
 
-    pub fn genesisFilePath(self: Cmd) error{UnknownCluster}!?[]const u8 {
+    pub fn getCluster(self: Cmd) error{UnknownCluster}!?sig.core.ClusterType {
+        return if (self.cluster) |cluster_str|
+            std.meta.stringToEnum(sig.core.ClusterType, cluster_str) orelse error.UnknownCluster
+        else
+            null;
+    }
+
+    pub fn genesisFilePath(self: Cmd) !?[]const u8 {
         if (self.genesis_file_path) |provided_path|
             return provided_path;
 
-        const local_path = if (try self.gossip.getCluster()) |n| switch (n) {
+        const local_path = if (try self.getCluster()) |cluster| switch (cluster) {
             .mainnet => "data/genesis-files/mainnet_genesis.bin",
             .devnet => "data/genesis-files/devnet_genesis.bin",
             .testnet => "data/genesis-files/testnet_genesis.bin",
-            .localnet => return error.MustProvideGenesisFileForLocalHost,
+            .development => return null,
         } else return null;
 
         std.fs.cwd().access(local_path, .{ .read = true }) catch {
             return null;
         };
+
+        return local_path;
     }
 
     /// Derives a path relative to validator_dir if the param equals the default value.
@@ -140,7 +150,6 @@ pub const Gossip = struct {
     host: ?[]const u8 = null,
     port: u16 = 8001,
     entrypoints: []const []const u8 = &.{},
-    cluster: ?[]const u8 = null,
     spy_node: bool = false,
     dump: bool = false,
     trusted_validators: []const []const u8 = &.{},
@@ -163,30 +172,23 @@ pub const Gossip = struct {
         };
     }
 
-    pub fn getCluster(self: Gossip) error{UnknownCluster}!?sig.core.Cluster {
-        return if (self.cluster) |cluster_str|
-            std.meta.stringToEnum(sig.core.Cluster, cluster_str) orelse
-                error.UnknownCluster
-        else
-            null;
-    }
-
     pub fn getEntrypointAddrs(
         self: Gossip,
+        cluster: ?sig.core.ClusterType,
         allocator: std.mem.Allocator,
     ) ![]sig.net.SocketAddr {
         var entrypoint_set = std.AutoArrayHashMap(sig.net.SocketAddr, void).init(allocator);
         defer entrypoint_set.deinit();
 
-        // add cluster entrypoints
-        if (try self.getCluster()) |cluster| {
-            for (sig.gossip.getClusterEntrypoints(cluster)) |entrypoint| {
+        // add cluster entrypoints (only for public clusters)
+        if (cluster) |c| {
+            for (c.getEntrypoints()) |entrypoint| {
                 const socket_addr = try resolveSocketAddr(allocator, entrypoint);
                 try entrypoint_set.put(socket_addr, {});
             }
         }
 
-        // add config entrypoints
+        // add user-provided entrypoints
         for (self.entrypoints) |entrypoint| {
             const socket_addr = sig.net.SocketAddr.parse(entrypoint) catch brk: {
                 break :brk try resolveSocketAddr(allocator, entrypoint);

src/core/genesis_config.zig

@@ -250,17 +250,50 @@ pub const Inflation = struct {
     }
 };
 
-/// Analogous to [ClusterType](https://github.com/anza-xyz/agave/blob/cadba689cb44db93e9c625770cafd2fc0ae89e33/sdk/src/genesis_config.rs#L46)
+/// Analogous to [ClusterType](https://github.com/anza-xyz/solana-sdk/blob/a467058aabc453c7d749a4993c56df293d1d75c3/cluster-type/src/lib.rs#L19)
 /// Explicit numbers are added to ensure we don't mess up the order of the fields and break bincode reading.
-pub const ClusterType = union(enum(u8)) {
-    Testnet = 0,
-    MainnetBeta = 1,
-    Devnet = 2,
-    Development = 3,
-    LocalHost,
-    Custom: struct {
-        url: []const u8,
-    },
+pub const ClusterType = enum(u8) {
+    testnet = 0,
+    mainnet = 1,
+    devnet = 2,
+    development = 3,
+
+    /// Returns entrypoints for public clusters, null for development.
+    /// For development, the caller must provide entrypoints manually.
+    pub fn getEntrypoints(self: ClusterType) []const []const u8 {
+        return switch (self) {
+            .mainnet => &.{
+                "entrypoint.mainnet-beta.solana.com:8001",
+                "entrypoint2.mainnet-beta.solana.com:8001",
+                "entrypoint3.mainnet-beta.solana.com:8001",
+                "entrypoint4.mainnet-beta.solana.com:8001",
+                "entrypoint5.mainnet-beta.solana.com:8001",
+            },
+            .testnet => &.{
+                "entrypoint.testnet.solana.com:8001",
+                "entrypoint2.testnet.solana.com:8001",
+                "entrypoint3.testnet.solana.com:8001",
+            },
+            .devnet => &.{
+                "entrypoint.devnet.solana.com:8001",
+                "entrypoint2.devnet.solana.com:8001",
+                "entrypoint3.devnet.solana.com:8001",
+                "entrypoint4.devnet.solana.com:8001",
+                "entrypoint5.devnet.solana.com:8001",
+            },
+            .development => @panic("TODO: should development require custom entrypoints?"),
+        };
+    }
+
+    /// Returns the RPC URL for this cluster.
+    pub fn getRpcUrl(self: ClusterType) []const u8 {
+        return switch (self) {
+            .mainnet => "https://api.mainnet-beta.solana.com",
+            .testnet => "https://api.testnet.solana.com",
+            .devnet => "https://api.devnet.solana.com",
+            .development => @panic("TODO: should development require custom rpc urls?"),
+        };
+    }
 };
 
 /// Analogous to [GenesisConfig](https://github.com/anza-xyz/agave/blob/cadba689cb44db93e9c625770cafd2fc0ae89e33/sdk/src/genesis_config.rs#L93)
@@ -312,7 +345,7 @@ pub const GenesisConfig = struct {
             .fee_rate_governor = .DEFAULT,
             .rent = .INIT,
             .epoch_schedule = .INIT,
-            .cluster_type = .Development,
+            .cluster_type = .development,
         };
     }
 
@@ -352,7 +385,7 @@ test "genesis_config deserialize development config" {
     const config = try GenesisConfig.init(allocator, genesis_path);
     defer config.deinit(allocator);
 
-    try std.testing.expectEqual(ClusterType.Development, config.cluster_type);
+    try std.testing.expectEqual(ClusterType.development, config.cluster_type);
 }
 
 test "genesis_config deserialize testnet config" {
@@ -362,7 +395,7 @@ test "genesis_config deserialize testnet config" {
     const config = try GenesisConfig.init(allocator, genesis_path);
     defer config.deinit(allocator);
 
-    try std.testing.expectEqual(ClusterType.Testnet, config.cluster_type);
+    try std.testing.expectEqual(ClusterType.testnet, config.cluster_type);
 }
 
 test "genesis_config deserialize devnet config" {
@@ -372,7 +405,7 @@ test "genesis_config deserialize devnet config" {
     const config = try GenesisConfig.init(allocator, genesis_path);
     defer config.deinit(allocator);
 
-    try std.testing.expectEqual(ClusterType.Devnet, config.cluster_type);
+    try std.testing.expectEqual(ClusterType.devnet, config.cluster_type);
 }
 
 test "genesis_config deserialize mainnet config" {
@@ -382,7 +415,7 @@ test "genesis_config deserialize mainnet config" {
     const config = try GenesisConfig.init(allocator, genesis_path);
     defer config.deinit(allocator);
 
-    try std.testing.expectEqual(ClusterType.MainnetBeta, config.cluster_type);
+    try std.testing.expectEqual(ClusterType.mainnet, config.cluster_type);
 }
 
 test "inflation" {

src/core/lib.zig

@@ -77,5 +77,3 @@ pub const Transaction = transaction.Transaction;
 pub const Epoch = time.Epoch;
 pub const Slot = time.Slot;
 pub const UnixTimestamp = time.UnixTimestamp;
-
-pub const Cluster = enum { mainnet, testnet, devnet, localnet };

src/gossip/helpers.zig

@@ -3,29 +3,28 @@ const sig = @import("../sig.zig");
 
 const Pubkey = sig.core.Pubkey;
 const ContactInfo = sig.gossip.ContactInfo;
-const Cluster = sig.core.Cluster;
+const ClusterType = sig.core.ClusterType;
 const GossipService = sig.gossip.GossipService;
 const SocketAddr = sig.net.SocketAddr;
 const IpAddr = sig.net.IpAddr;
 
 const resolveSocketAddr = sig.net.net.resolveSocketAddr;
 const getShredAndIPFromEchoServer = sig.net.echo.getShredAndIPFromEchoServer;
 const getWallclockMs = sig.time.getWallclockMs;
-const getClusterEntrypoints = sig.gossip.service.getClusterEntrypoints;
 
 /// inits a gossip client with the minimum required configuration
 /// relying on the cluster to provide the entrypoints
 pub fn initGossipFromCluster(
     allocator: std.mem.Allocator,
     logger: sig.trace.Logger("gossip"),
-    cluster: Cluster,
+    cluster: ClusterType,
     my_port: u16,
 ) !*GossipService {
     // gather entrypoints
     var entrypoints = std.ArrayList(SocketAddr).init(allocator);
     defer entrypoints.deinit();
 
-    const entrypoints_strs = getClusterEntrypoints(cluster);
+    const entrypoints_strs = cluster.getEntrypoints();
     for (entrypoints_strs) |entrypoint_str| {
         const socket_addr = try resolveSocketAddr(allocator, entrypoint_str);
         try entrypoints.append(socket_addr);

src/gossip/lib.zig

@@ -24,5 +24,3 @@ pub const Ping = ping_pong.Ping;
 pub const Pong = ping_pong.Pong;
 pub const SocketTag = data.SocketTag;
 pub const PruneData = prune.PruneData;
-
-pub const getClusterEntrypoints = service.getClusterEntrypoints;

src/gossip/service.zig

@@ -2256,34 +2256,6 @@ pub fn chunkValuesIntoPacketIndexes(
     return packet_indexs;
 }
 
-pub fn getClusterEntrypoints(cluster: sig.core.Cluster) []const []const u8 {
-    return switch (cluster) {
-        .mainnet => &.{
-            "entrypoint.mainnet-beta.solana.com:8001",
-            "entrypoint2.mainnet-beta.solana.com:8001",
-            "entrypoint3.mainnet-beta.solana.com:8001",
-            "entrypoint4.mainnet-beta.solana.com:8001",
-            "entrypoint5.mainnet-beta.solana.com:8001",
-        },
-        .testnet => &.{
-            "entrypoint.testnet.solana.com:8001",
-            "entrypoint2.testnet.solana.com:8001",
-            "entrypoint3.testnet.solana.com:8001",
-        },
-        .devnet => &.{
-            "entrypoint.devnet.solana.com:8001",
-            "entrypoint2.devnet.solana.com:8001",
-            "entrypoint3.devnet.solana.com:8001",
-            "entrypoint4.devnet.solana.com:8001",
-            "entrypoint5.devnet.solana.com:8001",
-        },
-        .localnet => &.{
-            "127.0.0.1:1024", // agave test-validator default
-            "127.0.0.1:8001", // sig validator default
-        },
-    };
-}
-
 test "general coverage" {
     const allocator = std.testing.allocator;