Commit Graph

1248 Commits

Author SHA1 Message Date
Sebastian Grewe
cdaf757b8b Merge branch 'next' of github.com:MPOS/php-mpos into next 2014-02-16 08:32:10 +01:00
Sebastian Grewe
6f5d866bb9 [ADDED] Force run even if cron is active with -f 2014-02-16 08:31:47 +01:00
Sebastian Grewe
5c22cc3c08 Merge pull request #1764 from MPOS/combine-cleanups
[IMPROVED] Combined cleanup tasks into single PHP
2014-02-16 08:12:11 +01:00
Sebastian Grewe
e6a396c85b Merge pull request #1750 from iAmShorty/wallet-info-adminpanel
[ENHANCEMENT] Wallet info adminpanel
2014-02-16 08:12:03 +01:00
Sebastian Grewe
5dd13d4475 Merge pull request #1757 from MPOS/getrealbalance-wrapper
[ADDED] getrealbalance wrapper for payouts
2014-02-16 08:11:08 +01:00
Sebastian Grewe
d1f3f5d01d [UPDATE] Return negative balance if main is negative 2014-02-15 19:17:12 +01:00
Sebastian Grewe
146b56259b [IMPROVED] Combined cleanup tasks into single PHP
* [IMPROVED] Logging format for all cleanup tasks
* [UPDATED] Cron shellescripts
* [UPDATE] Cron Monitoring Page
* [DELETED] Old `*_cleanup.php` scripts
2014-02-15 19:01:25 +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
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
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
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
682beb60d1 Merge pull request #1739 from MPOS/notification-cleanup
[ADDED] Notification cleanup script
2014-02-14 08:56:51 +01:00
iAmShorty
224af2c9d3 [UPDATE] showing accounts with balance and address 2014-02-13 16:29:33 +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
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
3d10f25d22 [ADDED] Documentation URL 2014-02-13 09:01:45 +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
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
iAmShorty
37581d720c [UPDATE] Removed Wallet Info Message 2014-02-12 14:47:28 +01:00
Sebastian Grewe
8fd0af6fe1 Merge pull request #1741 from iAmShorty/check-wallet-accounts
Check wallet accounts
2014-02-12 13:20:56 +01:00
iAmShorty
3b53a3bbb7 [UPDATE] updated text 2014-02-12 13:20:35 +01:00
iAmShorty
eb06bd1b7e [UPDATE] changed error message 2014-02-12 12:16:25 +01:00
iAmShorty
4096109788 [UPDATE] added currency 2014-02-12 12:14:02 +01:00
iAmShorty
ed943f5c54 [UPDATE] typo 2014-02-12 11:53:10 +01:00
iAmShorty
2d0755915a [UPDATE] no php notice when array is empty 2014-02-12 11:47:47 +01:00
iAmShorty
7d6e9e1fd3 [UPDATE] check for number of accounts in admin_checks.php 2014-02-12 11:44:18 +01:00
iAmShorty
2df6472656 [UPDATE] check for number of accounts in admin_checks.php 2014-02-12 11:43:41 +01:00
iAmShorty
e7a6ee7e95 [UPDATE] logging rpc error message 2014-02-12 11:03:51 +01:00
Sebastian Grewe
5f48d2dabc [ADDED] Notification cleanup script
* [ADDED] Admin Panel Setting for max age for notifications
* [ADDED] Cronjob to clean out old notifications
* [ADDED] New cron to scripts and monitoring

Fixes #1672 once merged.
2014-02-12 10:47:42 +01:00
Sebastian Grewe
975b41276d [ADDED] New memcache option for contrib caches 2014-02-12 08:07:58 +01:00
Sebastian Grewe
cb4211a618 Merge pull request #1732 from MPOS/no-txfee-check
[FIX] Do not add TXFee with txfee 0
2014-02-12 07:33:15 +01:00
Sebastian Grewe
c622d7c69b Merge pull request #1726 from j4s0n/fix/next/issue-1725
(#1725) Fix cold wallet check FP and added testnet detection
2014-02-11 19:38:08 +01:00
Sebastian Grewe
9039eb29dc [FIX] Do not add TXFee with txfee 0 2014-02-11 16:35:01 +01:00
j4s0n
4f7dcb4f9c Typo correction. 2014-02-10 23:46:56 -05:00
Sebastian Grewe
0cf6e38dc3 Merge pull request #1705 from MPOS/cron-check-active
[IMPROVED] Check if cron is running in PHP scripts
2014-02-10 21:57:28 +01:00
Sebastian Grewe
fe554f5864 Merge pull request #1704 from MPOS/worker-delete-csrf
[ADDE] CSRF validation for Worker Deletion
2014-02-10 21:57:16 +01:00
j4s0n
8c3205a8b2 (#1725) Fix cold wallet check FP and added testnet detection
Without this patch, admin.php checks if it can connect to the wallet service. Regardless of if that check passes or fails, it then checks if the cold wallet address is valid. If the can_connect() test failed, the validateaddress() check will also fail, even if the address is not invalid. To fix this, the validateaddress() check is move to an elseif block in the can_connect() chain.

Additionally, this patch checks to see if the wallet service is running as a testnet. While running as a testnet is perfectly acceptable when testing, the suer should be warned. A lot of folks using the quickstart guide miss this.

A function was added to the Bitcoin class to detect when we are running in a test net. A check was added to admin.php, and the existing can_connect and validateaddress() calls were restructured to solve these issues.
2014-02-10 12:07:08 -05:00
Sebastian Grewe
a9d9fe4b64 [FIX] Proper fix for Payout ID # 2014-02-10 09:47:40 +01:00
Sebastian Grewe
19fc975d95 [FIX] Insert ID of Payout Request 2014-02-09 17:46:25 +01:00
Sebastian Grewe
6ea257ac20 Merge pull request #1711 from raistlinthewiz/next
Fixed back ['memcache']['keyprefix'].
2014-02-08 18:10:31 +01:00