detailed workers view

.gitignore

@@ -1,2 +1,7 @@
 /vendor
 /cache/template
+/cache/info.txt
+/config.php
+/run.sh
+/dood.sh
+/todo.txt

README.md

@@ -1,44 +1,89 @@
-# pool
+# Modifications
 
-A proof of concept pool for Arionum
+This repository is based on angelexevior's fork.
+System requirements are indentical to the official pool code. 
 
-Live version: http://aropool.com
+Warning: because of additions to the config file, do not simply replace the php-files without making sure all variables are added to the config. 
 
-The pool requires a full node running on the same server (on a different subdomain) as it uses it's libraries and db connection.
+## Mining
+- Share count based on accepted share and pool min DL and networm maximum min DL rate
+- Multiple pool can work together, (eg. different min DL for Cpu, GPU or other mining settings, but same reward policy)
+- Database updated with orphan info
+- Poolsanity.php: improved peering to other pools (send and get infos)
+- Workers unique ID based on miner's session ID, or the address first 15 char
 
-## Install
+## Utils
+- Update.php: calculate orphan blocks, and overwriter (stealer)'s alias or address
+- Poolsanity.php: modified, to update PID every minute
+- Poolsanity.service: Made a system service for poolsanity, copy to /etc/systemd/sytem
+- getserverinfo.sh: update server resources
+- services: system services for automated jobs (sanity, poolsanity, serverinfo)
+- Added pool info service: Watching another pool's block height (Aropool.com, Aro.cool, Arionumpool.com, Arionum.info)
+  -> if our height lower, then force sanity
 
-The requirements are the same as for the arionum node:
+## Display
+- Show another pool's block heights
+- Show Server resources (CPU, Memory, Server load)
+- Show Orphans % (basen on last 100 block)
+- Show Orphan block overwriter ("stealer")
+- Expanded informations on main page (need to run /utils/getinfo.sh)
+  -> passed blocks from last found
+  -> luck % (based on passed blocks and actual hashrate, need to finetune)
+  -> Arionum actual price (from arionum.info)
+  -> network hashrates (from arionum.info)
+- Added some icons, and header
+- Added links page (webpages, miners, wallets, pools...)
+- Added Cuby's web wallet link
+- Added News info
 
-- php 7.2 (with argon2)
-- php-openssl
-- php-gmp
-- php-bcmath
+With the current setup payments are split from updates.
 
-## Usage
+Run payments to crontab every x hours, min payment can remain low, but it will prevent big miners from massive small payments.
 
-1. Create a new database for the pool (separate from the node one).
-2. Edit the `config.php` and follow the instructions inside.
-3. Import the `contrib/pool.sql` to your NEW mysql database.
-4. Chmod the cache directory using `chmod 777 cache -R`.
-5. Create a cron entry using the following format:
-   ```bash
-   */10 * * * * user php /path/to/pool/payments.php
-   ```
+Run update in seperate crontab every 1 minute. 
 
-Start the poolsanity by running:
+Optional: Run poolsanity as systemd-service
 
-```bash
-php /path/to/pool/poolsanity.php &>/dev/null &
-```
 
-## Notes
+### hendrik's changes ###
+
+## Bigger changes:
+- Change: Hashreporting has been removed from payments/poolsanity to a seperate updater. Updating hashrates on the website can be done independently of payment-cycle, and db is no longer only updated when moving to next block. Be aware that the 10minute update interval from the clients is fixed. As is the 'first appearance' in the db after submitting first nonce
+- Added: Api.php has been expanded and restructured with more options
+- Added: Last payment, payment date, payments in 24h, time of last submitted nonce included on individual miner page and api
+- Bugfix: False rejects stale blocks submitted through Dan's Javaminer after PHP upgrade. 
+- Bugfix: Workaround for misreporting Dan's Java miner/Android miner
+- TODO: either update miner hr more often or insert sum workerHR into dashboard/individual pages/api
 
