WantClue/NerdNos-Firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #56 from alcar21/feature/fix_pool_close_connection

Browse Source 
Feature/fix pool close connection
This commit is contained in:
BitMaker 2023-06-05 23:00:18 +02:00 committed by GitHub
commit 0872b7bbce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/mining.cpp
View File

@ -36,6 +36,24 @@ static miner_data mMiner; //Global miner data (Create a miner class TODO)
mining_subscribe mWorker; mining_subscribe mWorker;
mining_job mJob; mining_job mJob;
void checkPoolConnection(bool* isMinerSuscribed) {
if (client.connected()) {
return;
}
*isMinerSuscribed = false;
Serial.println("Client not connected, trying to connect...");
IPAddress serverIP(1, 1, 1, 1); //Temporally save poolIPaddres
WiFi.hostByName(poolString, serverIP);
Serial.printf("Resolved DNS got: %s\n", serverIP.toString());
if (!client.connect(poolString, portNumber)) {
Serial.println("Imposible to connect to : " + String(poolString));
WiFi.hostByName(poolString, serverIP);
vTaskDelay(1000 / portTICK_PERIOD_MS);
}
}
void runStratumWorker(void *name) { void runStratumWorker(void *name) {
// TEST: https://bitcoin.stackexchange.com/questions/22929/full-example-data-for-scrypt-stratum-client // TEST: https://bitcoin.stackexchange.com/questions/22929/full-example-data-for-scrypt-stratum-client
@ -49,7 +67,6 @@ void runStratumWorker(void *name) {
// connect to pool // connect to pool
IPAddress serverIP(1, 1, 1, 1); //Temporally save poolIPaddres
float currentPoolDifficulty = atof(DEFAULT_DIFFICULTY); float currentPoolDifficulty = atof(DEFAULT_DIFFICULTY);
bool isMinerSuscribed = false; bool isMinerSuscribed = false;
@ -64,9 +81,9 @@ void runStratumWorker(void *name) {
//Test vars: //Test vars:
//************ //************
//Nerdminerpool //Nerdminerpool
strcpy(poolString, "nerdminerPool"); // strcpy(poolString, "nerdminerPool");
portNumber = 3002; // portNumber = 3002;
strcpy(btcString,"test"); // strcpy(btcString,"test");
//Braiins //Braiins
//strcpy(poolString, "eu.stratum.braiins.com"); //strcpy(poolString, "eu.stratum.braiins.com");
//portNumber = 3333; //portNumber = 3333;
@ -76,17 +93,7 @@ void runStratumWorker(void *name) {
//portNumber = 3333; //portNumber = 3333;
//strcpy(btcString,"test"); //strcpy(btcString,"test");
if (!client.connected()) { checkPoolConnection(&isMinerSuscribed);
isMinerSuscribed = false;
Serial.println("Client not connected, trying to connect...");
if (!client.connect(serverIP, portNumber)) {
Serial.println("Imposible to connect to : " + String(poolString));
WiFi.hostByName(poolString, serverIP);
Serial.print("Resolved DNS got : "); Serial.println(serverIP);
vTaskDelay(1000 / portTICK_PERIOD_MS);
continue;
}
}
if(!isMinerSuscribed){ if(!isMinerSuscribed){
@ -109,11 +116,9 @@ void runStratumWorker(void *name) {
isMinerSuscribed=true; isMinerSuscribed=true;
} }
//Read pending messages from pool //Read pending messages from pool
while(client.available()){ while(client.connected() && client.available()){
Serial.println(" Received message from pool"); Serial.println(" Received message from pool");
String line = client.readStringUntil('\n'); String line = client.readStringUntil('\n');