bitcoinlib 0.7.2__tar.gz → 0.7.4__tar.gz

{bitcoinlib-0.7.2 → bitcoinlib-0.7.4}/CHANGELOG

@@ -1,3 +1,24 @@
+RELEASE 0.7.4 - Add and updates providers, improve blockchain parsing
+=====================================================================
+* Add testnet4, signet Blockbook provider
+* Allow to manage unrecognised keys and transactions for blockchain parsing
+* Fix issue with uncompressed wallet keys
+* Fix Blocksmurfer provider issues
+* Various provider updates and fixes
+* Update FAQ page and documentation
+* Avoid litecoin unittest issues
+
+RELEASE 0.7.3 - Fix provider issues, increase performance
+=========================================================
+* ElectrumX and Blockbook examples and documentation
+* Add mempool Signet provider
+* Fix documentation build
+* Enable unittest for Bitaps
+* Fix Mempool provider transaction order
+* Fix incorrect txid's when parsing blocks
+* Fix other provider issues
+* Improve provider performance
+
 RELEASE 0.7.2 - ElectrumX, Signet, Blocksmurfer API
 ===================================================
 * ElectrumX server support

{bitcoinlib-0.7.2/bitcoinlib.egg-info → bitcoinlib-0.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: bitcoinlib
-Version: 0.7.2
+Version: 0.7.4
 Summary: Bitcoin cryptocurrency Library
 Home-page: http://github.com/1200wd/bitcoinlib
 Author: 1200wd
@@ -33,10 +33,11 @@ Requires-Dist: ecdsa>=0.18; platform_system == "Windows"
 Requires-Dist: pycryptodome>=3.19.0
 Requires-Dist: SQLAlchemy>=2.0.20
 Requires-Dist: numpy==1.24.4; python_version < "3.9"
-Requires-Dist: numpy>=1.22.0; python_version >= "3.9"
+Requires-Dist: numpy<2,>=1.24.4; python_version >= "3.9"
 Provides-Extra: dev
 Requires-Dist: scrypt>=0.8.20; platform_system != "Windows" and extra == "dev"
-Requires-Dist: sphinx>=7.1.0; extra == "dev"
+Requires-Dist: sphinx>=7.1.0; python_version < "3.9" and extra == "dev"
+Requires-Dist: sphinx>=7.2.0; python_version >= "3.9" and extra == "dev"
 Requires-Dist: coveralls>=4.0.1; extra == "dev"
 Requires-Dist: psycopg>=3.1.16; extra == "dev"
 Requires-Dist: mysql-connector-python>=8.4.0; extra == "dev"
@@ -44,6 +45,7 @@ Requires-Dist: mysqlclient>=2.2.0; extra == "dev"
 Requires-Dist: sphinx_rtd_theme>=2.0.0; extra == "dev"
 Requires-Dist: Cython>=3.0.8; extra == "dev"
 Requires-Dist: win-unicode-console; platform_system == "Windows" and extra == "dev"
+Dynamic: license-file
 
 Python Bitcoin Library
 ======================
@@ -58,8 +60,10 @@ With BitcoinLib you can:
  - Create, analyse and run Bitcoin scripts
  - Generate Bitcoin addresses and represent them in different address formats like P2PKH, P2SH, Bech32, etc
  - Create private keys and work with Mnemonic password phrases
- - Uses external Service providers to fetch address, transaction, utxo and blockchain data. Or connect to you local `Bitcoin core <https://bitcoinlib.readthedocs.io/en/latest/source/_static/manuals.setup-bitcoind-connection.html>`_, `Bcoin <https://bitcoinlib.readthedocs.io/en/latest/source/_static/manuals.setup-bcoin.html>`_ or `Blockbook <https://bitcoinlib.readthedocs.io/en/latest/source/_static/manuals.setup-blockbook.html>`_ node.
- - Can be extended to support other cryptocurrencies by configuring custom parameters. At the moment Litecoin and Dogecoin are also supported.
+ - Use external Service providers to fetch address, transaction, utxo and blockchain data.
+ - Connect to you local `Bitcoin core <https://bitcoinlib.readthedocs.io/en/latest/source/_static/manuals.setup-bitcoind-connection.html>`_, `Bcoin <https://bitcoinlib.readthedocs.io/en/latest/source/_static/manuals.setup-bcoin.html>`_, `Blockbook <https://bitcoinlib.readthedocs.io/en/latest/source/_static/manuals.setup-blockbook.html>`_ or  `ElectrumX <https://bitcoinlib.readthedocs.io/en/latest/source/_static/manuals.setup-electrumx.html>`_ node.
+ - Can be extended to support other cryptocurrencies by configuring custom parameters.
+ - At the moment Litecoin, Dogecoin and various test networks are supported out-of-the-box.
 
 
 .. image:: https://github.com/1200wd/bitcoinlib/actions/workflows/unittests.yaml/badge.svg

{bitcoinlib-0.7.2 → bitcoinlib-0.7.4}/README.rst

@@ -11,8 +11,10 @@ With BitcoinLib you can:
  - Create, analyse and run Bitcoin scripts
  - Generate Bitcoin addresses and represent them in different address formats like P2PKH, P2SH, Bech32, etc
  - Create private keys and work with Mnemonic password phrases
- - Uses external Service providers to fetch address, transaction, utxo and blockchain data. Or connect to you local `Bitcoin core <https://bitcoinlib.readthedocs.io/en/latest/source/_static/manuals.setup-bitcoind-connection.html>`_, `Bcoin <https://bitcoinlib.readthedocs.io/en/latest/source/_static/manuals.setup-bcoin.html>`_ or `Blockbook <https://bitcoinlib.readthedocs.io/en/latest/source/_static/manuals.setup-blockbook.html>`_ node.
- - Can be extended to support other cryptocurrencies by configuring custom parameters. At the moment Litecoin and Dogecoin are also supported.
+ - Use external Service providers to fetch address, transaction, utxo and blockchain data.
+ - Connect to you local `Bitcoin core <https://bitcoinlib.readthedocs.io/en/latest/source/_static/manuals.setup-bitcoind-connection.html>`_, `Bcoin <https://bitcoinlib.readthedocs.io/en/latest/source/_static/manuals.setup-bcoin.html>`_, `Blockbook <https://bitcoinlib.readthedocs.io/en/latest/source/_static/manuals.setup-blockbook.html>`_ or  `ElectrumX <https://bitcoinlib.readthedocs.io/en/latest/source/_static/manuals.setup-electrumx.html>`_ node.
+ - Can be extended to support other cryptocurrencies by configuring custom parameters.
+ - At the moment Litecoin, Dogecoin and various test networks are supported out-of-the-box.
 
 
 .. image:: https://github.com/1200wd/bitcoinlib/actions/workflows/unittests.yaml/badge.svg

{bitcoinlib-0.7.2 → bitcoinlib-0.7.4}/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #    BitcoinLib - Python Cryptocurrency Library
-#    © 2016 November - 1200 Web Development <http://1200wd.com/>
+#    © 2016 - 2025 May - 1200 Web Development <http://1200wd.com/>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as

{bitcoinlib-0.7.2 → bitcoinlib-0.7.4}/bitcoinlib/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #    BitcoinLib - Python Cryptocurrency Library
-#    © 2018 - 2019 March - 1200 Web Development <http://1200wd.com/>
+#    © 2018 - 2025 May - 1200 Web Development <http://1200wd.com/>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as

bitcoinlib-0.7.4/bitcoinlib/config/VERSION

@@ -0,0 +1 @@
+0.7.4

{bitcoinlib-0.7.2 → bitcoinlib-0.7.4}/bitcoinlib/data/providers.examples.json

@@ -438,5 +438,26 @@
     "priority": 10,
     "denominator": 100000000,
     "network_overrides": null
+  },
+  "localhost.electrumx": {
+    "provider": "electrumx",
+    "network": "bitcoin",
+    "client_class": "ElectrumxClient",
+    "provider_coin_id": "",
+    "url": "localhost:50001",
+    "api_key": "",
+    "priority": 10,
+    "denominator": 1,
+    "network_overrides": null
+  },
+  "blockbook.localhost": {
+    "provider": "blockbook",
+    "network": "bitcoin",
+    "client_class": "BlockbookClient",
+    "provider_coin_id": "",
+    "url": "http://localhost:9130/api/v2/",
+    "priority": 10,
+    "denominator": 100000000,
+    "network_overrides": null
   }
 }

