From: Forrest Voight Date: Wed, 26 Jun 2013 19:59:31 +0000 (-0400) Subject: use OP_RETURN in new shares X-Git-Tag: 13.0^2~5 X-Git-Url: https://git.novaco.in/?p=p2pool.git;a=commitdiff_plain;h=618fc0852b49d0b52278a5d7767feaa0701fed29 use OP_RETURN in new shares --- diff --git a/p2pool/data.py b/p2pool/data.py index 3101f34..e5a4818 100644 --- a/p2pool/data.py +++ b/p2pool/data.py @@ -105,7 +105,7 @@ class NewShare(object): ('share_info', share_info_type), ]) - gentx_before_refhash = pack.VarStrType().pack(DONATION_SCRIPT) + pack.IntType(64).pack(0) + pack.VarStrType().pack('\x28' + pack.IntType(256).pack(0) + pack.IntType(64).pack(0))[:2] + gentx_before_refhash = pack.VarStrType().pack(DONATION_SCRIPT) + pack.IntType(64).pack(0) + pack.VarStrType().pack('\x6a\x28' + pack.IntType(256).pack(0) + pack.IntType(64).pack(0))[:3] @classmethod def generate_transaction(cls, tracker, share_data, block_target, desired_timestamp, desired_target, ref_merkle_link, desired_other_transaction_hashes_and_fees, net, known_txs=None, last_txout_nonce=0, base_subsidy=None): @@ -195,7 +195,7 @@ class NewShare(object): )], tx_outs=[dict(value=amounts[script], script=script) for script in dests if amounts[script] or script == DONATION_SCRIPT] + [dict( value=0, - script='\x28' + cls.get_ref_hash(net, share_info, ref_merkle_link) + pack.IntType(64).pack(last_txout_nonce), + script='\x6a\x28' + cls.get_ref_hash(net, share_info, ref_merkle_link) + pack.IntType(64).pack(last_txout_nonce), )], lock_time=0, )