[Feat] add band source

Cargo.toml

@@ -30,6 +30,7 @@ bothan-coinmarketcap = { path = "bothan-coinmarketcap", version = "0.0.1" }
 bothan-htx = { path = "bothan-htx", version = "0.0.1" }
 bothan-kraken = { path = "bothan-kraken", version = "0.0.1" }
 bothan-okx = { path = "bothan-okx", version = "0.0.1" }
+bothan-band = { path = "bothan-band", version = "0.0.1" }
 
 anyhow = "1.0.86"
 async-trait = "0.1.77"

README.md

@@ -35,6 +35,8 @@ This project comprises primarily of 6 main components:
 - [HTX](bothan-htx)
 - [Kraken](bothan-kraken)
 - [OKX](bothan-okx)
+- [Band/kiwi](bothan-band)
+- [Band/macaw](bothan-band)
 
 ## Features
 
@@ -64,6 +66,32 @@ This project comprises primarily of 6 main components:
    docker-compose up
    ```
 
+## Generating Protobuf Files
+
+Bothan uses [Buf](https://buf.build/) for protobuf file generation and linting.
+
+1. **Generate all proto files for Go client, Rust client, and server:**
+
+   Run the following command from the root of the project:
+
+   ```bash
+   buf generate
+   ```
+
+   This command will generate protobuf files for all supported languages (Go, Rust, server stubs, etc.) as specified in the `buf.gen.yaml` configuration.
+
+2. **Generate the descriptor file for the server:**
+
+   To create a protobuf descriptor file needed by the server, run:
+
+   ```bash
+   buf build -o bothan-api/server/src/proto/descriptor.pb
+   ```
+
+   This will output the descriptor file to `bothan-api/server/src/proto/descriptor.pb`.
+
+For more information on modifying or generating protobuf files, refer to [Buf documentation](https://docs.buf.build/).
+
 ## Support
 
 If you encounter any issues or have questions related to Bothan, we encourage you to open a GitHub issue. This ensures a

bothan-api/server-cli/Cargo.toml

@@ -24,6 +24,7 @@ bothan-coinmarketcap = { workspace = true }
 bothan-htx = { workspace = true }
 bothan-kraken = { workspace = true }
 bothan-okx = { workspace = true }
+bothan-band = { workspace = true }
 
 dirs = { workspace = true }
 futures = { workspace = true }

bothan-api/server-cli/config.example.toml

@@ -76,7 +76,7 @@ api_key = ""
 # User agent string for HTTP requests to CoinGecko.
 user_agent = "Bothan"
 # Update interval for polling data from CoinGecko.
-update_interval = "30s"
+update_interval = "1m"
 
 # Configuration for CoinMarketCap.
 [manager.crypto.source.coinmarketcap]
@@ -102,6 +102,18 @@ url = "wss://ws.kraken.com/v2"
 # WebSocket URL for streaming data from OKX.
 url = "wss://ws.okx.com:8443/ws/v5/public"
 
+[manager.crypto.source.band_kiwi]
+# URL for Band Kiwi source
+url = "https://kiwi.bandchain.org"
+# Update interval for Band Kiwi source
+update_interval = "1m"
+
+[manager.crypto.source.band_macaw]
+# URL for Band Macaw source
+url = "https://macaw.bandchain.org"
+# Update interval for Band Macaw source
+update_interval = "1m"
+
 # Telemetry configuration
 [telemetry]
 # Enable or disable telemetry.

bothan-api/server-cli/src/commands/config.rs

@@ -7,7 +7,6 @@ use std::path::PathBuf;
 
 use anyhow::{Context, anyhow};
 use bothan_api::config::AppConfig;
-use bothan_api::config::manager::crypto_info::sources::CryptoSourceConfigs;
 use clap::{Parser, Subcommand};
 
 use crate::bothan_home_dir;
@@ -54,8 +53,7 @@ impl ConfigCli {
                         .with_context(|| "Failed to create parent directories")?;
                 }
 
-                let mut app_config = AppConfig::default();
-                app_config.manager.crypto.source = CryptoSourceConfigs::with_default_sources();
+                let app_config = AppConfig::default();
 
                 let config_str =
                     toml::to_string(&app_config).with_context(|| "Failed to serialize config")?;

bothan-api/server-cli/src/commands/key.rs

@@ -74,7 +74,7 @@ fn export_key(config: &AppConfig) -> anyhow::Result<()> {
         read(&config.monitoring.path).with_context(|| "Failed to read monitoring key file")?;
     let pk = String::from_utf8(pkb).with_context(|| "Failed to parse monitoring key file")?;
     println!("Private Key");
-    println!("{}", pk);
+    println!("{pk}");
     Ok(())
 }
 

bothan-api/server-cli/src/commands/query.rs

@@ -112,6 +112,18 @@ pub enum QuerySubCommand {
         #[clap(flatten)]
         args: QueryArgs,
     },
+    /// Query Band/kiwi prices
+    #[clap(name = "band/kiwi")]
+    BandKiwi {
+        #[clap(flatten)]
+        args: QueryArgs,
+    },
+    /// Query Band/macaw prices
+    #[clap(name = "band/macaw")]
+    BandMacaw {
+        #[clap(flatten)]
+        args: QueryArgs,
+    },
 }
 
 impl QueryCli {
@@ -155,6 +167,14 @@ impl QueryCli {
                 let opts = source_config.okx.ok_or(config_err)?;
                 query_okx(opts, &args.query_ids, args.timeout).await?;
             }
+            QuerySubCommand::BandKiwi { args } => {
+                let opts = source_config.band_kiwi.ok_or(config_err)?;
+                query_band(opts, &args.query_ids, args.timeout).await?;
+            }
+            QuerySubCommand::BandMacaw { args } => {
+                let opts = source_config.band_macaw.ok_or(config_err)?;
+                query_band(opts, &args.query_ids, args.timeout).await?;
+            }
         }
 
         Ok(())
@@ -294,6 +314,22 @@ async fn query_okx<T: Into<Duration>>(
     Ok(())
 }
 
+async fn query_band<T: Into<Duration>>(
+    opts: bothan_band::WorkerOpts,
+    query_ids: &[String],
+    timeout_interval: T,
+) -> anyhow::Result<()> {
+    let api = bothan_band::api::RestApiBuilder::new(opts.url).build()?;
+    let asset_infos = timeout(
+        timeout_interval.into(),
+        api.get_asset_info(&dedup(query_ids)),
+    )
+    .await??;
+
+    display_asset_infos(asset_infos);
+    Ok(())
+}
+
 async fn query_websocket_with_max_sub<C, P, E1, E2>(
     connector: Arc<C>,
     ids: Vec<String>,

bothan-api/server-cli/src/commands/request.rs

@@ -60,7 +60,7 @@ impl RequestCli {
         let client = match GrpcClient::connect(&uri).await {
             Ok(client) => client,
             Err(e) => {
-                eprintln!("Failed to connect to server: {:#?}", e);
+                eprintln!("Failed to connect to server: {e:#?}");
                 std::process::exit(1);
             }
         };
@@ -71,7 +71,7 @@ impl RequestCli {
                     .get_info()
                     .await
                     .with_context(|| "Failed to get info")?;
-                println!("{:#?}", info);
+                println!("{info:#?}");
             }
             RequestSubCommand::UpdateRegistry { ipfs_hash, version } => {
                 client
@@ -98,7 +98,7 @@ impl RequestCli {
                     .get_prices(&ids)
                     .await
                     .with_context(|| "Failed to get prices")?;
-                println!("{:#?}", prices);
+                println!("{prices:#?}");
             }
         }
         Ok(())

bothan-api/server-cli/src/commands/start.rs

@@ -251,6 +251,8 @@ async fn init_crypto_opts(
     add_worker_opts(&mut worker_opts, &source.htx).await?;
     add_worker_opts(&mut worker_opts, &source.kraken).await?;
     add_worker_opts(&mut worker_opts, &source.okx).await?;
+    add_worker_opts(&mut worker_opts, &source.band_kiwi).await?;
+    add_worker_opts(&mut worker_opts, &source.band_macaw).await?;
 
     Ok(worker_opts)
 }

bothan-api/server-cli/src/helper.rs

@@ -32,7 +32,7 @@ impl<T> Exitable<T> for anyhow::Result<T> {
         match self {
             Ok(t) => t,
             Err(e) => {
-                eprintln!("{:?}", e);
+                eprintln!("{e:?}");
                 std::process::exit(code);
             }
         }

bothan-api/server-cli/src/main.rs

@@ -86,7 +86,7 @@ async fn main() {
     let cli = match Cli::try_parse() {
         Ok(cli) => cli,
         Err(e) => {
-            eprintln!("{}", e);
+            eprintln!("{e}");
             std::process::exit(1);
         }
     };
@@ -117,7 +117,8 @@ async fn main() {
         .add_directive(create_directive("bothan_cryptocompare", src_log_lvl))
         .add_directive(create_directive("bothan_htx", src_log_lvl))
         .add_directive(create_directive("bothan_kraken", src_log_lvl))
-        .add_directive(create_directive("bothan_okx", src_log_lvl));
+        .add_directive(create_directive("bothan_okx", src_log_lvl))
+        .add_directive(create_directive("bothan_band", src_log_lvl));
 
     tracing_subscriber::fmt().with_env_filter(filter).init();
 

bothan-api/server/Cargo.toml

@@ -18,6 +18,7 @@ bothan-coinmarketcap = { workspace = true }
 bothan-htx = { workspace = true }
 bothan-kraken = { workspace = true }
 bothan-okx = { workspace = true }
+bothan-band = { workspace = true }
 
 async-trait = { workspace = true }
 chrono = { workspace = true }

bothan-api/server/src/api.rs

@@ -21,9 +21,10 @@
 //! ```rust,no_run
 //! use bothan_api::api::BothanServer;
 //! use bothan_api::config::AppConfig;
