Skip to content

collateral increments on UI + past fiat rates #7

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
kxcd merged 4 commits into from
Jun 24, 2026
Merged

collateral increments on UI + past fiat rates #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d74e5d3
collateral increments on UI + past fiat rates
dafdafdafdaf Jun 23, 2026
a4cdf06
Merge branch 'main' of https://github.com/dafdafdafdaf/dash-yield
dafdafdafdaf Jun 23, 2026
5bd4bcc
collateral increments on UI + past fiat rates for one-year-old simula…
dafdafdafdaf Jun 23, 2026
5fb163e
disabled dev_mode
dafdafdafdaf Jun 23, 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
93 changes: 73 additions & 20 deletions JS/scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,39 +34,92 @@ function partial(fieldId) {
const rawValue = input.value;
const value = Number(rawValue);
const min = Number(input.min); // 1
const max = Number(input.max); // 1000 or 4000
const fullcollateral = Number(input.placeholder); // 1000 or 4000

if (refusalCount[fieldId] === undefined)
refusalCount[fieldId] = 0;

const isValid = rawValue !== '' && Number.isInteger(value) && value >= min && value <= max;
const isValid = rawValue !== '' && Number.isInteger(value) && value >= min;
if (!isValid) {
refusalCount[fieldId]++;
const lastValid = input.dataset.lastValid ?? input.placeholder;
input.value = lastValid;
if (refusalCount[fieldId] >= 5)
alert(JSalert + min + " & " + max + ".");
alert(JSalert);

} else { // valid partial collateral entered by the visitor
refusalCount[fieldId] = 0;
input.dataset.lastValid = rawValue;
const thenumber = document.getElementById(fieldId + "-number");
const yearlydash = document.getElementById(fieldId + "-earning");
const yearlyfiat = document.getElementById(fieldId + "-fiat-earning");
// updated earnings
yearlydash.textContent = ((value / max) * yearlydash.dataset.placeholder).toFixed(1);
yearlyfiat.textContent = ((value / max) * yearlyfiat.dataset.placeholder).toFixed(1);
// bounces to show it
yearlydash.classList.remove('earning-update');
yearlyfiat.classList.remove('earning-update');
void yearlydash.offsetWidth;
void yearlyfiat.offsetWidth;
yearlydash.classList.add('earning-update');
yearlyfiat.classList.add('earning-update');
yearlydash.addEventListener('animationend', () => {
yearlydash.classList.remove('earning-update');
}, { once: true });
yearlyfiat.addEventListener('animationend', () => {
yearlyfiat.classList.remove('earning-update');
}, { once: true });
// updated number of MNs/eMNs
var newnumber = Number((value / fullcollateral).toFixed(1));
var times = "";
if (newnumber != 1)
times = " × ";
if (newnumber < 0.1)
newnumber = "≈ 0.05";
else if (!Number.isInteger(newnumber))
newnumber = "≈ " + newnumber;
thenumber.textContent = newnumber + times;
// updated number and earnings
yearlydash.textContent = ((value / fullcollateral) * yearlydash.dataset.placeholder).toFixed(1);
yearlyfiat.textContent = ((value / fullcollateral) * yearlyfiat.dataset.placeholder).toFixed(0);
// funky bounces to show it
[thenumber, yearlydash, yearlyfiat].forEach(element => {
element.classList.remove('earning-update');
void element.offsetWidth;
element.classList.add('earning-update');
element.addEventListener('animationend', () => {
element.classList.remove('earning-update');
}, { once: true });
});



}
}
}

