private/desktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

miner
All checks were successful
Deploy / deploy-staging (push) Successful in 46s
Details
Deploy / deploy-production (push) Has been skipped
Details

Browse Source
This commit is contained in:
Lars Gebhardt-Kusche
2026-07-03 01:54:41 +02:00
parent 2d46b05b1e
commit 17c4bf16c2
3 changed files with 187 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
custom/apps/mining-checker/assets/js/app.js
View File

@@ -904,6 +904,7 @@
const [targetModalOpen, setTargetModalOpen] = useState(false);
const [selectedMinerScenarioId, setSelectedMinerScenarioId] = useState(null);
const [minerOfferFilters, setMinerOfferFilters] = useState({
offer_type: 'crypto',
speed_min: '',
speed_unit: 'auto',
price_max: '',
@@ -944,11 +945,9 @@
const [walletWithdrawalRows, setWalletWithdrawalRows] = useState([]);
const [minerOfferForm, setMinerOfferForm] = useState({
label: '',
runtime_months: '',
bonus_percent: '',
base_price_amount: '',
base_price_currency: 'USD',
payment_type: 'fiat',
payment_type: 'crypto',
auto_renew: false,
note: '',
is_active: true,
@@ -1036,8 +1035,9 @@
: currencies;
const selectableCurrencies = preferredSelectableCurrencies.length ? preferredSelectableCurrencies : currencies;
const evaluatedMinerOffers = Array.isArray(payload?.summary?.miner_offers) ? payload.summary.miner_offers : [];
const availableMinerOffers = evaluatedMinerOffers.filter((offer) => isOfferAvailableForWallet(offer, currentMiningCurrency, currentWalletMiningBalance));
const selectedOfferType = String(minerOfferFilters.offer_type || 'crypto').toLowerCase() === 'fiat' ? 'fiat' : 'crypto';
const filteredMinerOffers = evaluatedMinerOffers.filter((offer) => {
const paymentType = String(offer.payment_type || '').toLowerCase();
const speedMin = minerOfferFilters.speed_min === '' ? null : Number(minerOfferFilters.speed_min);
const speedUnit = String(minerOfferFilters.speed_unit || 'auto');
const priceMax = minerOfferFilters.price_max === '' ? null : Number(minerOfferFilters.price_max);
@@ -1053,6 +1053,18 @@
? offerHashrate * 1000
: offerHashrate;
if (paymentType !== selectedOfferType) {
return false;
}
if (selectedOfferType === 'crypto' && !isOfferAvailableForWallet(offer, currentMiningCurrency, currentWalletMiningBalance)) {
return false;
}
if (selectedOfferType === 'fiat' && !Number.isFinite(speedMin)) {
return false;
}
if (Number.isFinite(speedMin) && (!Number.isFinite(comparableHashrate) || comparableHashrate < speedMin)) {
return false;
}
@@ -1067,6 +1079,7 @@
return true;
});
const scenarioMinerOffers = filteredMinerOffers.filter((offer) => isOfferAvailableForWallet(offer, currentMiningCurrency, currentWalletMiningBalance));
const speedUnits = ['kH/s', 'MH/s'];
const fiatCurrencies = currencies.filter((currency) => !currency.is_crypto);
const cryptoCurrencies = currencies.filter((currency) => !!currency.is_crypto);
@@ -1078,7 +1091,7 @@
: cryptoCurrencies;
const selectableFiatCurrencies = preferredSelectableFiatCurrencies.length ? preferredSelectableFiatCurrencies : fiatCurrencies;
const selectableCryptoCurrencies = preferredSelectableCryptoCurrencies.length ? preferredSelectableCryptoCurrencies : cryptoCurrencies;
const selectedMinerScenario = availableMinerOffers.find((offer) => String(offer.id) === String(selectedMinerScenarioId)) || null;
const selectedMinerScenario = scenarioMinerOffers.find((offer) => String(offer.id) === String(selectedMinerScenarioId)) || null;
const activeMinerRows = currentPurchasedMiners.map((miner) => ({
id: `purchase-${miner.id}`,
source: 'miete',
@@ -1130,19 +1143,19 @@
return;
}
const exists = availableMinerOffers.some((offer) => String(offer.id) === String(selectedMinerScenarioId));
const exists = scenarioMinerOffers.some((offer) => String(offer.id) === String(selectedMinerScenarioId));
if (!exists) {
setSelectedMinerScenarioId(null);
}
}, [availableMinerOffers, selectedMinerScenarioId]);
}, [scenarioMinerOffers, selectedMinerScenarioId]);
useEffect(() => {
if (!purchaseMinerModalOpen) {
return;
}
const selectedOffer = availableMinerOffers.find((offer) => String(offer.id) === String(purchaseMinerForm.offer_id))
|| availableMinerOffers[0]
const selectedOffer = scenarioMinerOffers.find((offer) => String(purchaseMinerForm.offer_id) === String(offer.id))
|| scenarioMinerOffers[0]
|| null;
if (!selectedOffer) {
return;
@@ -1162,7 +1175,7 @@
reference_price_currency: current.reference_price_currency || selectedOffer.reference_price_currency || '',
auto_renew: current.auto_renew || !!selectedOffer.auto_renew,
}));
}, [purchaseMinerModalOpen, availableMinerOffers, purchaseMinerForm.offer_id, currentSettings.crypto_currency]);
}, [purchaseMinerModalOpen, scenarioMinerOffers, purchaseMinerForm.offer_id, currentSettings.crypto_currency]);
function measurementFxRate(measurementId, fromCurrency, toCurrency) {
const from = String(fromCurrency || '').toUpperCase();
@@ -2104,7 +2117,9 @@
try {
const offerPayload = {
...minerOfferForm,
base_price_currency: minerOfferForm.payment_type === 'crypto' ? 'USD' : minerOfferForm.base_price_currency,
base_price_currency: minerOfferForm.payment_type === 'crypto'
? (minerOfferForm.base_price_currency || 'USD')
: 'EUR',
};
await request(`${apiBase}/projects/${encodeURIComponent(projectKey)}/miner-offers`, {
method: 'POST',
@@ -2114,11 +2129,9 @@
setMessage('Miner-Angebot gespeichert.');
setMinerOfferForm({
label: '',
runtime_months: '',
bonus_percent: '',
base_price_amount: '',
base_price_currency: 'USD',
payment_type: 'fiat',
payment_type: 'crypto',
auto_renew: false,
note: '',
is_active: true,
@@ -2173,7 +2186,7 @@
return;
}
const selectedOffer = availableMinerOffers.find((offer) => String(offer.id) === String(purchaseMinerForm.offer_id));
const selectedOffer = scenarioMinerOffers.find((offer) => String(offer.id) === String(purchaseMinerForm.offer_id));
if (!selectedOffer) {
setError('Bitte ein gueltiges Miner-Angebot auswaehlen.');
return;
@@ -2990,7 +3003,7 @@
});
setPurchaseMinerModalOpen(true);
},
disabled: !availableMinerOffers.length,
disabled: !scenarioMinerOffers.length,
}, 'Neuen Miner mieten'),
]),
h('div', { key: 'list', className: 'mc-table-shell' }, [
@@ -3036,9 +3049,11 @@
]),
]),
]),
panel('Miner-Angebote', currentWalletMiningBalance !== null
? `Hier werden nur Basis-Miner gepflegt. Die Verfuegbarkeit von Krypto-Angeboten wird gegen deinen aktuellen NC-Wallet-Bestand (${fmtNumber(currentWalletMiningBalance, 8)} ${currentMiningCurrency}) bewertet.`
: 'Hier werden nur Basis-Miner gepflegt. Alle vorgegebenen Geschwindigkeiten und Preise werden daraus automatisch abgeleitet.',
panel('Miner-Angebote', selectedOfferType === 'crypto'
? (currentWalletMiningBalance !== null
? `Crypto-Angebote sind aktiv. Angezeigt werden nur Angebote, die dein NC-Wallet aktuell tragen kann (${fmtNumber(currentWalletMiningBalance, 8)} ${currentMiningCurrency}).`
: 'Crypto-Angebote sind aktiv. Solange kein Wallet-Bestand erkannt wird, bleiben die Krypto-Angebote sichtbar.')
: 'Fiat-Angebote sind aktiv. Die Berechnung startet erst, wenn du eine Geschwindigkeit eingibst.',
[
h('div', { key: 'actions', className: 'mc-inline-row' }, [
h('button', {
@@ -3049,7 +3064,11 @@
}, 'Basis-Angebot anlegen'),
]),
h('div', { key: 'filters', className: 'mc-filter-grid' }, [
inputField(`Min. Geschwindigkeit (${minerOfferFilters.speed_unit === 'kh' ? 'kH/s' : 'MH/s'})`, 'number', minerOfferFilters.speed_min, (value) => setMinerOfferFilters({ ...minerOfferFilters, speed_min: value }), '0.0001'),
selectField('Angebotsart', minerOfferFilters.offer_type, [
{ value: 'crypto', label: 'Crypto' },
{ value: 'fiat', label: 'Fiat' },
], (value) => setMinerOfferFilters({ ...minerOfferFilters, offer_type: value || 'crypto' })),
inputField(`${selectedOfferType === 'fiat' ? 'Geschwindigkeit' : 'Min. Geschwindigkeit'} (${minerOfferFilters.speed_unit === 'kh' ? 'kH/s' : 'MH/s'})`, 'number', minerOfferFilters.speed_min, (value) => setMinerOfferFilters({ ...minerOfferFilters, speed_min: value }), '0.0001'),
selectField('Geschwindigkeitseinheit', minerOfferFilters.speed_unit, [
{ value: 'auto', label: 'MH/s' },
{ value: 'kh', label: 'kH/s' },
@@ -3140,7 +3159,7 @@
}, 'Mieten'),
]),
]))
: [h('tr', { key: 'empty' }, h('td', { colSpan: 7 }, 'Keine Angebote passen auf die gesetzten Filter.'))]
: [h('tr', { key: 'empty' }, h('td', { colSpan: 7 }, selectedOfferType === 'fiat' && minerOfferFilters.speed_min === '' ? 'Bitte zuerst eine Geschwindigkeit eingeben, damit Fiat-Angebote berechnet werden.' : 'Keine Angebote passen auf die gesetzten Filter.'))]
),
]),
]),
@@ -3301,20 +3320,20 @@
minerOfferModalOpen ? renderModal('Basis-Miner-Angebot anlegen', [
h('form', { key: 'form', className: 'mc-form', onSubmit: submitMinerOffer }, [
inputField('Label', 'text', minerOfferForm.label, (value) => setMinerOfferForm({ ...minerOfferForm, label: value })),
inputField('Laufzeit in Monaten', 'number', minerOfferForm.runtime_months, (value) => setMinerOfferForm({ ...minerOfferForm, runtime_months: value })),
displayField('Basis-Geschwindigkeit', baseOfferSpeedLabel(minerOfferForm.payment_type)),
inputField('Bonus-Hashrate in %', 'number', minerOfferForm.bonus_percent, (value) => setMinerOfferForm({ ...minerOfferForm, bonus_percent: value }), '0.01'),
inputField(minerOfferForm.payment_type === 'crypto' ? 'Basispreis in USD' : 'Basispreis', 'number', minerOfferForm.base_price_amount, (value) => setMinerOfferForm({ ...minerOfferForm, base_price_amount: value }), '0.000001'),
displayField('Basis-Laufzeit', '3 Monate'),
displayField('Ableitung', baseOfferDerivationLabel(minerOfferForm.payment_type)),
inputField(baseOfferPriceLabel(minerOfferForm.payment_type, currentSettings.crypto_currency), 'number', minerOfferForm.base_price_amount, (value) => setMinerOfferForm({ ...minerOfferForm, base_price_amount: value }), '0.000001'),
selectField('Zahlungsart', minerOfferForm.payment_type, [{ value: 'fiat', label: 'FIAT' }, { value: 'crypto', label: 'Krypto' }], (value) => setMinerOfferForm({
...minerOfferForm,
payment_type: value,
base_price_currency: value === 'crypto'
? 'USD'
: (selectableFiatCurrencies[0]?.code || 'USD'),
: 'EUR',
})),
minerOfferForm.payment_type === 'crypto'
? displayField('Kostenwaehrung', 'USD')
: selectField('Basiswährung', minerOfferForm.base_price_currency, selectableFiatCurrencies.map((currency) => currency.code), (value) => setMinerOfferForm({ ...minerOfferForm, base_price_currency: value })),
? selectField('Basiswaehrung', minerOfferForm.base_price_currency, Array.from(new Set(['USD', String(currentSettings.crypto_currency || 'DOGE').toUpperCase()])), (value) => setMinerOfferForm({ ...minerOfferForm, base_price_currency: value || 'USD' }))
: displayField('Basiswaehrung', 'EUR'),
h('label', { className: 'mc-checkbox' }, [
h('input', { type: 'checkbox', checked: !!minerOfferForm.auto_renew, onChange: (event) => setMinerOfferForm({ ...minerOfferForm, auto_renew: event.target.checked }) }),
'Automatische Verlängerung',
@@ -3332,11 +3351,11 @@
], () => setMinerOfferModalOpen(false)) : null,
purchaseMinerModalOpen ? renderModal('Neuen Miner mieten', [
h('form', { key: 'form', className: 'mc-form', onSubmit: submitPurchaseMiner }, [
selectField('Angebot', purchaseMinerForm.offer_id, [{ value: '', label: 'Bitte waehlen' }].concat(availableMinerOffers.map((offer) => ({
selectField('Angebot', purchaseMinerForm.offer_id, [{ value: '', label: 'Bitte waehlen' }].concat(scenarioMinerOffers.map((offer) => ({
value: String(offer.id),
label: `${offer.label} · ${fmtNumber(offer.effective_price_amount, 6)} ${offer.effective_price_currency}`,
}))), (value) => {
const offer = availableMinerOffers.find((item) => String(item.id) === String(value));
const offer = scenarioMinerOffers.find((item) => String(item.id) === String(value));
setPurchaseMinerForm({
offer_id: value,
base_offer_id: offer ? String(offer.base_offer_id || offer.id || '') : '',
@@ -3666,7 +3685,19 @@
}
function baseOfferSpeedLabel(paymentType) {
return String(paymentType || 'fiat') === 'crypto' ? '75 kH/s' : '50 kH/s';
return String(paymentType || 'fiat') === 'crypto' ? '50 kH/s' : '100 kH/s';
}
function baseOfferPriceLabel(paymentType, cryptoCurrency) {
return String(paymentType || 'fiat') === 'crypto'
? `Basispreis fuer 50 kH/s auf 3 Monate in USD oder ${String(cryptoCurrency || 'DOGE').toUpperCase()}`
: 'Basispreis fuer 100 kH/s auf 3 Monate in EUR';
}
function baseOfferDerivationLabel(paymentType) {
return String(paymentType || 'fiat') === 'crypto'
? 'Varianten fuer 3, 6, 12, 18, 24 und 36 Monate mit festen Rabatten und Bonuswerten'
: 'Varianten fuer 3, 6 und 12 Monate mit festen Rabatten und Bonuswerten';
}
function formatHashrateWithBonus(speedValue, speedUnit, bonusValue, bonusUnit) {