bitcoin:eloipool.git
8 years agoMerge commit 'refs/merge-requests/5' of gitorious.org:bitcoin/eloipool
Luke Dashjr [Sat, 15 Mar 2014 06:23:01 +0000 (06:23 +0000)]
Merge commit 'refs/merge-requests/5' of gitorious.org:bitcoin/eloipool

8 years agoFix MWL = workLog[None]: KeyError: None 5
Henrik Nordstrom [Sat, 1 Mar 2014 21:28:31 +0000 (22:28 +0100)]
Fix MWL = workLog[None]: KeyError: None

8 years agoBugfix: Fix SubsidyAlgo
Luke Dashjr [Fri, 21 Feb 2014 06:02:47 +0000 (06:02 +0000)]
Bugfix: Fix SubsidyAlgo

8 years agoSlight cleanups to SubsidyAlgo documentation
Luke Dashjr [Sun, 16 Feb 2014 07:22:54 +0000 (07:22 +0000)]
Slight cleanups to SubsidyAlgo documentation

8 years agoMake block subsidy algorithm configurable
Sina Sadeghi [Sun, 16 Feb 2014 07:21:21 +0000 (07:21 +0000)]
Make block subsidy algorithm configurable

8 years agoMerge commit '29aae72'
Luke Dashjr [Tue, 29 Oct 2013 16:54:40 +0000 (16:54 +0000)]
Merge commit '29aae72'

Conflicts:
eloipool.py

8 years agoBugfix: Only account shares for dynamic targetting after all checks have passed
Luke Dashjr [Tue, 29 Oct 2013 16:48:34 +0000 (16:48 +0000)]
Bugfix: Only account shares for dynamic targetting after all checks have passed

8 years agoMerge commit 'a71ece8'
Luke Dashjr [Tue, 24 Sep 2013 01:05:45 +0000 (01:05 +0000)]
Merge commit 'a71ece8'

8 years agoInitialise GotWorkTarget (to 0) if it isn't configured, since clampTarget always...
Luke Dashjr [Tue, 24 Sep 2013 01:05:35 +0000 (01:05 +0000)]
Initialise GotWorkTarget (to 0) if it isn't configured, since clampTarget always checks it

8 years agoMerge commit '9f39631'
Luke Dashjr [Tue, 10 Sep 2013 05:01:31 +0000 (05:01 +0000)]
Merge commit '9f39631'

8 years agoBugfix: Stratum: Replies should not be sent if request id is null
Luke Dashjr [Tue, 10 Sep 2013 05:01:22 +0000 (05:01 +0000)]
Bugfix: Stratum: Replies should not be sent if request id is null

8 years agoMerge commit 'd297083'
Luke Dashjr [Tue, 10 Sep 2013 03:05:24 +0000 (03:05 +0000)]
Merge commit 'd297083'

Conflicts:
jsonrpcserver.py/networkserver.py

8 years agoBugfix: Check fd still has a handler object, in case it has been destroyed in the...
Luke Dashjr [Tue, 10 Sep 2013 03:04:34 +0000 (03:04 +0000)]
Bugfix: Check fd still has a handler object, in case it has been destroyed in the meantime

8 years agoMerge commit '04b653e'
Luke Dashjr [Mon, 9 Sep 2013 15:50:47 +0000 (15:50 +0000)]
Merge commit '04b653e'

8 years agoBugfix: Inhibit targetting above GotWorkTarget
Luke Dashjr [Mon, 9 Sep 2013 15:50:39 +0000 (15:50 +0000)]
Bugfix: Inhibit targetting above GotWorkTarget

8 years agomerkletree: Skip tests under Python 2
Luke Dashjr [Mon, 19 Aug 2013 15:10:06 +0000 (15:10 +0000)]
merkletree: Skip tests under Python 2

8 years agoMerge branch 'stratum_sidmanager'
Luke Dashjr [Sun, 7 Jul 2013 16:52:55 +0000 (16:52 +0000)]
Merge branch 'stratum_sidmanager'