-For the template system, we use [raintpl3].
+## Smaller changes:
+- Change: The 'last-update' values of workers has been reduced from 1hr to 720s to keep the calculation of total hashrate more precise, this means workers not having reported in during the last 12 minutes are not added to the miner total hr and pool hr.
+- Change: The 'time-out' value of miners has been enlarged to have miners remain in history when they are away for a while (max 24h). For individual workers it's set to 30minutes. 
+- Change: Discard of last remaining historical shares has been added to prevent ghost miners remaining in the list indefinely (hist.shares would never reach zero)
+- Change: A miner will be deleted from history if the historical share rate drops below 50 AND he has not submitted a nonce in the last 24h
+- Change: Only 'active miners' are counted to calculate total HR: those with miner HR > 0
+- Added/Change: Next average CPU Blocks HR we now also calculate average GPU blocks HR. Both are now only based on active miners. 
+- Change: How far back last payments are displayed on payments page is moved to config
+- Change: During payment cycle, how far back is searched for small pending payments is moved to config.
+- Change: Manual payment request of all outstanding payments now looks through entire pool history. 
+- Change: If no payment message is set in config it takes the pool hostname from config
+- Change: Degradation, poolname etc. have been moved to config
+- Bugfix: to make poolsanity being able to be started as service through systemd
+- Bugfix: fixed erros in hashrate extension determination
+- TODO: Bugfix of Ario's total hr calc in indiv.miner page.
 
-Please use a new name instead of [aropool] to avoid user confusion!
+## Display changes:
 
-This project is early alpha, bugs may be found, functions might not work properly etc.
-
-[aropool]: https://aropool.com
-[raintpl3]: https://github.com/feulf/raintpl3
+- Change: Small updates to dashboard layout based on reoccuring questions in discord
+- Change: On payments page: Removal of long TX addresses in payout page, replaced with links to block explorer
+- Change: To remove the constant confusion we are going to be consequent and call it GPU-*blocks* HR and NOT "GPU HR" (and CPU-*blocks* HR instead of "CPU HR") everywhere on the site. 
+- Bugfix: template/index.html responsive html code of the purple box showing hashrates caused errors on android. Fixed. Also: C-HR is now displayed left, G-HR right, just as in all other tables. 
+- Bugfix: Rounding error hashrates
+- Change: Template/Header page: pool name set in config
+- Added: On dashboard: average h/s displayed on page
+- Added: On blocks won page - Blocks are veryfiable through link to Block Explorer, for transparency
+- Change: On individual miner page - best DL is 1000000 replaced with No Nonce submitted yet
+- Change: On individual miner page - added time of last submitted nonce
+- Bugfix: On individual miner page - when last payment is still in mempool it's shown as Payment In Process
+- Bugfix: On individual miner page - when no payment ever last payment date is shown as No Payment Yet
+- Change: On info page - old mining info removed, pool details (rewards/degradation/payout/DL) are read from the config file
+- Change: On info page - discord handle can be set in config

api.php