{bitcoinlib-0.7.2 → bitcoinlib-0.7.4}/bitcoinlib/data/providers.json

@@ -58,6 +58,18 @@
     "denominator": 1,
     "network_overrides": null,
     "timeout": 0
+  },
+    "blockcypher": {
+    "provider": "blockcypher",
+    "network": "bitcoin",
+    "client_class": "BlockCypher",
+    "provider_coin_id": "",
+    "url": "https://api.blockcypher.com/v1/btc/main/",
+    "api_key": "",
+    "priority": 10,
+    "denominator": 1,
+    "network_overrides": null,
+    "timeout": 0
   },
   "cryptoid.litecoin": {
     "provider": "cryptoid",
@@ -342,7 +354,7 @@
     "provider_coin_id": "",
     "url": "https://mempool.space/api/",
     "api_key": "",
-    "priority": 0,
+    "priority": 10,
     "denominator": 1,
     "network_overrides": null,
     "timeout": 0
@@ -354,7 +366,7 @@
     "provider_coin_id": "",
     "url": "https://mempool.space/testnet/api/",
     "api_key": "",
-    "priority": 0,
+    "priority": 10,
     "denominator": 1,
     "network_overrides": null,
     "timeout": 0
@@ -370,6 +382,17 @@
     "denominator": 1,
     "network_overrides": null
   },
+  "blockbook.testnet4": {
+    "provider": "blockbook",
+    "network": "testnet4",
+    "client_class": "BlockbookClient",
+    "provider_coin_id": "",
+    "url": "https://blockbook.tbtc-1.zelcore.io/api/v2/",
+    "api_key": "",
+    "priority": 10,
+    "denominator": 1,
+    "network_overrides": null
+  },
   "mempool.litecoin": {
     "provider": "mempool",
     "network": "litecoin",
@@ -393,5 +416,27 @@
     "denominator": 1,
     "network_overrides": null,
     "timeout": 0
+  },
+  "mempool.signet": {
+    "provider": "mempool",
+    "network": "signet",
+    "client_class": "MempoolClient",
+    "provider_coin_id": "",
+    "url": "https://mempool.space/signet/api/",
+    "api_key": "",
+    "priority": 10,
+    "denominator": 1,
+    "network_overrides": null
+  },
+   "blockbook.signet": {
+    "provider": "blockbook",
+    "network": "signet",
+    "client_class": "BlockbookClient",
+    "provider_coin_id": "",
+    "url": "https://signet-explorer.wakiyamap.dev/api/v2/",
+    "api_key": "",
+    "priority": 10,
+    "denominator": 1,
+    "network_overrides": null
   }
 }

{bitcoinlib-0.7.2 → bitcoinlib-0.7.4}/bitcoinlib/keys.py

@@ -2,7 +2,7 @@
 #
 #    BitcoinLib - Python Cryptocurrency Library
 #    Public key cryptography and Hierarchical Deterministic Key Management
-#    © 2016 - 2024 June - 1200 Web Development <http://1200wd.com/>
+#    © 2016 - 2025 May - 1200 Web Development <http://1200wd.com/>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as

{bitcoinlib-0.7.2 → bitcoinlib-0.7.4}/bitcoinlib/networks.py

