midefos/basicswap
1
0
Fork 0
mirror of https://github.com/basicswap/basicswap.git synced 2026-04-08 18:37:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

BIP87 (RPC -> Electrum) legacy balance fix.

Browse Source
This commit is contained in:
gerlofvanek
2026-02-06 22:33:10 +01:00
parent 7b0925de46
commit 7d592a520b
2 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
basicswap/js_server.py
View File

@@ -1742,18 +1742,22 @@ def js_modeswitchinfo(self, url_split, post_string, is_json) -> bytes:
if has_legacy_funds and legacy_balance_sats > min_viable: if has_legacy_funds and legacy_balance_sats > min_viable:
rv["show_transfer_option"] = True rv["show_transfer_option"] = True
rv["require_transfer"] = True
rv["legacy_balance_sats"] = legacy_balance_sats rv["legacy_balance_sats"] = legacy_balance_sats
rv["legacy_balance"] = ci.format_amount(legacy_balance_sats) rv["legacy_balance"] = ci.format_amount(legacy_balance_sats)
rv["message"] = ( rv["message"] = (
"Funds on legacy addresses - transfer recommended for external wallet compatibility" "Funds on legacy addresses must be transferred for external wallet compatibility"
) )
else: else:
rv["show_transfer_option"] = False rv["show_transfer_option"] = False
rv["legacy_balance_sats"] = 0 rv["require_transfer"] = False
rv["legacy_balance"] = "0"
if has_legacy_funds: if has_legacy_funds:
rv["legacy_balance_sats"] = legacy_balance_sats
rv["legacy_balance"] = ci.format_amount(legacy_balance_sats)
rv["message"] = "Legacy balance too low to transfer" rv["message"] = "Legacy balance too low to transfer"
else: else:
rv["legacy_balance_sats"] = 0
rv["legacy_balance"] = "0"
rv["message"] = "All funds on native segwit addresses" rv["message"] = "All funds on native segwit addresses"
else: else:
rv["show_transfer_option"] = can_transfer rv["show_transfer_option"] = can_transfer

42
basicswap/static/js/pages/settings-page.js
View File

@@ -148,12 +148,19 @@
hiddenInput.value = submitter.value; hiddenInput.value = submitter.value;
form.appendChild(hiddenInput); form.appendChild(hiddenInput);
let transferValue = null;
const transferRadio = document.querySelector('input[name="transfer_choice"]:checked'); const transferRadio = document.querySelector('input[name="transfer_choice"]:checked');
const transferHidden = document.querySelector('input[name="transfer_choice"][type="hidden"]');
if (transferRadio) { if (transferRadio) {
transferValue = transferRadio.value;
} else if (transferHidden) {
transferValue = transferHidden.value;
}
if (transferValue) {
const transferInput = document.createElement('input'); const transferInput = document.createElement('input');
transferInput.type = 'hidden'; transferInput.type = 'hidden';
transferInput.name = `auto_transfer_now_${coinName}`; transferInput.name = `auto_transfer_now_${coinName}`;
transferInput.value = transferRadio.value === 'auto' ? 'true' : 'false'; transferInput.value = transferValue === 'auto' ? 'true' : 'false';
form.appendChild(transferInput); form.appendChild(transferInput);
} }
@@ -242,33 +249,20 @@
const data = await seedResponse.json(); const data = await seedResponse.json();
let transferSection = ''; let transferSection = '';
if (info.show_transfer_option && info.legacy_balance_sats > 0) { if (info.require_transfer && info.legacy_balance_sats > 0) {
transferSection = ` transferSection = `
<div class="bg-gray-200 dark:bg-gray-700 border border-gray-300 dark:border-gray-500 rounded-lg p-3 mb-3"> <div class="bg-yellow-100 dark:bg-yellow-900/50 border border-yellow-400 dark:border-yellow-600 rounded-lg p-3 mb-3">
<p class="text-sm font-medium text-yellow-700 dark:text-yellow-300 mb-2">Legacy Address Funds Detected</p> <p class="text-sm font-medium text-yellow-800 dark:text-yellow-200 mb-2">Legacy Funds Transfer Required</p>
<p class="text-xs text-gray-700 dark:text-gray-300 mb-3"> <p class="text-xs text-gray-700 dark:text-gray-300 mb-2">
${info.legacy_balance} ${info.coin} on legacy addresses won't be visible in external Electrum wallet. <strong>${info.legacy_balance} ${info.coin}</strong> on legacy addresses will be automatically transferred to a native segwit address.
</p>
<p class="text-xs text-gray-600 dark:text-gray-400 mb-2">
Est. fee: ${info.estimated_fee} ${info.coin} Est. fee: ${info.estimated_fee} ${info.coin}
</p> </p>
<div class="space-y-2"> <p class="text-xs text-gray-700 dark:text-gray-300">
<label class="flex items-start cursor-pointer hover:bg-gray-300 dark:hover:bg-gray-600 rounded p-1.5 -m-1"> This ensures your funds are recoverable using the extended key backup in external Electrum wallets.
<input type="radio" name="transfer_choice" value="auto" class="mt-0.5 mr-2 h-4 w-4 text-blue-600 border-gray-400 dark:border-gray-400 focus:ring-blue-500 bg-white dark:bg-gray-500">
<div>
<span class="text-sm font-medium text-gray-900 dark:text-white">Transfer to native segwit address</span>
<p class="text-xs text-gray-600 dark:text-gray-300">Recommended for external wallet compatibility.</p>
</div>
</label>
<label class="flex items-start cursor-pointer hover:bg-gray-300 dark:hover:bg-gray-600 rounded p-1.5 -m-1">
<input type="radio" name="transfer_choice" value="manual" checked class="mt-0.5 mr-2 h-4 w-4 text-blue-600 border-gray-400 dark:border-gray-400 focus:ring-blue-500 bg-white dark:bg-gray-500">
<div>
<span class="text-sm font-medium text-gray-900 dark:text-white">Keep on current addresses</span>
<p class="text-xs text-gray-600 dark:text-gray-300">Funds accessible in BasicSwap, transfer manually later if needed.</p>
</div>
</label>
</div>
<p class="text-xs text-red-600 dark:text-red-400 mt-3">
If you skip transfer, legacy funds won't be visible when importing the extended key into external Electrum wallet.
</p> </p>
<input type="hidden" name="transfer_choice" value="auto">
</div> </div>
`; `;
} else if (info.legacy_balance_sats > 0 && !info.show_transfer_option) { } else if (info.legacy_balance_sats > 0 && !info.show_transfer_option) {