bitcoinlib 0.7.2__tar.gz → 0.7.3__tar.gz

{bitcoinlib-0.7.2 → bitcoinlib-0.7.3}/CHANGELOG

@@ -1,3 +1,14 @@
+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.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: bitcoinlib
-Version: 0.7.2
+Version: 0.7.3
 Summary: Bitcoin cryptocurrency Library
 Home-page: http://github.com/1200wd/bitcoinlib
 Author: 1200wd
@@ -44,6 +44,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
 ======================

bitcoinlib-0.7.3/bitcoinlib/config/VERSION

@@ -0,0 +1 @@
+0.7.3

{bitcoinlib-0.7.2 → bitcoinlib-0.7.3}/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.3}/bitcoinlib/data/providers.json

@@ -393,5 +393,16 @@
     "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
   }
 }

{bitcoinlib-0.7.2 → bitcoinlib-0.7.3}/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.3}/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.3}/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.3}/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 = {}

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

@@ -1006,8 +1006,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.3}/bitcoinlib/wallets.py

@@ -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',

{bitcoinlib-0.7.2 → bitcoinlib-0.7.3/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.3
 Summary: Bitcoin cryptocurrency Library
 Home-page: http://github.com/1200wd/bitcoinlib
 Author: 1200wd
@@ -44,6 +44,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
 ======================

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

@@ -1,6 +1,6 @@
 [metadata]
 name = bitcoinlib
-version = 0.7.2
+version = 0.7.3
 url = http://github.com/1200wd/bitcoinlib
 author = 1200wd
 author_email = info@1200wd.com

{bitcoinlib-0.7.2 → bitcoinlib-0.7.3}/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.3}/tests/test_services.py

@@ -627,12 +627,12 @@ class TestService(unittest.TestCase, CustomAssertions):
 
     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'])
+            srv = ServiceTest(min_providers=3, cache_uri='', network=nw, exclude_providers=['bitgo'])
             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,
@@ -936,7 +936,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, exclude_providers=['bitgo'])
         t = srv.gettransaction('68104dbd6819375e7bdf96562f89290b41598df7b002089ecdd3c8d999025b13')
         if t:
             self.assertGreaterEqual(srv.results_cache_n, 0)

{bitcoinlib-0.7.2 → bitcoinlib-0.7.3}/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