Undo changes (#1570)

* Undo changes * Add change files
iotaledger · Nov 15, 2022 · 48db2d2 · 48db2d2
1 parent 38efc26
commit 48db2d2
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 24 deletions.
diff --git a/.changes/account-recovery.md b/.changes/account-recovery.md
@@ -0,0 +1,5 @@
+---
+"nodejs-binding": patch
+---
+
+Don't require address approval on ledger nano during account recovery.
diff --git a/.changes/syncing.md b/.changes/syncing.md
@@ -0,0 +1,5 @@
+---
+"nodejs-binding": patch
+---
+
+Sync outputs with expiration unlock condition, even when they can't be unlocked currently.
diff --git a/src/account/operations/output_finder.rs b/src/account/operations/output_finder.rs
@@ -54,7 +54,7 @@ impl AccountHandle {
                     Some(AddressGenerationOptions {
                         internal: false,
                         metadata: GenerateAddressOptions {
-                            ledger_nano_prompt: true,
+                            ledger_nano_prompt: false,
                         },
                     }),
                 )
@@ -78,7 +78,7 @@ impl AccountHandle {
                     Some(AddressGenerationOptions {
                         internal: true,
                         metadata: GenerateAddressOptions {
-                            ledger_nano_prompt: true,
+                            ledger_nano_prompt: false,
                         },
                     }),
                 )
@@ -113,7 +113,7 @@ impl AccountHandle {
                     Some(AddressGenerationOptions {
                         internal: false,
                         metadata: GenerateAddressOptions {
-                            ledger_nano_prompt: true,
+                            ledger_nano_prompt: false,
                         },
                     }),
                 )
@@ -124,7 +124,7 @@ impl AccountHandle {
                     Some(AddressGenerationOptions {
                         internal: true,
                         metadata: GenerateAddressOptions {
-                            ledger_nano_prompt: true,
+                            ledger_nano_prompt: false,
                         },
                     }),
                 )

diff --git a/src/account/operations/syncing/addresses/output_ids/basic.rs b/src/account/operations/syncing/addresses/output_ids/basic.rs
@@ -65,16 +65,7 @@ impl AccountHandle {
                 let client = client.clone();
                 tokio::spawn(async move {
                     client
-                        .basic_output_ids(vec![
-                            QueryParameter::ExpirationReturnAddress(bech32_address),
-                            // Ignore outputs that aren't expired yet
-                            QueryParameter::ExpiresBefore(
-                                std::time::SystemTime::now()
-                                    .duration_since(std::time::UNIX_EPOCH)
-                                    .expect("time went backwards")
-                                    .as_secs() as u32,
-                            ),
-                        ])
+                        .basic_output_ids(vec![QueryParameter::ExpirationReturnAddress(bech32_address)])
                         .await
                         .map_err(From::from)
                 })

diff --git a/src/account/operations/syncing/addresses/output_ids/nft.rs b/src/account/operations/syncing/addresses/output_ids/nft.rs
@@ -48,16 +48,7 @@ impl AccountHandle {
                 tokio::spawn(async move {
                     // Get outputs where the address is in the expiration unlock condition
                     client
-                        .nft_output_ids(vec![
-                            QueryParameter::ExpirationReturnAddress(bech32_address_),
-                            // Ignore outputs that aren't expired yet
-                            QueryParameter::ExpiresBefore(
-                                std::time::SystemTime::now()
-                                    .duration_since(std::time::UNIX_EPOCH)
-                                    .expect("time went backwards")
-                                    .as_secs() as u32,
-                            ),
-                        ])
+                        .nft_output_ids(vec![QueryParameter::ExpirationReturnAddress(bech32_address_)])
                         .await
                         .map_err(From::from)
                 })