Merge commit '6ce65de'

luke-jr · Jul 5, 2015 · 9e37d47 · 9e37d47
2 parents 00eb752 + 6ce65de
commit 9e37d47
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/merklemaker.py b/merklemaker.py
@@ -488,6 +488,10 @@ def _updateMerkleTree_fromTS(self, TS):
 		newMerkleTree.source = TS['name']
 		newMerkleTree.source_uri = TS['uri']
 
+		if MP['version'] < self.BlockVersion:
+			self.logger.error('Template from \'%s\' has too low block version (%u < %u)' % (TS['name'], MP['version'], self.BlockVersion))
+			return None
+
 		(AcceptedScore, TotalScore) = self._CheckTemplate(newMerkleTree, TS)
 		if TotalScore is None:
 			return (0, newMerkleTree)