@@ -0,0 +1,202 @@
+<?php
+/*
+Usage: 
+
+/api?q=poolstatus			returns current status of the pool
+/api?q=minerstatus&id=<wallet>		returns total hashrate and shares of miner
+/api?q=payments&id=<wallet>	returns payments of miner
+/api.php without flags 		also returns pool status at the moment for compatibility reasons
+
+*/
+
+header('Content-Type: application/json');
+require_once __DIR__.'/db.php';
+
+$q = san($_GET['q']);
+
+
+if ($q == "minerstatus") {
+
+	$id = san($_GET['id']);
+
+	if ($id == null) {
+
+		api_err("Invalid request");
+
+	} else {
+
+		$cpu_hashrate = $db->single("SELECT hashrate FROM miners WHERE id=:id",[":id"=>$id]);
+
+		if ($cpu_hashrate != 0) { // If there is result, we can load rest of values
+
+			$gpu_hashrate = $db->single("SELECT gpuhr FROM miners WHERE id=:id",[":id"=>$id]);
+			$historic = $db->single("SELECT historic FROM miners WHERE id=:id",[":id"=>$id]);
+			$shares = $db->single("SELECT shares FROM miners WHERE id=:id",[":id"=>$id]);
+			$update = $db->single("SELECT updated FROM miners WHERE id=:id",[":id"=>$id]);
+
+			$yesterday = time()-86400;
+			$yesterday_block = $aro->single("SELECT height+1 FROM blocks WHERE date<=$yesterday ORDER by height DESC LIMIT 1");
+			$last_payment_txn = $db->single("SELECT txn FROM payments WHERE address=:id AND done=1 ORDER by height DESC LIMIT 1",[":id"=>$id]);
+			$last_payment_time = $aro->single("SELECT date FROM transactions WHERE id=$last_payment_txn");
+			$total_paid = (int)$db->single("SELECT total_paid FROM miners WHERE id=:id",[":id"=>$id]);
+			$pending = $db->single("SELECT pending FROM miners WHERE id=:id",[":id"=>$id]);
+			$last_payment = $db->single("SELECT SUM(val) FROM payments WHERE txn=:lasttxn AND done=1",[":lasttxn"=>$last_payment_txn]);
+			$past_24h = $db->single("SELECT SUM(val) FROM payments WHERE address=:id AND height>=$yesterday_block AND done=1",[":id"=>$id]);
+
+			$workers = $db->single("SELECT COUNT(1) FROM workers WHERE miner=:id",[":id"=>$id]);
+
+			if ($update == null) {
+				$update = "No nonce submitted";
+			}
+
+			if ($shares == null) {
+				$shares = 0;
+			}
+
+			if ($historic == null) {
+				$historic = 0;
+			}
+
+			if ($cpu_hashrate == null) {
+				$cpu_hashrate = 0;
+			}
+
+			if ($gpu_hashrate == null) {
+				$gpu_hashrate = 0;
+			}
+
+			if ($last_payment_time == null) {
+				$last_payment_time = "Payment in process";
+			}
+
+			if ($last_payment == 0 ) {
+				$last_payment_time = "No payment yet";
+			}
+
+			if ($pending == null) {
+				$pending = 0;
+			}
+
+			if ($last_payment == null) {
+				$last_payment = 0;
+			}
+
+			if ($past_24h == null) {
+				$past_24h = 0;
+			}
+
+			if ($workers == null) {
+				$workers = 0;
+			}
+			echo json_encode(array(
+				"miner"	=> $id, 
+				"cpu_hr" => $cpu_hashrate, 
+				"gpu_hr" => $gpu_hashrate, 
+				"workers" => $workers, 
+				"historic_shares" => $historic, 
+				"current_shares" => $shares, 
+				"last_nonce_submited" => $update, 
+				"total_paid" => $total_paid, 
+				"pending" => $pending, 
+				"past_24h" => $past_24h, 
+				"last_payment" => $last_payment, 
+				"last_payment_date"	=> $last_payment_time
+			));
+
+		} else { // No result - we don't have record for this id in our miners table
+
+			api_err("Account not found");
+
+		}
+	}
+
+} elseif ($q == "poolstatus") {
+
+	$total_hr = (int)$db->single("SELECT val FROM info WHERE id='total_hash_rate'");
+	$total_gpu = (int)$db->single("SELECT val FROM info WHERE id='total_gpu_hr'");
+	$current = $aro->single("SELECT height FROM blocks ORDER by height DESC LIMIT 1");
+	$miners = $db->single("SELECT COUNT(1) FROM miners WHERE hashrate>0 OR gpuhr>0");
+	$last_won = (int)$db->single("SELECT height FROM blocks ORDER by height DESC LIMIT 1");
+	$last_won_time = $aro->single("SELECT date FROM blocks WHERE height=:h",[":h"=>$last_won]);
+
+	if ($last_won_time == null) {
+		$last_won_time = "Never";
+	}
+
+	if ($miners == 0) {
+		$avg_gpuhr = 0;
+		$avg_hr = 0;
+	}
+
+	echo json_encode(
+		array(
+			"cpu_hr" => $total_hr, 
+			"gpu_hr" => $total_gpu, 
+			"current_block_height" => $current, 
+			"last_won_block" => $last_won, 
+			"last_won_block_time" => $last_won_time, 
+			"active miners" => $miners, 
+			"fee" => $pool_config['fee'], 
+			"historic_reward" => $pool_config['historic_reward'], 
+			"current_reward" => $pool_config['current_reward'], 
+			"miner_reward" => $pool_config['miner_reward'], 
+			"min_payout" => $pool_config['min_payout']
+		));
+
+} elseif ($q == "payments") { 
+
+	$id = san($_GET['id']);
+
+	if ($id == null) {
+
+		api_err("Invalid request");
+
+	} else {
+
+		$yesterday = time()-86400;
+		$yesterday_block = $aro->single("SELECT height+1 FROM blocks WHERE date<=$yesterday ORDER by height DESC LIMIT 1");
+		$last_payment_txn = $db->single("SELECT txn FROM payments WHERE address=:id AND done=1 ORDER by height DESC LIMIT 1",[":id"=>$id]);
+		$last_payment_time = $aro->single("SELECT date FROM transactions WHERE id=$last_payment_txn");
+		$total_paid = (int)$db->single("SELECT total_paid FROM miners WHERE id=:id",[":id"=>$id]);
+		$pending = $db->single("SELECT pending FROM miners WHERE id=:id",[":id"=>$id]);
+		$last_payment = $db->single("SELECT SUM(val) FROM payments WHERE txn=:lasttxn AND done=1",[":lasttxn"=>$last_payment_txn]);
+		$past_24h = $db->single("SELECT SUM(val) FROM payments WHERE address=:id AND height>=$yesterday_block AND done=1",[":id"=>$id]);
+
+		if ($pending == null) {
+			$pending = 0;
+		}
+
+		if ($last_payment == null) {
+			$last_payment = 0;
+		}
+
+		if ($past_24h == null) {
+			$past_24h = 0;
+		}
+
+		if ($last_payment_time == null) {
+			$last_payment_time = "Payment in process";
+		}
+
+		if ($last_payment == 0 ) {
+			$last_payment_time = "No payment yet";
+		}
+
+		echo json_encode(array("miner"=>$id, "total paid"=>$total_paid, "pending"=>$pending, "past_24h"=>$past_24h, "last_payment"=>$last_payment, "last_payment_date"=>$last_payment_time));
+
+	}
+
+} else {
+
+	// we keep this here as this is the old aropool.com api, for compatibility
+	$total_hr = $db->single("SELECT val FROM info WHERE id='total_hash_rate'");
+	$total_gpu = $db->single("SELECT val FROM info WHERE id='total_gpu_hr'");
+	$current = $aro->single("SELECT height FROM blocks ORDER by height DESC LIMIT 1");
+	$miners = $db->single("SELECT COUNT(1) FROM miners");
+	$last_won = $db->single("SELECT height FROM blocks ORDER by height DESC LIMIT 1");
+	$last_won_time = $aro->single("SELECT date FROM blocks WHERE height=:h",[":h"=>$last_won]);
+
+	echo json_encode(array("cpu_hr"=>$total_hr, "gpu_hr"=>$total_gpu, "current_block_height"=>$current, "last_won_block"=>$last_won, "last_won_block_time"=>$last_won_time, "miners"=>$miners, "fee"=>$pool_config['fee']));
+
+}
+

composer.json

@@ -6,6 +6,7 @@
         "php": "^7.2",
         "ext-bcmath": "*",
         "ext-gmp": "*",
+        "ext-json": "*",
         "ext-openssl": "*",
         "rain/raintpl": "^3.1"
     },