Skip to content
Merged
Changes from all commits
Commits
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
17 changes: 9 additions & 8 deletions lib/wallets/wallet/impl/firo_wallet.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1020,20 +1020,21 @@ class FiroWallet<T extends ElectrumXCurrencyInterface> extends Bip39HDWallet<T>
);
}

bool isUsableOwner(Address? address) =>
address != null &&
address.value != collateralAddress &&
address.value != payoutAddress;

Address? ownerAddress = await getCurrentReceivingAddress();
const maxOwnerAttempts = 32;
for (
var i = 0;
i < maxOwnerAttempts &&
(ownerAddress == null || ownerAddress.value == collateralAddress);
i++
) {
for (var i = 0; i < maxOwnerAttempts && !isUsableOwner(ownerAddress); i++) {
await generateNewReceivingAddress();
ownerAddress = await getCurrentReceivingAddress();
}
if (ownerAddress == null || ownerAddress.value == collateralAddress) {
if (ownerAddress == null || !isUsableOwner(ownerAddress)) {
throw Exception(
"Could not derive owner address distinct from collateral address.",
"Could not derive owner address distinct from collateral and payout "
"addresses.",
);
}

Expand Down
Loading