When/if server provides "txid" for transactions, use that instead of …

…hashing them

bitcoin/txn.py

@@ -22,10 +22,13 @@
 _nullprev = b'\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0'
 
 class Txn:
-	def __init__(self, data=None):
+	def __init__(self, data=None, txid=None):
 		if data:
 			self.data = data
-			self.idhash()
+			if txid:
+				self.txid = txid
+			else:
+				self.idhash()
 
 	@classmethod
 	def new(cls):

merklemaker.py

@@ -389,10 +389,15 @@ def _ProcessGBT(self, MP, TS = None):
 		txninfo.insert(0, {
 		})
 
-		txnlist = [a for a in map(Txn, txnlist[1:])]
-		txnlist.insert(0, cbtxn)
-		txnlist = list(txnlist)
-		newMerkleTree = MerkleTree(txnlist)
+		txnobjs = [cbtxn]
+		for i in range(1, len(txnlist)):
+			iinfo = txninfo[i]
+			ka = {}
+			if 'txid' in iinfo:
+				ka['txid'] = iinfo['txid']
+			txnobjs.append(Txn(data=txnlist[i], **ka))
+		txnobjs = list(txnobjs)
+		newMerkleTree = MerkleTree(txnobjs)
 		newMerkleTree.POTInfo = MP.get('POTInfo')
 		newMerkleTree.MP = MP
 		newMerkleTree.oMP = oMP