Conflicts:
stratumserver.py

8 years agoStratumHandler: Safety check against issuing the same SessionId to multiple clients
Luke Dashjr [Mon, 25 Feb 2013 07:39:29 +0000 (07:39 +0000)]
StratumHandler: Safety check against issuing the same SessionId to multiple clients

8 years agoStratumHandler: Accept mining.subscribe(UserAgent, SessionID) method form (SessionID...
Luke Dashjr [Sun, 7 Jul 2013 16:51:45 +0000 (16:51 +0000)]
StratumHandler: Accept mining.subscribe(UserAgent, SessionID) method form (SessionID ignored)

8 years agoMerge commit '02c7323' into stratum_sidmanager
Luke Dashjr [Sun, 7 Jul 2013 16:45:22 +0000 (16:45 +0000)]
Merge commit '02c7323' into stratum_sidmanager

8 years agoMerge commit '9f2d881' into stratum_sidmanager
Luke Dashjr [Sun, 7 Jul 2013 16:45:10 +0000 (16:45 +0000)]
Merge commit '9f2d881' into stratum_sidmanager

8 years agoMerge commit 'd5eaf7b' into stratum_sidmanager
Luke Dashjr [Sun, 7 Jul 2013 16:44:27 +0000 (16:44 +0000)]
Merge commit 'd5eaf7b' into stratum_sidmanager

Conflicts:
stratumserver.py

8 years agoReplace "%p" with the previous block hash in CoinbaserCmd
Luke Dashjr [Sun, 7 Jul 2013 16:11:22 +0000 (16:11 +0000)]
Replace "%p" with the previous block hash in CoinbaserCmd

8 years agoMerge commit '0dc0955'
Luke Dashjr [Sun, 7 Jul 2013 16:01:05 +0000 (16:01 +0000)]
Merge commit '0dc0955'

8 years agoBugfix: authorization: Handle utf8 decoding outside of generic modules, safe if passw...
Luke Dashjr [Sun, 7 Jul 2013 16:00:05 +0000 (16:00 +0000)]
Bugfix: authorization: Handle utf8 decoding outside of generic modules, safe if password is None

9 years agoDocument asynchat-inherited recv function behaviour
Luke Dashjr [Mon, 17 Jun 2013 04:14:15 +0000 (04:14 +0000)]
Document asynchat-inherited recv function behaviour

9 years agoMerge remote-tracking branch 'kinlo/authentication2'
Luke Dashjr [Thu, 9 May 2013 21:58:51 +0000 (21:58 +0000)]
Merge remote-tracking branch 'kinlo/authentication2'

9 years agoImplemented authentication modules, and added 2 modules: allowall and simplefile
Peter Leurs [Thu, 9 May 2013 13:44:39 +0000 (15:44 +0200)]
Implemented authentication modules, and added 2 modules: allowall and simplefile

9 years agoignore the bitcoinrpc/ directory
Peter Leurs [Thu, 9 May 2013 14:52:56 +0000 (16:52 +0200)]
ignore the bitcoinrpc/ directory

9 years agoLog SQL INSERT errors in detail
Luke Dashjr [Sat, 4 May 2013 04:04:44 +0000 (04:04 +0000)]
Log SQL INSERT errors in detail

9 years agoEnable using any old Python function in share logging formatter
Luke Dashjr [Sat, 4 May 2013 03:51:11 +0000 (03:51 +0000)]
Enable using any old Python function in share logging formatter

9 years agoMerge branch 'arg_config'
Luke Dashjr [Fri, 3 May 2013 19:11:23 +0000 (19:11 +0000)]
Merge branch 'arg_config'

9 years agoBugfix: Need __import__ for config
Luke Dashjr [Fri, 3 May 2013 19:11:13 +0000 (19:11 +0000)]
Bugfix: Need __import__ for config

9 years agoNew config option SaveStateFilename to control what file is used for saved state
Luke Dashjr [Thu, 2 May 2013 23:56:43 +0000 (23:56 +0000)]
New config option SaveStateFilename to control what file is used for saved state

9 years agoMerge branch 'arg_config'
Luke Dashjr [Thu, 2 May 2013 23:51:28 +0000 (23:51 +0000)]
Merge branch 'arg_config'

9 years agoBugfix: Avoid trying to decode None objects
Luke Dashjr [Tue, 30 Apr 2013 21:32:26 +0000 (21:32 +0000)]
Bugfix: Avoid trying to decode None objects

9 years agoAdd command-line option --config (-c) for specifying a config to load rather than...
Luke Dashjr [Tue, 30 Apr 2013 21:09:17 +0000 (21:09 +0000)]
Add command-line option --config (-c) for specifying a config to load rather than the default
NOTE: This bumps the required Python version to 3.2

9 years agoAdd userAgent and submitProtocol keys to share objects for logging/statistical purposes
Luke Dashjr [Mon, 29 Apr 2013 00:34:31 +0000 (00:34 +0000)]
Add userAgent and submitProtocol keys to share objects for logging/statistical purposes

9 years agoconfig.py.example: Update UpstreamNetworkId to testnet3
Luke Dashjr [Sat, 20 Apr 2013 00:17:41 +0000 (00:17 +0000)]
config.py.example: Update UpstreamNetworkId to testnet3

9 years agoTrigger merkletree update when block inv received from bitcoin p2p
Luke Dashjr [Fri, 19 Apr 2013 23:52:26 +0000 (23:52 +0000)]
Trigger merkletree update when block inv received from bitcoin p2p

9 years agoMove "submitold" to specific methods
Luke Dashjr [Sat, 6 Apr 2013 21:18:25 +0000 (21:18 +0000)]
Move "submitold" to specific methods

9 years agoNetworkServer: Keep track of when the server was last idle
Luke Dashjr [Sat, 6 Apr 2013 19:01:15 +0000 (19:01 +0000)]
NetworkServer: Keep track of when the server was last idle

9 years agoMerge commit 'e978e43'
Luke Dashjr [Tue, 26 Mar 2013 16:13:54 +0000 (16:13 +0000)]
Merge commit 'e978e43'

9 years agoBugfix: Import traceback for SQL sharelogger
Luke Dashjr [Tue, 26 Mar 2013 16:13:41 +0000 (16:13 +0000)]
Bugfix: Import traceback for SQL sharelogger

9 years agoNow that CVE-2012-2459 is fixed on 97% of listening nodes, it should be reasonably...
Luke Dashjr [Sat, 23 Mar 2013 17:33:18 +0000 (17:33 +0000)]
Now that CVE-2012-2459 is fixed on 97% of listening nodes, it should be reasonably safe to make non-POT merkletrees - remove the warning unless POT >= 2

9 years agoconfig.py.example: Note BIP 23 Proposal requirement for TemplateChecks
Luke Dashjr [Mon, 25 Feb 2013 09:09:18 +0000 (09:09 +0000)]
config.py.example: Note BIP 23 Proposal requirement for TemplateChecks

9 years agoBugfix: ScheduleDict: Keep id in heapq to avoid attempts to order scheduled objects
Luke Dashjr [Sun, 24 Feb 2013 23:10:11 +0000 (23:10 +0000)]
Bugfix: ScheduleDict: Keep id in heapq to avoid attempts to order scheduled objects

9 years agoMerge commit '9f8d1f5'
Luke Dashjr [Sun, 24 Feb 2013 21:44:38 +0000 (21:44 +0000)]
Merge commit '9f8d1f5'

9 years agoBugfix: Stratum: handle_close is only called when the other end closes the connection...
Luke Dashjr [Sun, 24 Feb 2013 21:44:31 +0000 (21:44 +0000)]
Bugfix: Stratum: handle_close is only called when the other end closes the connection, but we need to clean up _Clients when we close it too

Fixes memory leak of subscribed StratumHandlers that we close

9 years agoUniqueSessionIdManager: Support for delaying releases of session ids, and picking...
Luke Dashjr [Fri, 15 Feb 2013 02:38:41 +0000 (02:38 +0000)]
UniqueSessionIdManager: Support for delaying releases of session ids, and picking them back up specifically

9 years agoUse values as keys in ScheduleDict instead of their id which might yield strange...
Luke Dashjr [Sun, 24 Feb 2013 21:35:24 +0000 (21:35 +0000)]
Use values as keys in ScheduleDict instead of their id which might yield strange results (when scheduling numbers for instance)

9 years agoMerge commit '826b85a'
Luke Dashjr [Sat, 23 Feb 2013 19:14:21 +0000 (19:14 +0000)]
Merge commit '826b85a'

9 years agoBugfix: Avoid division by zero in case all TemplateChecks error; treat it as a 0...
Luke Dashjr [Sat, 23 Feb 2013 19:14:14 +0000 (19:14 +0000)]
Bugfix: Avoid division by zero in case all TemplateChecks error; treat it as a 0.0 AcceptRatio

9 years agoconfig.py.example: Document importance of commas after single-element lists
Luke Dashjr [Fri, 22 Feb 2013 19:33:16 +0000 (19:33 +0000)]
config.py.example: Document importance of commas after single-element lists

9 years agoMerge branch 'multisource'
Luke Dashjr [Thu, 21 Feb 2013 06:08:25 +0000 (06:08 +0000)]
Merge branch 'multisource'

9 years agoMerkleMaker: Always prefer the highest block from any source
Luke Dashjr [Thu, 21 Feb 2013 06:07:42 +0000 (06:07 +0000)]
MerkleMaker: Always prefer the highest block from any source

This was already necessitated by _ProcessGBT calling updateBlock when it saw a new height (to rush out blank jobs)
Without it, race conditions would result in Eloipool reversing this decision and going back to the old block
This also meant it invalidated and wasted all the longpoll work

9 years agoMerkleMaker: Make code more readable
Luke Dashjr [Thu, 21 Feb 2013 06:06:47 +0000 (06:06 +0000)]
MerkleMaker: Make code more readable

9 years agoMerge commit '047890b'
Luke Dashjr [Thu, 21 Feb 2013 02:43:25 +0000 (02:43 +0000)]
Merge commit '047890b'

9 years agoBugfix: receiveShare: Set rejectReason to "ERROR" if any exception causes checkShare...
Luke Dashjr [Thu, 21 Feb 2013 02:43:16 +0000 (02:43 +0000)]
Bugfix: receiveShare: Set rejectReason to "ERROR" if any exception causes checkShare to abort

9 years agoSupport for BIP 23 "target" request extension
Luke Dashjr [Tue, 19 Feb 2013 20:31:03 +0000 (20:31 +0000)]
Support for BIP 23 "target" request extension

9 years agoStratum: Request and store client versions after authorize
Luke Dashjr [Tue, 19 Feb 2013 20:16:16 +0000 (20:16 +0000)]
Stratum: Request and store client versions after authorize

Can't do it any sooner, since *gminer error if they get anything unexpected during initialization

9 years agoMerge commit 'e27ae49'
Luke Dashjr [Mon, 18 Feb 2013 22:22:37 +0000 (22:22 +0000)]
Merge commit 'e27ae49'

Conflicts:
merklemaker.py

9 years agoBugfix: merkleMaker: When calling from outside, ensure "now" is set
Luke Dashjr [Mon, 18 Feb 2013 22:21:04 +0000 (22:21 +0000)]
Bugfix: merkleMaker: When calling from outside, ensure "now" is set

9 years agoMerge commit '5cfd67a'
Luke Dashjr [Mon, 18 Feb 2013 21:46:47 +0000 (21:46 +0000)]
Merge commit '5cfd67a'

Conflicts:
eloipool.py

9 years agoWorkaround for bug in Python's math.log function
Luke Dashjr [Mon, 18 Feb 2013 21:46:27 +0000 (21:46 +0000)]
Workaround for bug in Python's math.log function

9 years agoMerge commit '2a63a5d'
Luke Dashjr [Mon, 18 Feb 2013 05:14:47 +0000 (05:14 +0000)]
Merge commit '2a63a5d'

9 years agoBugfix: When retrying submissions, add the full server object back in to the list...
Luke Dashjr [Mon, 18 Feb 2013 05:14:40 +0000 (05:14 +0000)]
Bugfix: When retrying submissions, add the full server object back in to the list (not only the URI)

9 years agoLeft-align usernames in TopTargets
Luke Dashjr [Sun, 17 Feb 2013 04:03:06 +0000 (04:03 +0000)]
Left-align usernames in TopTargets

9 years agoMerge commit '73a01ee'
Luke Dashjr [Sun, 17 Feb 2013 03:58:11 +0000 (03:58 +0000)]
Merge commit '73a01ee'

Conflicts:
jsonrpcserver.py

9 years agoBugfix: If epoll errors, events won't be set, so just continue
Luke Dashjr [Sun, 17 Feb 2013 03:57:29 +0000 (03:57 +0000)]
Bugfix: If epoll errors, events won't be set, so just continue

9 years agoUpdate copyrights on code changed this year
Luke Dashjr [Sat, 16 Feb 2013 19:57:37 +0000 (19:57 +0000)]
Update copyrights on code changed this year

9 years agoManage unique session ids manually rather than just using connection object pointers
Luke Dashjr [Fri, 15 Feb 2013 01:42:56 +0000 (01:42 +0000)]
Manage unique session ids manually rather than just using connection object pointers

9 years agoMerge commit '53913aa'
Luke Dashjr [Sat, 9 Feb 2013 04:41:08 +0000 (04:41 +0000)]
Merge commit '53913aa'

9 years agoBugfix: Handle no-proposal scenario correctly
Luke Dashjr [Sat, 9 Feb 2013 04:41:02 +0000 (04:41 +0000)]
Bugfix: Handle no-proposal scenario correctly

9 years agoMerge commit '16f9d29'
Luke Dashjr [Sat, 9 Feb 2013 04:37:08 +0000 (04:37 +0000)]
Merge commit '16f9d29'

9 years agoBugfix: oMP is not a local variable here anymore
Luke Dashjr [Sat, 9 Feb 2013 04:37:02 +0000 (04:37 +0000)]
Bugfix: oMP is not a local variable here anymore

9 years agoSilence getTarget debug logging by default
Luke Dashjr [Thu, 7 Feb 2013 05:47:59 +0000 (05:47 +0000)]
Silence getTarget debug logging by default

9 years agoTopTargets() CLI command, to show vardiff targets in use
Luke Dashjr [Thu, 7 Feb 2013 05:47:42 +0000 (05:47 +0000)]
TopTargets() CLI command, to show vardiff targets in use

9 years agoMerge commit 'd4cbed7'
Luke Dashjr [Thu, 7 Feb 2013 04:31:24 +0000 (04:31 +0000)]
Merge commit 'd4cbed7'

9 years agoBugfix: Use static list of connections for boot_all
Luke Dashjr [Thu, 7 Feb 2013 04:31:15 +0000 (04:31 +0000)]
Bugfix: Use static list of connections for boot_all

9 years agoMerge branch 'simplelog'
Luke Dashjr [Thu, 7 Feb 2013 02:32:19 +0000 (02:32 +0000)]
Merge branch 'simplelog'

9 years agoSimplify and document logging configuration
Luke Dashjr [Thu, 7 Feb 2013 02:32:07 +0000 (02:32 +0000)]
Simplify and document logging configuration

9 years agoMerge commit '45212d2' (non-obvious conflicts!)
Luke Dashjr [Thu, 7 Feb 2013 01:34:30 +0000 (01:34 +0000)]
Merge commit '45212d2' (non-obvious conflicts!)

9 years agoBugfix: merkleMaker.access has been replaced by TS['access']
Luke Dashjr [Thu, 7 Feb 2013 01:34:07 +0000 (01:34 +0000)]
Bugfix: merkleMaker.access has been replaced by TS['access']

9 years agoMerge commit 'b44865e'
Luke Dashjr [Thu, 7 Feb 2013 01:29:24 +0000 (01:29 +0000)]
Merge commit 'b44865e'

9 years agoTests for (non-aggressive) POT and _ProcessGBT
Luke Dashjr [Thu, 7 Feb 2013 01:06:15 +0000 (01:06 +0000)]
Tests for (non-aggressive) POT and _ProcessGBT

9 years agoBugfix: Insert dummy txninfo element for coinbase transaction at the same time as...
Luke Dashjr [Thu, 7 Feb 2013 01:15:23 +0000 (01:15 +0000)]
Bugfix: Insert dummy txninfo element for coinbase transaction at the same time as inserting the coinbase transaction to txnlist

Fixes element alignment with pre-GBT sources (which omitted the insert) in fee-trimming logic

9 years agoSplit _ProcessGBT and _CheckTemplate out of _updateMerkleTree_fromTS
Luke Dashjr [Wed, 6 Feb 2013 20:29:41 +0000 (20:29 +0000)]
Split _ProcessGBT and _CheckTemplate out of _updateMerkleTree_fromTS

9 years agoMerge commit 'fde36f4'
Luke Dashjr [Tue, 5 Feb 2013 01:52:48 +0000 (01:52 +0000)]
Merge commit 'fde36f4'

9 years agoBugfix: Add missing username to target-reset log message
Luke Dashjr [Tue, 5 Feb 2013 01:52:41 +0000 (01:52 +0000)]
Bugfix: Add missing username to target-reset log message

9 years agoMerge branch 'multisource'
Luke Dashjr [Sat, 2 Feb 2013 05:03:03 +0000 (05:03 +0000)]
Merge branch 'multisource'

9 years agoBugfix: Correctly initialize without BlockSubmissions set
Luke Dashjr [Sat, 2 Feb 2013 05:02:57 +0000 (05:02 +0000)]
Bugfix: Correctly initialize without BlockSubmissions set

9 years agoAllow omitting "uri" from upstream configs if the same "name" is found elsewhere...
Luke Dashjr [Sat, 2 Feb 2013 04:59:50 +0000 (04:59 +0000)]
Allow omitting "uri" from upstream configs if the same "name" is found elsewhere with a specified "uri", and vice-versa

9 years agoBlockSubmissions config list to improve control over where we submit blocks
Luke Dashjr [Sat, 2 Feb 2013 04:44:47 +0000 (04:44 +0000)]
BlockSubmissions config list to improve control over where we submit blocks

9 years agoMerge branch 'multisource'
Luke Dashjr [Sat, 2 Feb 2013 01:45:34 +0000 (01:45 +0000)]
Merge branch 'multisource'

9 years agoMerge commit 'f25c32a'
Luke Dashjr [Sat, 2 Feb 2013 01:45:04 +0000 (01:45 +0000)]
Merge commit 'f25c32a'

Conflicts:
eloipool.py

9 years agoBugfix: Correct math to ceil power-of-two pdiff targetting
Luke Dashjr [Sat, 2 Feb 2013 01:44:24 +0000 (01:44 +0000)]
Bugfix: Correct math to ceil power-of-two pdiff targetting

9 years agoJSONRPCServer: Catch and return UTF-8 decode errors
Luke Dashjr [Fri, 1 Feb 2013 20:02:12 +0000 (20:02 +0000)]
JSONRPCServer: Catch and return UTF-8 decode errors

9 years agoMerge branch 'master' into multisource
Luke Dashjr [Fri, 1 Feb 2013 16:09:15 +0000 (16:09 +0000)]
Merge branch 'master' into multisource

Conflicts:
eloipool.py

9 years agoMerge commit '0768201'
Luke Dashjr [Fri, 1 Feb 2013 16:05:20 +0000 (16:05 +0000)]
Merge commit '0768201'

Conflicts:
eloipool.py