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

178 Commits

Author SHA1 Message Date
Sebastian Grewe
c578c504ed [MERGE] Conflict with NEXT 2013-09-18 16:32:29 +02:00
Sebastian Grewe
d863e66ef4 [BUG] Fixing contrib shares issue without cache 2013-09-18 16:31:36 +02:00
Sebastian Grewe
50cc2da3a3 [BUG] Fixed contrib shares with empty cache 2013-09-18 16:23:34 +02:00
Sebastian Grewe
1a9ada84d4 fixing merge conflict from next to branch 2013-09-18 11:46:22 +02:00
Sebastian Grewe
a349e1e060 use archive table for sharerate calcs 2013-09-18 11:38:51 +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
e6ab8006d1 [FEATURE] Adding more to gauges, adding graph to dashboard 
* Adding live-updates for gauges
* Adding new API calls
* Updated statistics to allow custom intervals
* Disabled caching for API calls for now
* Added new hashrate graph with auto-update

Addresses #444
 2013-09-14 14:43:14 +02:00
Sebastian Grewe
927fc12cb3 fixing admin panel user info 2013-08-22 15:01:00 +02:00
Sebastian Grewe
6522fb2747 fixing merge conflicts 2013-08-22 11:54:17 +02:00
Sebastian Grewe
6ec5b4b845 Fixing hashrate graphs 
* Proper initilize array in order
* Fill data after initilizing
* Removed 0 fills

Thanks @iriiria for this fix!

Fixes #624
 2013-08-22 11:33:26 +02:00
Sebastian Grewe
b23dd56bc8 Adding baseline shares to statistics class 
* Calculate shares towards our base diff
* Calculate share rate based on actual shares not diff
 2013-08-22 11:29:26 +02:00
Sebastian Grewe
526701d2e1 Merging with origin/next to get branch updated 2013-08-20 15:55:05 +02:00
Sebastian Grewe
1708e5d2b5 Do not add 24th hour, use 0 hour 2013-08-15 10:03:22 +02:00
Sebastian Grewe
14c0535b10 Fill empty hours with proper data 
* Properly sort the array prior to sending it back
 * Sort from current to one hour earlier for proper data display
 * Adjusted templates to use new sorted arrays

Fixes #606
 2013-08-15 09:58:33 +02:00
Sebastian Grewe
50f380c25e first test to fill with data 2013-08-15 09:14:02 +02:00
Sebastian Grewe
0dbe1ebe11 fixing hashrate graphs 2013-08-07 09:45:40 +02:00
obigal
1819a47bf4 Vardiff/pushpool and pps payout support 2013-08-07 09:44:11 +02:00
obigal
360bd22dc6 Updates 2013-08-07 09:42:06 +02:00
obigal
fcb9ebd529 Update statistics.class.php 2013-08-07 09:41:19 +02:00
obigal
1f2bc294f2 Update for pushpool compatibility 2013-08-07 09:39:04 +02:00
obigal
f452f79f07 Update statistics.class.php 2013-08-07 09:32:51 +02:00
obigal
ef234fe80b Vardiff/pushpool and pps payout support 2013-08-07 09:29:48 +02:00
obigal
c3a63d58ce Updates 2013-08-07 09:29:48 +02:00
obigal
b6f3fd5972 Update statistics.class.php 2013-08-07 09:29:48 +02:00
obigal
41183b2e65 Update for pushpool compatibility 2013-08-07 09:29:48 +02:00
obigal
a42adb11b2 Update statistics.class.php 2013-08-07 09:29:47 +02:00
Sebastian Grewe
63b942a7e1 Adding No Fee option to admin panel 
Admins can disable a users fee via admin panel now.

Fixes #260
 2013-07-23 10:56:45 +02:00
Sebastian Grewe
8ec1d2cab3 Adding anonymous account support 
* Added anonymous flag to accounts table
* Added checkbox for anonymous flag in edit account page
* Updated user class to support new flag
* Updated statistics class to support anonymous and donations
* Updated all templates showing usernames to show anonymous instead
* Added new SQL `ALTER TABLE` file for upgrading the table

Fixes #419 once merged.
 2013-07-12 10:33:42 +02:00
Sebastian Grewe
9d50c9a222 User proper archive table for union 
Addresses #312
 2013-07-07 19:39:58 +02:00
