use on-chain address in wallet picker (#3717)
What changed, and why it matters
This commit changes how Cake Wallet picks which Bitcoin-style address to display as 'Active' in the wallet picker. Previously, the app always used the main on-chain address, even when the user was on a Lightning or Silent Payments address page. Now, for Lightning and Silent Payments pages, it uses the on-chain address associated with those features, and passes that chosen address into the address-type labeling logic. This is a UI/UX consistency fix rather than a cryptographic or network security change. It could affect what address a user sees or copies, but there is no direct evidence it enables theft or unauthorized transactions.
Treat as a routine UI consistency fix. Review that addressForBuy is correctly populated and that the wallet picker still shows the address the user expects for each page type. No urgent security action is indicated by the diff alone.
Security signals we found
Address display/presentation logic changed
Active address selection now depends on address page type
No input validation, signature, or transaction authorization code modified
No explicit security fix language in commit title or message
Evidence from the diff
In cw_bitcoin/lib/electrum_wallet_addresses.dart, updateAddressesInBox() now computes an activeAddress: if addressPageType is LightningAddressType.p2l or SilentPaymentsAddresType.p2sp it uses addressForBuy, otherwise it uses the existing address field. This activeAddress is then used as the ‘Active’ entry in addressesMap and is passed to addBitcoinAddressTypes(), which now takes an explicit activeAddress parameter instead of implicitly reading the class-level address field. The change ensures that the wallet picker’s ‘Active’ label and the address-type list are consistent with the currently selected address page type. No cryptographic, validation, or network-layer code is modified.
Changed components
cw_bitcoin/lib/electrum_wallet_addresses.dartElectrumWalletAddressesBase.updateAddressesInBox()ElectrumWalletAddressesBase.addBitcoinAddressTypes()Wallet picker / address list UIInspect captured patch +21 / −17
### cw_bitcoin/lib/electrum_wallet_addresses.dart
@@ -595,75 +595,75 @@ abstract class ElectrumWalletAddressesBase extends WalletAddresses with Store {
}) async =>
getAddress(index: index, hd: hd, addressType: addressType);
- void addBitcoinAddressTypes() {
+ void addBitcoinAddressTypes(String activeAddress) {
final lastP2wpkh = _addresses
.where((addressRecord) =>
_isUnusedReceiveAddressByType(addressRecord, SegwitAddresType.p2wpkh))
.lastOrNull;
if (lastP2wpkh != null) {
- if (lastP2wpkh.address != address) {
+ if (lastP2wpkh.address != activeAddress) {
addressesMap[lastP2wpkh.address] = 'P2WPKH';
} else {
- addressesMap[address] = 'Active - P2WPKH';
+ addressesMap[activeAddress] = 'Active - P2WPKH';
}
}
final lastP2pkh = _addresses.firstWhereOrNull(
(addressRecord) => _isUnusedReceiveAddressByType(addressRecord, P2pkhAddressType.p2pkh));
if (lastP2pkh != null) {
- if (lastP2pkh.address != address) {
+ if (lastP2pkh.address != activeAddress) {
addressesMap[lastP2pkh.address] = 'P2PKH';
} else {
- addressesMap[address] = 'Active - P2PKH';
+ addressesMap[activeAddress] = 'Active - P2PKH';
}
}
final lastP2sh = _addresses.firstWhereOrNull((addressRecord) =>
_isUnusedReceiveAddressByType(addressRecord, P2shAddressType.p2wpkhInP2sh));
if (lastP2sh != null) {
- if (lastP2sh.address != address) {
+ if (lastP2sh.address != activeAddress) {
addressesMap[lastP2sh.address] = 'P2SH';
} else {
- addressesMap[address] = 'Active - P2SH';
+ addressesMap[activeAddress] = 'Active - P2SH';
}
}
final lastP2tr = _addresses.firstWhereOrNull(
(addressRecord) => _isUnusedReceiveAddressByType(addressRecord, SegwitAddresType.p2tr));
if (lastP2tr != null) {
- if (lastP2tr.address != address) {
+ if (lastP2tr.address != activeAddress) {
addressesMap[lastP2tr.address] = 'P2TR';
} else {
- addressesMap[address] = 'Active - P2TR';
+ addressesMap[activeAddress] = 'Active - P2TR';
}
}
final lastP2wsh = _addresses.firstWhereOrNull(
(addressRecord) => _isUnusedReceiveAddressByType(addressRecord, SegwitAddresType.p2wsh));
if (lastP2wsh != null) {
- if (lastP2wsh.address != address) {
+ if (lastP2wsh.address != activeAddress) {
addressesMap[lastP2wsh.address] = 'P2WSH';
} else {
- addressesMap[address] = 'Active - P2WSH';
+ addressesMap[activeAddress] = 'Active - P2WSH';
}
}
final firstSilentAddressRecord = silentAddresses.firstOrNull;
if (firstSilentAddressRecord != null) {
- if (firstSilentAddressRecord.address != address) {
+ if (firstSilentAddressRecord.address != activeAddress) {
addressesMap[firstSilentAddressRecord.address] = firstSilentAddressRecord.name.isEmpty
? "Silent Payments"
: "Silent Payments - ${firstSilentAddressRecord.name}";
} else {
- addressesMap[address] = 'Active - Silent Payments';
+ addressesMap[activeAddress] = 'Active - Silent Payments';
}
}
if (lightningAddress != null) {
- if (lightningAddress != address) {
+ if (lightningAddress != activeAddress) {
addressesMap[lightningAddress!] = 'LN';
} else {
- addressesMap[address] = 'Active - LN';
+ addressesMap[activeAddress] = 'Active - LN';
}
}
}
@@ -703,7 +703,11 @@ abstract class ElectrumWalletAddressesBase extends WalletAddresses with Store {
Future<void> updateAddressesInBox() async {
try {
addressesMap.clear();
- addressesMap[address] = 'Active';
+ final activeAddress = addressPageType == LightningAddressType.p2l ||
+ addressPageType == SilentPaymentsAddresType.p2sp
+ ? addressForBuy
+ : address;
+ addressesMap[activeAddress] = 'Active';
allAddressesMap.clear();
_addresses.forEach((addressRecord) {
@@ -712,7 +716,7 @@ abstract class ElectrumWalletAddressesBase extends WalletAddresses with Store {
switch (walletInfo.type) {
case WalletType.bitcoin:
- addBitcoinAddressTypes();
+ addBitcoinAddressTypes(activeAddress);
break;
case WalletType.litecoin:
addLitecoinAddressTypes();Why this scored 23/100
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.