RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,957 Commits 4 Branches 11 Tags 14 MiB
ee02445b7d
Commit Graph

246 Commits

Author SHA1 Message Date
Sebastian Grewe
ab2b2d6062 Merge pull request #812 from TheSerapher/uptimerobot 
Uptimerobot
 2013-11-02 02:58:03 -07:00
Sebastian Grewe
ab4e5df2bc Merge pull request #810 from TheSerapher/issue-715-skip-orphans 
Issue 715 skip orphans
 2013-11-02 01:46:42 -07:00
nicoschtein
9c33c8314a Changed email address to new "system_error_email" setting on Prop Cron 2013-10-30 16:20:45 -02:00
nicoschtein
3a85792325 Changed email address to new "system_error_email" setting on PPLNS Cron 2013-10-30 16:16:54 -02:00
Sebastian Grewe
b98258bf62 [FIX] Fix payouts on orphans 2013-10-30 14:45:40 +01:00
Sebastian Grewe
5cbb469b56 [FIX] Default to 0 if no prev upstream share available 2013-10-30 14:11:08 +01:00
Sebastian Grewe
c9435cf180 [FIX] Skip orphans for double payout detection 
Should fix the case where orphan blocks are followed by valid blocks
with the same or lower height due to changing the main chain.

Fixes $715, specifically the orphan block issue.
 2013-10-30 07:54:25 +01:00
Sebastian Grewe
88a2a29b3b [UPDATE] Adding missing files 2013-10-29 09:23:52 +01:00
Sebastian Grewe
c6dd4086ff Merge pull request #764 from TheSerapher/payout-fixes 
Payout fixes
 2013-10-28 05:20:19 -07:00
Sebastian Grewe
a841880fe7 Merge pull request #760 from TheSerapher/issue-759 
Issue 759
 2013-10-27 07:02:02 -07:00
Sebastian Grewe
a2472284a8 [FIX] Proper fetch Archive Shares 
Is now in-line with getMininumShareId.
 2013-10-27 03:28:41 +01:00
Sebastian Grewe
7a79c66ba8 Merge branch 'next' into payout-fixes 2013-10-27 02:44:09 +01:00
Sebastian Grewe
d23358a2f7 [UPDATE] Reduce notification info logging 2013-10-27 02:54:21 +02:00
Sebastian Grewe
a6f9c25b5b [UPDATE] Proper implementation of target bits 
* [ADDED] New Config Option: Algorithm
 * scrypt and sha256d supported right now
 * might add SHA coin support across MPOS
 * Compatible with previous implementation
* [REMOVED] config option: pps_target
 * Replaced by config option: algorithm
 * Please update your config, defaults to srypt now!
* [ADDED] Unpaid Shares in Dashboard
* [MODIFIED] User estshares from DB query instead template math
 2013-10-26 14:10:34 +02:00
Sebastian Grewe
0838bc7783 [FIX] Fixing PPS calculations 
* [FIX] PPS estimations
* [FIX] PPS Value, PPS Payouts being off (too low)

Tested on testnet, estimates worked perfectly and payouts worked well.
 2013-10-26 02:38:24 +02:00
Sebastian Grewe
ac5c0fce95 [IMPROVED] Out of Order Share detection 
* [ADDED] Allow findblocks to detect and fix out of order shares
* [IMPROVED] Share class extends Base class for common functions
* [IMPROVED] Added more debugging and logging output to cronjob
* [ADDED] Added various new methods to blocks, share, base classes

For an overview of errors thrown in crons, please check:

https://github.com/TheSerapher/php-mpos/wiki/Error-Codes

Fixes #759 once merged.
 2013-10-24 12:04:00 +02:00
obigal
7e49e7c254 pplns-stats, block-stats paging, dynamic and reverse payout 2013-10-22 09:07:31 -04:00
nicoschtein
7f6e7738d8 [FIX] Incorrectly reporting # of unconfirmed coins 
Fixes #720 and fixes #721.
This will work in all three cases:

