wayfinder-paths 0.1.8__py3-none-any.whl → 0.1.10__py3-none-any.whl

wayfinder_paths/core/config.py

@@ -4,7 +4,6 @@ Separates user-provided configuration from system configuration
 """
 
 import json
-import os
 from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Any
@@ -72,12 +71,8 @@ class SystemConfig:
     These are values managed by the Wayfinder system
     """
 
-    # API endpoints (populated from environment or defaults)
-    api_base_url: str = field(
-        default_factory=lambda: os.getenv(
-            "WAYFINDER_API_URL", "https://api.wayfinder.ai"
-        )
-    )
+    # API endpoints (populated from config.json or defaults)
+    api_base_url: str = field(default="https://api.wayfinder.ai")
 
     # Job configuration
     job_id: str | None = None
@@ -102,10 +97,7 @@ class SystemConfig:
     def from_dict(cls, data: dict[str, Any]) -> "SystemConfig":
         """Create SystemConfig from dictionary"""
         return cls(
-            api_base_url=data.get(
-                "api_base_url",
-                os.getenv("WAYFINDER_API_URL", "https://api.wayfinder.ai"),
-            ),
+            api_base_url=data.get("api_base_url", "https://api.wayfinder.ai"),
             job_id=data.get("job_id"),
             job_type=data.get("job_type", "strategy"),
             update_interval=data.get("update_interval", 60),
@@ -113,10 +105,8 @@ class SystemConfig:
             retry_delay=data.get("retry_delay", 5),
             log_path=data.get("log_path"),
             data_path=data.get("data_path"),
-            wallets_path=data.get(
-                "wallets_path", os.getenv("WALLETS_PATH", "wallets.json")
-            ),
-            wallet_id=data.get("wallet_id") or os.getenv("WALLET_ID"),
+            wallets_path=data.get("wallets_path", "wallets.json"),
+            wallet_id=data.get("wallet_id"),
         )
 
     def to_dict(self) -> dict[str, Any]:
@@ -386,36 +376,6 @@ class StrategyJobConfig:
         return config
 
 
-def load_config_from_env() -> StrategyJobConfig:
-    """
-    Load configuration from environment variables
-    This is the simplest way for users to provide configuration
-    """
-    user_config = UserConfig(
-        username=os.getenv("WAYFINDER_USERNAME"),
-        password=os.getenv("WAYFINDER_PASSWORD"),
-        refresh_token=os.getenv("WAYFINDER_REFRESH_TOKEN"),
-        main_wallet_address=os.getenv("MAIN_WALLET_ADDRESS"),
-        strategy_wallet_address=os.getenv("STRATEGY_WALLET_ADDRESS"),
-        default_slippage=float(os.getenv("DEFAULT_SLIPPAGE", "0.005")),
-        gas_multiplier=float(os.getenv("GAS_MULTIPLIER", "1.2")),
-    )
-
-    system_config = SystemConfig(
-        api_base_url=os.getenv("WAYFINDER_API_URL", "https://api.wayfinder.ai"),
-        job_id=os.getenv("JOB_ID"),
-        update_interval=int(os.getenv("UPDATE_INTERVAL", "60")),
-        max_retries=int(os.getenv("MAX_RETRIES", "3")),
-        retry_delay=int(os.getenv("RETRY_DELAY", "5")),
-        wallets_path=os.getenv("WALLETS_PATH", "wallets.json"),
-        wallet_id=os.getenv("WALLET_ID"),
-    )
-
-    # No auto-population - wallets must be explicitly set in environment or matched by label
-
-    return StrategyJobConfig(user=user_config, system=system_config)
-
-
 # --- Internal helpers -------------------------------------------------------
 
 

wayfinder_paths/core/constants/__init__.py

