From a5958543503bdae4e67a98cf48f23e7f29b1917f Mon Sep 17 00:00:00 2001 From: Cryp Toon Date: Fri, 12 Apr 2024 18:29:16 +0200 Subject: [PATCH] Fix issue with 1 byte data items --- bitcoinlib/scripts.py | 2 +- bitcoinlib/services/bitcoind.py | 2 +- examples/wallet_bitcoind_connected_wallets2.py | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bitcoinlib/scripts.py b/bitcoinlib/scripts.py index 124f9f6c..77144d37 100644 --- a/bitcoinlib/scripts.py +++ b/bitcoinlib/scripts.py @@ -127,7 +127,7 @@ def get_data_type(data): elif ((data.startswith(b'\x02') or data.startswith(b'\x03')) and len(data) == 33) or \ (data.startswith(b'\x04') and len(data) == 65): return 'key' - elif len(data) == 20 or len(data) == 32 or len(data) == 64 or 1 < len(data) <= 4: + elif len(data) == 20 or len(data) == 32 or len(data) == 64 or 1 <= len(data) <= 4: return 'data-%d' % len(data) else: return 'other' diff --git a/bitcoinlib/services/bitcoind.py b/bitcoinlib/services/bitcoind.py index 5980ccf8..9d7c0fd0 100644 --- a/bitcoinlib/services/bitcoind.py +++ b/bitcoinlib/services/bitcoind.py @@ -138,7 +138,7 @@ def __init__(self, network='bitcoin', base_url='', denominator=100000000, *args) bdc = self.from_config('', network) base_url = bdc.base_url network = bdc.network - wallet_name = '' if not len(args) >= 6 else args[6] + wallet_name = '' if not len(args) > 6 else args[6] if wallet_name: base_url = base_url.replace("{wallet_name}", wallet_name) _logger.info("Connect to bitcoind") diff --git a/examples/wallet_bitcoind_connected_wallets2.py b/examples/wallet_bitcoind_connected_wallets2.py index 37968d0d..f37c60ee 100644 --- a/examples/wallet_bitcoind_connected_wallets2.py +++ b/examples/wallet_bitcoind_connected_wallets2.py @@ -25,3 +25,5 @@ w.scan(scan_gap_limit=1) w.info() +# TODO +# FIXME