1) $config['confirmations'] > $config['network_confirmations'])
2) $config['confirmations'] < $config['network_confirmations'])
3) $config['confirmations'] = $config['network_confirmations'])
 2013-10-14 14:36:14 -03:00
andy
8311dca422 [FIX] Incorrectly reporting # of unconfirmed coins 2013-10-13 07:48:06 -07:00
Sebastian Grewe
b1001950cf [FIX] Removed debug exit from prop payout 2013-10-12 19:57:18 +02:00
Sebastian Grewe
1c1b311385 [FIX] Set block internally accounted for earlier 2013-10-12 19:54:31 +02:00
Sebastian Grewe
15d7b6d1fa [IMPROVED] Detect potential dual payout situations 2013-10-12 19:28:56 +02:00
Sebastian Grewe
1dfb7e9702 Merge pull request #673 from TheSerapher/issue-444-theserapher 
Issue 444 theserapher
 2013-10-04 02:27:28 -07:00
obigal
66296a8f36 pplns_payout block average fix when multiple blocks found during a payout run 2013-10-02 16:42:03 -04:00
Sebastian Grewe
64205dd099 [MERGE] Fix merge conflict with NEXT 2013-09-30 09:56:49 +02:00
Sebastian Grewe
db89768cd5 Merge pull request #648 from TheSerapher/issue-145 
Issue 145
 2013-09-30 00:53:45 -07:00
Sebastian Grewe
43fa4358c2 [IMPROVED] Allow running crons with full path 
Crons can now be called from any directory and will be executed inside
their working directory. Allows for more flexibility, e.g. taking out
the statistics cron and running it directly.
 2013-09-30 09:46:34 +02:00
Sebastian Grewe
1387bbdf44 [MERGE] Merge conflict NEXT 2013-09-18 16:34:52 +02:00
Sebastian Grewe
4954f14923 Merge branch 'next' into issue-444-theserapher 2013-09-18 11:03:07 +02:00
Sebastian Grewe
07f0361050 [IMPROVEMENT] Support incremental contrib shares 2013-09-18 10:48:02 +02:00
Sebastian Grewe
a0fa71b264 [IMPROVEMENT] Adding incremental round/user shares 
This will address #510. It needs thorough testing and is a WiP but
is a start to improve cron runtime and DB loads.
 2013-09-18 09:45:52 +02:00
Sebastian Grewe
d8c8a89f7a fixing PHP warning in crons 2013-09-17 14:27:58 +02:00
Sebastian Grewe
6eec747be6 fixing PPLNS payouts one last time 2013-08-22 16:16:04 +02:00
Sebastian Grewe
db754c146e Revert "Revert "adjusting pplns target to baseline shares"" 
Reverting the revert .... :-/

This reverts commit 2d27132725.
 2013-08-22 15:20:46 +02:00
Sebastian Grewe
2d27132725 Revert "adjusting pplns target to baseline shares" 
* Shares are already baselined when calculating rounds

This reverts commit c9a8f8dc65.
 2013-08-22 14:51:30 +02:00
Sebastian Grewe
c9a8f8dc65 adjusting pplns target to baseline shares 2013-08-22 14:39:46 +02:00
Sebastian Grewe
2aad605cf2 minor cleanup 2013-08-22 11:27:09 +02:00
Sebastian Grewe
526701d2e1 Merging with origin/next to get branch updated 2013-08-20 15:55:05 +02:00
Sebastian Grewe
408ebf3b0b Merge branch 'next' into issue-569 
Conflicts:
	cronjobs/findblock.php
 2013-08-19 09:37:54 +02:00
Sebastian Grewe
f0921264f8 Fixing proof-of-stake detection 
Fixes #569
 2013-08-19 09:36:25 +02:00
Sebastian Grewe
e7b8cb8d4a Remove number_format for transaction generation 
* Fixes: Incorrect payouts due to number formatting
* Moved number_format to output only

Fixes #611
 2013-08-19 08:48:27 +02:00
