Merge pull request #505 from 1200wd/release-7.9

Release 7.9

Author: mccwdev

bitcoinlib/services/bcoin.py

@@ -149,16 +149,17 @@ def gettransactions(self, address, after_txid='', limit=MAX_TRANSACTIONS):
     def getrawtransaction(self, txid):
         return self.compose_request('tx', txid)['hex']
 
-    def sendrawtransaction(self, rawtx):
-        res = self.compose_request('broadcast', variables={'tx': rawtx}, method='post')
-        txid = ''
-        if 'success' in res and res['success']:
-            t = Transaction.parse_hex(rawtx, network=self.network)
-            txid = t.txid
-        return {
-            'txid': txid,
-            'response_dict': res
-        }
+    # Gives a false success response for invalid transactions!
+    # def sendrawtransaction(self, rawtx):
+    #     res = self.compose_request('broadcast', variables={'tx': rawtx}, method='post')
+    #     txid = ''
+    #     if 'success' in res and res['success']:
+    #         t = Transaction.parse_hex(rawtx, network=self.network)
+    #         txid = t.txid
+    #     return {
+    #         'txid': txid,
+    #         'response_dict': res
+    #     }
 
     def estimatefee(self, blocks):
         if blocks > 15:

bitcoinlib/services/electrumx.py

@@ -68,8 +68,7 @@ async def main(host, port, method, parameters):
                     await session.send_request('server.version', ["Bitcoinlib", ELECTRUMX_PROTOCOL_VERSION])
                     return await session.send_request(method, parameters)
 
-            loop = asyncio.get_event_loop()
-            return loop.run_until_complete(main(host, port, method, parameters))
+            return asyncio.run(main(host, port, method, parameters))
         else:
             content = {
                 "method": method,

bitcoinlib/services/services.py

@@ -383,14 +383,12 @@ def gettransactions(self, address, after_txid='', limit=MAX_TRANSACTIONS):
                 qry_after_txid = bytes.fromhex(txs_cache[-1:][0].txid)
 
         # Get (extra) transactions from service providers
-        txs = []
-        if not (db_addr and db_addr.last_block and db_addr.last_block >= self.blockcount()) or not caching_enabled:
-            txs = self._provider_execute('gettransactions', address, qry_after_txid.hex(),  limit)
-            if txs is False:
-                raise ServiceError("Error when retrieving transactions from service provider")
-            for tx in txs:
-                if tx.date and not tx.date.tzinfo:
-                    tx.date = tx.date.replace(tzinfo=timezone.utc)
+        txs = self._provider_execute('gettransactions', address, qry_after_txid.hex(),  limit)
+        if txs is False:
+            raise ServiceError("Error when retrieving transactions from service provider")
+        for tx in txs:
+            if tx.date and not tx.date.tzinfo:
+                tx.date = tx.date.replace(tzinfo=timezone.utc)
 
         # Store transactions and address in cache
         # - disable cache if comparing providers or if after_txid is used and no cache is available

bitcoinlib/wallets.py

@@ -2057,7 +2057,7 @@ def scan(self, scan_gap_limit=5, account_id=None, change=None, rescan_used=False
         # Rescan used addresses
         if rescan_used:
             for key in self.keys_addresses(account_id=account_id, change=change, network=network, used=True):
-                self.scan_key(key.id)
+                self.scan_key(key.key_id)
 
         # Update already known transactions with known block height
         self.transactions_update_confirmations()
@@ -3449,12 +3449,17 @@ def utxo_last(self, address):
 
         :return str:
         """
-        to = self.session.query(
-            DbTransaction.txid, DbTransaction.confirmations). \
-            join(DbTransactionOutput).join(DbKey). \
-            filter(DbKey.address == address, DbTransaction.wallet_id == self.wallet_id,
-                   DbTransactionOutput.spent.is_(False)). \
-            order_by(DbTransaction.confirmations).first()
+        query = self.session.query(
+                DbTransaction.txid, DbTransaction.confirmations
+        ).join(DbTransactionOutput).join(DbKey).filter(
+            DbKey.address == address,
+            DbTransaction.wallet_id == self.wallet_id,
+            DbTransactionOutput.spent.is_(False)
+        )
+        if self.ignore_dust:
+            query = query.filter(DbTransactionOutput.value >= self.network.dust_amount)
+
+        to = query.order_by(DbTransaction.confirmations).first()
         return '' if not to else to[0].hex()
 
     def transactions_update_confirmations(self):
@@ -3766,7 +3771,7 @@ def transactions_export(self, account_id=None, network=None, include_new=False,
 
             # Loop through all transaction inputs and outputs
             for tei in te:
-                # Create string with  list of inputs addresses for incoming transactions, and outputs addresses
+                # Create string with a list of inputs addresses for incoming transactions, and outputs addresses
                 # for outgoing txs
                 addr_list_in = tei[3] if isinstance(tei[3], list) else [tei[3]]
                 addr_list_out = tei[4] if isinstance(tei[4], list) else [tei[4]]

tests/test_wallets.py

@@ -2902,7 +2902,7 @@ def test_wallet_readonly_create_and_import(self):
         self.assertGreaterEqual(w.balance(), 4532991)
         self.assertRaisesRegex(WalletError, "No unspent", w.send_to, '1ApcyGtcX4DUmfGqPBPY1bvKEh2irLqnhp', 50000)
         self.assertEqual(w.utxo_last('13A1W4jLPP75pzvn2qJ5KyyqG3qPSpb9jM'),
-                         '1b590ccbdeb5659772c69e8aee4bc7eeafec7573ddb1254b97a512f56162fd9c')
+                         '22965c151d850b5c7d98561e5432459141b1321a299cdcac1764f540eef56451')
 
     def test_wallet_address_import_public_key(self):
         wif = 'xpub661MyMwAqRbcFCwFkcko75u2VEinbG1u5U4nq8AFJq4AbLPEvwcmhZGgGcnDcEBpcfAFEP8vVhbJJvX1ieGWdoaa5AnHfyB' \