Insert witness commitments in generation transaction output

bitcoin/script.py

@@ -43,6 +43,13 @@ def toAddress(cls, addr):
 		elif ver == 5 or ver == 196:
 			return b'\xa9\x14' + pubkeyhash + b'\x87'
 		raise ValueError('invalid address version')
+
+	@classmethod
+	def commitment(cls, commitment):
+		clen = len(commitment)
+		if clen > 0x4b:
+			raise NotImplementedError
+		return b'\x6a' + bytes((clen,)) + commitment
 
 def countSigOps(s):
 	# FIXME: don't count data as ops

eloipool.py

@@ -100,7 +100,10 @@ def RaiseRedFlags(reason):
 import subprocess
 from time import time
 
-def makeCoinbaseTxn(coinbaseValue, useCoinbaser = True, prevBlockHex = None):
+def makeCoinbaseTxn(coinbaseValue, useCoinbaser = True, prevBlockHex = None, witness_commitment = NotImplemented):
+	if witness_commitment is NotImplemented:
+		raise NotImplementedError
+
 	txn = Txn.new()
 
 	if useCoinbaser and hasattr(config, 'CoinbaserCmd') and config.CoinbaserCmd:
@@ -128,6 +131,10 @@ def makeCoinbaseTxn(coinbaseValue, useCoinbaser = True, prevBlockHex = None):
 	pkScript = BitcoinScript.toAddress(config.TrackerAddr)
 	txn.addOutput(coinbaseValue, pkScript)
 
+	# SegWit commitment
+	if not witness_commitment is None:
+		txn.addOutput(0, BitcoinScript.commitment(WitnessMagic + witness_commitment))
+
 	# TODO
 	# TODO: red flag on dupe coinbase
 	return txn

merklemaker.py

@@ -176,7 +176,7 @@ def URI2Access(uri):
 
 	def createClearMerkleTree(self, height):
 		subsidy = self.SubsidyAlgo(height)
-		cbtxn = self.makeCoinbaseTxn(subsidy, False)
+		cbtxn = self.makeCoinbaseTxn(subsidy, False, witness_commitment=None)
 		cbtxn.setCoinbase(b'\0\0')  # necessary to avoid triggering segwit marker+flags
 		cbtxn.assemble()
 		mt = MerkleTree([cbtxn])
@@ -406,7 +406,9 @@ def _ProcessGBT(self, MP, TS = None):
 				ka['txid'] = iinfo['txid']
 			txnobjs.append(Txn(data=txnlist[i], **ka))
 
-		cbtxn = self.makeCoinbaseTxn(MP['coinbasevalue'], prevBlockHex = MP['previousblockhash'])
+		witness_commitment = CalculateWitnessCommitment(txnobjs, self.WitnessNonce)
+
+		cbtxn = self.makeCoinbaseTxn(MP['coinbasevalue'], prevBlockHex = MP['previousblockhash'], witness_commitment=witness_commitment)
 		cbtxn.setCoinbase(b'\0\0')
 		cbtxn.assemble()
 		txnobjs[0] = cbtxn
@@ -416,7 +418,7 @@ def _ProcessGBT(self, MP, TS = None):
 		newMerkleTree.POTInfo = MP.get('POTInfo')
 		newMerkleTree.MP = MP
 		newMerkleTree.oMP = oMP
-		newMerkleTree.witness_commitment = CalculateWitnessCommitment(txnobjs, self.WitnessNonce)
+		newMerkleTree.witness_commitment = witness_commitment
 
 		return newMerkleTree
 
@@ -823,9 +825,9 @@ def MBS(LO = 0):
 	txninfo[2]['fee'] = 0
 	assert MBS(1) == (MP, txnlist, txninfo)
 	# _ProcessGBT tests
-	def makeCoinbaseTxn(coinbaseValue, useCoinbaser = True, prevBlockHex = None):
+	def makeCoinbaseTxn(coinbaseValue, useCoinbaser = True, prevBlockHex = None, witness_commitment=None):
 		txn = Txn.new()
-		txn.addOutput(coinbaseValue, b'')
+		txn.addOutput(coinbaseValue, BitcoinScript.commitment(witness_commitment) if witness_commitment else b'')
 		return txn
 	MM.makeCoinbaseTxn = makeCoinbaseTxn
 	MM.updateBlock = lambda *a, **ka: None