From 69b8ec46346adb6e23b63c75bfdf18e834427884 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Mon, 14 May 2012 15:56:15 +0000
Subject: [PATCH] Use BIP22 "obj" transactions when possible

Backward compatibility with hex-only and gmp_fees retained for now
---
 merklemaker.py | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/merklemaker.py b/merklemaker.py
index c9e491c..5bb6392 100644
--- a/merklemaker.py
+++ b/merklemaker.py
@@ -42,7 +42,7 @@ class merkleMaker(threading.Thread):
 			'transactions/remove',
 			'prevblock',
 		],
-		'tx': 'hex',
+		'tx': 'obj',
 	}
 	
 	def __init__(self, *a, **k):
@@ -131,8 +131,21 @@ class merkleMaker(threading.Thread):
 		bits = bytes.fromhex(MP['bits'])[::-1]
 		if (prevBlock, bits) != self.currentBlock:
 			self.updateBlock(prevBlock, bits, _HBH=(MP['previousblockhash'], MP['bits']))
+		
+		txnlist = MP['transactions']
+		if len(txnlist) and isinstance(txnlist[0], dict):
+			txninfo = txnlist
+			txnlist = tuple(a['data'] for a in txnlist)
+			txninfo.insert(0, {
+			})
+		elif 'transactionfees' in MP:
+			# Backward compatibility with pre-BIP22 gmp_fees branch
+			txninfo = [{'fee':a} for a in MP['transactionfees']]
+		else:
+			# Backward compatibility with pre-BIP22 hex-only (bitcoind <0.7, Eloipool <future)
+			txninfo = [{}] * len(txnlist)
 		# TODO: cache Txn or at least txid from previous merkle roots?
-		txnlist = [a for a in map(bytes.fromhex, MP['transactions'])]
+		txnlist = [a for a in map(bytes.fromhex, txnlist)]
 		
 		cbtxn = self.makeCoinbaseTxn(MP['coinbasevalue'])
 		cbtxn.setCoinbase(b'\0\0')
@@ -153,18 +166,11 @@ class merkleMaker(threading.Thread):
 		
 		txncount = len(txnlist)
 		idealtxncount = txncount
-		if hasattr(self, 'Greedy') and self.Greedy and 'transactionfees' in MP:
-			feeinfo = MP['transactionfees']
-			feeinfo.insert(0, -MP['coinbasevalue'])
+		if hasattr(self, 'Greedy') and self.Greedy:
 			# Aim to cut off extra zero-fee transactions on the end
 			# NOTE: not cutting out ones intermixed, in case of dependencies
-			feeinfoLen = len(feeinfo)
-			if feeinfoLen > txncount:
-				feeinfoLen = txncount
-			elif feeinfoLen < txncount:
-				idealtxncount -= txncount - feeinfoLen
-			for i in range(feeinfoLen - 1, 0, -1):
-				if feeinfo[i]:
+			for i in range(len(txninfo) - 1, 0, -1):
+				if 'fee' not in txninfo[i] or txninfo[i]['fee']:
 					break
 				idealtxncount -= 1
 		
-- 
2.1.4