btclock/btclock_v3
3
1
Fork 2
Code Issues Pull requests 1 Projects Releases 14 Wiki Activity Actions

Add mining pool daily/expected earnings

Browse source
This commit is contained in:
kdmukai 2024-12-18 15:58:12 -06:00
parent 1bd465b33a
commit 2bc5984f6f
8 changed files with 95 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
lib/btclock/mining_pool_stats_handler.cpp
View file

@ -41,16 +41,10 @@ std::array<std::string, NUM_SCREENS> parseMiningPoolStatsHashRate(std::string mi
// Account for the position of the mining pool logo and the hashrate label
std::size_t startIndex = NUM_SCREENS - 1 - textLength;
std::cout << "miningPoolName: " << miningPoolName << std::endl;
// Insert the mining pool logo icon just before the digits
// Insert the pickaxe icon just before the digits
if (startIndex > 0)
{
if (miningPoolName == "ocean") {
ret[startIndex - 1] = "mdi:braiins_logo";
} else if (miningPoolName == "braiins") {
ret[startIndex - 1] = "mdi:braiins_logo";
}
ret[startIndex - 1] = "mdi:pickaxe";
}
// Place the digits
@ -60,7 +54,79 @@ std::array<std::string, NUM_SCREENS> parseMiningPoolStatsHashRate(std::string mi
}
ret[NUM_SCREENS - 1] = label;
ret[0] = "POOL/STATS";
// Set the mining pool logo
if (miningPoolName == "ocean") {
ret[0] = "mdi:ocean_logo";
} else if (miningPoolName == "braiins") {
ret[0] = "mdi:braiins_logo";
}
return ret;
}
std::array<std::string, NUM_SCREENS> parseMiningPoolStatsDailyEarnings(std::string miningPoolName, int sats)
{
std::array<std::string, NUM_SCREENS> ret;
ret.fill(""); // Initialize all elements to empty strings
std::string satsDisplay = std::to_string(sats);
std::string label;
if (miningPoolName == "braiins") {
// fpps guarantees payout; report current daily earnings
label = "sats/earned";
} else {
// TIDES can only estimate earnings on the next block Ocean finds
label = "sats/block";
}
if (sats >= 100000000) {
// A whale mining 1+ BTC per day! No decimal points; whales scoff at such things.
label = "BTC" + label.substr(4);
satsDisplay = satsDisplay.substr(0, satsDisplay.length() - 8);
} else if (sats >= 10000000) {
// 10.0M to 99.9M you get one decimal point
satsDisplay = satsDisplay.substr(0, satsDisplay.length() - 6) + "." + satsDisplay[2] + "M";
} else if (sats >= 1000000) {
// 1.00M to 9.99M you get two decimal points
satsDisplay = satsDisplay.substr(0, satsDisplay.length() - 6) + "." + satsDisplay.substr(2, 2) + "M";
} else if (sats >= 100000) {
// 100K to 999K you get no extra precision
satsDisplay = satsDisplay.substr(0, satsDisplay.length() - 3) + "K";
} else if (sats >= 10000) {
// 10.0K to 99.9K you get one decimal point
satsDisplay = satsDisplay.substr(0, satsDisplay.length() - 3) + "." + satsDisplay[2] + "K";
} else {
// Pleb miner! 4 digit or fewer sats will fit as-is. no-op.
}
std::size_t textLength = satsDisplay.length();
// Calculate the position where the digits should start
// Account for the position of the mining pool logo
std::size_t startIndex = NUM_SCREENS - 1 - textLength;
// Insert the pickaxe icon just before the digits if there's room
if (startIndex > 0)
{
ret[startIndex - 1] = "mdi:pickaxe";
}
// Place the digits
for (std::size_t i = 0; i < textLength; ++i)
{
ret[startIndex + i] = satsDisplay.substr(i, 1);
}
ret[NUM_SCREENS - 1] = label;
// Set the mining pool logo
if (miningPoolName == "ocean") {
ret[0] = "mdi:ocean_logo";
} else if (miningPoolName == "braiins") {
ret[0] = "mdi:braiins_logo";
}
return ret;
}

1
lib/btclock/mining_pool_stats_handler.hpp
View file

