add client allowlist and close virtual channel

Author: txalkan

src/args.rs

@@ -1,10 +1,11 @@
+use bitcoin::secp256k1::PublicKey;
 use clap::{value_parser, Parser};
 use rgb_lib::BitcoinNetwork;
 use std::path::PathBuf;
 
 use crate::auth::check_auth_args;
 use crate::error::AppError;
-use crate::utils::check_port_is_available;
+use crate::utils::{check_port_is_available, hex_str_to_compressed_pubkey};
 
 #[derive(Parser)]
 #[command(author, version, about, long_about = None)]
@@ -38,6 +39,9 @@ struct Args {
 
     #[arg(long, default_value_t = false)]
     enable_virtual_channels_v0: bool,
+
+    #[arg(long, value_delimiter = ',')]
+    virtual_peer_pubkeys: Vec<String>,
 }
 
 pub(crate) struct UserArgs {
@@ -48,6 +52,7 @@ pub(crate) struct UserArgs {
     pub(crate) max_media_upload_size_mb: u16,
     pub(crate) root_public_key: Option<biscuit_auth::PublicKey>,
     pub(crate) enable_virtual_channels_v0: bool,
+    pub(crate) virtual_peer_pubkeys: Vec<PublicKey>,
 }
 
 pub(crate) fn parse_startup_args() -> Result<UserArgs, AppError> {
@@ -62,6 +67,14 @@ pub(crate) fn parse_startup_args() -> Result<UserArgs, AppError> {
 
     let root_public_key = check_auth_args(args.disable_authentication, args.root_public_key)?;
 
+    let mut virtual_peer_pubkeys = Vec::new();
+    for pubkey in args.virtual_peer_pubkeys {
+        let Some(parsed_pubkey) = hex_str_to_compressed_pubkey(&pubkey) else {
+            return Err(AppError::InvalidVirtualPeerPubkey(pubkey));
+        };
+        virtual_peer_pubkeys.push(parsed_pubkey);
+    }
+
     Ok(UserArgs {
         storage_dir_path: args.storage_directory_path,
         daemon_listening_port,
@@ -70,5 +83,6 @@ pub(crate) fn parse_startup_args() -> Result<UserArgs, AppError> {
         max_media_upload_size_mb: args.max_media_upload_size_mb,
         root_public_key,
         enable_virtual_channels_v0: args.enable_virtual_channels_v0,
+        virtual_peer_pubkeys,
     })
 }

src/error.rs

@@ -35,7 +35,7 @@ pub enum APIError {
     #[error("Batch transfer not found")]
     BatchTransferNotFound,
 
-    #[error("Cannot close channel")]
+    #[error("Cannot close channel: {0}")]
     CannotCloseChannel(String),
 
     #[error("Cannot estimate fees")]
@@ -546,6 +546,9 @@ pub enum AppError {
     #[error("The provided root public key is invalid")]
     InvalidRootKey,
 
+    #[error("Invalid virtual peer pubkey: {0}")]
+    InvalidVirtualPeerPubkey(String),
+
     #[error("IO error: {0}")]
     IO(#[from] std::io::Error),