fix(ecosystem): fix pyright and pytest errors

Author: simonjonsson87

src/flare_ai_kit/agent/ecosystem_tools_wrapper.py

@@ -207,7 +207,7 @@ async def post_to_x(content: str) -> bool:
     from flare_ai_kit.social.settings import SocialSettings
     from flare_ai_kit.social.x import XClient
 
-    settings = SocialSettings()  # type: ignore[call-arg]
+    settings = SocialSettings()
     x_client = XClient(settings)
     if not x_client.is_configured:
         raise ValueError(
@@ -239,7 +239,7 @@ async def send_telegram_message(chat_id: str, message: str) -> bool:
     from flare_ai_kit.social.settings import SocialSettings
     from flare_ai_kit.social.telegram import TelegramClient
 
-    settings = SocialSettings()  # type: ignore[call-arg]
+    settings = SocialSettings()
     telegram_client = TelegramClient(settings)
     if not telegram_client.is_configured:
         raise ValueError(

src/flare_ai_kit/ecosystem/applications/cyclo.py

@@ -95,6 +95,8 @@ async def lock(self, token: str, amount_WEI: int) -> tuple[str, int]:
             ValueError: If the transaction fails with a ZeroSharesAmount error or no Deposit event is found.
 
         """
+        if self.flare_provider.address is None:
+            raise ValueError("Wallet address cannot be None.")
         # ======== Get addresses from token string ==============
         token_address, cyclo_address = self.get_addresses(token)
 
@@ -201,6 +203,8 @@ async def unlock(
             Exception: If the token is unsupported or transaction building fails.
 
         """
+        if self.flare_provider.address is None:
+            raise ValueError("Wallet address cannot be None.")
         # ============= Map token string to addresses ================
         _token_address, cyclo_address = self.get_addresses(token)
 

src/flare_ai_kit/ecosystem/applications/flare_portal.py

@@ -117,6 +117,9 @@ async def wrap_flr_to_wflr(self, amount_WEI: int):
             Exception: If transaction building or execution fails.
 
         """
+        if self.flare_provider.address is None:
+            raise ValueError("Wallet address cannot be None.")
+
         wrap_fn = self.wflr_contract.functions.deposit()
         wrap_tx = await self.flare_provider.build_transaction(
             function_call=wrap_fn,
@@ -164,6 +167,9 @@ async def unwrap_wflr_to_flr(self, amount_WEI: int):
             Exception: If transaction building or execution fails.
 
         """
+        if self.flare_provider.address is None:
+            raise ValueError("Wallet address cannot be None.")
+
         unwrap_fn = self.wflr_contract.functions.withdraw(amount_WEI)
         unwrap_tx = await self.flare_provider.build_transaction(
             function_call=unwrap_fn, from_addr=self.flare_provider.address

src/flare_ai_kit/ecosystem/applications/kinetic.py

@@ -116,6 +116,9 @@ async def supply(self, token: str, amount_WEI: int) -> str:
             Exception: If the token is unsupported or transaction building fails.
 
         """
+        if self.flare_provider.address is None:
+            raise ValueError("Wallet address cannot be None.")
+
         # ======== Get addresses from token string ==============
         token_address, lending_address = self.get_addresses(token)
 
@@ -189,6 +192,9 @@ async def withdraw(self, token: str, amount_WEI: int) -> str:
             Exception: If the token is unsupported or transaction building fails.
 
         """
+        if self.flare_provider.address is None:
+            raise ValueError("Wallet address cannot be None.")
+
         # ============= Map token string to addresses ================
         _token_address, lending_address = self.get_addresses(token)
 
@@ -248,6 +254,8 @@ async def enable_collateral(self, token: str) -> str:
             Exception: If the token is unsupported or transaction building fails.
 
         """
+        if self.flare_provider.address is None:
+            raise ValueError("Wallet address cannot be None.")
         # ============= Map token string to addresses ================
         _token_address, lending_address = self.get_addresses(token)
 
@@ -304,6 +312,9 @@ async def disable_collateral(self, token: str) -> str:
             Exception: If the token is unsupported or transaction building fails.
 
         """
+        if self.flare_provider.address is None:
+            raise ValueError("Wallet address cannot be None.")
+
         # ============= Map token string to addresses ================
         _token_address, lending_address = self.get_addresses(token)
 

src/flare_ai_kit/ecosystem/applications/openocean.py

@@ -141,6 +141,9 @@ async def swap(
             >>> print(f"Swap completed: {hash}")
 
         """
+        if self.provider.address is None:
+            raise ValueError("Wallet address cannot be None.")
+
         amount_WEI = self.provider.w3.to_wei(amount, unit="ether")
 
         # Get token info

src/flare_ai_kit/ecosystem/applications/sceptre.py

@@ -82,6 +82,9 @@ async def stake(self, amount_WEI: int) -> str:
             Exception: If the transaction building or execution fails.
 
         """
+        if self.flare_provider.address is None:
+            raise ValueError("Wallet address cannot be None.")
+
         stake_abi = [
             {
                 "inputs": [],
@@ -146,6 +149,9 @@ async def unstake(self, amount_WEI: int) -> str:
             Exception: If the transaction building or execution fails.
 
         """
+        if self.flare_provider.address is None:
+            raise ValueError("Wallet address cannot be None.")
+
         unstake_abi = [
             {
                 "inputs": [

src/flare_ai_kit/ecosystem/applications/sparkdex.py

@@ -104,6 +104,9 @@ async def swap_erc20_tokens(
             Exception: If the token addresses are invalid or transaction building fails.
 
         """
+        if self.flare_provider.address is None:
+            raise ValueError("Wallet address cannot be None.")
+
         # =========== Approve SparkDEX to spend token_in  ==============
         allowance = await self.flare_provider.erc20_allowance(
             owner_address=self.flare_provider.address,

src/flare_ai_kit/ecosystem/applications/stargate.py

@@ -135,6 +135,9 @@ async def bridge_weth_to_chain(
             Exception: If transaction building or execution fails.
 
         """
+        if self.flare_provider.address is None:
+            raise ValueError("Wallet address cannot be None.")
+
         #
         # === Define parameter for the quoteOFT in the contract ===
         #

src/flare_ai_kit/ecosystem/flare.py

@@ -21,10 +21,16 @@
     Web3Exception,
 )
 
+# from web3.middleware import ExtraDataToPOAMiddleware as _RawExtraDataToPOAMiddleware
+from web3.middleware import ExtraDataToPOAMiddleware, Web3Middleware
+
+# Annotate as a middleware class to keep pyright happy:
+poa: type[Web3Middleware] = ExtraDataToPOAMiddleware
+
 # pyright: reportUnknownVariableType=false
-from web3.middleware import (
-    ExtraDataToPOAMiddleware,
-)
+# from web3.middleware import (
+#    ExtraDataToPOAMiddleware,
+# )
 from web3.types import Nonce, TxParams, TxReceipt, Wei
 
 from flare_ai_kit.common import FlareTxError, FlareTxRevertedError, load_abi
@@ -98,24 +104,10 @@ def __init__(self, settings: EcosystemSettings) -> None:
             FlareConnectionError: If the Web3 provider cannot be initialized.
 
         """
-        if not settings.account_address:
-            raise ValueError("account_address must be set and non-empty")
         self.address = settings.account_address
-
-        if not settings.account_private_key:
-            raise ValueError("account_private_key must be set and non-empty")
         self.private_key = settings.account_private_key
-
-        if not settings.web3_provider_url:
-            raise ValueError("web3_provider_url must be set and non-empty")
         self.web3_provider_url = str(settings.web3_provider_url)
-
-        if not settings.max_retries:
-            raise ValueError("max_retries must be set and non-empty")
         self.max_retries = settings.max_retries
-
-        if not settings.retry_delay:
-            raise ValueError("retry_delay must be set and non-empty")
         self.retry_delay = settings.retry_delay
 
         try:
@@ -128,8 +120,9 @@ def __init__(self, settings: EcosystemSettings) -> None:
                 middleware=[ExtraDataToPOAMiddleware] if settings.is_testnet else [],
             )
             # Inject geth_poa_middleware to handle Flare's oversized extraData
-# pyright: reportUnknownArgumentType=false
-            self.w3.middleware_onion.inject(ExtraDataToPOAMiddleware, layer=0)
+            # self.w3.middleware_onion.inject(ExtraDataToPOAMiddleware(), layer=0)
+            self.w3.middleware_onion.inject(poa, layer=0)
+
             self.contract_registry = self.w3.eth.contract(
                 address=self.w3.to_checksum_address(CONTRACT_REGISTRY_ADDRESS),
                 abi=load_abi("FlareContractRegistry"),
@@ -225,7 +218,7 @@ async def prepare_base_tx_params(self, from_addr: ChecksumAddress) -> TxParams:
                 "maxFeePerGas": Wei(max_fee_per_gas),
                 "maxPriorityFeePerGas": max_priority_fee_per_gas,
                 "chainId": chain_id,
-                "type": 2, 
+                "type": 2,
             }
             logger.debug("Prepared base transaction parameters", params=params)
         except Web3Exception as e:
@@ -359,28 +352,6 @@ async def check_balance(self, address: str) -> float:
         )
         return balance_float
 
-    @with_web3_error_handling("Estimating transaction gas limit")
-    async def estimate_gas(self, tx: TxParams, gas_buffer: float = 0.2) -> int | None:
-        try:
-            gas_estimate = await self.w3.eth.estimate_gas(tx)
-            gas_limit = int(gas_estimate * (1 + gas_buffer))
-            return gas_limit
-        except Exception as e:
-            logger.warning(f"Gas estimation failed: {e}")
-            return None
-
-    @with_web3_error_handling("Estimating gas price")
-    async def estimate_gas_price(self, gas_priority_multiple: float = 1) -> int:
-        fee_history = await self.w3.eth.fee_history(
-            10, "latest", reward_percentiles=[50]
-        )  # Median reward for last 10 blocks
-        base_fee = fee_history["baseFeePerGas"][-1]  # Most recent base fee
-        priority_fee = (
-            int(statistics.median(fee_history["reward"][0])) * gas_priority_multiple
-        )  # Median priority fee
-        gas_price = base_fee + priority_fee  # EIP-1559 compatible gas price
-        return int(gas_price)
-
     @with_web3_error_handling("Creating FLR transfer transaction")
     async def create_send_flr_tx(
         self, from_address: str, to_address: str, amount: float

src/flare_ai_kit/ecosystem/settings.py

@@ -178,15 +178,15 @@ class EcosystemSettings(BaseSettings):
         description="Account private key to use when interacting onchain.",
     )
     openocean_token_list: str = Field(
-        "https://open-api.openocean.finance/v4/flare/tokenList",
+        default="https://open-api.openocean.finance/v4/flare/tokenList",
         description="OpenOcean token list URL",
     )
     openocean_gas_price: str = Field(
-        "https://open-api.openocean.finance/v4/bsc/gasPrice",
+        default="https://open-api.openocean.finance/v4/bsc/gasPrice",
         description="OpenOcean gas price URL",
     )
     openocean_swap: str = Field(
-        "https://open-api.openocean.finance/v4/flare/swap",
+        default="https://open-api.openocean.finance/v4/flare/swap",
         description="OpenOcean swap URL",
     )
     contracts: Contracts = Field(