@ -2,3 +2,4 @@
#include <string>
std::array<std::string, NUM_SCREENS> parseMiningPoolStatsHashRate(std::string miningPoolName, std::string text);
std::array<std::string, NUM_SCREENS> parseMiningPoolStatsDailyEarnings(std::string miningPoolName, int sats);

1
src/lib/config.cpp
View file

@ -340,6 +340,7 @@ void setupPreferences()
if (preferences.getBool("miningPoolStatsEnabled", DEFAULT_MINING_POOL_STATS_ENABLED))
{
addScreenMapping(SCREEN_MINING_POOL_STATS_HASHRATE, "Mining Pool Hashrate");
addScreenMapping(SCREEN_MINING_POOL_STATS_EARNINGS, "Mining Pool Earnings");
}
}

2
src/lib/defaults.hpp
View file

@ -61,7 +61,7 @@
#define MINING_POOL_NAME_OCEAN "ocean"
#define MINING_POOL_NAME_BRAIINS "braiins"
#define DEFAULT_MINING_POOL_STATS_ENABLED true
#define DEFAULT_MINING_POOL_STATS_ENABLED false
#define DEFAULT_MINING_POOL_NAME MINING_POOL_NAME_OCEAN
#define DEFAULT_MINING_POOL_USER "38Qkkei3SuF1Eo45BaYmRHUneRD54yyTFy" // Random actual Ocean hasher

26
src/lib/mining_pool_stats_fetch.cpp
View file