+//! use bothan_api::config::manager::crypto_info::sources::CryptoSourceConfigs;
 //!
 //! fn main() -> Result<(), Box<dyn std::error::Error>> {
-//!     let config = AppConfig::default();
+//!     let mut config = AppConfig::default();
 //!     // Initialize server with config
 //!     Ok(())
 //! }

bothan-api/server/src/config/log.rs

@@ -68,7 +68,7 @@ impl Display for LogLevel {
             LogLevel::Warn => "warn".to_string(),
             LogLevel::Error => "error".to_string(),
         };
-        write!(f, "{}", str)
+        write!(f, "{str}")
     }
 }
 

bothan-api/server/src/config/manager/crypto_info/sources.rs

@@ -6,13 +6,13 @@
 //!
 //! ```rust,no_run
 //! use bothan_api::config::manager::crypto_info::sources::CryptoSourceConfigs;
-//! let sources = CryptoSourceConfigs::with_default_sources();
+//! let sources = CryptoSourceConfigs::default();
 //! ```
 
 use serde::{Deserialize, Serialize};
 
 /// Configuration for the worker sources for crypto asset info.
-#[derive(Clone, Debug, Default, Serialize, Deserialize)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct CryptoSourceConfigs {
     /// Binance worker options.
     pub binance: Option<bothan_binance::WorkerOpts>,
