Commit Graph

174 Commits

Author SHA1 Message Date
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