Sebastian Grewe
020d1ef01b Fixing notification reset for active workers 
Fixes #600
 2013-08-14 11:48:41 +02:00
Sebastian Grewe
f3a0cf0417 Fixing PPLNS payouts when exceeding target 
Round shares are taken to only match PPLNS target. Round target was not
re-adjusted to reflect the new, lower amount of round shares.

* Fix: Properly adjust round target shares when exceeding PPLNS target

Fixes #588 once merged
 2013-08-12 09:35:45 +02:00
Sebastian Grewe
68f2d72cac use regexp detection 2013-08-12 08:48:30 +02:00
Sebastian Grewe
596b2b3a5d Merge pull request #574 from TheSerapher/issue-568 
Deduct TXFee from transferred balance
 2013-08-07 21:45:30 -07:00
Sebastian Grewe
d5651764cd Update findblock.php 
* fixed typo
 2013-08-08 06:42:42 +02:00
Sebastian Grewe
8809e3df53 Do not use number_format for inserting to DB 
This will fix an issue with very large payouts not being inserted to the
DB properly. Moved number formatting to displaying output as it should
be.
 2013-08-07 09:44:11 +02:00
obigal
53da013fab Update pps_payout.php 2013-08-07 09:36:26 +02:00
obigal
ef234fe80b Vardiff/pushpool and pps payout support 2013-08-07 09:29:48 +02:00
obigal
174bfdc0cf Update pps_payout.php 2013-08-07 09:29:48 +02:00
obigal
128050f508 Update pps_payout.php 2013-08-07 09:29:48 +02:00
Sebastian Grewe
769a85cbc0 Deduct TXFee from transferred balance 
This should fix #568 as proposed by @nicoschtein
 2013-08-07 08:54:38 +02:00
Sebastian Grewe
6dfce75df8 Skip proof-of-stake blocks in findblock cron 
* Do not add proof-of-stake blocks to database

Fixes #569
 2013-08-07 08:47:22 +02:00
Sebastian Grewe
95825224a1 Adding archiving flag for transactions 
* Added new column to transactions table (`007_transactions.sql`)
* Added setArchived method to mark old transactions as archived
* Honor archived flag in getBalance and getLockedBalance

This will further address and fix #536 once merged.
 2013-08-01 12:16:59 +02:00
nicoschtein
a84c91f886 Fix PIDFILE folder check 2013-08-01 04:04:45 -03:00
Nicolas Schteinschraber
038ec39e55 Added BASEPATH and SUBFOLDER configs for PIDFILE 
Checks if the path exists, if it does not, it is created, if there is
an error a message is printed with the problematic path.
 2013-08-01 02:55:33 -03:00
nicoschtein
fee9d82192 Added curly brackets to arg vars and removed extra empty arg catcher. 2013-08-01 00:11:21 -03:00
nicoschtein
87315238da Properly overwrite PIDPREFIX via command line argument 2013-07-31 06:35:04 -03:00
Nicolas Schteinschraber
4c8295edc2 Added ability to pass prefix as an argument when calling script. 2013-07-31 04:28:15 -03:00
nicoschtein
0a3abb363e Added Prefix Option to run-crons.sh PID File. 
Added configuration option 'PIDPREFIX' to add to PIDFILE name, so it will be unique in a multipool server.
 2013-07-31 03:01:33 -03:00
Sebastian Grewe
527354f64e Generate PID name based on script name 
Fixes #533
 2013-07-30 10:18:49 +02:00
Sebastian Grewe
59534d1c02 Merge pull request #532 from TheSerapher/issue-529 
Fixing PPLNS target percentages
 2013-07-28 07:43:38 -07:00
Sebastian Grewe
97ac16b21a Fixing PPLNS target percentages 
This should fix #529 with proportional payouts towards the calculated
PPLNS target are off.
 2013-07-28 10:04:09 +02:00
Sebastian Grewe
89c539e6fd Fixing notifications for findblocks cron 
If disabled, findblocks would still send out notifications.

