Merge master into develop-port, keeping develop-port versions

Author: F1r3Hydr4nt

CHANGELOG.md

@@ -7,6 +7,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## Table of Contents
 
 - [Unreleased](#unreleased)
+- [1.0.11 - 2025-11-23](#1011---2025-11-23)
 - [1.0.10 - 2025-10-30](#1010---2025-10-30)
 - [1.0.9 - 2025-09-30](#109---2025-09-30)
 - [1.0.8 - 2025-08-13](#108---2025-08-13)
@@ -45,6 +46,27 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ### Security
 - (Notify of any improvements related to security vulnerabilities or potential risks.)
 
+---
+## [1.0.11] - 2025-11-23
+
+### Changed
+- Converted `LivePolicy` fee model from asynchronous to synchronous implementation
+- Replaced `default_http_client()` (async) with `default_sync_http_client()` (sync) in `LivePolicy`
+- **`Transaction.fee()` can now be called from both synchronous and asynchronous functions without any special handling**
+- Removed unused `asyncio` and `inspect` imports from `transaction.py`
+- Simplified `Transaction.fee()` implementation by removing async helper methods
+
+### Fixed
+- Updated all `LivePolicy` tests to use synchronous mocks instead of `AsyncMock`
+- Fixed `test_transaction_fee_with_default_rate` to use explicit fee model for deterministic testing
+- Removed `asyncio.run()` calls from `LivePolicy` test suite
+
+### Notes
+- This change is transparent to users - `tx.fee()` works seamlessly in both sync and async contexts without any API changes
+- You can call `tx.fee()` inside `async def` functions or regular `def` functions - it works the same way
+- All existing code and documentation remain compatible with no modifications required
+
+---
 ## [1.0.10] - 2025-10-30
 
 ### Changed

bsv/constants.py

@@ -7,7 +7,7 @@
 TRANSACTION_SEQUENCE: int = int(os.getenv('BSV_PY_SDK_TRANSACTION_SEQUENCE') or 0xffffffff)
 TRANSACTION_VERSION: int = int(os.getenv('BSV_PY_SDK_TRANSACTION_VERSION') or 1)
 TRANSACTION_LOCKTIME: int = int(os.getenv('BSV_PY_SDK_TRANSACTION_LOCKTIME') or 0)
-TRANSACTION_FEE_RATE: int = int(os.getenv('BSV_PY_SDK_TRANSACTION_FEE_RATE') or 10)  # satoshi per kilobyte
+TRANSACTION_FEE_RATE: int = int(os.getenv('BSV_PY_SDK_TRANSACTION_FEE_RATE') or 100)  # satoshi per kilobyte
 BIP32_DERIVATION_PATH = os.getenv('BSV_PY_SDK_BIP32_DERIVATION_PATH') or "m/"
 BIP39_ENTROPY_BIT_LENGTH: int = int(os.getenv('BSV_PY_SDK_BIP39_ENTROPY_BIT_LENGTH') or 128)
 BIP44_DERIVATION_PATH = os.getenv('BSV_PY_SDK_BIP44_DERIVATION_PATH') or "m/44'/236'/0'"

bsv/transaction.py

@@ -1,5 +1,3 @@
-import asyncio
-import inspect
 import math
 from contextlib import suppress
 from typing import List, Optional, Union, Dict, Any
@@ -175,29 +173,10 @@ def estimated_byte_length(self) -> int:
 
     estimated_size = estimated_byte_length
 
-    # Private helper method for handling asynchronous fee resolution and application
-    async def _resolve_and_apply_fee(self, fee_estimate, change_distribution):
-        """
-        A helper method to resolve and apply the transaction fee asynchronously.
-
-        :param fee_estimate: An awaitable object that resolves to the estimated fee
-        :param change_distribution: The method of distributing change ('equal' or 'random')
-        :return: The resolved fee value (int) or None in case of an error
-        """
-        try:
-            # Resolve the fee asynchronously
-            resolved_fee = await fee_estimate
-            # Apply the resolved fee to the transaction
-            self._apply_fee_amount(resolved_fee, change_distribution)
-            return resolved_fee
-        except Exception as e:
-            # Handle any errors and return None on failure
-            return None
-
     def fee(self, model_or_fee=None, change_distribution='equal'):
         """
         Computes the transaction fee and adjusts the change outputs accordingly.
-        This method can be called synchronously, even if it internally uses asynchronous operations.
+        This method can be called synchronously or from async contexts.
 
         :param model_or_fee: A fee model or a fee amount. If not provided, it defaults to an instance
             of `LivePolicy` that fetches the latest mining fees.
@@ -214,15 +193,10 @@ def fee(self, model_or_fee=None, change_distribution='equal'):
             self._apply_fee_amount(model_or_fee, change_distribution)
             return model_or_fee
 
-        # If the fee estimation requires asynchronous computation
+        # Compute the fee using the fee model
         fee_estimate = model_or_fee.compute_fee(self)
-
-        if inspect.isawaitable(fee_estimate):
-            # Execute the asynchronous task synchronously and get the result
-            resolved_fee = asyncio.run(self._resolve_and_apply_fee(fee_estimate, change_distribution))
-            return resolved_fee
-
-        # Apply the fee directly if it is computed synchronously
+        
+        # Apply the fee directly
         self._apply_fee_amount(fee_estimate, change_distribution)
         return fee_estimate