Skip to content

sunset #24

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

Merged
SwapMarket merged 1 commit into from
Aug 1, 2025
Merged

sunset #24

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
2 changes: 1 addition & 1 deletion src/configs/mainnet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"network": "mainnet",
"loglevel": "info",
"apiUrl": "https://api.swapmarket.online",
"apiUrl": "",
"blockExplorerUrl": "https://blockstream.info/liquid",
"dustBTC": 500,
"dustToken": 2000000
Expand Down
35 changes: 9 additions & 26 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ let exchangeRate: number | null = null;
let exchangeRateText = "Connecting...";
let hasError = false;
let displayError =
"We're experiencing issues loading the necessary information. Please try again later.";
"Please email swapmarket.wizard996@passinbox.com if you had a failed swap.";
let withdrawalPending: boolean = false;
let withdrawalComplete: boolean = false;
let broadcastAttempts = 0;
Expand All @@ -78,7 +78,7 @@ let explWithdrawalAddress = "";
let btcChangeAddress = "";
let tokenChangeAddress = "";
let lastSeenTxId = "";
let statusText = "Validating wallet balances, please wait...";
let statusText = "THIS SERVICE HAS BEEN DISCONTINUED. Please email swapmarket.wizard996@passinbox.com if you had a failed swap.";
let limitsValidated = false;
let interval: NodeJS.Timeout;
let assetIdMap: Map<string, string>;
Expand Down Expand Up @@ -183,7 +183,7 @@ void (async () => {
// verify wallet balances
validateReserves()
.then(() => {
limitsValidated = true;
limitsValidated = false;
statusText = `<small>This exchange is running entirely in your browser and has loaded all the data necessary for autonomous operation. Read <a title="Click to read about the app" target="_blank" href="${config.repoUrl}/blob/main/README.md">FAQ</a>`;
if (config.network == "mainnet") {
// statusText += ` and try it on <a target="_blank" href="${config.testnetUrl}">Liquid Testnet</a>`;
Expand Down Expand Up @@ -258,7 +258,7 @@ void (async () => {

const ERROR_MESSAGE = () => {
let t = `<div style="text-align: center;">
<h2>Connection Lost!</h2>
<h2>THIS SERVICE HAS BEEN DISCONTINUED!</h2>
<p>${displayError}</p>`;
if (resumeLink) {
t += `If you have already sent the deposit, DO NOT reload this page or your funds WILL BE LOST.<br><br>Save <a href="${resumeLink}">this link</a> to resume the swap when you are back online.`;
Expand Down Expand Up @@ -1255,8 +1255,7 @@ void (async () => {
return { token, value };
}

// 1. Always spend the new deposit UTXO to signal success
// 2. Prioritise smallest UTXOs to consolidate them
// Prioritise smallest UTXOs to consolidate them
function selectUTXOs(
satsBTC: number,
satsToken: number,
Expand All @@ -1265,29 +1264,15 @@ void (async () => {
let totalBTC = 0;
let totalToken = 0;
let selectedUTXOs: UTXO[] = [];
const lastN = walletUTXOs.length - 1;


let leftToAllocateToken = satsToken;
let leftToAllocateBTC = satsBTC + satsFee;

if (walletUTXOs[lastN].value > 0) {
// add the newly deposited UTXO first
selectedUTXOs.push(walletUTXOs[lastN]);

if (walletUTXOs[lastN].token === "BTC") {
leftToAllocateBTC -= walletUTXOs[lastN].value;
totalBTC += walletUTXOs[lastN].value;
} else {
leftToAllocateToken -= walletUTXOs[lastN].value;
totalToken += walletUTXOs[lastN].value;
}
}

// sort BTC by increasing value, exclude the last one
let btcUTXOs = walletUTXOs
.filter(
(utxo) =>
utxo.token! === "BTC" && utxo.value! > 0 && utxo.N! < lastN,
utxo.token! === "BTC" && utxo.value! > 0,
)
.sort((a, b) => (a.value || 0) - (b.value || 0)); // Sort by `value` ascending

Expand All @@ -1297,8 +1282,7 @@ void (async () => {
.filter(
(utxo) =>
utxo.token! === info.Token &&
utxo.value! > 0 &&
utxo.N! < lastN,
utxo.value! > 0,
)
.sort((a, b) => (a.value || 0) - (b.value || 0)); // Sort by `value` ascending

Expand All @@ -1316,8 +1300,7 @@ void (async () => {
.filter(
(utxo) =>
utxo.token! === "BTC" &&
utxo.value! > 0 &&
utxo.N! < lastN,
utxo.value! > 0,
) // Filter by token and ensure `value` is defined
.sort((a, b) => (b.value || 0) - (a.value || 0)); // Sort by `value` descending
}
Expand Down
Loading