Split inbound+outbound payments, use PaymentId as outbound key

[ldk-sample] / src / disk.rs

diff --git a/src/disk.rs b/src/disk.rs
index 13ac5e7680e8d0aac87a664e25a4c600cd5f8f89..d301180d605202690aa24dd96bbf1bfa2c18d7c2 100644 (file)
--- a/src/disk.rs
+++ b/src/disk.rs
@@ -1,21 +1,20 @@
-use crate::cli;
-use bitcoin::hashes::hex::FromHex;
-use bitcoin::secp256k1::key::PublicKey;
-use bitcoin::{BlockHash, Txid};
-use lightning::chain::channelmonitor::ChannelMonitor;
-use lightning::chain::keysinterface::{InMemorySigner, KeysManager};
-use lightning::chain::transaction::OutPoint;
+use crate::{cli, InboundPaymentInfoStorage, NetworkGraph, OutboundPaymentInfoStorage};
+use bitcoin::secp256k1::PublicKey;
+use bitcoin::Network;
+use chrono::Utc;
+use lightning::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringDecayParameters};
 use lightning::util::logger::{Logger, Record};
-use lightning::util::ser::{ReadableArgs, Writer};
+use lightning::util::ser::{Readable, ReadableArgs, Writer};
 use std::collections::HashMap;
 use std::fs;
 use std::fs::File;
-// use std::io::{BufRead, BufReader, Cursor, Write};
-use std::io::{BufRead, BufReader, Cursor};
+use std::io::{BufRead, BufReader};
 use std::net::SocketAddr;
 use std::path::Path;
 use std::sync::Arc;
-use time::OffsetDateTime;
+
+pub(crate) const INBOUND_PAYMENTS_FNAME: &str = "inbound_payments";
+pub(crate) const OUTBOUND_PAYMENTS_FNAME: &str = "outbound_payments";
 
 pub(crate) struct FilesystemLogger {
        data_dir: String,
@@ -32,7 +31,10 @@ impl Logger for FilesystemLogger {
                let raw_log = record.args.to_string();
                let log = format!(
                        "{} {:<5} [{}:{}] {}\n",
-                       OffsetDateTime::now_utc().format("%F %T"),
+                       // Note that a "real" lightning node almost certainly does *not* want subsecond
+                       // precision for message-receipt information as it makes log entries a target for
+                       // deanonymization attacks. For testing, however, its quite useful.
+                       Utc::now().format("%Y-%m-%d %H:%M:%S%.3f"),
                        record.level.to_string(),
                        record.module_path,
                        record.line,
@@ -73,57 +75,44 @@ pub(crate) fn read_channel_peer_data(
        Ok(peer_data)
 }
 
-pub(crate) fn read_channelmonitors(
-       path: String, keys_manager: Arc<KeysManager>,
-) -> Result<HashMap<OutPoint, (BlockHash, ChannelMonitor<InMemorySigner>)>, std::io::Error> {
-       if !Path::new(&path).exists() {
-               return Ok(HashMap::new());
-       }
-       let mut outpoint_to_channelmonitor = HashMap::new();
-       for file_option in fs::read_dir(path).unwrap() {
-               let file = file_option.unwrap();
-               let owned_file_name = file.file_name();
-               let filename = owned_file_name.to_str();
-               if !filename.is_some() || !filename.unwrap().is_ascii() || filename.unwrap().len() < 65 {
-                       return Err(std::io::Error::new(
-                               std::io::ErrorKind::Other,
-                               "Invalid ChannelMonitor file name",
-                       ));
+pub(crate) fn read_network(
+       path: &Path, network: Network, logger: Arc<FilesystemLogger>,
+) -> NetworkGraph {
+       if let Ok(file) = File::open(path) {
+               if let Ok(graph) = NetworkGraph::read(&mut BufReader::new(file), logger.clone()) {
+                       return graph;
                }
+       }
+       NetworkGraph::new(network, logger)
+}
 
-               let txid = Txid::from_hex(filename.unwrap().split_at(64).0);
-               if txid.is_err() {
-                       return Err(std::io::Error::new(
-                               std::io::ErrorKind::Other,
-                               "Invalid tx ID in filename",
-                       ));
+pub(crate) fn read_inbound_payment_info(path: &Path) -> InboundPaymentInfoStorage {
+       if let Ok(file) = File::open(path) {
+               if let Ok(info) = InboundPaymentInfoStorage::read(&mut BufReader::new(file)) {
+                       return info;
                }
+       }
+       InboundPaymentInfoStorage { payments: HashMap::new() }
+}
 
-               let index = filename.unwrap().split_at(65).1.split('.').next().unwrap().parse();
-               if index.is_err() {
-                       return Err(std::io::Error::new(
-                               std::io::ErrorKind::Other,
-                               "Invalid tx index in filename",
-                       ));
+pub(crate) fn read_outbound_payment_info(path: &Path) -> OutboundPaymentInfoStorage {
+       if let Ok(file) = File::open(path) {
+               if let Ok(info) = OutboundPaymentInfoStorage::read(&mut BufReader::new(file)) {
+                       return info;
                }
+       }
+       OutboundPaymentInfoStorage { payments: HashMap::new() }
+}
 
-               let contents = fs::read(&file.path())?;
-
-               if let Ok((blockhash, channel_monitor)) =
-                       <(BlockHash, ChannelMonitor<InMemorySigner>)>::read(
-                               &mut Cursor::new(&contents),
-                               &*keys_manager,
-                       ) {
-                       outpoint_to_channelmonitor.insert(
-                               OutPoint { txid: txid.unwrap(), index: index.unwrap() },
-                               (blockhash, channel_monitor),
-                       );
-               } else {
-                       return Err(std::io::Error::new(
-                               std::io::ErrorKind::Other,
-                               "Failed to deserialize ChannelMonitor",
-                       ));
+pub(crate) fn read_scorer(
+       path: &Path, graph: Arc<NetworkGraph>, logger: Arc<FilesystemLogger>,
+) -> ProbabilisticScorer<Arc<NetworkGraph>, Arc<FilesystemLogger>> {
+       let params = ProbabilisticScoringDecayParameters::default();
+       if let Ok(file) = File::open(path) {
+               let args = (params.clone(), Arc::clone(&graph), Arc::clone(&logger));
+               if let Ok(scorer) = ProbabilisticScorer::read(&mut BufReader::new(file), args) {
+                       return scorer;
                }
        }
-       Ok(outpoint_to_channelmonitor)
+       ProbabilisticScorer::new(params, graph, logger)
 }