Sebastian Grewe
89af793a28 Fixing pool hashrate graph 
Should fix #312 completely.
 2013-07-06 17:32:58 +02:00
Sebastian Grewe
380e802c75 fixing stmt issue 2013-07-06 08:34:41 +02:00
Sebastian Grewe
ab85af19a1 Re-add shares archive table for 24h hashrates 
This should fix #312 and fix #256 where hashrates are reset on quick rounds.
Users are not able to properly view their past 24h hashrates.

Will be merged once confirmed working.
 2013-07-05 23:23:19 +02:00
Sebastian Grewe
b3479a9c04 Adding further IFNULL checks to statistics class 2013-07-04 13:25:11 +02:00
Sebastian Grewe
c9915ce628 Removed var_dump debug output 2013-07-04 13:02:36 +02:00
Sebastian Grewe
463b97ea50 Do not return null on empty valid/invalid shares 2013-07-04 13:01:29 +02:00
Sebastian Grewe
306162a1da Adding shares archive table back in for hash calcs 
If the shares archive table is used via config option, those shares are
included when calculating the users hashrate. This will help on very
short rounds where each round end deletes all shares and users will not
be able to track their hashrates. They will be very jumpy and change to
0 all the time.

Still missing this implementation for the hourly hashrate function to
ensure the graphs are always kept up-to-date.

Addresses #331
 2013-07-02 14:02:13 +02:00
Sebastian Grewe
cfb209a425 removed debug output 2013-06-30 13:43:05 +02:00
Sebastian Grewe
5c6e872867 Fixing false shares result in API call 
Fixes #262
 2013-06-28 15:54:30 +02:00
Sebastian Grewe
92f2243cfb Fixing getuserstatus API call 
Fixes #257
 2013-06-28 15:47:21 +02:00
Sebastian Grewe
1126118cb9 Fetch all user shares in one query 
This will fetch all user shares in a single run, not user by user as
done previously. Saves one query and can possibly increase SQL execution
time.

Addresses #246
 2013-06-26 10:54:10 +02:00
Sebastian Grewe
416d52078d Adding an optimized valid/invalid shares query 
* This should speed up the process of finding shares for round and users

Addresses #246
 2013-06-26 10:00:06 +02:00
Sebastian Grewe
3f0c3884aa Adding some more information for PPS to sidebar 
* Added user share rate to sidebar for PPS
* Added estimated 24h LTC payout based on PPS value and share rate

Addresses #160
 2013-06-18 09:35:01 +02:00
Sebastian Grewe
91ef2caaab Added cronjob to pre-cache statistics 
This will fix #199 and help on loading times for the website in case
caches are empty. Caches are pre-filled by a cron so the website only
does it as a fall back. Check Ticket for details.
 2013-06-17 10:07:40 +02:00
Sebastian Grewe
0817befaaa Further cleanup to reduce PHP notice warnings 2013-06-14 13:51:06 +02:00
Sebastian Grewe
6f858188ad Adding pool and combined hashrate graphs 
* Moving from My Graph to its own section: Hashrate Graphs
* Adding pool hashrate graph
* Adding combined hashrate graph and piechart

Fixes #187
 2013-06-13 22:59:19 +02:00
Sebastian Grewe
42b6d4b3b2 Adding support for user locking 
* Currently no GUI, use DB access to change the row entry
* Upgraded Database table `accounts` with upgrade SQL
* Updated `admin` field to `is_admin` as boolean
* Modified pages, classes, templates to support is_admin and is_locked

Addresses #147
 2013-06-13 11:36:28 +02:00
Sebastian Grewe
671a2d01ca Properly display both shares and hashrates 
* As proposed in #132 thi allows for both shares and hashsrates

Fixes #132.
 2013-06-07 09:02:58 +02:00
Sebastian Grewe
4b05846a78 Re-Adding shares for admin user panel 
* Re-enables estimations
* Still fixes #130 which had issues with hashrates, those are still
  fixed
 2013-06-07 08:42:07 +02:00
Sebastian Grewe
f63485a539 Fixing admin panel user display 
* Fixes #130. Removed total shares in favor of the hashrate.
* Fixes hashrate display.
* Added pagination template file to include pagination on other pages in
the future.
 2013-06-07 08:33:14 +02:00
