Merge pull request #3157 from autonomys/gateway-args

Add max object size and DSN listen on address arguments to gateway

crates/subspace-gateway/src/commands/run.rs

@@ -22,6 +22,9 @@ use subspace_gateway_rpc::{SubspaceGatewayRpc, SubspaceGatewayRpcConfig};
 use subspace_kzg::Kzg;
 use tracing::info;
 
+/// The default size limit, based on the maximum block size in some domains.
+pub const DEFAULT_MAX_SIZE: usize = 5 * 1024 * 1024;
+
 /// Options for running a node
 #[derive(Debug, Parser)]
 pub(crate) struct RunOptions {
@@ -39,13 +42,17 @@ pub(crate) struct GatewayOptions {
     #[arg(long, verbatim_doc_comment)]
     dev: bool,
 
+    /// The maximum object size to fetch.
+    /// Larger objects will return an error.
+    #[arg(long, default_value_t = DEFAULT_MAX_SIZE)]
+    max_size: usize,
+
     #[clap(flatten)]
     dsn_options: NetworkArgs,
 
     /// Options for RPC
     #[clap(flatten)]
     rpc_options: RpcOptions<RPC_DEFAULT_PORT>,
-    // TODO: maximum object size
 }
 
 /// Default run command for gateway
@@ -56,6 +63,7 @@ pub async fn run(run_options: RunOptions) -> anyhow::Result<()> {
         gateway:
             GatewayOptions {
                 dev,
+                max_size,
                 mut dsn_options,
                 rpc_options,
             },
@@ -87,7 +95,7 @@ pub async fn run(run_options: RunOptions) -> anyhow::Result<()> {
         dsn_node.clone(),
         SegmentCommitmentPieceValidator::new(dsn_node, node_client, kzg),
     );
-    let object_fetcher = ObjectFetcher::new(piece_getter, erasure_coding, None);
+    let object_fetcher = ObjectFetcher::new(piece_getter, erasure_coding, Some(max_size));
 
     let rpc_api = SubspaceGatewayRpc::new(SubspaceGatewayRpcConfig { object_fetcher });
     let rpc_handle = launch_rpc_server(rpc_api, rpc_options).await?;

crates/subspace-gateway/src/commands/run/network.rs

@@ -40,6 +40,12 @@ pub(crate) struct NetworkArgs {
     /// Maximum pending outgoing swarm connection limit.
     #[arg(long, default_value_t = 100)]
     pending_out_connections: u32,
+
+    /// Multiaddrs to listen on for DSN connections, multiple are supported.
+    ///
+    /// This is mainly for debugging.
+    #[arg(long)]
+    listen_on: Vec<Multiaddr>,
 }
 
 /// Create a DSN network client with the supplied configuration.
@@ -54,6 +60,7 @@ pub async fn configure_network(
         allow_private_ips,
         out_connections,
         pending_out_connections,
+        listen_on,
     }: NetworkArgs,
 ) -> anyhow::Result<(Node, NodeRunner<()>, RpcNodeClient)> {
     // TODO:
@@ -92,6 +99,7 @@ pub async fn configure_network(
         max_established_outgoing_connections: out_connections,
         max_pending_outgoing_connections: pending_out_connections,
         kademlia_mode: KademliaMode::Static(Mode::Client),
+        listen_on,
         ..default_config
     };
 

crates/subspace-gateway/src/commands/run/rpc.rs

@@ -12,7 +12,7 @@ pub const RPC_DEFAULT_PORT: u16 = 9955;
 /// Options for the RPC server.
 #[derive(Debug, Parser)]
 pub(crate) struct RpcOptions<const DEFAULT_PORT: u16> {
-    /// IP and port (TCP) on which to listen for RPC requests.
+    /// IP and port (TCP) to listen for RPC requests.
     ///
     /// This RPC method is not safe to be exposed on a public IP address.
     #[arg(long, default_value_t = SocketAddr::new(