// 1000 or 4000 increments management (using up/down arrow keys)
document.addEventListener("DOMContentLoaded", () => {
['coll-MN', 'coll-Evo'].forEach(id => {
const input = document.getElementById(id);
if (!input)
return;
const stepValue = Number(input.placeholder); // 1000 for MN, 4000 for Evo
let lastValue = Number(input.value);
// 1 : up/down arrow on keyboard
input.addEventListener('keydown', (e) => {
let currentValue = Number(input.value) || 0;
if (e.key === 'ArrowUp') {
e.preventDefault();
let newValue = Math.ceil((currentValue + 0.1) / stepValue) * stepValue;
input.value = newValue;
input.dispatchEvent(new Event('input'));
} else if (e.key === 'ArrowDown') {
e.preventDefault();
let newValue = Math.floor((currentValue - 0.1) / stepValue) * stepValue;
input.value = Math.max(Number(input.min) || 1, newValue);

input.dispatchEvent(new Event('input'));
}
});
// 2 : browser arrows clicked
input.addEventListener('input', (e) => {
if (e.inputType !== 'insertText' && e.inputType !== 'deleteContentBackward') {
let currentValue = Number(input.value) || 0;
if (currentValue > lastValue) {
let newValue = Math.ceil((lastValue + 0.1) / stepValue) * stepValue;
input.value = newValue;
}
else if (currentValue < lastValue) {
let newValue = Math.floor((lastValue - 0.1) / stepValue) * stepValue;
input.value = Math.max(Number(input.min) || 1, newValue);
}
partial(id.replace('coll-', ''));
}
lastValue = Number(input.value);
});
});
});
77 changes: 47 additions & 30 deletions compute.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php declare(strict_types=1);
// ================================== PARAMETERS ==================================
require "configs/.config-compute.php"; // for connection to Dash Core (RPC), CoinGecko (API key) and ExchangeRate-API (API key)
require "configs/.config-compute.php"; // for connection to Dash Core (RPC), CoinGecko (API key)
require "configs/config.php"; // for fiat currencies & languages list


Expand Down Expand Up @@ -84,10 +84,10 @@ function dash_rpc(string $method, array $params = []):array|int|bool {
$data_temp = json_decode($rawContent, true);
if ($data_temp !== null) {
$JSON["lastPrices"] = $data_temp;
$JSON["lastPrices"]["status"] = "JSON read";
$JSON["lastPrices"]["status"][] = "JSON read";
} else {
$JSON["lastPrices"] = [];
$JSON["lastPrices"]["status"] = "JSON corrupted, trying to refresh";
$JSON["lastPrices"]["status"][] = "JSON corrupted, trying to refresh";
}
}

