Allow disabling block proposals entirely with TemplateChecks=None

luke-jr · Jun 22, 2015 · 2570c30 · 2570c30
1 parent 0daf6a0
commit 2570c30
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/config.py.example b/config.py.example
@@ -82,8 +82,9 @@ TemplateSources = (
 )
 
 # JSON-RPC servers to check block proposals with
-# If none provided, and selected source supports proposals, it alone will also
-# be used for checking
+# If the list provided is empty, and selected source supports proposals, it
+# alone will be used for checking. If TemplateChecks is None, no checking will
+# ever be performed.
 # NOTE: Any servers listed here MUST support BIP 23 Block Proposals
 # NOTE: Mainline bitcoind (as of 0.8) does NOT support this (though the 0.8.0.eligius branch does)
 TemplateChecks = (

diff --git a/merklemaker.py b/merklemaker.py
@@ -392,7 +392,7 @@ def _ProcessGBT(self, MP, TS = None):
 	def _CheckTemplate(self, newMerkleTree, TS):
 		TCList = self.TemplateChecks
 		if not TCList:
-			if 'proposal' not in newMerkleTree.oMP.get('capabilities', ()):
+			if TCList is None or 'proposal' not in newMerkleTree.oMP.get('capabilities', ()):
 				return (None, None)
 			TCList = (
 				{