Sebastian Grewe
aebb97a1d8 use default cashing times 2013-06-06 12:01:06 +02:00
Sebastian Grewe
1bf2e7cf18 Pre-sort SQL data in array for easy time access 
This allows us to access the array key as the time. This way the
template can properly render the time axis according to current time.
 2013-06-06 11:47:20 +02:00
Sebastian Grewe
232e79f7ad do not pass two arguments to SQL 2013-06-06 11:01:04 +02:00
Sebastian Grewe
52d079eaed do not include archive table for hashrates, better formatting 2013-06-06 10:45:37 +02:00
Sebastian Grewe
7dc0736b77 First version for new user graphs 
* Properly calculate hashrate
* Remove number formatting, it breaks the graph
* Not properly in order based on time but displays correct values

Addresses #90
 2013-06-05 17:22:47 +02:00
Sebastian Grewe
c1682e2203 Ignore rejected shares in top list calculations 
Fixes #104
 2013-06-04 15:58:51 +02:00
Sebastian Grewe
020ea2269b Re-adding admin flags to user list for admin panel 
Fixes #99
 2013-06-04 13:46:56 +02:00
Sebastian Grewe
d85ded7c5c Moving from user to statistics class 
* This fetches all users and joins with shares table

Should speed up things a fair bit.
 2013-06-04 13:14:25 +02:00
Sebastian Grewe
07d49f83d3 Changing hash- and share rate calculation SQL 
* Do not include shares_archive table
 * Main reason: This table is optional
 * Secondary reason: Speeds up the query from 1.3s to 0.005s
* Drawback: Once a block is found it takes 10 minutes for the stats to
  be accuracte again

This could potentially be reverted but since shares_archive is optional
and the speed increase is rather significant I'd like to keep it this
way.
 2013-06-03 15:03:04 +02:00
Sebastian Grewe
376bae1e2d Moved setCache method into StatsCacheClass 
* Allow calling method via memcache wrapping call
* Make it available to all classes using StatsCache
 2013-05-28 10:09:57 +02:00
Sebastian Grewe
1bdf5e3156 added some more debug output for profiling 2013-05-23 10:02:11 +02:00
Sebastian Grewe
f7d5b1b2d1 Merge pull request #30 from TheSerapher/transparent-caching 
Transparent caching
 2013-05-17 08:10:09 -07:00
Sebastian Grewe
6ffaece837 allow caching to be more transparent and configurable 2013-05-17 16:25:45 +02:00
Sebastian Grewe
f3da885137 fix ordering for share contributors, for real 2013-05-17 13:57:32 +02:00
Sebastian Grewe
cf9e392867 fix ordering for share contributors 2013-05-17 13:56:11 +02:00
Sebastian Grewe
ccf322bde1 re-adding seperate tables for shares and hashes due to SQL load when combining them 2013-05-17 13:47:56 +02:00
Sebastian Grewe
16f9cc4390 adding proper shares per second 2013-05-16 21:12:59 +02:00
Sebastian Grewe
a45140d3e0 moved more stats to stats class 2013-05-16 14:56:08 +02:00
Sebastian Grewe
ec3d6d7cbd merger contributer and hashrate tables into a sortable table, added personal hashrate graphs, added JS files, updated statistics class and page controllers 2013-05-15 16:55:29 +02:00
Sebastian Grewe
884a202842 replaced fixed targetdiff with setting from configuration in user hash rate calculation 2013-05-15 13:26:53 +02:00
Sebastian Grewe
649b527a8f further moved stats from user into statistics class, added more caching 2013-05-15 01:07:59 +02:00
Sebastian Grewe
9b961e04cf cleaned up statistics, added some user specifc stats from user class to statistics class 2013-05-14 23:57:22 +02:00
Sebastian Grewe
0e7f7d75f2 adding special getRoundShares for statistics into stats class 2013-05-14 18:08:47 +02:00
Sebastian Grewe
ef2c9b2c97 adding archive table for hashrate calculations and added getCurrentShareRate for shares/minute 2013-05-14 16:31:18 +02:00
Sebastian Grewe
fd6d0c0948 adding classes to statistics class, added getCurrentHashrate 2013-05-13 23:28:54 +02:00
Sebastian Grewe
4a7b51d9eb implemented transactions, PPS payouts and Transactions displayed on the website 2013-05-11 16:50:15 +02:00
Sebastian Grewe
3971ea797c further work on sharecounter cron, almost all features available now 2013-05-11 09:15:19 +02:00