Expand All @@ -102,54 +102,71 @@ function dash_rpc(string $method, array $params = []):array|int|bool {
if ($needs_price_update) {
$JSON["lastPrices"]["USD"]["source"] = "CoinGecko";
try {
$url = "https://api.coingecko.com/api/v3/coins/dash/market_chart?vs_currency=usd&days=365&x_cg_demo_api_key=" . $CoinGeckoAPIkey;
$data = http_get_json($url);
$data = http_get_json("https://api.coingecko.com/api/v3/coins/dash/market_chart?vs_currency=usd&days=365&x_cg_demo_api_key=" . $CoinGeckoAPIkey);
if (isset($data["prices"]) && is_array($data["prices"])) {
$prices = $data["prices"];
$JSON["lastPrices"]["USD"]["time"] = ["timestamp" => $now, "readable" => date("Y-m-d H:i:s", $now)];
$JSON["lastPrices"]["USD"]["365d"] = round($prices[0][1], 2);
$JSON["lastPrices"]["USD"]["current"] = round($prices[count($prices) - 1][1], 2);
$JSON["lastPrices"]["USD"]["status"] = "Dash/USD price refreshed";
$JSON["lastPrices"]["USD"]["status"][] = "Dash/USD price refreshed";
}
} catch (Exception $e) {
$JSON["lastPrices"]["USD"]["status"] = "Fetch failed: " . $e->getMessage();
$JSON["lastPrices"]["USD"]["status"][] = "Fetch failed: " . $e->getMessage();
}
}

// Exchange rates update (ExchangeRate-API) if missing or outdated
// Exchange rates update (Frankfurter.dev) if missing or outdated
$needs_exchange_update = false;
if (!isset($JSON["lastPrices"]["conversion_rates"]) || !isset($JSON["lastPrices"]["conversion_rates"]["time"]["timestamp"]) || ($now - $JSON["lastPrices"]["conversion_rates"]["time"]["timestamp"]) > ($hoursExchangeRate * 60 * 60)) {
$needs_exchange_update = true;
}
if ($needs_exchange_update) {
try {
$url_exchange = "https://v6.exchangerate-api.com/v6/" . $ExchangeRateAPIKey . "/latest/USD";
$data_exch = http_get_json($url_exchange);
if (isset($data_exch["conversion_rates"])) {
$JSON["lastPrices"]["conversion_rates"] = [
"source" => "ExchangeRate-API",
"time" => [
"timestamp" => $now,
"readable" => date("Y-m-d H:i:s", $now)
]
];
foreach (array_keys($fiatcurrencies) as $f) {
if (!isset($data_exch["conversion_rates"][$f])) {
$JSON["lastPrices"]["conversion_rates"]["status"] = "Warning: missing rate for " . $f;
$JSON["lastPrices"]["conversion_rates"] = [
"source" => "Frankfurter.dev",
"time" => [
"timestamp" => $now,
"readable" => date("Y-m-d H:i:s", $now)
]
];
$exch_rate_dates = array("now" => $now, "one-year-ago" => ($now - (365 * 24 * 60 * 60)));
foreach ($exch_rate_dates as $datename => $datestamp) {
try {
if ($datename == "one-year-ago")
$data_exch_get = "&date=" . date("Y-m-d", $datestamp);
else
$data_exch_get = "";
$data_exch = http_get_json("https://api.frankfurter.dev/v2/rates?base=USD" . $data_exch_get);
if (is_array($data_exch) and !empty($data_exch)) {
$JSON["lastPrices"]["conversion_rates"][$datename] = [
"time" => [
"timestamp" => $datestamp,
"readable" => date("Y-m-d H:i:s", $datestamp)
]
];
$JSON["lastPrices"]["conversion_rates"][$datename]["USD"] = 1;
foreach ($data_exch as $row) { // Harvest exchange rates for followed fiat currencies
if (in_array($row["quote"], array_keys($fiatcurrencies)))
$JSON["lastPrices"]["conversion_rates"][$datename][$row["quote"]] = (float)$row["rate"];
}
foreach (array_keys($fiatcurrencies) as $f) { // Check if some followed fiat are missing
if (!isset($JSON["lastPrices"]["conversion_rates"][$datename][$f])) {
$JSON["lastPrices"]["conversion_rates"][$datename]["status"][] = "Warning: missing rate for " . $f;
}
}
$JSON["lastPrices"]["conversion_rates"][$f] = $data_exch["conversion_rates"][$f] ?? 1.0;
$JSON["lastPrices"]["conversion_rates"][$datename]["status"][] = "Conversion rates refreshed";
}
$JSON["lastPrices"]["conversion_rates"]["status"] = "Conversion rates refreshed";
} catch (Exception $e) {
$JSON["lastPrices"]["conversion_rates"][$datename]["status"][] = "Exchange update failed: " . $e->getMessage();
}
} catch (Exception $e) {
$JSON["lastPrices"]["conversion_rates"]["status"] = "Exchange update failed: " . $e->getMessage();
}
}

// Saving lastPrices.json
if ($needs_price_update || $needs_exchange_update) {
file_put_contents("cache/lastPrices.json", json_encode($JSON["lastPrices"], JSON_PRETTY_PRINT), LOCK_EX); // maybe we should prevent saving failures
$JSON["lastPrices"]["status"] = "JSON saved";
if (!file_put_contents("cache/lastPrices.json", json_encode($JSON["lastPrices"], JSON_PRETTY_PRINT), LOCK_EX))
$JSON["lastPrices"]["status"][] = "failed to save JSON";
else
$JSON["lastPrices"]["status"][] = "JSON saved";
}


Expand Down Expand Up @@ -191,15 +208,15 @@ function dash_rpc(string $method, array $params = []):array|int|bool {
$JSON["rewards"]["yearly"][$type]["DASH"] = round(($JSON["APY"][$now][$type] / 100) * $collateral[$type], 8);
foreach (array_keys($fiatcurrencies) as $fiatcurrency) {
$currentfiat = strtoupper($fiatcurrency);
$rate = $JSON["lastPrices"]["conversion_rates"][$currentfiat] ?? 1.0;
$rate = $JSON["lastPrices"]["conversion_rates"]["now"][$currentfiat] ?? 1.0;
$JSON["rewards"]["yearly"][$type][$currentfiat] = round($JSON["rewards"]["yearly"][$type]["DASH"] * $dashPriceUSD * $rate, 0);
}

// Simulations over the previous 365 days
$dashPrice365d = $JSON["lastPrices"]["USD"]["365d"];
foreach (array_keys($fiatcurrencies) as $fiatcurrency) {
$currentfiat = strtoupper($fiatcurrency);
$rate = $JSON["lastPrices"]["conversion_rates"][$currentfiat] ?? 1.0;
$rate = $JSON["lastPrices"]["conversion_rates"]["now"][$currentfiat] ?? 1.0;

$historiqueAPY = json_decode(file_get_contents("cache/APYhistory.json"), true);
$rewardspast365d = calculateInterestAndAPY($historiqueAPY, ($now - (365 * 24 * 60 * 60)), $now, $type, $collateral[$type]);
Expand Down
Loading