multi: setup grpc server

Author: orbitalturtle

Cargo.lock

@@ -24,12 +24,13 @@ rand_core = "0.6.4"
 log = "0.4.17"
 log4rs = { version = "1.2.0", features = ["file_appender"] }
 tokio = { version = "1.25.0", features = ["rt", "rt-multi-thread"] }
-tonic = "0.8.3"
+tonic = "0.11"
 tonic_lnd = { git = "https://github.com/orbitalturtle/tonic_lnd", rev="afb0187621bca604f606cacfe3cb2aedf5d2fc89", package="fedimint-tonic-lnd", features = ["lightningrpc", "routerrpc"] }
 hex = "0.4.3"
 configure_me = "0.4.0"
 bytes = "1.4.0"
 triggered = "0.1.2"
+prost = "0.12"
 
 [dev-dependencies]
 bitcoincore-rpc = { package="core-rpc", version = "0.17.0" }
@@ -41,6 +42,7 @@ tempfile = "3.5.0"
 
 [build-dependencies]
 configure_me_codegen = "0.4.4"
+tonic-build = "0.11"
 
 # The profile that 'cargo dist' will build with
 [profile.dist]

Cargo.toml

@@ -1,3 +1,10 @@
-fn main() {
-    configure_me_codegen::build_script_auto().unwrap_or_else(|error| error.report_and_exit())
+fn main() -> Result<(), Box<dyn std::error::Error>> {
+    configure_me_codegen::build_script_auto().unwrap_or_else(|error| error.report_and_exit());
+
+    // Compile the protos for our grpc server.
+    tonic_build::configure()
+        .protoc_arg("--experimental_allow_proto3_optional")
+        .compile(&["proto/lndkrpc.proto"], &["proto"])?;
+
+    Ok(())
 }

build.rs

@@ -0,0 +1,15 @@
+syntax = "proto3";
+package lndkrpc;
+
+service Offers {
+    rpc PayOffer (PayOfferRequest) returns (PayOfferResponse);
+}
+
+message PayOfferRequest {
+   string offer = 1;
+   optional uint64 amount = 2;
+}
+
+message PayOfferResponse {
+    string payment_preimage = 2;
+}

proto/lndkrpc.proto

@@ -4,6 +4,11 @@ pub mod lnd;
 pub mod lndk_offers;
 pub mod onion_messenger;
 mod rate_limit;
+pub mod server;
+
+pub mod lndkrpc {
+    tonic::include_proto!("lndkrpc");
+}
 
 use crate::lnd::{
     features_support_onion_messages, get_lnd_client, get_network, LndCfg, LndNodeSigner,
@@ -46,6 +51,8 @@ pub fn init_logger(config: LogConfig) {
     });
 }
 
