p2p checkpoint

README.md

@@ -40,14 +40,13 @@ Kepler instances are configured by the [kepler.toml](kepler.toml) configuration
 
 The following common options are available:
 
-| Option               | env var                     | description                                                    |
-|:---------------------|:----------------------------|:---------------------------------------------------------------|
-| log_level            | KEPLER_LOG_LEVEL            | Set the level of logging output, options are "normal", "debug" |
-| address              | KEPLER_ADDRESS              | Set the listening address of the kepler instance               |
-| port                 | KEPLER_PORT                 | Set the listening TCP port for the kepler instance             |
-| storage.blocks.type  | KEPLER_STORAGE_BLOCKS_TYPE  | Set the mode of block storage, options are "Local" and "S3"    |
-| storage.indexes.type | KEPLER_STORAGE_INDEXES_TYPE | Set the type of the index store, options are "Local" and "DynamoDB" |
-| orbits.allowlist     | KEPLER_ORBITS_ALLOWLIST     | Set the URL of an allowlist service for gating the creation of Orbit Peers                                                               |
+| Option               | env var                     | description                                                                |
+|:---------------------|:----------------------------|:---------------------------------------------------------------------------|
+| log_level            | KEPLER_LOG_LEVEL            | Set the level of logging output, options are "normal", "debug"             |
+| address              | KEPLER_ADDRESS              | Set the listening multi-address of the kepler instance                     |
+| storage.blocks.type  | KEPLER_STORAGE_BLOCKS_TYPE  | Set the mode of block storage, options are "Local" and "S3"                |
+| storage.indexes.type | KEPLER_STORAGE_INDEXES_TYPE | Set the type of the index store, options are "Local" and "DynamoDB"        |
+| orbits.allowlist     | KEPLER_ORBITS_ALLOWLIST     | Set the URL of an allowlist service for gating the creation of Orbit Peers |
 
 ### Storage Config
 
@@ -82,7 +81,7 @@ Additionally, the following environment variables must be present: `AWS_ACCESS_K
 Kepler instances can be started via command line, e.g.:
 
 ``` sh
-KEPLER_PORT=8001 kepler
+KEPLER_ADDRESS=/ip4/127.0.0.1/tcp/8001 kepler
 ```
 
 If the Kepler instance is not able to find or establish a connection to the configured storage, the instance will terminate.

kepler.toml

@@ -1,7 +1,6 @@
 [global]
 # log_level = "normal"
-# address = "127.0.0.1"
-# port = 8000
+# address = "/ip4/127.0.0.1/tcp/8081"
 # cors = true
 
 ## Example of nest config variable: KEPLER_DATABASE_PATH

src/auth_guards.rs

@@ -81,12 +81,11 @@ fn get_state(req: &Request<'_>) -> Result<(config::Config, (PeerId, Multiaddr))>
         .state::<config::Config>()
         .cloned()
         .ok_or_else(|| anyhow!("Could not retrieve config"))?;
-    let port = config.relay.port;
     Ok((
         config,
         req.rocket()
             .state::<RelayNode>()
-            .map(|r| (*r.id(), multiaddr!(Memory(port))))
+            .map(|r| (*r.id(), multiaddr!(Memory(1u8))))
             .ok_or_else(|| anyhow!("Could not retrieve relay node information"))?,
     ))
 }

src/config.rs

@@ -3,6 +3,7 @@ use crate::{
     storage::{file_system::FileSystemConfig, s3::S3BlockConfig},
     BlockConfig,
 };
+use libp2p::{build_multiaddr, Multiaddr};
 use rocket::http::hyper::Uri;
 use serde::{Deserialize, Serialize};
 use serde_with::{serde_as, DisplayFromStr, FromInto};
@@ -81,8 +82,7 @@ pub struct DynamoStorage {
 
 #[derive(Serialize, Deserialize, Debug, Clone, Hash, PartialEq, Eq)]
 pub struct Relay {
-    pub address: String,
-    pub port: u16,
+    pub address: Multiaddr,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, Hash, PartialEq, Eq)]
@@ -122,8 +122,7 @@ impl Default for LocalIndexStorage {
 impl Default for Relay {
     fn default() -> Self {
         Self {
-            address: "127.0.0.1".into(),
-            port: 8081,
+            address: build_multiaddr!(Ip4([127, 0, 0, 1]), Tcp(8081u16)),
         }
     }
 }

src/lib.rs

@@ -80,10 +80,7 @@ pub async fn app(config: &Figment) -> Result<Rocket<Build>> {
     )?;
 
     relay_node
-        .listen_on([
-            build_multiaddr!(Memory(kepler_config.relay.port)),
-            build_multiaddr!(Ip4([127, 0, 0, 1]), Tcp(kepler_config.relay.port)),
-        ])
+        .listen_on([build_multiaddr!(Memory(1u64)), kepler_config.relay.address])
         .await?;
 
     let routes = routes![

src/routes/mod.rs

@@ -4,7 +4,7 @@ use kepler_lib::{
     authorization::{EncodingError, HeaderEncode},
     libipld::Cid,
 };
-use libp2p::{identity::Keypair, multiaddr::multiaddr, PeerId};
+use libp2p::{identity::Keypair, multiaddr::Protocol, PeerId};
 use rocket::{
     data::{Data, ToByteUnit},
     http::{Header, Status},
@@ -90,12 +90,12 @@ pub mod util_routes {
 
 #[get("/peer/relay")]
 pub fn relay_addr(relay: &State<RelayNode>, config: &State<Config>) -> String {
-    multiaddr!(
-        Ip4([127, 0, 0, 1]),
-        Tcp(config.relay.port),
-        P2p(*relay.id())
-    )
-    .to_string()
+    config
+        .relay
+        .address
+        .clone()
+        .with(Protocol::P2p(*relay.id().as_ref()))
+        .to_string()
 }
 
 #[get("/peer/generate")]