@@ -2,7 +2,7 @@
 #
 #    BitcoinLib - Python Cryptocurrency Library
 #    NETWORK class reads network definitions and with helper methods
-#    © 2017 - 2022 October - 1200 Web Development <http://1200wd.com/>
+#    © 2017 - 2025 May - 1200 Web Development <http://1200wd.com/>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -93,7 +93,7 @@ def network_by_value(field, value):
     >>> network_by_value('prefix_wif', 'B0')
     ['litecoin', 'litecoin_legacy']
     >>> network_by_value('prefix_address', '6f')
-    ['testnet', 'litecoin_testnet']
+    ['testnet', 'testnet4', 'signet', 'litecoin_testnet']
 
     This method does not work for HD prefixes, use 'wif_prefix_search' instead
 

{bitcoinlib-0.7.2 → bitcoinlib-0.7.4}/bitcoinlib/services/authproxy.py

@@ -168,7 +168,7 @@ class AuthServiceProxy(object):
         results = []
         responses = self._get_response()
         for response in responses:
-            if response['error'] is not None:
+            if response.get('error') is not None:
                 raise JSONRPCException(response['error'])
             elif 'result' not in response:
                 raise JSONRPCException({

{bitcoinlib-0.7.2 → bitcoinlib-0.7.4}/bitcoinlib/services/bcoin.py

@@ -91,10 +91,10 @@ class BcoinClient(BaseClient):
 
     def getutxos(self, address, after_txid='', limit=MAX_TRANSACTIONS):
         # First get all transactions for this address from the blockchain
-        txs = self.gettransactions(address, limit=50)
+        txs = self.gettransactions(address, limit=200)
 
         # Fail if large number of transactions are found
-        if len(txs) > 50:
+        if len(txs) >= 200:
             raise ClientError("If not all transactions are known, we cannot determine utxo's")
 
         utxos = []
@@ -130,14 +130,14 @@ class BcoinClient(BaseClient):
         assert(limit > 0)
         txs = []
         while True:
-            variables = {'limit': limit, 'after': after_txid}
+            variables = {'limit': 100, 'after': after_txid}
             res = self.compose_request('tx', 'address', address, variables)
             for tx in res:
                 txs.append(self._parse_transaction(tx))
             if not txs or len(txs) >= limit:
                 break
-            if len(res) == limit:
-                after_txid = res[limit-1]['hash']
+            if len(res) == 100:
+                after_txid = res[99]['hash']
             else:
                 break
 

{bitcoinlib-0.7.2 → bitcoinlib-0.7.4}/bitcoinlib/services/bitcoind.py

@@ -195,6 +195,14 @@ class BitcoindClient(BaseClient):
             if get_input_values:
                 txi = self.proxy.getrawtransaction(i.prev_txid.hex(), 1)
                 i.value = int(round(float(txi['vout'][i.output_n_int]['value']) / self.network.denominator))
+        # This doesn't seem to save any time:
+        # if get_input_values:
+        #     batchreq = []
+        #     for i in t.inputs:
+        #         batchreq.append(['getrawtransaction', i.prev_txid.hex(), 1])
+        #     res = self.proxy.batch_(batchreq)
+        #     for n, txi in enumerate(res):
+        #         t.inputs[n].value = int(round(float(txi['vout'][t.inputs[n].output_n_int]['value']) / self.network.denominator))
         for o in t.outputs:
             o.spent = None
 

{bitcoinlib-0.7.2 → bitcoinlib-0.7.4}/bitcoinlib/services/blockbook.py

@@ -2,7 +2,8 @@
 #
 #    BitcoinLib - Python Cryptocurrency Library
 #    Blockbook Client api/v2 - available on various servers or run on your own see https://github.com/trezor/blockbook
-#    © 2023 - 1200 Web Development <http://1200wd.com/>
+#    1200 Web Development <http://1200wd.com/>
+#    © 2023 - 2025 May
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as

{bitcoinlib-0.7.2 → bitcoinlib-0.7.4}/bitcoinlib/services/blockchaininfo.py

@@ -2,7 +2,8 @@
 #
 #    BitcoinLib - Python Cryptocurrency Library
 #    blockchain_info client
-#    © 2017-2019 July - 1200 Web Development <http://1200wd.com/>
+#    1200 Web Development <http://1200wd.com/>
+#    © 2017 - 2025 May
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as

{bitcoinlib-0.7.2 → bitcoinlib-0.7.4}/bitcoinlib/services/blockcypher.py

@@ -216,4 +216,12 @@ class BlockCypher(BaseClient):
         t = self.gettransaction(txid)
         return 1 if t.outputs[output_n].spent else 0
 
-    # def getinfo(self):
+    def getinfo(self):
+        info = self.compose_request('', '')
+        return {
+            'blockcount': info['height'],
+            'chain': info['name'],
+            'difficulty': 0,
+            'hashrate': 0,
+            'mempool_size': info['unconfirmed_count'],
+        }

{bitcoinlib-0.7.2 → bitcoinlib-0.7.4}/bitcoinlib/services/blocksmurfer.py

@@ -2,7 +2,7 @@
 #
 #    BitcoinLib - Python Cryptocurrency Library
 #    Blocksmurfer client
-#    © 2020 Januari - 1200 Web Development <http://1200wd.com/>
+#    © 2020 - 2025 May - 1200 Web Development <http://1200wd.com/>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -21,6 +21,7 @@
 import logging
 from datetime import datetime, timezone
 from bitcoinlib.main import MAX_TRANSACTIONS
+from bitcoinlib.keys import Address
 from bitcoinlib.services.baseclient import BaseClient, ClientError
 from bitcoinlib.transactions import Transaction
 
@@ -75,7 +76,8 @@ class BlocksmurferClient(BaseClient):
                 'size': u['size'],
                 'value': u['value'],
                 'script': u['script'],
-                'date': datetime.strptime(u['date'][:19], "%Y-%m-%dT%H:%M:%S").replace(tzinfo=timezone.utc)
+                'date': None if not u['date'] else datetime.strptime(u['date'][:19], "%Y-%m-%dT%H:%M:%S").replace(
+                    tzinfo=timezone.utc)
             })
         return utxos[:limit]
 
