diff --git a/electrumx/lib/coins.py b/electrumx/lib/coins.py index 5c6b2fb..c13d64c 100644 --- a/electrumx/lib/coins.py +++ b/electrumx/lib/coins.py @@ -137,21 +137,6 @@ class Coin(object): return None return sha256(script).digest()[:HASHX_LEN] - @util.cachedproperty - def address_handlers(cls): - return ScriptPubKey.PayToHandlers( - address=cls.P2PKH_address_from_hash160, - script_hash=cls.P2SH_address_from_hash160, - pubkey=cls.P2PKH_address_from_pubkey, - unspendable=lambda: None, - strange=lambda script: None, - ) - - @classmethod - def address_from_script(cls, script): - '''Given a pk_script, return the adddress it pays to, or None.''' - return ScriptPubKey.pay_to(cls.address_handlers, script) - @staticmethod def lookup_xverbytes(verbytes): '''Return a (is_xpub, coin_class) pair given xpub/xprv verbytes.''' @@ -185,31 +170,6 @@ class Coin(object): assert len(hash160) == 20 return cls.ENCODE_CHECK(cls.P2SH_VERBYTES[0] + hash160) - @classmethod - def multisig_address(cls, m, pubkeys): - '''Return the P2SH address for an M of N multisig transaction. - - Pass the N pubkeys of which M are needed to sign it. If - generating an address for a wallet, it is the caller's - responsibility to sort them to ensure order does not matter - for, e.g., wallet recovery. - ''' - script = cls.pay_to_multisig_script(m, pubkeys) - return cls.P2SH_address_from_hash160(hash160(script)) - - @classmethod - def pay_to_multisig_script(cls, m, pubkeys): - '''Return a P2SH script for an M of N multisig transaction.''' - return ScriptPubKey.multisig_script(m, pubkeys) - - @classmethod - def pay_to_pubkey_script(cls, pubkey): - '''Return a pubkey script that pays to a pubkey. - - Pass the raw pubkey bytes (length 33 or 65). - ''' - return ScriptPubKey.P2PK_script(pubkey) - @classmethod def hash160_to_P2PKH_script(cls, hash160): return ScriptPubKey.P2PKH_script(hash160) diff --git a/tests/test_transactions.py b/tests/test_transactions.py index 747c7fb..d91a65c 100644 --- a/tests/test_transactions.py +++ b/tests/test_transactions.py @@ -55,6 +55,5 @@ def test_transaction(transaction_details): spk = vout[i]['scriptPubKey'] tx_pks = tx.outputs[i].pk_script assert spk['hex'] == tx_pks.hex() - assert spk['address'] == coin.address_from_script(tx_pks) assert coin.address_to_hashX(spk['address']) == \ coin.hashX_from_script(tx_pks)