@@ -7,7 +7,6 @@ This package contains all constants used across the system, organized by categor
 
 from .base import (
     CHAIN_CODE_TO_ID,
-    DEFAULT_GAS_ESTIMATE_FALLBACK,
     DEFAULT_NATIVE_GAS_UNITS,
     DEFAULT_SLIPPAGE,
     GAS_BUFFER_MULTIPLIER,
@@ -19,7 +18,6 @@ __all__ = [
     "ZERO_ADDRESS",
     "CHAIN_CODE_TO_ID",
     "DEFAULT_NATIVE_GAS_UNITS",
-    "DEFAULT_GAS_ESTIMATE_FALLBACK",
     "GAS_BUFFER_MULTIPLIER",
     "ONE_GWEI",
     "DEFAULT_SLIPPAGE",

wayfinder_paths/core/constants/base.py

@@ -19,13 +19,17 @@ CHAIN_CODE_TO_ID = {
 
 # Gas/defaults
 DEFAULT_NATIVE_GAS_UNITS = 21000
-DEFAULT_GAS_ESTIMATE_FALLBACK = 100000
+# Fallback gas limit used only when RPC gas estimation fails for non-revert reasons.
+# Must be high enough for typical DeFi interactions (lending, swaps, etc.).
 GAS_BUFFER_MULTIPLIER = 1.1  # 10% buffer for native sends
 ONE_GWEI = 1_000_000_000
 DEFAULT_SLIPPAGE = 0.005
 
 # Timeout constants (seconds)
-DEFAULT_TRANSACTION_TIMEOUT = 120  # Transaction receipt wait timeout
+# Base L2 (and some RPC providers) can occasionally take >2 minutes to index/return receipts,
+# even if the transaction is eventually mined. A longer timeout reduces false negatives that
+# can lead to unsafe retry behavior (nonce gaps, duplicate swaps, etc.).
+DEFAULT_TRANSACTION_TIMEOUT = 300  # Transaction receipt wait timeout
 DEFAULT_HTTP_TIMEOUT = 30.0  # HTTP client timeout
 
 # Adapter type identifiers

wayfinder_paths/core/constants/moonwell_abi.py

@@ -0,0 +1,411 @@
+"""
+Moonwell ABI constants for smart contract interactions.
+
+This module contains ABI definitions for Moonwell protocol contracts,
+including mToken (ERC20 Delegator), Comptroller, and Reward Distributor contracts.
+"""
+
+# mToken (CErc20Delegator) ABI - for lending, borrowing, and position management
+MTOKEN_ABI = [
+    # Lend (supply) tokens by minting mTokens
+    {
+        "name": "mint",
+        "type": "function",
+        "stateMutability": "nonpayable",
+        "inputs": [{"name": "mintAmount", "type": "uint256"}],
+        "outputs": [{"name": "", "type": "uint256"}],
+    },
+    # Withdraw (redeem) underlying by burning mTokens
+    {
+        "name": "redeem",
+        "type": "function",
+        "stateMutability": "nonpayable",
+        "inputs": [{"name": "redeemTokens", "type": "uint256"}],
+        "outputs": [{"name": "", "type": "uint256"}],
+    },
+    # Withdraw exact underlying amount
+    {
+        "name": "redeemUnderlying",
+        "type": "function",
+        "stateMutability": "nonpayable",
+        "inputs": [{"name": "redeemAmount", "type": "uint256"}],
+        "outputs": [{"name": "", "type": "uint256"}],
+    },
+    # Borrow underlying tokens
+    {
+        "name": "borrow",
+        "type": "function",
+        "stateMutability": "nonpayable",
+        "inputs": [{"name": "borrowAmount", "type": "uint256"}],
+        "outputs": [{"name": "", "type": "uint256"}],
+    },
+    # Repay borrowed tokens
+    {
+        "name": "repayBorrow",
+        "type": "function",
+        "stateMutability": "nonpayable",
+        "inputs": [{"name": "repayAmount", "type": "uint256"}],
+        "outputs": [{"name": "", "type": "uint256"}],
+    },
+    # Get mToken balance
+    {
+        "name": "balanceOf",
+        "type": "function",
+        "stateMutability": "view",
+        "inputs": [{"name": "owner", "type": "address"}],
+        "outputs": [{"name": "", "type": "uint256"}],
+    },
+    # Get underlying balance (including accrued interest)
+    {
+        "name": "balanceOfUnderlying",
+        "type": "function",
+        "stateMutability": "nonpayable",
+        "inputs": [{"name": "owner", "type": "address"}],
+        "outputs": [{"name": "", "type": "uint256"}],
+    },
+    # Get current borrow balance (including interest)
+    {
+        "name": "borrowBalanceCurrent",
+        "type": "function",
+        "stateMutability": "nonpayable",
+        "inputs": [{"name": "account", "type": "address"}],
+        "outputs": [{"name": "", "type": "uint256"}],
+    },
+    # Get stored borrow balance (without accruing interest first)
+    {
+        "name": "borrowBalanceStored",
+        "type": "function",
+        "stateMutability": "view",
+        "inputs": [{"name": "account", "type": "address"}],
+        "outputs": [{"name": "", "type": "uint256"}],
+    },
+    # Get exchange rate between mToken and underlying
+    {
+        "name": "exchangeRateCurrent",
+        "type": "function",
+        "stateMutability": "nonpayable",
+        "inputs": [],
+        "outputs": [{"name": "", "type": "uint256"}],
+    },
+    # Get stored exchange rate
+    {
+        "name": "exchangeRateStored",
+        "type": "function",
+        "stateMutability": "view",
+        "inputs": [],
+        "outputs": [{"name": "", "type": "uint256"}],
+    },
+    # Get underlying token address
+    {
+        "name": "underlying",
+        "type": "function",
+        "stateMutability": "view",
+        "inputs": [],
+        "outputs": [{"name": "", "type": "address"}],
+    },
+    # Get supply rate per timestamp
+    {
+        "name": "supplyRatePerTimestamp",
+        "type": "function",
+        "stateMutability": "view",
+        "inputs": [],
+        "outputs": [{"name": "", "type": "uint256"}],
+    },
+    # Get borrow rate per timestamp
+    {
+        "name": "borrowRatePerTimestamp",
+        "type": "function",
+        "stateMutability": "view",
+        "inputs": [],
+        "outputs": [{"name": "", "type": "uint256"}],
+    },
+    # Get total borrows
+    {
+        "name": "totalBorrows",
+        "type": "function",
+        "stateMutability": "view",
+        "inputs": [],
+        "outputs": [{"name": "", "type": "uint256"}],
+    },
+    # Get total supply of mTokens
+    {
+        "name": "totalSupply",
+        "type": "function",
+        "stateMutability": "view",
+        "inputs": [],
+        "outputs": [{"name": "", "type": "uint256"}],
+    },
+    # Get cash (available liquidity)
+    {
+        "name": "getCash",
+        "type": "function",
+        "stateMutability": "view",
+        "inputs": [],
+        "outputs": [{"name": "", "type": "uint256"}],
+    },
+    # Accrue interest
+    {
+        "name": "accrueInterest",
+        "type": "function",
+        "stateMutability": "nonpayable",
+        "inputs": [],
+        "outputs": [{"name": "", "type": "uint256"}],
+    },
+    # Get decimals
+    {
+        "name": "decimals",
+        "type": "function",
+        "stateMutability": "view",
+        "inputs": [],
+        "outputs": [{"name": "", "type": "uint8"}],
+    },
+]
+
+# Comptroller ABI - for collateral management and account liquidity
+COMPTROLLER_ABI = [
+    # Enable a market as collateral
+    {
+        "name": "enterMarkets",
+        "type": "function",
+        "stateMutability": "nonpayable",
+        "inputs": [{"name": "mTokens", "type": "address[]"}],
+        "outputs": [{"name": "", "type": "uint256[]"}],
+    },
+    # Disable a market as collateral
+    {
+        "name": "exitMarket",
+        "type": "function",
+        "stateMutability": "nonpayable",
+        "inputs": [{"name": "mTokenAddress", "type": "address"}],
+        "outputs": [{"name": "", "type": "uint256"}],
+    },
+    # Get account liquidity (error, liquidity, shortfall)
+    {
+        "name": "getAccountLiquidity",
+        "type": "function",
+        "stateMutability": "view",
+        "inputs": [{"name": "account", "type": "address"}],
+        "outputs": [
+            {"name": "error", "type": "uint256"},
+            {"name": "liquidity", "type": "uint256"},
+            {"name": "shortfall", "type": "uint256"},
+        ],
+    },
+    # Get market info (isListed, collateralFactorMantissa)
+    {
+        "name": "markets",
+        "type": "function",
+        "stateMutability": "view",
+        "inputs": [{"name": "mToken", "type": "address"}],
+        "outputs": [
+            {"name": "isListed", "type": "bool"},
+            {"name": "collateralFactorMantissa", "type": "uint256"},
+        ],
+    },
+    # Check if account has entered a market
+    {
+        "name": "checkMembership",
+        "type": "function",
+        "stateMutability": "view",
+        "inputs": [
+            {"name": "account", "type": "address"},
+            {"name": "mToken", "type": "address"},
+        ],
+        "outputs": [{"name": "", "type": "bool"}],
+    },
+    # Get all markets an account has entered
+    {
+        "name": "getAssetsIn",
+        "type": "function",
+        "stateMutability": "view",
+        "inputs": [{"name": "account", "type": "address"}],
+        "outputs": [{"name": "", "type": "address[]"}],
+    },
+    # Get all listed markets
+    {
+        "name": "getAllMarkets",
+        "type": "function",
+        "stateMutability": "view",
+        "inputs": [],
+        "outputs": [{"name": "", "type": "address[]"}],
+    },
+    # Get hypothetical account liquidity
+    {
+        "name": "getHypotheticalAccountLiquidity",
+        "type": "function",
+        "stateMutability": "view",
+        "inputs": [
+            {"name": "account", "type": "address"},
+            {"name": "mTokenModify", "type": "address"},
+            {"name": "redeemTokens", "type": "uint256"},
+            {"name": "borrowAmount", "type": "uint256"},
+        ],
+        "outputs": [
+            {"name": "error", "type": "uint256"},
+            {"name": "liquidity", "type": "uint256"},
+            {"name": "shortfall", "type": "uint256"},
+        ],
+    },
+    # Get close factor
+    {
+        "name": "closeFactorMantissa",
+        "type": "function",
+        "stateMutability": "view",
+        "inputs": [],
+        "outputs": [{"name": "", "type": "uint256"}],
+    },
+    # Get liquidation incentive
+    {
+        "name": "liquidationIncentiveMantissa",
+        "type": "function",
+        "stateMutability": "view",
+        "inputs": [],
+        "outputs": [{"name": "", "type": "uint256"}],
+    },
+    # Claim rewards for a user (called on comptroller in some versions)
+    {
+        "name": "claimReward",
+        "type": "function",
+        "stateMutability": "nonpayable",
+        "inputs": [{"name": "holder", "type": "address"}],
+        "outputs": [],
+    },
+]
+
+# Reward Distributor ABI - for claiming WELL rewards
+REWARD_DISTRIBUTOR_ABI = [
+    # Claim rewards for all markets
+    {
+        "name": "claimReward",
+        "type": "function",
+        "stateMutability": "nonpayable",
+        "inputs": [],
+        "outputs": [],
+    },
+    # Claim rewards for specific holder and markets
+    {
+        "name": "claimReward",
+        "type": "function",
+        "stateMutability": "nonpayable",
+        "inputs": [
+            {"name": "holder", "type": "address"},
+            {"name": "mTokens", "type": "address[]"},
+        ],
+        "outputs": [],
+    },
+    # Get reward token address
+    {
+        "name": "rewardToken",
+        "type": "function",
+        "stateMutability": "view",
+        "inputs": [],
+        "outputs": [{"name": "", "type": "address"}],
+    },
+    # Get pending rewards (accrued but not yet claimed)
+    {
+        "name": "rewardAccrued",
+        "type": "function",
+        "stateMutability": "view",
+        "inputs": [{"name": "holder", "type": "address"}],
+        "outputs": [{"name": "", "type": "uint256"}],
+    },
+    # Get outstanding rewards for a user across all markets
+    # Returns array of (mToken, [(rewardToken, totalReward, supplySide, borrowSide)])
+    {
+        "name": "getOutstandingRewardsForUser",
+        "type": "function",
+        "stateMutability": "view",
+        "inputs": [{"name": "user", "type": "address"}],
+        "outputs": [
+            {
+                "name": "",
+                "type": "tuple[]",
+                "components": [
+                    {"name": "mToken", "type": "address"},
+                    {
+                        "name": "rewards",
+                        "type": "tuple[]",
+                        "components": [
+                            {"name": "rewardToken", "type": "address"},
+                            {"name": "totalReward", "type": "uint256"},
+                            {"name": "supplySide", "type": "uint256"},
+                            {"name": "borrowSide", "type": "uint256"},
+                        ],
+                    },
+                ],
+            }
+        ],
+    },
+    # Get outstanding rewards for a user for a specific mToken
+    {
+        "name": "getOutstandingRewardsForUser",
+        "type": "function",
+        "stateMutability": "view",
+        "inputs": [
+            {"name": "mToken", "type": "address"},
+            {"name": "user", "type": "address"},
+        ],
+        "outputs": [
+            {
+                "name": "",
+                "type": "tuple[]",
+                "components": [
+                    {"name": "rewardToken", "type": "address"},
+                    {"name": "totalReward", "type": "uint256"},
+                    {"name": "supplySide", "type": "uint256"},
+                    {"name": "borrowSide", "type": "uint256"},
+                ],
+            }
+        ],
+    },
+    # Get all market configurations for an mToken
+    # Returns array of (mToken, rewardToken, supplyEmissionsPerSec, borrowEmissionsPerSec, ...)
+    {
+        "name": "getAllMarketConfigs",
+        "type": "function",
+        "stateMutability": "view",
+        "inputs": [{"name": "mToken", "type": "address"}],
+        "outputs": [
+            {
+                "name": "",
+                "type": "tuple[]",
+                "components": [
+                    {"name": "mToken", "type": "address"},
+                    {"name": "rewardToken", "type": "address"},
+                    {"name": "owner", "type": "address"},
+                    {"name": "emissionCap", "type": "uint256"},
+                    {"name": "supplyEmissionsPerSec", "type": "uint256"},
+                    {"name": "borrowEmissionsPerSec", "type": "uint256"},
+                    {"name": "supplyGlobalIndex", "type": "uint256"},
+                    {"name": "borrowGlobalIndex", "type": "uint256"},
+                    {"name": "endTime", "type": "uint256"},
+                ],
+            }
+        ],
+    },
+]
+
+# WETH ABI for wrapping/unwrapping ETH
+WETH_ABI = [
+    {
+        "name": "deposit",
+        "type": "function",
+        "stateMutability": "payable",
+        "inputs": [],
+        "outputs": [],
+    },
+    {
+        "name": "withdraw",
+        "type": "function",
+        "stateMutability": "nonpayable",
+        "inputs": [{"name": "wad", "type": "uint256"}],
+        "outputs": [],
+    },
+    {
+        "name": "balanceOf",
+        "type": "function",
+        "stateMutability": "view",
+        "inputs": [{"name": "account", "type": "address"}],
+        "outputs": [{"name": "", "type": "uint256"}],
+    },
+]

wayfinder_paths/core/services/base.py

@@ -56,14 +56,20 @@ class EvmTxn(ABC):
         address: str,
         token_address: str | None,
         chain_id: int,
+        block_identifier: int | str | None = None,
     ) -> tuple[bool, Any]:
         """
-        Get balance for an address.
+        Get balance for an address at a specific block.
 
         Args:
             address: Address to query balance for
             token_address: ERC20 token address, or None for native token
             chain_id: Chain ID
+            block_identifier: Block to query at. Can be:
+                - int: specific block number (for pinning to tx block)
+                - "safe": OP Stack safe block (data posted to L1)
+                - "finalized": fully finalized block
+                - None/"latest": current head (default, but avoid after txs)
 
         Returns:
             Tuple of (success, balance_integer_or_error_message)