Commit Graph

3075 Commits

Author SHA1 Message Date
Sebastian Grewe
1d5acb48b2 [FIX] Wrong argument count 2014-02-15 18:16:57 +01:00
Sebastian Grewe
4cf1f35619 Merge branch 'next' of github.com:MPOS/php-mpos into next 2014-02-15 17:54:59 +01:00
Sebastian Grewe
f62a47dd2c [FIX] Abort cron on locking failure
Fixes #1762
2014-02-15 17:54:20 +01:00
Sebastian Grewe
ee805b65ce [IMPROVED] PPLNS payout log format 2014-02-15 17:10:58 +01:00
Sebastian Grewe
950e607230 [IMPROVED] Proportional payout log format 2014-02-15 17:10:45 +01:00
Sebastian Grewe
aab216e117 [IMPROVED] Blockupdate log format 2014-02-15 15:57:53 +01:00
Sebastian Grewe
93b7fb6de2 [IMPROVED] Findblocks log formatting 2014-02-15 15:43:13 +01:00
iAmShorty
2acf83894d only show new table if accounts > 1 2014-02-15 13:55:28 +01:00
Sebastian Grewe
7c4ec2f042 Merge pull request #1754 from MPOS/csrf-validation
[FIX] Use session ID for user uniqueness
2014-02-15 09:30:31 +01:00
Sebastian Grewe
587b579a1e Merge pull request #1759 from Fapper/patch-1
[FIX] Correct link to 'Wow, Much Pool' donor in README
2014-02-15 09:28:56 +01:00
Sebastian Grewe
bd561ff465 [FIX] Statistics Graphs ACL
Fixes #1760
2014-02-15 09:27:38 +01:00
iAmShorty
b0baa29a1f [FIX] fix for negative balance
using php abs() should do the trick with negative balance
2014-02-14 21:03:30 +01:00
iAmShorty
691e1e60cb Update bitcoinwrapper.class.php 2014-02-14 20:49:42 +01:00
Martin madsen
9e59f71384 Fix link to 'Wow, Much Pool' donor in README 2014-02-14 20:02:50 +01:00
Sebastian Grewe
6f1f56abb6 [ADDED] getrealbalance wrapper for payouts
During payouts, we must ensure our wallets main accounts has the funds
to payout users. Hence we implement a wrapper method:

* If account count == 1 we only have main account, return getbalance
* Else return our main accounts balance - calculated unconfirmed

This should keep getbalance untouched when used on other places but
gives our payout processing a proper main account balance.

It's mostly a wrapper for those wallets running multiple accounts in one
wallet. They are warned on the front-end already but this ensure payouts
process properly.

Fixes #1755 once merged.
2014-02-14 17:21:52 +01:00
iAmShorty
cc3f8abf49 Merge pull request #1756 from iAmShorty/liquid-payout
[FIX] remove Liquid payout from cron
2014-02-14 17:13:56 +01:00
iAmShorty
8046b5225f [FIX] permissions 2014-02-14 17:11:29 +01:00
iAmShorty
2ac6540a8f [FIX] removed from cronjob 2014-02-14 17:10:27 +01:00
iAmShorty
0ef5fdedef [UPDATE] small changes 2014-02-14 17:08:22 +01:00
Sebastian Grewe
cb85e266be [FIX] Use session ID for user uniqueness 2014-02-14 14:16:36 +01:00
Sebastian Grewe
8f4af5b038 [REMOVED] Liquid payout cron from monitoring pages 2014-02-14 11:40:50 +01:00
Sebastian Grewe
a083b1c272 [REMOVED] Liquid Payout cron due to issues
Payouts did not work very well and caused more issues for pools than
being worth having this cron. We revert this and let them use
sendtoaddress again whenever they wish to deduct payouts from their pool
at their own discretion.

We may add this thing back in sometime later with a proper and working
implementation but no promises.
2014-02-14 11:39:11 +01:00
Sebastian Grewe
03255ae541 Merge pull request #1738 from MPOS/acl-overhaul
[UPDATE] ACL Management
2014-02-14 11:14:01 +01:00
Sebastian Grewe
d7f2e6e5ac [UPDATE] ACL Management
* [ADDED] Smarty acl_check function
* [ADDED] Optional default return  value for getValue calls
* [UPDATE] ACL Checks in page controllers
* [UPDATE] Navigation template to use check_acl from Smarty
* [ADDED] New ACL options where needed
* [REMOVED] Disable pages from System Settings Tab
* [ADDED] Above removed pages into ACL Settings Tab

This will make usage of ACLs a bit easier and transparent.
Also fixes #1731 once merged.
2014-02-14 10:56:25 +01:00
Sebastian Grewe
f43a5214c4 [FIX] PPS Payout processing
* [ADDED] Abort if we don't have enough shares to calculate PPS from
* [FIXED] Proper calculations for account shares, we dropped a share
  each run
