Skip to content

wallet: expose next unused address #809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jharveyb wants to merge 1 commit into from
+19 −0
Closed

wallet: expose next unused address #809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/payment/onchain.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,13 @@ impl OnchainPayment {
Ok(funding_address)
}

/// Retrieve the next unused on-chain/funding address.
pub fn next_address(&self) -> Result<Address, Error> {
Copy link
Collaborator

@tnull tnull Feb 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Exposing this API will be super confusing, IMO, as it will be entirely unclear which variant to use. And we intentionally only expose APIs that advance the descriptor index to avoid address reuse.

let funding_address = self.wallet.get_next_address()?;
log_info!(self.logger, "Generated next funding address: {}", funding_address);
Ok(funding_address)
}

/// Send an on-chain payment to the given address.
///
/// This will respect any on-chain reserve we need to keep, i.e., won't allow to cut into
Expand Down
12 changes: 12 additions & 0 deletions src/wallet/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,18 @@ impl Wallet {
Ok(address_info.address)
}

pub(crate) fn get_next_address(&self) -> Result<bitcoin::Address, Error> {
let mut locked_wallet = self.inner.lock().unwrap();
let mut locked_persister = self.persister.lock().unwrap();

let address_info = locked_wallet.next_unused_address(KeychainKind::External);
locked_wallet.persist(&mut locked_persister).map_err(|e| {
log_error!(self.logger, "Failed to persist wallet: {}", e);
Error::PersistenceFailed
})?;
Ok(address_info.address)
}

pub(crate) fn get_new_internal_address(&self) -> Result<bitcoin::Address, Error> {
let mut locked_wallet = self.inner.lock().unwrap();
let mut locked_persister = self.persister.lock().unwrap();
Expand Down
Loading