@@ -32,11 +32,44 @@ pub struct CryptoSourceConfigs {
     pub kraken: Option<bothan_kraken::WorkerOpts>,
     /// OKX worker options.
     pub okx: Option<bothan_okx::WorkerOpts>,
+    /// Band/kiwi worker options.
+    ///
+    /// NOTE: The `name` field in `WorkerOpts` is marked with `#[serde(skip)]`, so deserialized instances
+    /// will have an empty/default name. The custom deserializer `de_kiwi` reconstructs the options
+    #[serde(default, deserialize_with = "de_kiwi")]
+    pub band_kiwi: Option<bothan_band::WorkerOpts>,
+    /// Band/macaw worker options.
+    ///
+    /// NOTE: The `name` field in `WorkerOpts` is marked with `#[serde(skip)]`, so deserialized instances
+    /// will have an empty/default name. The custom deserializer `de_macaw` reconstructs the options
+    #[serde(default, deserialize_with = "de_macaw")]
+    pub band_macaw: Option<bothan_band::WorkerOpts>,
 }
 
-impl CryptoSourceConfigs {
-    /// Creates a new `CryptoSourceConfigs` with all sources set to their default options.
-    pub fn with_default_sources() -> Self {
+// Macro to generate deserialization functions for Band workers with preset names.
+// This macro defines a function that:
+// - Deserializes an Option<WorkerOpts>,
+// - If present, creates a new WorkerOpts with the given name and original URL/update_interval.
+macro_rules! de_band_named {
+    ($fn_name:ident, $name:expr) => {
+        fn $fn_name<'de, D>(d: D) -> Result<Option<bothan_band::WorkerOpts>, D::Error>
+        where
+            D: serde::Deserializer<'de>,
+        {
+            let v = Option::<bothan_band::WorkerOpts>::deserialize(d)?;
+            let v = v.map(|w| bothan_band::WorkerOpts::new($name, &w.url, Some(w.update_interval)));
+            Ok(v)
+        }
+    };
+}
+
+const BAND1_WORKER_NAME: &str = "band/kiwi";
+de_band_named!(de_kiwi, BAND1_WORKER_NAME);
+const BAND2_WORKER_NAME: &str = "band/macaw";
+de_band_named!(de_macaw, BAND2_WORKER_NAME);
+
+impl Default for CryptoSourceConfigs {
+    fn default() -> Self {
         CryptoSourceConfigs {
             binance: Some(bothan_binance::WorkerOpts::default()),
             bitfinex: Some(bothan_bitfinex::WorkerOpts::default()),
@@ -47,6 +80,16 @@ impl CryptoSourceConfigs {
             htx: Some(bothan_htx::WorkerOpts::default()),
             kraken: Some(bothan_kraken::WorkerOpts::default()),
             okx: Some(bothan_okx::WorkerOpts::default()),
+            band_kiwi: Some(bothan_band::WorkerOpts::new(
+                "band/kiwi",
+                "https://kiwi.bandchain.org",
+                None,
+            )),
+            band_macaw: Some(bothan_band::WorkerOpts::new(
+                "band/macaw",
+                "https://macaw.bandchain.org",
+                None,
+            )),
         }
     }
 }