Thanks @feeleep75 for the heads up.

Fixes #522
 2013-07-25 13:41:13 +02:00
Sebastian Grewe
8552679920 Merge pull request #516 from TheSerapher/logrotation-script 
Adding sample logrotation config and cron
 2013-07-24 03:51:24 -07:00
Sebastian Grewe
9ff455d0dd Adding sample logrotation config and cron 
This will allow pool operators to rotate the logfiles automatically via cron.
 2013-07-24 11:13:28 +02:00
Sebastian Grewe
d6d1da31b5 adding address validation to payout crons 2013-07-24 09:02:24 +02:00
Sebastian Grewe
35d1f5fa92 Merge pull request #498 from TheSerapher/manual-payout-cron 
Adding manual payout cron
 2013-07-23 05:36:49 -07:00
Sebastian Grewe
200f3316d8 disable cron if MP is disabled 2013-07-23 13:19:32 +02:00
Sebastian Grewe
760f1a679e Allow admin to disable notification system 
This addresses #497 and allows the admins to disable notifications
through the admin panel. Might be used by those relying on clients using
the API instead.

Once merged it will fix #497.
 2013-07-23 13:06:38 +02:00
Sebastian Grewe
3cfef93580 WiP to disable fees for specific accounts 
* added new account table column: `no_fee`
* honor `no_fee` flag during payout process
* added upgrade SQL file for this feature

Address #260
 2013-07-23 10:56:45 +02:00
Sebastian Grewe
ee5e2c46c6 Adding manual payout cron 
This will avoid double payouts via the website. Payouts will be
requested by users and processed by a cron. If, for whatever reason,
users do add two requests (it is checked if a payout exists) they would
only have one successful payout until their account balance is back up
to a save value to trigger the payout.

This should fix any issues with manual payouts being exploited through
the website. Will require some testing by others to ensure things work
as expected.
 2013-07-22 16:14:22 +02:00
Sebastian Grewe
f51cc36b09 set end time of cron even when disabled 2013-07-22 14:14:51 +02:00
Sebastian Grewe
7fce187ab0 Admin Panel Setting to disable/enable AP/MP 
This will allow admins to temporarily or permanantly enable and disable
auto and manual payout processing.

Fixes #488
 2013-07-19 11:12:28 +02:00
Sebastian Grewe
6641cf7f5c Adding notifications and start/end times 
Fixes #486
 2013-07-18 15:41:52 +02:00
Sebastian Grewe
1adf8fc177 Merge pull request #476 from TheSerapher/issue-470 
Fixing option argument in run-crons for PHP binary
 2013-07-17 02:15:54 -07:00
Sebastian Grewe
39eb7f5714 Fixing option argument in run-crons for PHP binary 
Fixes #470
 2013-07-17 09:18:18 +02:00
Sebastian Grewe
82f29de293 Merge pull request #472 from TheSerapher/issue-469 
Fixing issue with wrong require
 2013-07-17 00:13:21 -07:00
Sebastian Grewe
60b4bba489 Fixing wrong round share calculations on PPLNS 
This addresses #468, might be the actual fix already.
 2013-07-16 21:49:12 +02:00
Sebastian Grewe
271c776053 Fixing issue with wrong require 
Fixes #469
 2013-07-16 21:16:53 +02:00
Sebastian Grewe
b64ef5a489 Use INFO as default logging level for crons 2013-07-12 19:42:43 +02:00
Sebastian Grewe
015da23d8e disable SQL intensive admin query cache 2013-07-12 19:42:26 +02:00
Sebastian Grewe
3df40b5bb7 removing newlines 2013-07-12 09:48:31 +02:00
Sebastian Grewe
ab620f1fe0 Merge pull request #443 from TheSerapher/issue-432 
Get rid of Orphan transaction types
 2013-07-12 00:46:45 -07:00
Sebastian Grewe
09c0087775 Add tickerupdate to cron monitoring 
Fixes #439
 2013-07-11 16:50:24 +02:00