+pub const DEFAULT_SERVER_PORT: u16 = 7000;
+
 #[allow(clippy::result_unit_err)]
 pub fn setup_logger(log_level: Option<String>, log_dir: Option<String>) -> Result<(), ()> {
     let log_level = match log_level {
@@ -128,7 +135,6 @@ impl LndkOnionMessenger {
         offer_handler: Arc<impl OffersMessageHandler>,
     ) -> Result<(), ()> {
         let mut client = get_lnd_client(args.lnd).expect("failed to connect");
-
         let info = client
             .lightning()
             .get_info(GetInfoRequest {})

src/lib.rs

@@ -16,9 +16,9 @@ use log::error;
 use std::cell::RefCell;
 use std::collections::HashMap;
 use std::error::Error;
-use std::fmt;
 use std::fmt::Display;
 use std::path::PathBuf;
+use std::{fmt, fs};
 use tonic_lnd::lnrpc::{
     GetInfoResponse, HtlcAttempt, LightningNode, ListPeersResponse, Payment, QueryRoutesResponse,
     Route,
@@ -43,8 +43,8 @@ pub fn get_lnd_client(cfg: LndCfg) -> Result<Client, ConnectError> {
 /// LndCfg specifies the configuration required to connect to LND's grpc client.
 #[derive(Clone)]
 pub struct LndCfg {
-    address: String,
-    creds: Creds,
+    pub address: String,
+    pub creds: Creds,
 }
 
 impl LndCfg {
@@ -161,6 +161,18 @@ pub enum Creds {
     String { macaroon: String, cert: String },
 }
 
+impl Creds {
+    #[allow(clippy::result_unit_err)]
+    pub fn get_certificate_string(&self) -> Result<String, ()> {
+        let cert = match self {
+            Creds::Path { macaroon: _, cert } => fs::read_to_string(cert)
+                .map_err(|e| error!("Error reading tls certificate from file {e:?}"))?,
+            Creds::String { macaroon: _, cert } => cert.clone(),
+        };
+        Ok(cert)
+    }
+}
+
 /// features_support_onion_messages returns a boolean indicating whether a feature set supports onion messaging.
 pub fn features_support_onion_messages(features: &HashMap<u32, tonic_lnd::lnrpc::Feature>) -> bool {
     features.contains_key(&ONION_MESSAGES_OPTIONAL)

src/lnd.rs

@@ -10,9 +10,18 @@ mod internal {
 }
 
 use internal::*;
-use lndk::lnd::{validate_lnd_creds, LndCfg};
-use lndk::{setup_logger, Cfg, LifecycleSignals, LndkOnionMessenger, OfferHandler};
+use lndk::lnd::{get_lnd_client, validate_lnd_creds, LndCfg};
+use lndk::server::LNDKServer;
+use lndk::{
+    lndkrpc, setup_logger, Cfg, LifecycleSignals, LndkOnionMessenger, OfferHandler,
+    DEFAULT_SERVER_PORT,
+};
+use lndkrpc::offers_server::OffersServer;
+use log::{error, info};
 use std::sync::Arc;
+use tokio::select;
+use tonic::transport::Server;
+use tonic_lnd::lnrpc::GetInfoRequest;
 
 #[macro_use]
 extern crate configure_me;
@@ -32,7 +41,8 @@ async fn main() -> Result<(), ()> {
     .map_err(|e| {
         println!("Error validating config: {e}.");
     })?;
-    let lnd_args = LndCfg::new(config.address, creds);
+    let address = config.address.clone();
+    let lnd_args = LndCfg::new(config.address, creds.clone());
 
     let (shutdown, listener) = triggered::trigger();
     let signals = LifecycleSignals { shutdown, listener };
@@ -42,8 +52,47 @@ async fn main() -> Result<(), ()> {
     };
 
     let handler = Arc::new(OfferHandler::new());
+    let messenger = LndkOnionMessenger::new();
     setup_logger(config.log_level, config.log_dir)?;
 
-    let messenger = LndkOnionMessenger::new();
-    messenger.run(args, Arc::clone(&handler)).await
+    let mut client = get_lnd_client(args.lnd.clone()).expect("failed to connect to lnd");
+    let info = client
+        .lightning()
+        .get_info(GetInfoRequest {})
+        .await
+        .expect("failed to get info")
+        .into_inner();
+
+    let addr = format!("[::1]:{DEFAULT_SERVER_PORT}")
+        .parse()
+        .map_err(|e| {
+            error!("Error parsing API address: {e}");
+        })?;
+
+    let tls_str = creds.get_certificate_string()?;
+    let server = LNDKServer::new(
+        Arc::clone(&handler),
+        &info.identity_pubkey,
+        tls_str,
+        address,
+    )
+    .await;
+
+    let server_fut = Server::builder()
+        .add_service(OffersServer::new(server))
+        .serve(addr);
+
+    select! {
+       _ = messenger.run(args, Arc::clone(&handler)) => {
+           info!("Onion messenger completed");
+       },
+       result2 = server_fut => {
+            match result2 {
+                Ok(_) => info!("API completed"),
+                Err(e) => error!("Error running API: {}", e),
+            };
+       },
+    }
+
+    Ok(())
 }