Merge pull request p2pool#368 from veqtrus/revert_immediate_segwit

Tweaks to transaction selection
umarfarooqitgcuf · Dec 30, 2017 · 27255ec · 27255ec
2 parents afcb011 + fa52b11
commit 27255ec
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/p2pool/bitcoin/helper.py b/p2pool/bitcoin/helper.py
@@ -55,8 +55,7 @@ def go():
         except jsonrpc.Error_for_code(-32601): # Method not found
             print >>sys.stderr, 'Error: Bitcoin version too old! Upgrade to v0.5 or newer!'
             raise deferral.RetrySilentlyException()
-    work['transactions'] = [x for x in work['transactions'] if x['txid'] == x['hash']] # don't mine segwit txs for now
-    packed_transactions = [(x['data'] if isinstance(x, dict) else x).decode('hex') for x in work['transactions']]
+    packed_transactions = [x['data'].decode('hex') for x in work['transactions'] if len(x.get('depends', [])) == 0]
     if 'height' not in work:
         work['height'] = (yield bitcoind.rpc_getblock(work['previousblockhash']))['height'] + 1
     elif p2pool.DEBUG: