From 8d3a932fac343fdf1ff561817ad30c2dba5a7c42 Mon Sep 17 00:00:00 2001 From: DanGould Date: Tue, 13 Aug 2024 16:41:37 -0400 Subject: [PATCH 1/2] Bump payjoin version 0.13.1 --- Cargo.lock | 4 ++-- mutiny-core/Cargo.toml | 2 +- mutiny-wasm/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ffae713e2..c98ba7d43 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2987,9 +2987,9 @@ checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "payjoin" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7b659f9e4ff06192df5d4504ea7ae866a1680eb2c87e4dca521fb14753eb0e7" +checksum = "38f2c772cf07af6032e0ce5c8438a4acc53f955df7870f135db5e187a077fbba" dependencies = [ "bip21", "bitcoin 0.30.2", diff --git a/mutiny-core/Cargo.toml b/mutiny-core/Cargo.toml index 205d425c1..36e2db110 100644 --- a/mutiny-core/Cargo.toml +++ b/mutiny-core/Cargo.toml @@ -44,7 +44,7 @@ cbc = { version = "0.1", features = ["alloc"] } aes = { version = "0.8" } jwt-compact = { version = "0.8.0-beta.1", features = ["es256k"] } argon2 = { version = "0.5.0", features = ["password-hash", "alloc"] } -payjoin = { version = "0.13.0", features = ["send", "base64"] } +payjoin = { version = "0.13.1", features = ["send", "base64"] } bincode = "1.3.3" hex-conservative = "0.1.1" async-lock = "3.2.0" diff --git a/mutiny-wasm/Cargo.toml b/mutiny-wasm/Cargo.toml index 0dfdab189..68f095e4f 100644 --- a/mutiny-wasm/Cargo.toml +++ b/mutiny-wasm/Cargo.toml @@ -42,7 +42,7 @@ futures = "0.3.25" urlencoding = "2.1.2" once_cell = "1.18.0" hex-conservative = "0.1.1" -payjoin = { version = "0.13.0", features = ["send", "base64"] } +payjoin = { version = "0.13.1", features = ["send", "base64"] } fedimint-core = "=0.3.0" moksha-core = "0.2.1" From 78775a6dc8b4cf004a0fce04bc7f6722077ac5f6 Mon Sep 17 00:00:00 2001 From: benthecarman Date: Tue, 13 Aug 2024 16:57:37 -0500 Subject: [PATCH 2/2] Fix test for tony's deleted account --- mutiny-core/src/lib.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mutiny-core/src/lib.rs b/mutiny-core/src/lib.rs index 288f8cdfd..805560479 100644 --- a/mutiny-core/src/lib.rs +++ b/mutiny-core/src/lib.rs @@ -4290,8 +4290,8 @@ mod tests { parse_npub("npub18s7md9ytv8r240jmag5j037huupk5jnsk94adykeaxtvc6lyftesuw5ydl").unwrap(); let ben = parse_npub("npub1u8lnhlw5usp3t9vmpz60ejpyt649z33hu82wc2hpv6m5xdqmuxhs46turz").unwrap(); - let tony = - parse_npub("npub1t0nyg64g5vwprva52wlcmt7fkdr07v5dr7s35raq9g0xgc0k4xcsedjgqv").unwrap(); + let jack = + parse_npub("npub1sg6plzptd64u62a878hep2kev88swjh3tw00gjsfl8f237lmu63q0uf63m").unwrap(); // create wallet let mnemonic = generate_seed(12).unwrap(); @@ -4324,22 +4324,22 @@ mod tests { assert!(contact.ln_address.is_some()); assert!(!contact.name.is_empty()); - // add tony as a contact with incomplete info + // add jack as a contact with incomplete info let incorrect_name = "incorrect name".to_string(); let new_contact = Contact { name: incorrect_name.clone(), - npub: Some(tony), + npub: Some(jack), ..Default::default() }; let id = mw.storage.create_new_contact(new_contact).unwrap(); - // sync contacts again, tony's contact should be correct + // sync contacts again, jack's contact should be correct mw.sync_nostr_contacts(npub).await.expect("synced contacts"); let contacts = mw.storage.get_contacts().unwrap(); assert_eq!(contacts.len(), 2); let contact = contacts.get(&id).unwrap(); - assert_eq!(contact.npub, Some(tony)); + assert_eq!(contact.npub, Some(jack)); assert!(contact.image_url.is_some()); assert!(contact.ln_address.is_some()); assert_ne!(contact.name, incorrect_name);