Sebastian Grewe
e0d43141b5 Merge pull request #438 from TheSerapher/issue-431 
Adding last runtime to monitoring page
 2013-07-11 07:45:38 -07:00
Sebastian Grewe
65047d3f09 wrong argument option 2013-07-11 16:09:21 +02:00
Sebastian Grewe
450cc4d24d Command-line switch for PHP Binary and Verbosity 
This will fix #429
 2013-07-11 16:07:51 +02:00
Sebastian Grewe
dfde017267 Get rid of Orphan transaction types 
This fixes #432 and puts orphans on the same system as unconfirmed
transactions.
 2013-07-11 14:26:53 +02:00
Sebastian Grewe
875572813b Adding last runtime to monitoring page 
Displays the date/time of the last successful run.

Fixes #431
 2013-07-11 13:25:22 +02:00
Sebastian Grewe
dad727a8f0 Fix CRONHOME detection if a symlink is used 
This will fix CRONHOME detection if `run-rcrons.sh` is a symlink in `/etc/cron.minutely`.
Before symlinks would not return the proper path.
 2013-07-11 09:50:51 +02:00
Sebastian Grewe
5d568a4621 Adding CRONHOME detection to run-crons.sh 
This will ensure the cron will run without having to change the CRONHOME
configuration.
 2013-07-11 09:42:10 +02:00
Sebastian Grewe
ceeed45bb3 Adding statistics cron to monitoring 
Useful to trace cron runtimes in order to adjust caching times for long
rounds.

Addresses #145 and adds a new cron to monitoring page
 2013-07-10 11:26:06 +02:00
Sebastian Grewe
94d9c1eb4c Added cronjob monitoring to admin panel 
* Added monitoring class to deal with monitoring events
* Added event calls to all important cronjobs
* Added cron_end include file for monitoring cleanups on successful runs
* Added Monitoring to autoloader
* Modified account page to check for running auto_payout in monitoring
* Added monitoring to Navigation bar
* Added monitoring controller page

Fixes #415
 2013-07-10 10:40:11 +02:00
Sebastian Grewe
85c1a8eaf5 more debug information on non-existing block shares 2013-07-09 22:41:07 +02:00
Sebastian Grewe
00b3c45d2a Adding archive cleanup cron 
Since this needs to be done for all payouts, moved into it's own cron.

* Adjusted run-crons.sh to trigger archive cleanup
* Adjusted payouts to remove purgeArchive calls
* Adjusted pps payout, removed old configuration variable

Further addresses #143
 2013-07-09 21:59:44 +02:00
Sebastian Grewe
ba240000ab Latest version for PPLNS payouts 
* Rebased with next to add logging functions
* Added block method to fetch specific block
* Modified getArchive shares method to be more constistent
* Added new global configuration
* Adjusted smarty globals with new configuration
* More verbose pplns cron with logging
* Re-target the round in case of PPLNS not being matched by archive

Fixes #143
 2013-07-09 21:59:44 +02:00
Sebastian Grewe
394d8b52a9 Abort payout process if missing share_id 
As discussed in #392 we should abort any payouts for rounds until the
issue is fixed.
 2013-07-09 21:59:44 +02:00
Sebastian Grewe
2f2acdad6d First working version of PPLNS payouts 
* Based PPLNS on Prop Payout script
* Using defaults from prop payout, no class adjustments
* Added more methods required for PPLNS
* Added block methods for dynamic payout calculations
* Added PPLNS Sidebar that also displays the PPLNS Target
 * Shares beyond this target will not be included in payouts
 * Shares missing to this target will be added from archives
* Enabled archiving by default for PPLNS
* Added configuration options for PPLNS
 * Documented the usage for PPLNS, defaults are sane
* Added pplns_payout to run-crons

Addresses #143 and if accepted will fix it
 2013-07-09 21:59:44 +02:00
Sebastian Grewe
dc51d874a7 Adding block height to blockupdate output 
This should make tracing block updates easier.
 2013-07-09 21:26:06 +02:00