* [ADDED] Error code if no new shares available
2014-02-14 10:55:17 +01:00
Sebastian Grewe
6f706b883d Merge branch 'next' of github.com:MPOS/php-mpos into next 2014-02-14 09:42:16 +01:00
Sebastian Grewe
6d52f5d47c [FIX] Added missing file, gitignore :/ 2014-02-14 09:42:03 +01:00
Sebastian Grewe
682beb60d1 Merge pull request #1739 from MPOS/notification-cleanup
[ADDED] Notification cleanup script
2014-02-14 08:56:51 +01:00
Sebastian Grewe
bb2037d813 Merge pull request #1753 from andymornes/next
[FIX] Correcting user ID for new block emails
2014-02-14 06:34:51 +01:00
Andy Mornes
ac3bea9f1a [FIX] Correcting user ID for new block emails
Also adding the currency to the notifications as well.
2014-02-13 13:26:48 -06:00
iAmShorty
1fd7499856 [UPDATE] style changes 2014-02-13 17:28:47 +01:00
iAmShorty
224af2c9d3 [UPDATE] showing accounts with balance and address 2014-02-13 16:29:33 +01:00
Sebastian Grewe
8589d84ba9 Merge pull request #1751 from MPOS/transaction-index
[UPDATE] Added INDEX to transactions table
2014-02-13 14:58:39 +01:00
Sebastian Grewe
c8f639796a [UPDATE] Added INDEX to transactions table
Should speed up queries using both account_id and archived for a
specific account.
2014-02-13 14:45:32 +01:00
iAmShorty
81b8b976d1 [FEATURE] show addresses from account 2014-02-13 12:29:04 +01:00
iAmShorty
146799d163 [FEATURE] show addresses from account 2014-02-13 12:28:26 +01:00
Sebastian Grewe
8c1174bcb2 Merge pull request #1749 from iAmShorty/wallet-info
[UPDATE] Wallet Accounts Message
2014-02-13 09:31:04 +01:00
iAmShorty
58085eb7f5 [UPDATE] cleanup 2014-02-13 09:30:07 +01:00
iAmShorty
0e792e34f3 [UPDATE] message only if more than 1 account in wallet and Default has no funds 2014-02-13 09:21:19 +01:00
Sebastian Grewe
46574cb4ab Merge pull request #1722 from MPOS/sendmany-support
[ADDED] First draft: sendmany RPC support
2014-02-13 09:12:28 +01:00
Sebastian Grewe
3d10f25d22 [ADDED] Documentation URL 2014-02-13 09:01:45 +01:00
Sebastian Grewe
eb40e4080a [ADDED] Log RPC TXID into logfile for payouts 2014-02-12 16:21:24 +01:00
Sebastian Grewe
d725f9bf5d [ADDED] Sendmany config option
* Disable sendmany by default
* Allow people to enable the new feature via config
2014-02-12 16:21:24 +01:00
Sebastian Grewe
71aca7e0af [UPDATE] Getbalance wrapper
We need to wrap our getbalance call due to issues in the coind and
payout systems in the RPC. Apparently it's having issues with multiple
accounts setup in a single wallet. Sendmany can not properly use other
accounts added to the wallet as the payout account.

Hence we wrap our getbalance call in the RPC and only return the default
account balance at all times. Since this is used for all payouts and for
payments from blocks, there should be no issue. Those pools running
multiple accounts in their wallet will have to move their coins into the
default wallet!
2014-02-12 16:21:24 +01:00
Sebastian Grewe
332aa5aaa4 [FIX] Apply TXFees before running sendmany 2014-02-12 16:21:24 +01:00
Sebastian Grewe
4359b6a649 [CHANGE] Made startup messages debug level 2014-02-12 16:21:24 +01:00
Sebastian Grewe
0e49e8440d [ADDED] First draft: sendmany RPC support
We can now run payouts via sendmany:

* No big logical changes, sendmany is called once for MP and once for AP
* Instead of paying out via sendtoaddress, store in array and use
  sendmany later
* Update all transactions with the RPC TXID returned by sendmany

Will fix #1238 once merged.
2014-02-12 16:21:23 +01:00
Sebastian Grewe
2f52a8b1d2 Merge branch 'next' of github.com:MPOS/php-mpos into next 2014-02-12 15:44:12 +01:00
Sebastian Grewe
def685082b [ADDED] RPC Error Code to Logging 2014-02-12 15:44:00 +01:00
Sebastian Grewe
86ca90fa09 Merge pull request #1743 from iAmShorty/check-wallet-accounts
[UPDATE] Removed Wallet Info Message
2014-02-12 14:51:39 +01:00