@@ -93,16 +95,20 @@ class BlocksmurferClient(BaseClient):
                         status=tx['status'], coinbase=tx['coinbase'], rawtx=bytes.fromhex(tx['raw_hex']),
                         witness_type=tx['witness_type'])
         for ti in tx['inputs']:
+            address = ti['address'] if not self.network_overrides else (
+                Address.parse(ti['address'], network_overrides=self.network_overrides).address)
             t.add_input(prev_txid=ti['prev_txid'], output_n=ti['output_n'], keys=ti.get('keys', []),
                         index_n=ti['index_n'], unlocking_script=ti['script'], value=ti['value'],
-                        public_hash=bytes.fromhex(ti['public_hash']), address=ti['address'],
+                        public_hash=bytes.fromhex(ti['public_hash']), address=address,
                         witness_type=ti['witness_type'], locktime_cltv=ti['locktime_cltv'],
                         locktime_csv=ti['locktime_csv'], signatures=ti['signatures'], compressed=ti['compressed'],
                         locking_script=ti['locking_script'], sigs_required=ti['sigs_required'], sequence=ti['sequence'],
                         witnesses=[bytes.fromhex(w) for w in ti['witnesses']], script_type=ti['script_type'],
                         strict=self.strict)
         for to in tx['outputs']:
-            t.add_output(value=to['value'], address=to['address'], public_hash=to['public_hash'],
+            address = to['address'] if not self.network_overrides else (
+                Address.parse(to['address'], network_overrides=self.network_overrides).address)
+            t.add_output(value=to['value'], address=address, public_hash=to['public_hash'],
                          lock_script=to['script'], spent=to['spent'], strict=self.strict)
         t.update_totals()
         return t

{bitcoinlib-0.7.2 → bitcoinlib-0.7.4}/bitcoinlib/services/electrumx.py

@@ -168,6 +168,8 @@ class ElectrumxClient(BaseClient):
                 except:
                     pass
             t.input_total += i.value
+        for o in t.outputs:
+            o.spent = None
         t.update_totals()
         return t
 

{bitcoinlib-0.7.2 → bitcoinlib-0.7.4}/bitcoinlib/services/mempool.py

@@ -141,8 +141,7 @@ class MempoolClient(BaseClient):
             if len(prtxs) > 100:
                 break
         txs = []
-        # FIXME: Mempool return transactions in incorrect order, this tries to fix it, but does not always work...
-        for tx in sorted(prtxs, key=lambda x: x['status']['block_height']):
+        for tx in prtxs[::-1]:
             t = self._parse_transaction(tx)
             if t:
                 txs.append(t)

{bitcoinlib-0.7.2 → bitcoinlib-0.7.4}/bitcoinlib/services/services.py

@@ -101,7 +101,7 @@ class Service(object):
             raise ServiceError(errstr)
         f.close()
 
-        provider_list = list(set([self.providers_defined[x]['provider'] for x in self.providers_defined]))
+        provider_set = {self.providers_defined[x]['provider'] for x in self.providers_defined}
         if providers is None:
             providers = []
         if exclude_providers is None:
@@ -109,7 +109,7 @@ class Service(object):
         if not isinstance(providers, list):
             providers = [providers]
         for p in providers:
-            if p not in provider_list:
+            if p not in provider_set:
                 raise ServiceError("Provider '%s' not found in provider definitions" % p)
 
         self.providers = {}
@@ -344,7 +344,7 @@ class Service(object):
         """
         Get all transactions for specified address.
 
-        Sorted from old to new, so transactions with highest number of confirmations first.
+        Sorted from old to new, so transactions with the highest number of confirmations first.
 
         :param address: Address string
         :type address: str

{bitcoinlib-0.7.2 → bitcoinlib-0.7.4}/bitcoinlib/transactions.py

@@ -745,7 +745,10 @@ class Output(object):
     @property
     def address(self):
         if not self._address:
-            address_obj = self.address_obj
+            try:
+                address_obj = self.address_obj
+            except Exception:
+                return ''
             if not address_obj:
                 return ''
             self._address = address_obj.address
@@ -1006,8 +1009,11 @@ class Transaction(object):
             rawtx.seek(pos_start)
             raw_bytes = rawtx.read(raw_len)
 
+        txid = '' if witness_type == 'segwit' else double_sha256(raw_bytes)[::-1].hex()
+
         return Transaction(inputs, outputs, locktime, version, network, size=raw_len, output_total=output_total,
-                           coinbase=coinbase, flag=flag, witness_type=witness_type, rawtx=raw_bytes, index=index)
+                           coinbase=coinbase, flag=flag, witness_type=witness_type, rawtx=raw_bytes, index=index,
+                           txid=txid)
 
     @classmethod
     def parse_hex(cls, rawtx, strict=True, network=DEFAULT_NETWORK):

{bitcoinlib-0.7.2 → bitcoinlib-0.7.4}/bitcoinlib/wallets.py

@@ -838,7 +838,7 @@ class WalletTransaction(Transaction):
             return None
 
         srv = Service(network=self.network.name, wallet_name=self.hdwallet.name, providers=self.hdwallet.providers,
-                      cache_uri=self.hdwallet.db_cache_uri)
+                      cache_uri=self.hdwallet.db_cache_uri, strict=self.hdwallet.strict)
         res = srv.sendrawtransaction(self.raw_hex())
         if not res:
             self.error = "Cannot send transaction. %s" % srv.errors
@@ -1235,9 +1235,9 @@ class Wallet(object):
     def _commit(self):
         try:
             self.session.commit()
-        except Exception:
+        except Exception as e:
             self.session.rollback()
-            raise WalletError("Could not commit to database, rollback performed!")
+            raise WalletError("Could not commit to database, rollback performed! Database error: %s" % str(e))
 
     @classmethod
     def create(cls, name, keys=None, owner='', network=None, account_id=0, purpose=0, scheme='bip32',
@@ -1546,6 +1546,7 @@ class Wallet(object):
                 self.key_depth = len(self.key_path) - 1
             self.last_updated = None
             self.anti_fee_sniping = db_wlt.anti_fee_sniping
+            self.strict = True
         else:
             raise WalletError("Wallet '%s' not found, please specify correct wallet ID or name." % wallet)
 
@@ -2965,7 +2966,8 @@ class Wallet(object):
         """
 
         network, account_id, acckey = self._get_account_defaults(network, account_id)
-        srv = Service(network=network, wallet_name=self.name, providers=self.providers, cache_uri=self.db_cache_uri)
+        srv = Service(network=network, wallet_name=self.name, providers=self.providers, cache_uri=self.db_cache_uri,
+                      strict=self.strict)
         balance = srv.getbalance(self.addresslist(account_id=account_id, network=network))
         if srv.results:
             new_balance = {
@@ -3189,7 +3191,8 @@ class Wallet(object):
                     addresslist = self.addresslist(account_id=account_id, used=used, network=network, key_id=key_id,
                                                    change=change, depth=depth)
                     random.shuffle(addresslist)
-                    srv = Service(network=network, wallet_name=self.name, providers=self.providers, cache_uri=self.db_cache_uri)
+                    srv = Service(network=network, wallet_name=self.name, providers=self.providers,
+                                  cache_uri=self.db_cache_uri, strict=self.strict)
                     utxos = []
                     for address in addresslist:
                         if rescan_all:
@@ -3390,7 +3393,8 @@ class Wallet(object):
         :return:
         """
         network = self.network.name
-        srv = Service(network=network, wallet_name=self.name, providers=self.providers, cache_uri=self.db_cache_uri)
+        srv = Service(network=network, wallet_name=self.name, providers=self.providers, cache_uri=self.db_cache_uri,
+                      strict=self.strict)
         blockcount = srv.blockcount()
         self.session.query(DbTransaction).\
             filter(DbTransaction.wallet_id == self.wallet_id,
@@ -3413,7 +3417,8 @@ class Wallet(object):
         txids = list(dict.fromkeys(txids))
 
         txs = []
-        srv = Service(network=self.network.name, wallet_name=self.name, providers=self.providers, cache_uri=self.db_cache_uri)
+        srv = Service(network=self.network.name, wallet_name=self.name, providers=self.providers,
+                      cache_uri=self.db_cache_uri, strict=self.strict)
         for txid in txids:
             tx = srv.gettransaction(to_hexstring(txid))
             if tx:
@@ -3468,7 +3473,8 @@ class Wallet(object):
         # Update number of confirmations and status for already known transactions
         self.transactions_update_confirmations()
 
-        srv = Service(network=network, wallet_name=self.name, providers=self.providers, cache_uri=self.db_cache_uri)
+        srv = Service(network=network, wallet_name=self.name, providers=self.providers, cache_uri=self.db_cache_uri,
+                      strict=self.strict)
 
         # Get transactions for wallet's addresses
         txs = []
@@ -3752,12 +3758,12 @@ class Wallet(object):
         if not key:
             raise WalletError("Key '%s' not found in this wallet" % key_id)
         if key.key_type == 'multisig':
-            inp_keys = [HDKey.from_wif(ck.child_key.wif, network=ck.child_key.network_name) for ck in
-                        key.multisig_children]
+            inp_keys = [HDKey.from_wif(ck.child_key.wif, network=ck.child_key.network_name, compressed=key.compressed)
+                        for ck in key.multisig_children]
         elif key.key_type in ['bip32', 'single']:
             if not key.wif:
                 raise WalletError("WIF of key is empty cannot create HDKey")
-            inp_keys = [HDKey.from_wif(key.wif, network=key.network_name)]
+            inp_keys = [HDKey.from_wif(key.wif, network=key.network_name, compressed=key.compressed)]
         else:
             raise WalletError("Input key type %s not supported" % key.key_type)
         return inp_keys, key
@@ -3946,10 +3952,11 @@ class Wallet(object):
                     addr = addr.key()
                 transaction.add_output(value, addr, change=False)
 
-        srv = Service(network=network, wallet_name=self.name, providers=self.providers, cache_uri=self.db_cache_uri)
+        srv = Service(network=network, wallet_name=self.name, providers=self.providers, cache_uri=self.db_cache_uri,
+                      strict=self.strict)
 
         if not locktime and self.anti_fee_sniping:
-            srv = Service(network=network, providers=self.providers, cache_uri=self.db_cache_uri)
+            srv = Service(network=network, providers=self.providers, cache_uri=self.db_cache_uri, strict=self.strict)
             blockcount = srv.blockcount()
             if blockcount:
                 transaction.locktime = blockcount
@@ -4451,7 +4458,8 @@ class Wallet(object):
                 continue
             input_arr.append((utxo['txid'], utxo['output_n'], utxo['key_id'], utxo['value']))
             total_amount += utxo['value']
-        srv = Service(network=network, wallet_name=self.name, providers=self.providers, cache_uri=self.db_cache_uri)
+        srv = Service(network=network, wallet_name=self.name, providers=self.providers, cache_uri=self.db_cache_uri,
+                      strict=self.strict)
 
         fee_modifier = 1 if self.witness_type == 'legacy' else 0.6
         if isinstance(fee, str):

{bitcoinlib-0.7.2 → bitcoinlib-0.7.4/bitcoinlib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: bitcoinlib
-Version: 0.7.2
+Version: 0.7.4
 Summary: Bitcoin cryptocurrency Library
 Home-page: http://github.com/1200wd/bitcoinlib
 Author: 1200wd
@@ -33,10 +33,11 @@ Requires-Dist: ecdsa>=0.18; platform_system == "Windows"
 Requires-Dist: pycryptodome>=3.19.0
 Requires-Dist: SQLAlchemy>=2.0.20
 Requires-Dist: numpy==1.24.4; python_version < "3.9"
-Requires-Dist: numpy>=1.22.0; python_version >= "3.9"
+Requires-Dist: numpy<2,>=1.24.4; python_version >= "3.9"
 Provides-Extra: dev
 Requires-Dist: scrypt>=0.8.20; platform_system != "Windows" and extra == "dev"
-Requires-Dist: sphinx>=7.1.0; extra == "dev"
+Requires-Dist: sphinx>=7.1.0; python_version < "3.9" and extra == "dev"
+Requires-Dist: sphinx>=7.2.0; python_version >= "3.9" and extra == "dev"
 Requires-Dist: coveralls>=4.0.1; extra == "dev"
 Requires-Dist: psycopg>=3.1.16; extra == "dev"
 Requires-Dist: mysql-connector-python>=8.4.0; extra == "dev"
@@ -44,6 +45,7 @@ Requires-Dist: mysqlclient>=2.2.0; extra == "dev"
 Requires-Dist: sphinx_rtd_theme>=2.0.0; extra == "dev"
 Requires-Dist: Cython>=3.0.8; extra == "dev"
 Requires-Dist: win-unicode-console; platform_system == "Windows" and extra == "dev"
+Dynamic: license-file
 
 Python Bitcoin Library
 ======================
@@ -58,8 +60,10 @@ With BitcoinLib you can:
  - Create, analyse and run Bitcoin scripts
  - Generate Bitcoin addresses and represent them in different address formats like P2PKH, P2SH, Bech32, etc
  - Create private keys and work with Mnemonic password phrases
- - Uses external Service providers to fetch address, transaction, utxo and blockchain data. Or connect to you local `Bitcoin core <https://bitcoinlib.readthedocs.io/en/latest/source/_static/manuals.setup-bitcoind-connection.html>`_, `Bcoin <https://bitcoinlib.readthedocs.io/en/latest/source/_static/manuals.setup-bcoin.html>`_ or `Blockbook <https://bitcoinlib.readthedocs.io/en/latest/source/_static/manuals.setup-blockbook.html>`_ node.
- - Can be extended to support other cryptocurrencies by configuring custom parameters. At the moment Litecoin and Dogecoin are also supported.
+ - Use external Service providers to fetch address, transaction, utxo and blockchain data.
+ - Connect to you local `Bitcoin core <https://bitcoinlib.readthedocs.io/en/latest/source/_static/manuals.setup-bitcoind-connection.html>`_, `Bcoin <https://bitcoinlib.readthedocs.io/en/latest/source/_static/manuals.setup-bcoin.html>`_, `Blockbook <https://bitcoinlib.readthedocs.io/en/latest/source/_static/manuals.setup-blockbook.html>`_ or  `ElectrumX <https://bitcoinlib.readthedocs.io/en/latest/source/_static/manuals.setup-electrumx.html>`_ node.
+ - Can be extended to support other cryptocurrencies by configuring custom parameters.
+ - At the moment Litecoin, Dogecoin and various test networks are supported out-of-the-box.
 
 
 .. image:: https://github.com/1200wd/bitcoinlib/actions/workflows/unittests.yaml/badge.svg

{bitcoinlib-0.7.2 → bitcoinlib-0.7.4}/bitcoinlib.egg-info/requires.txt

@@ -12,10 +12,9 @@ ecdsa>=0.18
 numpy==1.24.4
 
 [:python_version >= "3.9"]
-numpy>=1.22.0
+numpy<2,>=1.24.4
 
 [dev]
-sphinx>=7.1.0
 coveralls>=4.0.1
 psycopg>=3.1.16
 mysql-connector-python>=8.4.0
@@ -28,3 +27,9 @@ scrypt>=0.8.20
 
 [dev:platform_system == "Windows"]
 win-unicode-console
+
+[dev:python_version < "3.9"]
+sphinx>=7.1.0
+
+[dev:python_version >= "3.9"]
+sphinx>=7.2.0

{bitcoinlib-0.7.2 → bitcoinlib-0.7.4}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = bitcoinlib
-version = 0.7.2
+version = 0.7.4
 url = http://github.com/1200wd/bitcoinlib
 author = 1200wd
 author_email = info@1200wd.com
@@ -40,12 +40,13 @@ install_requires =
 	pycryptodome >= 3.19.0
 	SQLAlchemy >= 2.0.20
 	numpy == 1.24.4;python_version<"3.9"
-	numpy >= 1.22.0;python_version>="3.9"
+	numpy >= 1.24.4, <2;python_version>="3.9"
 
 [options.extras_require]
 dev = 
 	scrypt >= 0.8.20;platform_system!="Windows"
-	sphinx >= 7.1.0
+	sphinx >= 7.1.0;python_version<"3.9"
+	sphinx >= 7.2.0;python_version>="3.9"
 	coveralls >= 4.0.1
 	psycopg >= 3.1.16
 	mysql-connector-python >= 8.4.0

{bitcoinlib-0.7.2 → bitcoinlib-0.7.4}/tests/test_db.py

@@ -89,7 +89,7 @@ class TestDb(unittest.TestCase):
         if os.getenv('UNITTEST_DATABASE') == 'mysql':
             self.skipTest('MySQL does not allow indexing on LargeBinary fields, so caching is not possible')
         dbtmp = DbCache(self.database_cache_uri)
-        srv = Service(cache_uri=self.database_cache_uri, exclude_providers=['bitaps', 'bitgo'])
+        srv = Service(cache_uri=self.database_cache_uri, exclude_providers=['bitgo'])
         t = srv.gettransaction('68104dbd6819375e7bdf96562f89290b41598df7b002089ecdd3c8d999025b13')
         if t:
             self.assertGreaterEqual(srv.results_cache_n, 0)

{bitcoinlib-0.7.2 → bitcoinlib-0.7.4}/tests/test_keys.py

@@ -609,7 +609,7 @@ class TestHDKeys(unittest.TestCase):
             k = HDKey(network=network)
             for witness_type in ['legacy', 'p2sh-segwit', 'segwit']:
                 for multisig in [False, True]:
-                    if (network[:4] == 'doge') and witness_type != 'legacy':
+                    if (network[:4] == 'doge' or network[:4] == 'dash') and witness_type != 'legacy':
                         break
                     kwif = k.wif_private(witness_type=witness_type, multisig=multisig)
                     hdkey = wif_prefix_search(kwif, witness_type=witness_type, multisig=multisig, network=network)

{bitcoinlib-0.7.2 → bitcoinlib-0.7.4}/tests/test_networks.py

@@ -2,7 +2,7 @@
 #
 #    BitcoinLib - Python Cryptocurrency Library
 #    Unit Tests for Bitcoinlib Network Class
-#    © 2018 - 2020 November - 1200 Web Development <http://1200wd.com/>
+#    © 2018 - 2025 May - 1200 Web Development <http://1200wd.com/>
 #
 
 import unittest

{bitcoinlib-0.7.2 → bitcoinlib-0.7.4}/tests/test_services.py

@@ -310,7 +310,7 @@ class TestService(unittest.TestCase, CustomAssertions):
         self.assertEqual(res[0].txid, '8b8a8f1de23f70b2bdaa74488d97dc64728c2d99d2d486945c71e258fdef6ca1')
 
     def test_service_gettransactions_after_txid_segwit(self):
-        res = ServiceTest(timeout=TIMEOUT_TEST, exclude_providers=['blockcypher']).\
+        res = ServiceTest(timeout=TIMEOUT_TEST).\
             gettransactions('bc1qj9hlju59t0m4389033r2x8mlxwc86qgqm9flm626sd22cdhfs9jsyrrp6q',
                             after_txid='bd430d52f35166a7dd6251c73a48559ad8b5f41b6c5bc4a6c4c1a3e3702f4287')
         self.assertEqual(res[0].txid, 'cab75da6d7fe1531c881d4efdb4826410a2604aa9e6442ab12a08363f34fb408')
@@ -626,13 +626,13 @@ class TestService(unittest.TestCase, CustomAssertions):
         self.assertIn(txid, [utxo['txid'] for utxo in utxos])
 
     def test_service_blockcount(self):
-        for nw in ['bitcoin', 'litecoin', 'testnet']:  # ToDo: add testnet4 when more providers are available
-            srv = ServiceTest(min_providers=3, cache_uri='', network=nw, exclude_providers=['bitgo', 'bitaps'])
+        for nw in ['bitcoin']:
+            srv = ServiceTest(min_providers=3, cache_uri='', network=nw)
             srv.blockcount()
             n_blocks = None
             delta = 200
-            if nw == 'testnet':
-                delta = 2500
+            if nw == 'testnet':  # Testnet 3 has frequent blockstorms causing delay in processing for various providers
+                delta = 25000
             for provider in srv.results:
                 if n_blocks is not None:
                     self.assertAlmostEqual(srv.results[provider], n_blocks, delta=delta,
@@ -785,11 +785,14 @@ class TestService(unittest.TestCase, CustomAssertions):
         fields = [k for k, _ in res.items()]
         self.assertListEqual(sorted(fields), ['blockcount', 'chain', 'difficulty', 'hashrate', 'mempool_size'])
 
-    def test_service_getinfo_litecoin(self):
-        srv = ServiceTest(network='litecoin')
-        res = srv.getinfo()
-        fields = [k for k, _ in res.items()]
-        self.assertListEqual(sorted(fields), ['blockcount', 'chain', 'difficulty', 'hashrate', 'mempool_size'])
+    # Temporary disable unittest - all service provider have issues
+    # def test_service_getinfo_litecoin(self):
+    #     srv = ServiceTest(network='litecoin')
+    #     res = srv.getinfo()
+    #     if not res:
+    #         print(srv.errors)
+    #     fields = [k for k, _ in res.items()]
+    #     self.assertListEqual(sorted(fields), ['blockcount', 'chain', 'difficulty', 'hashrate', 'mempool_size'])
 
     def test_service_getinputvalues(self):
         rawtx = '02000000000101cb5f7b25dbf8106c6df0083d97e36690ba95c6477bdae2b9fa487115f259b3b60000000000ffffffff' \
@@ -861,11 +864,14 @@ class TestServiceCache(unittest.TestCase):
             if os.path.isfile(DATABASE_CACHE_UNITTESTS):
                 try:
                     os.remove(DATABASE_CACHE_UNITTESTS)
+                except:
+                    pass
+            if os.path.isfile(DATABASE_CACHE_UNITTESTS2):
+                try:
                     os.remove(DATABASE_CACHE_UNITTESTS2)
                 except:
                     pass
 
-
     def test_service_cache_transactions(self):
         srv = ServiceTest(cache_uri=DATABASE_CACHE_UNITTESTS2)
         address = '1JQ7ybfFBoWhPJpjoihezpeAjd2xv9nXaN'
@@ -889,30 +895,29 @@ class TestServiceCache(unittest.TestCase):
         ca = srv.getcacheaddressinfo(address)
         self.assertEqual(ca['address'], address)
 
-    # FIXME: Disabled, lack of providers
-    # def test_service_cache_gettransaction(self):
-    #     srv = ServiceTest(network='litecoin_testnet', cache_uri=DATABASE_CACHE_UNITTESTS2)
-    #     txid = 'b6533d361daac291f64fff32a5c157a4785b423ce36e2eac27117879f93973da'
-    #
-    #     t = srv.gettransaction(txid)
-    #     self.assertEqual(srv.results_cache_n, 0)
-    #     self.assertEqual(t.fee, 6680)
-    #
-    #     t = srv.gettransaction(txid)
-    #     self.assertEqual(srv.results_cache_n, 1)
-    #     self.assertEqual(t.fee, 6680)
-    #
-    #     rawtx = srv.getrawtransaction(txid)
-    #     self.assertEqual(srv.results_cache_n, 1)
-    #     self.assertEqual(rawtx, '0100000001ce18990b7a14afaf00eef179852daf07a7eb0eaaf90ae92393220fcd6fd899a101000000'
-    #                             'db00483045022100bdcd0f4713b35872154c94e65fe65946abf60ef9b6b307479981dbec546b22ce02'
-    #                             '20156d537a93b174392e23360c4336785362de1028c9400ef298252c9006cdb01501483045022100b5'
-    #                             'f876fdd2a6200bed1f15b9eba213e24fb3b9707b07ba8f24ef06bf8e774018022002165eeb777463a6'
-    #                             'e1bceb0d2c29c2ad3aa46b639b744520020e1a028c66bc3c0147522102a6126cabab675799a7f8022d'
-    #                             'c756b40fd5226c8ebe3c279e4f5aebc034b6d48d21039b904498e7702692b72b265dfb0221994bb850'
-    #                             '5ee50837aba768083b3a25aba952aeffffffff0240787d010000000017a914d9f17035fdd2180e4e67'
-    #                             'de2c17d63c218948780a875022d64ead01000017a91494d0071ed66b6584650440fdc6dfc2916a119b'
-    #                             '068700000000')
+    def test_service_cache_gettransaction(self):
+        srv = ServiceTest(network='litecoin_testnet', cache_uri=DATABASE_CACHE_UNITTESTS2)
+        txid = 'b6533d361daac291f64fff32a5c157a4785b423ce36e2eac27117879f93973da'
+
+        t = srv.gettransaction(txid)
+        self.assertEqual(srv.results_cache_n, 0)
+        self.assertEqual(t.fee, 6680)
+
+        t = srv.gettransaction(txid)
+        self.assertEqual(srv.results_cache_n, 1)
+        self.assertEqual(t.fee, 6680)
+
+        rawtx = srv.getrawtransaction(txid)
+        self.assertEqual(srv.results_cache_n, 1)
+        self.assertEqual(rawtx, '0100000001ce18990b7a14afaf00eef179852daf07a7eb0eaaf90ae92393220fcd6fd899a101000000'
+                                'db00483045022100bdcd0f4713b35872154c94e65fe65946abf60ef9b6b307479981dbec546b22ce02'
+                                '20156d537a93b174392e23360c4336785362de1028c9400ef298252c9006cdb01501483045022100b5'
+                                'f876fdd2a6200bed1f15b9eba213e24fb3b9707b07ba8f24ef06bf8e774018022002165eeb777463a6'
+                                'e1bceb0d2c29c2ad3aa46b639b744520020e1a028c66bc3c0147522102a6126cabab675799a7f8022d'
+                                'c756b40fd5226c8ebe3c279e4f5aebc034b6d48d21039b904498e7702692b72b265dfb0221994bb850'
+                                '5ee50837aba768083b3a25aba952aeffffffff0240787d010000000017a914d9f17035fdd2180e4e67'
+                                'de2c17d63c218948780a875022d64ead01000017a91494d0071ed66b6584650440fdc6dfc2916a119b'
+                                '068700000000')
 
     def test_service_cache_transactions_after_txid(self):
         # Do not store anything in cache if after_txid is used
@@ -936,7 +941,7 @@ class TestServiceCache(unittest.TestCase):
         self.assertGreaterEqual(srv.results_cache_n, 1)
 
     def test_service_cache_transaction_coinbase(self):
-        srv = ServiceTest(cache_uri=DATABASE_CACHE_UNITTESTS2, exclude_providers=['bitaps', 'bitgo'])
+        srv = ServiceTest(cache_uri=DATABASE_CACHE_UNITTESTS2)
         t = srv.gettransaction('68104dbd6819375e7bdf96562f89290b41598df7b002089ecdd3c8d999025b13')
         if t:
             self.assertGreaterEqual(srv.results_cache_n, 0)

{bitcoinlib-0.7.2 → bitcoinlib-0.7.4}/tests/test_wallets.py

@@ -2393,8 +2393,8 @@ class TestWalletTransactions(unittest.TestCase, CustomAssertions):
         w.utxo_add(w.get_key().address, 1234567, os.urandom(32).hex(), 1)
         t = w.send_to('tb1qrjtz22q59e76mhumy0p586cqukatw5vcd0xvvz', 123456)
         block_height = Service(network='testnet', cache_uri='').blockcount()
-        # FIXME: remove delta when testnet network is stable again
-        self.assertAlmostEqual(t.locktime, block_height+1, delta=500)
+        # TODO: Replace with testnet4 / bitcoin test to avoid issues with testnet3 blockstorms
+        self.assertAlmostEqual(t.locktime, block_height+1, delta=25000)
 
         w2 = wallet_create_or_open('antifeesnipingtestwallet2', network='testnet', anti_fee_sniping=True,
                                    db_uri=self.database_uri)

bitcoinlib-0.7.2/bitcoinlib/config/VERSION

@@ -1 +0,0 @@
-0.7.2