diff --git a/ChangeLog.md b/ChangeLog.md index 4d41ed58fd..a7b2d79c31 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,6 +1,4 @@ ## Client Versions ## -* v9.49.5 (???) - * automatically spend 1‐of‐`N` multisig outputs * v9.49.4 (2014-02-05) * reconceived this package as a libary * moved CLI to new repository: `counterparty-cli` diff --git a/counterpartylib/lib/backend/__init__.py b/counterpartylib/lib/backend/__init__.py index 40fbdb9606..227cdefde7 100644 --- a/counterpartylib/lib/backend/__init__.py +++ b/counterpartylib/lib/backend/__init__.py @@ -110,20 +110,14 @@ def get_btc_supply(normalize=False): return total_supply if normalize else int(total_supply * config.UNIT) def is_vout_spendable(vout, source): - # TODO: Support multi‐sig sources. source = script.make_canonical(source) scriptpubkey_hex = vout['scriptPubKey']['hex'] c_scriptpubkey = bitcoinlib.core.CScript(bitcoinlib.core.x(scriptpubkey_hex)) vout_address = script.scriptpubkey_to_address(c_scriptpubkey) if not vout_address: return False - if script.is_multisig(vout_address) and not script.is_multisig(source): - signatures_required, pubkeyhashes, signatures_possible = script.extract_array(vout_address) - if signatures_required == 1 and source in pubkeyhashes: - return True - else: - if vout_address == source: - return True + if vout_address == source: + return True return False def get_unspent_txouts(source, return_confirmed=False):