Skip to content

fix(platform-wallet): reserve platform receive address on hand-out (Found-026) [backport] #3658

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

Open
lklimek wants to merge 2 commits into
base: v3.1-dev
Choose a base branch
from
Open

fix(platform-wallet): reserve platform receive address on hand-out (Found-026) [backport] #3658

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4bf2cd
fix(rs-platform-wallet): reserve platform receive address on hand-out…
lklimek May 18, 2026
4acd3c2
Merge branch 'v3.1-dev' into fix/found-026-v3.1-dev
lklimek May 21, 2026
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
12 changes: 10 additions & 2 deletions packages/rs-platform-wallet/src/wallet/platform_addresses/wallet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,10 +259,18 @@ impl PlatformAddressWallet {
key_wallet::KeySource::Public(xpub)
};

let address = managed_account
// Reserve the address on hand-out (Found-026): platform-payment
// `used` only flips on a positive synced balance, so without
// marking it here a concurrent caller's `next_unused` would
// re-hand the same index before the sync pass. `mark_index_used`
// is idempotent — a later real sync hit on this index is a
// no-op, so gap-limit/`highest_used` accounting isn't doubled.
let info = managed_account
.addresses
.next_unused(&key_source, true)
.next_unused_with_info(&key_source, true)
.map_err(|e| PlatformWalletError::AddressSync(e.to_string()))?;
let address = info.address.clone();
managed_account.addresses.mark_index_used(info.index);

PlatformAddress::try_from(address).map_err(|e| {
PlatformWalletError::AddressSync(format!("Failed to convert to PlatformAddress: {e}"))
Expand Down
Loading