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

1353 Commits

Author SHA1 Message Date
Sebastian Grewe
c249b7bac5 Merge pull request #1877 from iAmShorty/hashrate-fix 
[FIX] another hashrate calc error
 2014-03-03 11:43:13 +01:00
iAmShorty
ec06339867 [FIX] another hashrate calc error 2014-03-03 11:42:03 +01:00
Sebastian Grewe
d17eec85d0 Merge pull request #1873 from rog1121/master 
Use Defined Limit on getusertransactions API
 2014-03-03 10:36:27 +01:00
Sebastian Grewe
a1dbe8bb09 [FIX] Workaround for missing confirmations 
This will fix issues with those coins that don't track confirmations for
blocks inside the getblock RPC call. It will try to fallback to the
transactions confirmations and insert those instead.

Fixes #1823 as mentioned by @ice00 - Thanks for that!
 2014-03-03 09:42:36 +01:00
iAmShorty
f891743aed [FIX] fixed calculation 2014-03-03 08:50:12 +01:00
iAmShorty
863dbb56eb [FIX] fixed nethashrate for some coins 2014-03-03 08:41:44 +01:00
rog1121
73f4cafc28 Use Defined Limit 2014-03-02 12:16:14 -07:00
rog1121
b8aa9f8738 Update getusertransactions.inc.php 2014-03-02 12:07:22 -07:00
Sebastian Grewe
6fd55536fa [FIX] Removed method call on PPS globals 2014-03-02 16:26:31 +01:00
Sebastian Grewe
58807e580b [FIX] PHP Notice on Admin Settings page 2014-03-02 12:33:40 +01:00
Barry Deeney
7dce981901 Added the getLastValid function for findblock cron 2014-03-02 11:02:28 +08:00
rog1121
639d4ccb10 Fix Notifications Class 2014-03-01 17:00:51 -07:00
Sebastian Grewe
aac80502e1 [FIX] Bail findblocks on block insertion errors 
Fixes #1857 once merged.
 2014-02-28 09:09:29 +01:00
Sebastian Grewe
12b80856c4 [UPDATE] Enable PPLNS Backpay by default 2014-02-27 22:34:47 +01:00
Sebastian Grewe
8d369d5ba4 [IMPROVED] Deduct TXFEE in Transaction CreateDebit 
No need to deduct the fees on our cronjob, do it automatically in our
transaction class when creating a Debit record.
 2014-02-27 15:19:01 +01:00
Sebastian Grewe
5966f77e76 [ADDED] Hashrate modifier name and value 
* [ADDED] Hashrate modifier value to getnavbardata
* [ADDED] Hashrate modifier name to getnavbardata

Fixes #1845 once merged.
 2014-02-27 15:19:00 +01:00
Sebastian Grewe
d857a3d85e [FIX] No captcha on contactform if disabled 
Fixes #1846 once merged
 2014-02-27 11:07:37 +01:00
Sebastian Grewe
bbba9d1daf Merge pull request #1837 from MPOS/unified-user-miningstats 
Unified user miningstats
 2014-02-26 09:53:41 +01:00
Sebastian Grewe
3e64dd3487 Merge pull request #1798 from MPOS/x-forwarded-for-check 
[CHANGED] Parse X-FORWARDED-FOR when supplied
 2014-02-26 09:53:29 +01:00
Sebastian Grewe
d750e81b02 [FIX] Wait for global cache data, don't run queries 2014-02-26 09:42:49 +01:00
Sebastian Grewe
78619c1427 [IMPROVED] Unified user speed statistics 
* [ADDED] getUserMiningStats to fetch all speed related data
 * Uses global cache if available, falls back to local query and then
   local caches
* [REMOVED] getUserHashrate, getUserSharerate, getUserAvgShareDifficulty
* [UPDATED] All code occurences for the above to use the new system

Probably won't change much since global cache was already used but does
help on the Dashboard since we combine at least 2 calls into one.
 2014-02-26 09:27:32 +01:00
Sebastian Grewe
b2f555a83a Merge pull request #1820 from iAmShorty/users-registered 
[UPDATE] Adding registrations and Regdate to Admin Dashboard and Userinfo
 2014-02-24 15:02:55 +01:00
iAmShorty
759b8a2e7a [UPDATE] separate pages, new icons, navigation update 2014-02-24 14:40:46 +01:00
Sebastian Grewe
dc1fe9aa35 Merge pull request #1799 from MPOS/debug-to-logfile 
[IMPROVED] Allow debug console log to logfile
 2014-02-24 11:26:43 +01:00
