Skip to content

Commit 1dff271

Browse files
EthanYuanEthanYuan
authored
Merge pull request #94 from EthanYuan/raise-vss-write-event
feat: emit vss write event
2 parents 96f4086 + 2e6d021 commit 1dff271

File tree

10 files changed

+210
-31
lines changed

10 files changed

+210
-31
lines changed

‎Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎mutiny-core/src/keymanager.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,8 +333,8 @@ mod tests {
333333
let network = Network::Testnet;
334334
let pass = uuid::Uuid::new_v4().to_string();
335335
let cipher = encryption_key_from_pass(&pass).unwrap();
336-
let db = MemoryStorage::new(Some(pass), Some(cipher), None);
337336
let logger = Arc::new(MutinyLogger::default());
337+
let db = MemoryStorage::new(Some(pass), Some(cipher), None, None, logger.clone());
338338
let fees = Arc::new(MutinyFeeEstimator::new(
339339
db.clone(),
340340
esplora.clone(),
@@ -391,8 +391,8 @@ mod tests {
391391
let network = Network::Testnet;
392392
let pass = uuid::Uuid::new_v4().to_string();
393393
let cipher = encryption_key_from_pass(&pass).unwrap();
394-
let db = MemoryStorage::new(Some(pass), Some(cipher), None);
395394
let logger = Arc::new(MutinyLogger::default());
395+
let db = MemoryStorage::new(Some(pass), Some(cipher), None, None, logger.clone());
396396
let fees = Arc::new(MutinyFeeEstimator::new(
397397
db.clone(),
398398
esplora.clone(),

‎mutiny-core/src/lib.rs

Lines changed: 52 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2063,6 +2063,7 @@ struct BitcoinPriceResponse {
20632063
#[cfg(test)]
20642064
#[cfg(target_arch = "wasm32")]
20652065
mod tests {
2066+
use crate::logging::MutinyLogger;
20662067
use crate::storage::{
20672068
payment_key, persist_payment_info, IndexItem, MemoryStorage, MutinyStorage, ONCHAIN_PREFIX,
20682069
PAYMENT_OUTBOUND_PREFIX_KEY,
@@ -2088,6 +2089,7 @@ mod tests {
20882089
use hex_conservative::DisplayHex;
20892090
use itertools::Itertools;
20902091
use std::str::FromStr;
2092+
use std::sync::Arc;
20912093

20922094
use crate::test_utils::*;
20932095

@@ -2107,7 +2109,13 @@ mod tests {
21072109

21082110
let pass = uuid::Uuid::new_v4().to_string();
21092111
let cipher = encryption_key_from_pass(&pass).unwrap();
2110-
let storage = MemoryStorage::new(Some(pass), Some(cipher), None);
2112+
let storage = MemoryStorage::new(
2113+
Some(pass),
2114+
Some(cipher),
2115+
None,
2116+
None,
2117+
Arc::new(MutinyLogger::default()),
2118+
);
21112119
assert!(!NodeManager::has_node_manager(storage.clone()));
21122120
let config = MutinyWalletConfigBuilder::new(xpriv)
21132121
.with_network(network)
@@ -2130,7 +2138,13 @@ mod tests {
21302138

21312139
let pass = uuid::Uuid::new_v4().to_string();
21322140
let cipher = encryption_key_from_pass(&pass).unwrap();
2133-
let storage = MemoryStorage::new(Some(pass), Some(cipher), None);
2141+
let storage = MemoryStorage::new(
2142+
Some(pass),
2143+
Some(cipher),
2144+
None,
2145+
None,
2146+
Arc::new(MutinyLogger::default()),
2147+
);
21342148
assert!(!NodeManager::has_node_manager(storage.clone()));
21352149
let config = MutinyWalletConfigBuilder::new(xpriv)
21362150
.with_network(network)
@@ -2158,7 +2172,13 @@ mod tests {
21582172

21592173
let pass = uuid::Uuid::new_v4().to_string();
21602174
let cipher = encryption_key_from_pass(&pass).unwrap();
2161-
let storage = MemoryStorage::new(Some(pass), Some(cipher), None);
2175+
let storage = MemoryStorage::new(
2176+
Some(pass),
2177+
Some(cipher),
2178+
None,
2179+
None,
2180+
Arc::new(MutinyLogger::default()),
2181+
);
21622182

21632183
assert!(!NodeManager::has_node_manager(storage.clone()));
21642184
let config = MutinyWalletConfigBuilder::new(xpriv)
@@ -2223,7 +2243,13 @@ mod tests {
22232243

22242244
let pass = uuid::Uuid::new_v4().to_string();
22252245
let cipher = encryption_key_from_pass(&pass).unwrap();
2226-
let storage = MemoryStorage::new(Some(pass), Some(cipher), None);
2246+
let storage = MemoryStorage::new(
2247+
Some(pass),
2248+
Some(cipher),
2249+
None,
2250+
None,
2251+
Arc::new(MutinyLogger::default()),
2252+
);
22272253
assert!(!NodeManager::has_node_manager(storage.clone()));
22282254
let config = MutinyWalletConfigBuilder::new(xpriv)
22292255
.with_network(network)
@@ -2239,7 +2265,13 @@ mod tests {
22392265
// create a second mw and make sure it has a different seed
22402266
let pass = uuid::Uuid::new_v4().to_string();
22412267
let cipher = encryption_key_from_pass(&pass).unwrap();
2242-
let storage2 = MemoryStorage::new(Some(pass), Some(cipher), None);
2268+
let storage2 = MemoryStorage::new(
2269+
Some(pass),
2270+
Some(cipher),
2271+
None,
2272+
None,
2273+
Arc::new(MutinyLogger::default()),
2274+
);
22432275
assert!(!NodeManager::has_node_manager(storage2.clone()));
22442276
let xpriv2 = Xpriv::new_master(network, &[0; 32]).unwrap();
22452277
let config2 = MutinyWalletConfigBuilder::new(xpriv2)
@@ -2259,7 +2291,13 @@ mod tests {
22592291

22602292
let pass = uuid::Uuid::new_v4().to_string();
22612293
let cipher = encryption_key_from_pass(&pass).unwrap();
2262-
let storage3 = MemoryStorage::new(Some(pass), Some(cipher), None);
2294+
let storage3 = MemoryStorage::new(
2295+
Some(pass),
2296+
Some(cipher),
2297+
None,
2298+
None,
2299+
Arc::new(MutinyLogger::default()),
2300+
);
22632301

22642302
MutinyWallet::restore_mnemonic(storage3.clone(), mnemonic.clone())
22652303
.await
@@ -2290,7 +2328,13 @@ mod tests {
22902328

22912329
let pass = uuid::Uuid::new_v4().to_string();
22922330
let cipher = encryption_key_from_pass(&pass).unwrap();
2293-
let storage = MemoryStorage::new(Some(pass), Some(cipher), None);
2331+
let storage = MemoryStorage::new(
2332+
Some(pass),
2333+
Some(cipher),
2334+
None,
2335+
None,
2336+
Arc::new(MutinyLogger::default()),
2337+
);
22942338
assert!(!NodeManager::has_node_manager(storage.clone()));
22952339
let mut config_builder = MutinyWalletConfigBuilder::new(xpriv).with_network(network);
22962340
config_builder.with_safe_mode();
@@ -2315,7 +2359,7 @@ mod tests {
23152359
let test_name = "test_sort_index_item";
23162360
log!("{}", test_name);
23172361

2318-
let storage = MemoryStorage::new(None, None, None);
2362+
let storage = MemoryStorage::new(None, None, None, None, Arc::new(MutinyLogger::default()));
23192363
let seed = generate_seed(12).expect("Failed to gen seed");
23202364
let network = Network::Regtest;
23212365
let xpriv = Xpriv::new_master(network, &seed.to_seed("")).unwrap();

‎mutiny-core/src/messagehandler.rs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,19 @@ pub enum CommonLnEvent {
7373
hex_tx: String,
7474
timestamp: u64,
7575
},
76+
// Before sync to VSS
77+
SyncToVssStarting {
78+
key: String,
79+
version: Option<u32>,
80+
timestamp: u64,
81+
},
82+
// Sync to VSS completed
83+
SyncToVssCompleted {
84+
key: String,
85+
version: Option<u32>,
86+
timestamp: u64,
87+
duration_ms: u128,
88+
},
7689
}
7790

7891
#[derive(Clone)]

‎mutiny-core/src/nodemanager.rs

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2123,7 +2123,7 @@ mod tests {
21232123
use crate::{
21242124
encrypt::encryption_key_from_pass,
21252125
nodemanager::{ChannelClosure, MutinyInvoice, NodeManager, TransactionDetails},
2126-
ActivityItem, MutinyWalletConfigBuilder, PrivacyLevel,
2126+
ActivityItem, MutinyLogger, MutinyWalletConfigBuilder, PrivacyLevel,
21272127
};
21282128
use crate::{keymanager::generate_seed, nodemanager::NodeManagerBuilder};
21292129
use bdk_chain::ConfirmationTime;
@@ -2160,7 +2160,13 @@ mod tests {
21602160

21612161
let pass = uuid::Uuid::new_v4().to_string();
21622162
let cipher = encryption_key_from_pass(&pass).unwrap();
2163-
let storage = MemoryStorage::new(Some(pass), Some(cipher), None);
2163+
let storage = MemoryStorage::new(
2164+
Some(pass),
2165+
Some(cipher),
2166+
None,
2167+
None,
2168+
std::sync::Arc::new(MutinyLogger::default()),
2169+
);
21642170

21652171
assert!(!NodeManager::has_node_manager(storage.clone()));
21662172
let c = MutinyWalletConfigBuilder::new(xpriv)
@@ -2182,7 +2188,13 @@ mod tests {
21822188

21832189
let pass = uuid::Uuid::new_v4().to_string();
21842190
let cipher = encryption_key_from_pass(&pass).unwrap();
2185-
let storage = MemoryStorage::new(Some(pass), Some(cipher), None);
2191+
let storage = MemoryStorage::new(
2192+
Some(pass),
2193+
Some(cipher),
2194+
None,
2195+
None,
2196+
std::sync::Arc::new(MutinyLogger::default()),
2197+
);
21862198
let seed = generate_seed(12).expect("Failed to gen seed");
21872199
let network = Network::Regtest;
21882200
let xpriv = Xpriv::new_master(network, &seed.to_seed("")).unwrap();
@@ -2226,7 +2238,13 @@ mod tests {
22262238

22272239
let pass = uuid::Uuid::new_v4().to_string();
22282240
let cipher = encryption_key_from_pass(&pass).unwrap();
2229-
let storage = MemoryStorage::new(Some(pass), Some(cipher), None);
2241+
let storage = MemoryStorage::new(
2242+
Some(pass),
2243+
Some(cipher),
2244+
None,
2245+
None,
2246+
std::sync::Arc::new(MutinyLogger::default()),
2247+
);
22302248
let seed = generate_seed(12).expect("Failed to gen seed");
22312249
let network = Network::Regtest;
22322250
let xpriv = Xpriv::new_master(network, &seed.to_seed("")).unwrap();

‎mutiny-core/src/onchain.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -957,8 +957,8 @@ mod tests {
957957
);
958958
let pass = uuid::Uuid::new_v4().to_string();
959959
let cipher = encryption_key_from_pass(&pass).unwrap();
960-
let db = MemoryStorage::new(Some(pass), Some(cipher), None);
961960
let logger = Arc::new(MutinyLogger::default());
961+
let db = MemoryStorage::new(Some(pass), Some(cipher), None, None, logger.clone());
962962
let fees = Arc::new(MutinyFeeEstimator::new(
963963
db.clone(),
964964
esplora.clone(),

0 commit comments

Comments
 (0)