@ -3,13 +3,17 @@
TaskHandle_t miningPoolStatsFetchTaskHandle;
std::string miningPoolStatsHashrate;
std::string miningPoolStatsBestDiff;
int miningPoolStatsDailyEarnings;
std::string getMiningPoolStatsHashRate()
{
return miningPoolStatsHashrate;
}
int getMiningPoolStatsDailyEarnings()
{
return miningPoolStatsDailyEarnings;
}
void taskMiningPoolStatsFetch(void *pvParameters)
{
@ -21,25 +25,15 @@ void taskMiningPoolStatsFetch(void *pvParameters)
http.setUserAgent(USER_AGENT);
String miningPoolStatsApiUrl;
// TODO: Remove when webui gets proper update
Serial.println("FORCING miningPoolUser");
preferences.putString("miningPoolName", MINING_POOL_NAME_OCEAN);
Serial.println("miningPoolName: \"" + preferences.getString("miningPoolName", DEFAULT_MINING_POOL_NAME) + "\"");
Serial.println("miningPoolUser: \"" + preferences.getString("miningPoolUser", DEFAULT_MINING_POOL_USER) + "\"");
std::string httpHeaderKey = "";
std::string httpHeaderValue;
if (preferences.getString("miningPoolName", DEFAULT_MINING_POOL_NAME) == MINING_POOL_NAME_OCEAN) {
miningPoolStatsApiUrl = "https://api.ocean.xyz/v1/statsnap/" + preferences.getString("miningPoolUser", DEFAULT_MINING_POOL_USER);
Serial.println(miningPoolStatsApiUrl);
}
else if (preferences.getString("miningPoolName", DEFAULT_MINING_POOL_NAME) == MINING_POOL_NAME_BRAIINS) {
miningPoolStatsApiUrl = "https://pool.braiins.com/accounts/profile/json/btc/";
httpHeaderKey = "Pool-Auth-Token";
httpHeaderValue = preferences.getString("miningPoolUser", DEFAULT_MINING_POOL_USER).c_str();
Serial.println(miningPoolStatsApiUrl);
}
else
{
@ -64,14 +58,12 @@ void taskMiningPoolStatsFetch(void *pvParameters)
Serial.println(doc.as<String>());
if (preferences.getString("miningPoolName", DEFAULT_MINING_POOL_NAME) == MINING_POOL_NAME_OCEAN) {
Serial.println(doc["result"].as<String>());
Serial.println(doc["result"]["hashrate_300s"].as<String>());
miningPoolStatsHashrate = doc["result"]["hashrate_300s"].as<std::string>();
miningPoolStatsDailyEarnings = int(doc["result"]["estimated_earn_next_block"].as<float>() * 100000000);
}
else if (preferences.getString("miningPoolName", DEFAULT_MINING_POOL_NAME) == MINING_POOL_NAME_BRAIINS) {
// Reports hashrate in specific hashrate units (e.g. Gh/s); we want raw total hashes per second.
std::string hashrateUnit = doc["btc"]["hash_rate_unit"].as<std::string>();
Serial.println(doc["btc"]["hash_rate_unit"].as<String>());
int multiplier = 0;
if (hashrateUnit == "Zh/s") {
multiplier = 21;
@ -91,11 +83,11 @@ void taskMiningPoolStatsFetch(void *pvParameters)
// Add zeroes to pad to a full h/s output
miningPoolStatsHashrate = std::to_string(static_cast<int>(std::round(doc["btc"]["hash_rate_5m"].as<float>()))) + std::string(multiplier, '0');
Serial.println(miningPoolStatsHashrate.c_str());
miningPoolStatsDailyEarnings = int(doc["btc"]["today_reward"].as<float>() * 100000000);
}
// if (workQueue != nullptr && (getCurrentScreen() == SCREEN_MINING_POOL_STATS_HASHRATE || getCurrentScreen() == SCREEN_MINING_POOL_STATS_BESTDIFF))
if (workQueue != nullptr && (getCurrentScreen() == SCREEN_MINING_POOL_STATS_HASHRATE))
if (workQueue != nullptr && (getCurrentScreen() == SCREEN_MINING_POOL_STATS_HASHRATE || getCurrentScreen() == SCREEN_MINING_POOL_STATS_EARNINGS))
{
WorkItem priceUpdate = {TASK_MINING_POOL_STATS_UPDATE, 0};
xQueueSend(workQueue, &priceUpdate, portMAX_DELAY);

2
src/lib/mining_pool_stats_fetch.hpp
View file

@ -12,4 +12,4 @@ void setupMiningPoolStatsFetchTask();
void taskMiningPoolStatsFetch(void *pvParameters);
std::string getMiningPoolStatsHashRate();
// std::string getMiningPoolStatsBestDiff();
int getMiningPoolStatsDailyEarnings();

9
src/lib/screen_handler.cpp
View file

@ -39,9 +39,9 @@ void workerTask(void *pvParameters) {
if (getCurrentScreen() == SCREEN_MINING_POOL_STATS_HASHRATE) {
taskEpdContent =
parseMiningPoolStatsHashRate(preferences.getString("miningPoolName", DEFAULT_MINING_POOL_NAME).c_str(), getMiningPoolStatsHashRate());
// } else if (getCurrentScreen() == SCREEN_BITAXE_BESTDIFF) {
// taskEpdContent =
// parseBitaxeBestDiff(getBitaxeBestDiff());
} else if (getCurrentScreen() == SCREEN_MINING_POOL_STATS_EARNINGS) {
taskEpdContent =
parseMiningPoolStatsDailyEarnings(preferences.getString("miningPoolName", DEFAULT_MINING_POOL_NAME).c_str(), getMiningPoolStatsDailyEarnings());
}
setEpdContent(taskEpdContent);
break;
@ -190,7 +190,8 @@ void setCurrentScreen(uint newScreen) {
}
break;
}
case SCREEN_MINING_POOL_STATS_HASHRATE: {
case SCREEN_MINING_POOL_STATS_HASHRATE:
case SCREEN_MINING_POOL_STATS_EARNINGS: {
if (preferences.getBool("miningPoolStatsEnabled", DEFAULT_MINING_POOL_STATS_ENABLED)) {
WorkItem miningPoolStatsUpdate = {TASK_MINING_POOL_STATS_UPDATE, 0};
xQueueSend(workQueue, &miningPoolStatsUpdate, portMAX_DELAY);

1
src/lib/shared.hpp
View file

@ -61,6 +61,7 @@ const PROGMEM int SCREEN_BITAXE_HASHRATE = 80;
const PROGMEM int SCREEN_BITAXE_BESTDIFF = 81;
const PROGMEM int SCREEN_MINING_POOL_STATS_HASHRATE = 85;
const PROGMEM int SCREEN_MINING_POOL_STATS_EARNINGS = 86;
const PROGMEM int SCREEN_COUNTDOWN = 98;
const PROGMEM int SCREEN_CUSTOM = 99;