iAmShorty
55266e274a [UPDATE] added pagination to reg and invite 2014-02-24 11:24:13 +01:00
Nathan Patten
966d32036b Update chat.inc.php 2014-02-24 21:12:15 +11:00
iAmShorty
0f9cdb915c [UPDATE] fixed typo in sql queries 2014-02-24 10:58:23 +01:00
iAmShorty
d419b1f0ff [UPDATE] sorting by count 2014-02-24 10:56:47 +01:00
iAmShorty
37b8d5a56b [UPDATE] changed hardcoded table names 2014-02-24 10:52:12 +01:00
iAmShorty
fbdd811d7f [UPDATE] added top inviter, some code cleanup 2014-02-24 10:39:09 +01:00
Nathan Patten
d5c63ff824 Update smarty_globals.inc.php 2014-02-24 20:32:00 +11:00
Nathan Patten
624c613c89 Update admin_settings.inc.php 2014-02-24 20:28:09 +11:00
Nathan Patten
7f8c5e8270 Blah 2014-02-24 20:18:14 +11:00
Nathan Patten
17509aa3b9 Update admin_settings.inc.php 2014-02-24 20:02:45 +11:00
Nathan Patten
ae9c220521 Update chat.inc.php 2014-02-24 20:01:02 +11:00
Nathan Patten
a9cc0a9ec9 Update smarty_globals.inc.php 2014-02-24 19:56:51 +11:00
Nathan Patten
aac9b70aac Update smarty_globals.inc.php 2014-02-24 19:30:08 +11:00
Nathan Patten
3418c3db77 Update chat.inc.php 2014-02-24 19:29:01 +11:00
Nathan Patten
b1af60709e [EDIT] move from acl to system 
Was going to do this the first time.. dunno why i put it in acl :p
 2014-02-24 19:17:31 +11:00
iAmShorty
d0a82be11b [UPDATE] adding if user was invited and inviter to registered users 2014-02-23 22:30:52 +01:00
iAmShorty
23afae0aaf [UPDATE] added last 10 registered users to dashboard 2014-02-23 21:35:20 +01:00
iAmShorty
7ffa620975 [UPDATE] Adding Reg Date to Userinfo in Admin Panel 2014-02-23 20:48:58 +01:00
iAmShorty
47f6048378 [UPDATE] Adding registrations to Admin Dashboard 2014-02-23 20:23:21 +01:00
Nathan Patten
45127409ed [FIX] Web Chat Disabled bt default 2014-02-23 07:26:36 +11:00
Nathan Patten
b79bd6ae8e [ADD] Chat 2014-02-22 21:33:49 +11:00
Nathan Patten
305d0e4cc9 [ADD] Chat settings 2014-02-22 21:32:30 +11:00
Nathan Patten
b657d41bd6 [ADD] Chat global 2014-02-22 21:30:11 +11:00
iAmShorty
c5ff564deb [FIX] Wallet Balance 2014-02-20 20:59:54 +01:00
Sebastian Grewe
865cd96f5e [IMPROVED] Allow debug console log to logfile 
* Needs logging level set to 7 in security config
* Needs debugging enabled in global config
 2014-02-20 09:01:18 +01:00
Sebastian Grewe
8bd469ba5d [CHANGED] Parse X-FORWARDED-FOR when supplied 
Instead of trusting REMOTE_ADDR we should parse X-FORWARDED-FOR if
supplied. This will properly use the user IP in a multi-LB setup.

Needs testing
 2014-02-19 14:32:20 +01:00
iAmShorty
e16db6071e [FIX] Wallet Balance Fix 2014-02-19 09:45:35 +01:00
Sebastian Grewe
8cb42aab2b Merge pull request #1770 from iAmShorty/realbalance-wrapper 
[FIX] return balance from main account
 2014-02-19 09:34:01 +01:00
Sebastian Grewe
a4e3468b9b [CHANGE] 500 default limit 2014-02-18 09:22:16 +01:00
Sebastian Grewe
7229b5b130 [ADDED] Payout Queue Limiter 
* [ADDED] LIMIT to getMPQueue and getAPQueue
* [ADDED] Default config payout queue size of 1000 for MP and 1000 for AP
* [UPDATED] Payouts cronjob to use this new default limits

This may help some coins that have tx count issues when doing sendmany.
Other coins can play with the values to find their sweet spot. Run the
payout multiple times in a row to force more transactions of the same
amount.

Fixes #1773 and thanks to @jrwr for the idea!
 2014-02-18 09:16:26 +01:00
iAmShorty
d2be015554 [FIX] return balance from main account 2014-02-16 16:44:36 +01:00
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