Merge pull request 'Fix exception handling in daily data retrieval' (#71) from 20230313-dailydata into main

Author: vicariousdrama

CHANGELOG.md

@@ -38,11 +38,13 @@ title: NODEYEZ Change Log
 - Improved Mock data for testing renderings
 - Added watermarks to renders
 - Updated the markdown and jekyll themes for website, now available at https://nodeyez.com
+- Slushpool renamed to Braiins pool
 
 **Bugfixes**
 
 - Fixed Blockhash Dungeon seeder and perpetual growth bug
 - Fixed floortiles bug in Blockhash Dungeon
+- Daily Data Retrieval has url corrections for Braiins pool
 
 ## 1.0.0
 

README.md

@@ -14,7 +14,7 @@ Scripts can be run on their own, or run continuously in the background as a serv
 
 A few sample images that you can produce on your node using Nodeyez are shown below
 
-<img src="./images/arthashdungeon.png" width=196 /><img src="./images/channelbalance.png" width=196 /><img src="./images/difficultyepoch.png" width=196 /><img src="./images/fearandgreed.png" width=196 /><img src="./images/fiatprice.png" width=196 /><img src="./images/mempoolblocks.png" width=196 /><img src="./images/minerbraiins.png" width=196 /><img src="./images/satsperusd.png" width=196 /><img src="./images/slushpool.png" width=196 /><img src="./images/sysinfo.png" width=196 /><img src="./images/whirlpoolclimix.png" width=196 /><img src="./images/whirlpoolliquidity.png" width=196 />
+<img src="./images/arthashdungeon.png" width=196 /><img src="./images/channelbalance.png" width=196 /><img src="./images/difficultyepoch.png" width=196 /><img src="./images/fearandgreed.png" width=196 /><img src="./images/fiatprice.png" width=196 /><img src="./images/mempoolblocks.png" width=196 /><img src="./images/minerbraiins.png" width=196 /><img src="./images/satsperusd.png" width=196 /><img src="./images/braiinspool.png" width=196 /><img src="./images/sysinfo.png" width=196 /><img src="./images/whirlpoolclimix.png" width=196 /><img src="./images/whirlpoolliquidity.png" width=196 />
 
 ## Informational Panels
 
@@ -52,7 +52,7 @@ These panels can be configured to report on local LND based nodes, as well as re
 * [Luxor Pool](./_docs/script-luxor-mining-hashrate.md)
 * [Miner - Braiins](./_docs/script-minerbraiins.md)
 * [Miner - MicroBT](./_docs/script-minermicrobt.md)
-* [Braiins Pool](./_docs/script-slushpool.md)
+* [Braiins Pool](./_docs/script-braiinspool.md)
 
 ## Other Fun Panels
 

_docs/index.md

@@ -1,5 +1,6 @@
 ---
 name: Documentation Index
+title: NODEYEZ Panels
 layout: default
 groups:
   - Informational Panels

_docs/script-slushpool.md _docs/script-braiinspool.md_docs/script-slushpool.md renamed to _docs/script-braiinspool.md

@@ -4,7 +4,7 @@ name: Braiins Pool
 title: Braiins Pool Script
 layout: default
 description: Creates a graph of earnings over the past 30 days of participation in Braiins pool
-imageurl: ../images/slushpool.png
+imageurl: ../images/braiinspool.png
 ---
 
 # Braiins Mining Pool
@@ -14,7 +14,7 @@ mining pool account. To use it, you'll want to add a profile for monitoring
 with read access. You can do that on the [Access Profiles page](https://pool.braiins.com/settings/access/). 
 The Limited read-only permission is sufficient for the API calls made.
 
-![sample image of slushpool](../images/slushpool.png)
+![sample image of braiins pool](../images/braiinspool.png)
 
 The pricing and profitability estimates are based on a steady load with no
 variance in hashrate and does not take into account change in market price
@@ -24,27 +24,27 @@ from this panel in future updates.
 ## Script Location
 
 This script is installed at
-[/home/nodeyez/nodeyez/scripts/slushpool.py](../scripts/slushpool.py)
+[/home/nodeyez/nodeyez/scripts/braiinspool.py](../scripts/braiinspool.py)
 
 ## Configuration
 
 To configure this script override the default configuration as follows
 
 ```shell
-nano /home/nodeyez/nodeyez/config/slushpool.json
+nano /home/nodeyez/nodeyez/config/braiinspool.json
 ```
 
 You must set the authtoken field with your API access token
 
 | field name | description |
 | --- | --- |
-| outputFile | The path to save the generated image. Default `/home/nodeyez/nodeyez/imageoutput/slushpool.png` |
+| outputFile | The path to save the generated image. Default `/home/nodeyez/nodeyez/imageoutput/braiinspool.png` |
 | colorTextFG | The color of the text expressed as a Hexadecimal color specifier. Default `#ffffff` |
 | colorBackground | The background color of the image expressed as a hexadecimal color specifier. Default `#000000` |
 | width | The width, in pixels, to generate the image. Default `480` |
 | height | The height, in pixels, to generate the image. Default `320` |
 | sleepInterval | The amount of time, in seconds, the script should wait before data gathering and image creation again. Default `600` |
-| authtoken | Create your API access  token at https://slushpool.com/settings/access/ with limited read-only access, and not web access |
+| authtoken | Create your API access  token at https://pool.braiins.com/settings/access/ with limited read-only access, and not web access |
 | useTor | Indicates whether remote calls should use torify for privacy. Experimental. Default `true` |
 | priceurl | The url that provides the pricing information from bisq marketplace. Default `https://bisq.markets/bisq/api/markets/ticker` |
 | priceCheckInterval | The amount of time, in seconds, the script should wait before checking the price again to use for profitability. 10800 is 3 hours. Default `10800` |
@@ -69,7 +69,7 @@ After making changes, Save (CTRL+O) and Exit (CTRL+X) nano.
 
 ```shell
 cd /home/nodeyez/nodeyez/scripts
-/usr/bin/env python3 slushpool.py
+/usr/bin/env python3 braiinspool.py
 ```
 
 Press CTRL+C to stop the process
@@ -79,8 +79,8 @@ Press CTRL+C to stop the process
 To enable the script to run at startup, as the privileged user run the following
 
 ```shell
-sudo systemctl enable nodeyez-slushpool.service
-sudo systemctl start nodeyez-slushpool.service
+sudo systemctl enable nodeyez-braiinspool.service
+sudo systemctl start nodeyez-braiinspool.service
 ```
 
 ---

_install_steps/5panels.md

@@ -1,5 +1,6 @@
 ---
 name: Panel Index
+title: NODEYEZ Panels
 layout: default
 groups:
   - Informational Panels

_install_steps/8runatstartup.md

@@ -24,6 +24,7 @@ sudo systemctl enable nodeyez-arthash.service
 sudo systemctl enable nodeyez-arthashdungeon.service
 sudo systemctl enable nodeyez-blockheight.service
 sudo systemctl enable nodeyez-blockstats.service
+sudo systemctl enable nodeyez-braiinspool.service
 sudo systemctl enable nodeyez-channelbalance.service
 sudo systemctl enable nodeyez-channelfees.service
 sudo systemctl enable nodeyez-daily-data-retrieval.service
@@ -44,7 +45,6 @@ sudo systemctl enable nodeyez-ordinals.service
 sudo systemctl enable nodeyez-rofstatus.service
 sudo systemctl enable nodeyez-satsperusd.service
 sudo systemctl enable nodeyez-slideshow.service
-sudo systemctl enable nodeyez-slushpool.service
 sudo systemctl enable nodeyez-sysinfo.service
 sudo systemctl enable nodeyez-utcclock.service
 sudo systemctl enable nodeyez-whirlpoolclimix.service
@@ -60,6 +60,7 @@ sudo systemctl start nodeyez-arthash.service
 sudo systemctl start nodeyez-arthashdungeon.service
 sudo systemctl start nodeyez-blockheight.service
 sudo systemctl start nodeyez-blockstats.service
+sudo systemctl start nodeyez-braiinspool.service
 sudo systemctl start nodeyez-channelbalance.service
 sudo systemctl start nodeyez-channelfees.service
 sudo systemctl start nodeyez-daily-data-retrieval.service
@@ -80,7 +81,6 @@ sudo systemctl start nodeyez-ordinals.service
 sudo systemctl start nodeyez-rofstatus.service
 sudo systemctl start nodeyez-satsperusd.service
 sudo systemctl start nodeyez-slideshow.service
-sudo systemctl start nodeyez-slushpool.service
 sudo systemctl start nodeyez-sysinfo.service
 sudo systemctl start nodeyez-utcclock.service
 sudo systemctl start nodeyez-whirlpoolclimix.service

images/slushpool.png images/braiinspool.pngimages/slushpool.png renamed to images/braiinspool.png

@@ -1,10 +1,10 @@
 {
-  "authtoken.comment": "Create your API access  token at https://slushpool.com/settings/access/ with limited read-only access, and not web access",
+  "authtoken.comment": "Create your API access  token at https://pool.braiins.com/settings/access/ with limited read-only access, and not web access",
   "authtoken.type": "string",
   "authtoken": "--put-your-auth-token-here--",
   "outputFile.comment": "The path to save the generated image",
   "outputFile.type": "string",
-  "outputFile": "/home/nodeyez/nodeyez/imageoutput/slushpool.png",
+  "outputFile": "/home/nodeyez/nodeyez/imageoutput/braiinspool.png",
   "useTor.comment": "Indicates whether remote calls should use torify for privacy. Experimental",
   "useTor.type": "boolean",
   "useTor": true,

sample-config/slushpool.json sample-config/braiinspool.jsonsample-config/slushpool.json renamed to sample-config/braiinspool.json

@@ -57,7 +57,7 @@ def createimage(accountrewards, accountprofile, poolstats, price_last, width=480
     im = Image.new(mode="RGB", size=(width, height), color=colorBackground)
     draw = ImageDraw.Draw(im)
     # Header
-    vicarioustext.drawcenteredtext(draw, "SlushPool Mining Summary", 24, int(width/2), int(headerheight/2), colorHeader, True)
+    vicarioustext.drawcenteredtext(draw, "Braiins Pool Mining Summary", 24, int(width/2), int(headerheight/2), colorHeader, True)
     # Hashrate
     hashrate = getaccounthashrate(accountprofile)
     vicarioustext.drawcenteredtext(draw, "Hashrate", 16, (width/4*1), (headerheight + (hashheight/2) - 24), colorTextFG)
@@ -133,7 +133,7 @@ def createimage(accountrewards, accountprofile, poolstats, price_last, width=480
     maoldy = -1
     for reward in accountrewards["btc"]["daily_rewards"]:
         days = days + 1
-        # skip the first day entry, something not right, and it doesnt show on slushpool.com
+        # skip the first day entry, something not right, and it doesnt show on pool.braiins.com
         if days < (daystoskip + 1):
            continue
         if days > totaldays + 1:
@@ -199,9 +199,9 @@ def createimage(accountrewards, accountprofile, poolstats, price_last, width=480
 
 if __name__ == '__main__':
     # Defaults
-    configFile = "/home/nodeyez/nodeyez/config/slushpool.json"
-    outputFile = "/home/nodeyez/nodeyez/imageoutput/slushpool.png"
-    authtoken = "--put-your-auth-token-in-nodeyez/config/slushpool.json--"
+    configFile = "/home/nodeyez/nodeyez/config/braiinspool.json"
+    outputFile = "/home/nodeyez/nodeyez/imageoutput/braiinspool.png"
+    authtoken = "--put-your-auth-token-in-nodeyez/config/braiinspool.json--"
     useTor=True
     priceUrl = "https://bisq.markets/bisq/api/markets/ticker"
     priceCheckInterval = 10800	                      # controls how often (in seconds), the market price is checked.  10800 is once every 3 hours
@@ -211,9 +211,9 @@ def createimage(accountrewards, accountprofile, poolstats, price_last, width=480
     height=320
     sleepInterval = 600                               # controls how often this display panel is updated. 600 is once every 10 minutes
     colorHeader=ImageColor.getrgb("#ffffff")          # The header text color. Need to pass to also specify bolding
-    colorMiningReward=ImageColor.getrgb("#6b50ff")    # Slushpool mining rewards color
-    colorBOSReward=ImageColor.getrgb("#fb82a8")       # Slushpool BOS rewards color
-    colorReferralReward=ImageColor.getrgb("#00bac5")  # Slushpool referral rewards color
+    colorMiningReward=ImageColor.getrgb("#6b50ff")    # Braiins pool mining rewards color
+    colorBOSReward=ImageColor.getrgb("#fb82a8")       # Braiins pool BOS rewards color
+    colorReferralReward=ImageColor.getrgb("#00bac5")  # Braiins pool referral rewards color
     colorGraphLineLight=ImageColor.getrgb("#a0a0a0")  # Chart border left and bottom
     colorGraphLineDark=ImageColor.getrgb("#606060")   # Chart border top and right
     colorMovingAverage=ImageColor.getrgb("#d69f06")   # The moving average line
@@ -237,8 +237,8 @@ def createimage(accountrewards, accountprofile, poolstats, price_last, width=480
     if exists(configFile):
         with open(configFile) as f:
             config = json.load(f)
-        if "slushpool" in config:
-            config = config["slushpool"]
+        if "braiinspool" in config:
+            config = config["braiinspool"]
         if "authtoken" in config:
             authtoken = config["authtoken"]
         else:
@@ -291,7 +291,7 @@ def createimage(accountrewards, accountprofile, poolstats, price_last, width=480
     # Check for single run
     if len(sys.argv) > 1:
         if sys.argv[1] in ['-h','--help']:
-            print(f"Creates a summary image of Slushpool account with the current hashrate, and the")
+            print(f"Creates a summary image of Braiins pool account with the current hashrate, and the")
             print(f"account earnings depicted for yesterday and today, and a graph of past 30 days")
             print(f"Usage:")
             print(f"1) Call without arguments to run continuously using the configuration or defaults")
@@ -303,11 +303,11 @@ def createimage(accountrewards, accountprofile, poolstats, price_last, width=480
     # Loop
     while True:
         print("Getting account profile and rewards")
-        accountprofile = vicariousnetwork.getslushpoolaccountprofile(True, authtoken)
+        accountprofile = vicariousnetwork.getbraiinspoolaccountprofile(True, authtoken)
         time.sleep(6)
-        accountrewards = vicariousnetwork.getslushpoolaccountrewards(True, authtoken)
+        accountrewards = vicariousnetwork.getbraiinspoolaccountrewards(True, authtoken)
         time.sleep(6)
-        poolstats = vicariousnetwork.getslushpoolstats(True, authtoken)
+        poolstats = vicariousnetwork.getbraiinspoolstats(True, authtoken)
         if price_countdown <= 0:
             print("Getting updated prices")
             price_last, price_high, price_low = vicariousnetwork.getpriceinfo(True, priceUrl, price_last, price_high, price_low)