aljaz/notedeck
1
0
Fork 0
mirror of https://github.com/aljazceru/notedeck.git synced 2025-12-20 09:54:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

use ZapWallet

Browse Source 
Signed-off-by: kernelkind <kernelkind@gmail.com>
This commit is contained in:
kernelkind
2025-04-17 19:32:20 -04:00
parent 61943aa6c7
commit f16e63cf3b
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
crates/notedeck/src/user_account.rs
View File

@@ -1,11 +1,11 @@
use enostr::Keypair; use enostr::Keypair;
use tokenator::{ParseError, TokenParser, TokenSerializable}; use tokenator::{ParseError, TokenParser, TokenSerializable};
use crate::Wallet; use crate::wallet::ZapWallet;
pub struct UserAccount { pub struct UserAccount {
pub key: Keypair, pub key: Keypair,
pub wallet: Option<Wallet>, pub wallet: Option<ZapWallet>,
} }
impl UserAccount { impl UserAccount {
@@ -13,7 +13,7 @@ impl UserAccount {
Self { key, wallet: None } Self { key, wallet: None }
} }
pub fn with_wallet(mut self, wallet: Wallet) -> Self { pub fn with_wallet(mut self, wallet: ZapWallet) -> Self {
self.wallet = Some(wallet); self.wallet = Some(wallet);
self self
} }
@@ -21,7 +21,7 @@ impl UserAccount {
enum UserAccountRoute { enum UserAccountRoute {
Key(Keypair), Key(Keypair),
Wallet(Wallet), Wallet(ZapWallet),
} }
impl TokenSerializable for UserAccount { impl TokenSerializable for UserAccount {
@@ -36,7 +36,7 @@ impl TokenSerializable for UserAccount {
parser, parser,
&[ &[
|p| Ok(UserAccountRoute::Key(Keypair::parse_from_tokens(p)?)), |p| Ok(UserAccountRoute::Key(Keypair::parse_from_tokens(p)?)),
|p| Ok(UserAccountRoute::Wallet(Wallet::parse_from_tokens(p)?)), |p| Ok(UserAccountRoute::Wallet(ZapWallet::parse_from_tokens(p)?)),
], ],
); );
@@ -90,8 +90,8 @@ mod tests {
#[test] #[test]
fn test_user_account_serialize_deserialize() { fn test_user_account_serialize_deserialize() {
let kp = FullKeypair::generate(); let kp = FullKeypair::generate();
let acc = let acc = UserAccount::new(kp.to_keypair())
UserAccount::new(kp.to_keypair()).with_wallet(Wallet::new(URI.to_owned()).unwrap()); .with_wallet(Wallet::new(URI.to_owned()).unwrap().into());
let mut writer = TokenWriter::new("\t"); let mut writer = TokenWriter::new("\t");
acc.serialize_tokens(&mut writer); acc.serialize_tokens(&mut writer);
@@ -111,6 +111,6 @@ mod tests {
panic!(); panic!();
}; };
assert_eq!(wallet.uri, URI); assert_eq!(wallet.wallet.uri, URI);
} }
} }

8
crates/notedeck/src/wallet.rs
View File

@@ -14,7 +14,7 @@ pub fn get_wallet_for_mut<'a>(
accounts: &'a mut Accounts, accounts: &'a mut Accounts,
global_wallet: &'a mut GlobalWallet, global_wallet: &'a mut GlobalWallet,
account_pk: &'a [u8; 32], account_pk: &'a [u8; 32],
) -> Option<&'a mut Wallet> { ) -> Option<&'a mut ZapWallet> {
let cur_acc = accounts.get_account_mut_optimized(account_pk)?; let cur_acc = accounts.get_account_mut_optimized(account_pk)?;
if let Some(wallet) = &mut cur_acc.wallet { if let Some(wallet) = &mut cur_acc.wallet {
@@ -137,7 +137,7 @@ impl TokenSerializable for Wallet {
} }
pub struct GlobalWallet { pub struct GlobalWallet {
pub wallet: Option<Wallet>, pub wallet: Option<ZapWallet>,
pub ui_state: WalletUIState, pub ui_state: WalletUIState,
wallet_handler: TokenHandler, wallet_handler: TokenHandler,
} }
@@ -172,8 +172,8 @@ impl GlobalWallet {
} }
} }
fn construct_global_wallet(wallet_handler: &TokenHandler) -> Option<Wallet> { fn construct_global_wallet(wallet_handler: &TokenHandler) -> Option<ZapWallet> {
let Ok(res) = wallet_handler.load::<Wallet>("\t") else { let Ok(res) = wallet_handler.load::<ZapWallet>("\t") else {
return None; return None;
}; };

2
crates/notedeck/src/zaps/cache.rs
View File

@@ -51,7 +51,7 @@ fn process_event(
}); });
}; };
let promise = wallet.pay_invoice(&invoice); let promise = wallet.wallet.pay_invoice(&invoice);
let ctx = SendingNWCInvoiceContext { let ctx = SendingNWCInvoiceContext {
request_noteid: req_noteid, request_noteid: req_noteid,

6
crates/notedeck_columns/src/nav.rs
View File

@@ -546,7 +546,7 @@ fn render_nav_body(
if let Some(cur_acc) = ctx.accounts.get_selected_account_mut() { if let Some(cur_acc) = ctx.accounts.get_selected_account_mut() {
if let Some(wallet) = &mut cur_acc.wallet { if let Some(wallet) = &mut cur_acc.wallet {
break 's WalletState::Wallet { break 's WalletState::Wallet {
wallet, wallet: &mut wallet.wallet,
can_create_local_wallet: false, can_create_local_wallet: false,
}; };
} }
@@ -560,7 +560,7 @@ fn render_nav_body(
}; };
WalletState::Wallet { WalletState::Wallet {
wallet, wallet: &mut wallet.wallet,
can_create_local_wallet: true, can_create_local_wallet: true,
} }
} }
@@ -579,7 +579,7 @@ fn render_nav_body(
}; };
WalletState::Wallet { WalletState::Wallet {
wallet, wallet: &mut wallet.wallet,
can_create_local_wallet: false, can_create_local_wallet: false,
} }
} }

4
crates/notedeck_columns/src/ui/wallet.rs
View File

@@ -49,7 +49,7 @@ impl WalletAction {
}; };
accounts.update_current_account(move |acc| { accounts.update_current_account(move |acc| {
acc.wallet = Some(wallet); acc.wallet = Some(wallet.into());
}); });
} else { } else {
if global_wallet.wallet.is_some() { if global_wallet.wallet.is_some() {
@@ -60,7 +60,7 @@ impl WalletAction {
return; return;
}; };
global_wallet.wallet = Some(wallet); global_wallet.wallet = Some(wallet.into());
global_wallet.save_wallet(); global_wallet.save_wallet();
} }
} }