fix: load consignment from cache

bitlightlabs · Oct 16, 2024 · bb7ba40 · bb7ba40
1 parent f2bce4b
commit bb7ba40
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/lightning/src/color_ext/database.rs b/lightning/src/color_ext/database.rs
@@ -1,7 +1,7 @@
 use core::fmt::{Display, Formatter};
 use std::{
 	collections::HashMap,
-	io::{self, Write},
+	io::{self, Read, Write},
 	sync::{Arc, Mutex},
 };
 
@@ -230,6 +230,18 @@ impl Write for ConsignmentBinaryData {
 	}
 }
 
+impl Read for ConsignmentBinaryData {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        let len = std::cmp::min(buf.len(), self.0.len());
+        if len == 0 {
+            return Ok(0);
+        }
+        buf[..len].copy_from_slice(&self.0[..len]);
+        self.0.drain(..len);
+        Ok(len)
+    }
+}
+
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
 pub struct ConsignmentHandle(usize);
 

diff --git a/lightning/src/color_ext/mod.rs b/lightning/src/color_ext/mod.rs
@@ -15,8 +15,7 @@ use bitcoin::psbt::{PartiallySignedTransaction, Psbt};
 use bitcoin::secp256k1::PublicKey;
 use bitcoin::{TxOut, Txid};
 use database::{
-	ColorDatabaseImpl, ConsignmentBinaryData, PaymentDirection, PaymentHashKey, ProxyIdKey,
-	RgbInfoKey,
+	ColorDatabaseImpl, ConsignmentBinaryData, ConsignmentHandle, PaymentDirection, PaymentHashKey, ProxyIdKey, RgbInfoKey
 };
 use hex::DisplayHex;
 use rgb_lib::wallet::rust_only::AssetBeneficiariesMap;
@@ -678,6 +677,13 @@ impl ColorSourceImpl {
 		Ok(())
 	}
 
+	pub fn get_consignment_by_funding_txid(
+		&self, funding_txid: &Txid,
+	) -> Option<ConsignmentBinaryData> {
+		let handle = self.database.consignment().lock().unwrap().get_by_funding_txid(funding_txid)?;
+		self.database.consignment().lock().unwrap().resolve(handle).cloned()
+	}
+
 	/// Update RGB channel amount
 	pub fn update_rgb_channel_amount_impl(
 		&self, channel_id: &ChannelId, rgb_offered_htlc: u64, rgb_received_htlc: u64, pending: bool,