iwa 0.0.17__tar.gz → 0.0.19__tar.gz

{iwa-0.0.17/src/iwa.egg-info → iwa-0.0.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iwa
-Version: 0.0.17
+Version: 0.0.19
 Summary: A secure, modular, and plugin-based framework for crypto agents and ops
 Requires-Python: <4.0,>=3.12
 Description-Content-Type: text/markdown

{iwa-0.0.17 → iwa-0.0.19}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "iwa"
-version = "0.0.17"
+version = "0.0.19"
 description = "A secure, modular, and plugin-based framework for crypto agents and ops"
 readme = "README.md"
 requires-python = ">=3.12,<4.0"
@@ -71,7 +71,7 @@ where = ["src"]
 
 [tool.ruff]
 line-length = 100
-target-version = "0.0.17"
+target-version = "0.0.19"
 fix = true
 
 [tool.ruff.lint]

{iwa-0.0.17 → iwa-0.0.19}/src/iwa/core/chain/interface.py

@@ -2,9 +2,8 @@
 
 import threading
 import time
-from typing import Callable, Dict, Optional, Tuple, TypeVar, Union
+from typing import Callable, Dict, Optional, TypeVar, Union
 
-from eth_account.datastructures import SignedTransaction
 from web3 import Web3
 
 from iwa.core.chain.errors import TenderlyQuotaExceededError, sanitize_rpc_url
@@ -449,69 +448,6 @@ class ChainInterface:
 
         return False
 
-    def send_native_transfer(
-        self,
-        from_address: EthereumAddress,
-        to_address: EthereumAddress,
-        value_wei: int,
-        sign_callback: Callable[[dict], SignedTransaction],
-    ) -> Tuple[bool, Optional[str]]:
-        """Send native currency transaction with retry logic."""
-
-        def _do_transfer() -> Tuple[bool, Optional[str]]:
-            tx = {
-                "from": from_address,
-                "to": to_address,
-                "value": value_wei,
-                "nonce": self.web3.eth.get_transaction_count(from_address),
-                "chainId": self.chain.chain_id,
-            }
-
-            balance_wei = self.get_native_balance_wei(from_address)
-            gas_price = self.web3.eth.gas_price
-            gas_estimate = self.web3.eth.estimate_gas(tx)
-            required_wei = value_wei + (gas_estimate * gas_price)
-
-            if balance_wei < required_wei:
-                logger.error(
-                    f"Insufficient balance. "
-                    f"Balance: {self.web3.from_wei(balance_wei, 'ether'):.4f} "
-                    f"{self.chain.native_currency}, "
-                    f"Required: {self.web3.from_wei(required_wei, 'ether'):.4f} "
-                    f"{self.chain.native_currency}"
-                )
-                return False, None
-
-            tx["gas"] = gas_estimate
-            tx["gasPrice"] = gas_price
-
-            signed_tx = sign_callback(tx)
-            txn_hash = self.web3.eth.send_raw_transaction(signed_tx.raw_transaction)
-            receipt = self.web3.eth.wait_for_transaction_receipt(txn_hash)
-
-            status = getattr(receipt, "status", None)
-            if status is None and isinstance(receipt, dict):
-                status = receipt.get("status")
-
-            if receipt and status == 1:
-                self.wait_for_no_pending_tx(from_address)
-                logger.info(f"Transaction sent successfully. Tx Hash: {txn_hash.hex()}")
-                # Check Tenderly block limit after each successful transaction
-                self.check_block_limit()
-                return True, receipt["transactionHash"].hex()
-
-            logger.error("Transaction failed (status != 1)")
-            return False, None
-
-        try:
-            return self.with_retry(
-                _do_transfer,
-                operation_name=f"native_transfer to {str(to_address)[:10]}...",
-            )
-        except Exception as e:
-            logger.exception(f"Native transfer failed: {e}")
-            return False, None
-
     def get_token_address(self, token_name: str) -> Optional[EthereumAddress]:
         """Get token address by name"""
         return self.chain.get_token_address(token_name)

{iwa-0.0.17 → iwa-0.0.19}/src/iwa/core/pricing.py

@@ -19,7 +19,6 @@ class PriceService:
     """Service to fetch token prices from CoinGecko."""
 
     BASE_URL = "https://api.coingecko.com/api/v3"
-    DEMO_URL = "https://demo-api.coingecko.com/api/v3"
 
     def __init__(self):
         """Initialize PriceService."""
@@ -60,9 +59,7 @@ class PriceService:
         max_retries = 2
         for attempt in range(max_retries + 1):
             try:
-                # Use demo URL if API key is present, otherwise standard URL
-                # NOTE: Demo URL is significantly more reliable for demo keys
-                base_url = self.DEMO_URL if self.api_key else self.BASE_URL
+                base_url = self.BASE_URL
                 url = f"{base_url}/simple/price"
                 params = {"ids": token_id, "vs_currencies": vs_currency}
                 headers = {}

{iwa-0.0.17 → iwa-0.0.19}/src/iwa/core/services/transaction.py

@@ -1,6 +1,5 @@
 """Transaction service module."""
 
-import time
 from typing import TYPE_CHECKING, Dict, List, Optional, Tuple
 
 from loguru import logger
@@ -31,32 +30,37 @@ class TransferLogger:
         self.account_service = account_service
         self.chain_interface = chain_interface
 
-    def log_transfers(self, receipt: Dict, tx: Dict) -> None:
+    def log_transfers(self, receipt: Dict) -> None:
         """Log all transfers (ERC20 and native) from a transaction receipt.
 
         Args:
             receipt: Transaction receipt containing logs.
-            tx: Original transaction dict.
 
         """
-        # Log native value transfer if present
-        native_value = tx.get("value", 0)
-        if native_value and int(native_value) > 0:
-            self._log_native_transfer(tx, native_value)
+        # Get the original transaction to check for native value transfer
+        tx_hash = receipt.get("transactionHash") or getattr(receipt, "transactionHash", None)
+        if tx_hash:
+            try:
+                tx = self.chain_interface.web3.eth.get_transaction(tx_hash)
+                native_value = getattr(tx, "value", 0) or tx.get("value", 0) if isinstance(tx, dict) else getattr(tx, "value", 0)
+                if native_value and int(native_value) > 0:
+                    from_addr = getattr(tx, "from", "") if hasattr(tx, "from") else tx.get("from", "")
+                    # Handle AttributeDict's special 'from' attribute
+                    if not from_addr and hasattr(tx, "__getitem__"):
+                        from_addr = tx["from"]
+                    to_addr = getattr(tx, "to", "") or (tx.get("to", "") if isinstance(tx, dict) else "")
+                    self._log_native_transfer(from_addr, to_addr, native_value)
+            except Exception as e:
+                logger.debug(f"Could not get tx for native transfer logging: {e}")
 
         # Log ERC20 transfers from event logs
-        logs = receipt.get("logs", [])
-        if hasattr(receipt, "logs"):
-            logs = receipt.logs
+        logs = receipt.get("logs", []) if isinstance(receipt, dict) else getattr(receipt, "logs", [])
 
         for log in logs:
             self._process_log(log)
 
-    def _log_native_transfer(self, tx: Dict, value_wei: int) -> None:
+    def _log_native_transfer(self, from_addr: str, to_addr: str, value_wei: int) -> None:
         """Log a native currency transfer."""
-        from_addr = tx.get("from", "")
-        to_addr = tx.get("to", "")
-
         from_label = self._resolve_address_label(from_addr)
         to_label = self._resolve_address_label(to_addr)
 
@@ -213,53 +217,67 @@ class TransactionService:
         chain_name: str = "gnosis",
         tags: Optional[List[str]] = None,
     ) -> Tuple[bool, Dict]:
-        """Sign and send a transaction with retry logic for gas."""
+        """Sign and send a transaction using unified retry mechanism.
+
+        Uses ChainInterface.with_retry() for consistent RPC rotation and retry logic.
+        Gas errors are handled by increasing gas and retrying within the same mechanism.
+        """
         chain_interface = ChainInterfaces().get(chain_name)
         tx = dict(transaction)
-        max_retries = 10
 
         if not self._prepare_transaction(tx, signer_address_or_tag, chain_interface):
             return False, {}
 
-        for attempt in range(1, max_retries + 1):
+        # Mutable state for retry attempts
+        state = {"gas_retries": 0, "max_gas_retries": 5}
+
+        def _do_sign_send_wait() -> Tuple[bool, Dict, bytes]:
+            """Inner operation wrapped by with_retry."""
             try:
                 signed_txn = self.key_storage.sign_transaction(tx, signer_address_or_tag)
-                txn_hash = chain_interface.web3.eth.send_raw_transaction(signed_txn.raw_transaction)
-
-                # Use chain_interface.with_retry for waiting for receipt to handle timeouts/RPC errors
-                def wait_for_receipt(tx_h=txn_hash):
-                    return chain_interface.web3.eth.wait_for_transaction_receipt(tx_h)
-
-                receipt = chain_interface.with_retry(
-                    wait_for_receipt, operation_name="wait_for_receipt"
+                txn_hash = chain_interface.web3.eth.send_raw_transaction(
+                    signed_txn.raw_transaction
                 )
+                receipt = chain_interface.web3.eth.wait_for_transaction_receipt(txn_hash)
 
-                if receipt and getattr(receipt, "status", None) == 1:
-                    signer_account = self.account_service.resolve_account(signer_address_or_tag)
-                    chain_interface.wait_for_no_pending_tx(signer_account.address)
-                    logger.info(f"Transaction sent successfully. Tx Hash: {txn_hash.hex()}")
-
-                    self._log_successful_transaction(
-                        receipt, tx, signer_account, chain_name, txn_hash, tags, chain_interface
-                    )
-                    return True, receipt
+                status = getattr(receipt, "status", None)
+                if status is None and isinstance(receipt, dict):
+                    status = receipt.get("status")
 
-                # Transaction reverted
+                if receipt and status == 1:
+                    return True, receipt, txn_hash
+                # Transaction mined but reverted - don't retry
                 logger.error("Transaction failed (status 0).")
-                return False, {}
+                raise ValueError("Transaction reverted")
 
             except web3_exceptions.Web3RPCError as e:
-                if self._handle_gas_error(e, tx, attempt, max_retries):
-                    continue
-                return False, {}
+                # Handle gas errors by increasing gas and re-raising
+                self._handle_gas_retry(e, tx, state)
+                raise  # Re-raise to trigger with_retry's retry mechanism
 
-            except Exception as e:
-                # Attempt RPC rotation
-                if self._handle_generic_error(e, chain_interface, attempt, max_retries):
-                    continue
+        try:
+            success, receipt, txn_hash = chain_interface.with_retry(
+                _do_sign_send_wait,
+                operation_name=f"sign_and_send to {tx.get('to', 'unknown')[:10]}...",
+            )
+            if success:
+                signer_account = self.account_service.resolve_account(signer_address_or_tag)
+                chain_interface.wait_for_no_pending_tx(signer_account.address)
+                logger.info(f"Transaction sent successfully. Tx Hash: {txn_hash.hex()}")
+                self._log_successful_transaction(
+                    receipt, tx, signer_account, chain_name, txn_hash, tags, chain_interface
+                )
+                return True, receipt
+            return False, {}
+        except ValueError as e:
+            # Transaction reverted - already logged
+            if "reverted" in str(e).lower():
                 return False, {}
-
-        return False, {}
+            logger.exception(f"Transaction failed: {e}")
+            return False, {}
+        except Exception as e:
+            logger.exception(f"Transaction failed after retries: {e}")
+            return False, {}
 
     def _prepare_transaction(self, tx: dict, signer_tag: str, chain_interface) -> bool:
         """Ensure nonce and chainId are set."""
@@ -274,32 +292,16 @@ class TransactionService:
             tx["chainId"] = chain_interface.chain.chain_id
         return True
 
-    def _handle_gas_error(self, e, tx, attempt, max_retries) -> bool:
-        err_text = str(e)
-        if self._is_gas_too_low_error(err_text) and attempt < max_retries:
-            logger.warning(
-                f"Gas too low error detected. Retrying with increased gas (Attempt {attempt}/{max_retries})..."
-            )
+    def _handle_gas_retry(self, e: Exception, tx: dict, state: dict) -> None:
+        """Increase gas if error is gas-related and retries remaining."""
+        if self._is_gas_too_low_error(str(e)) and state["gas_retries"] < state["max_gas_retries"]:
             current_gas = int(tx.get("gas", 30_000))
             tx["gas"] = int(current_gas * 1.5)
-            tx["gas"] = int(current_gas * 1.5)
-            # Exponential backoff for gas errors
-            time.sleep(min(2**attempt, 30))
-            return True
-        logger.exception(f"Error sending transaction: {e}")
-        return False
-
-    def _handle_generic_error(self, e, chain_interface, attempt, max_retries) -> bool:
-        if attempt < max_retries:
-            logger.warning(f"Error encountered: {e}. Attempting to rotate RPC...")
-
-            if chain_interface.rotate_rpc():
-                logger.info("Retrying with new RPC...")
-                # Exponential backoff
-                time.sleep(min(2**attempt, 30))
-                return True
-        logger.exception(f"Unexpected error sending transaction: {e}")
-        return False
+            state["gas_retries"] += 1
+            logger.warning(
+                f"Gas too low, increasing to {tx['gas']} "
+                f"(attempt {state['gas_retries']}/{state['max_gas_retries']})"
+            )
 
     def _log_successful_transaction(
         self, receipt, tx, signer_account, chain_name, txn_hash, tags, chain_interface
@@ -323,7 +325,7 @@ class TransactionService:
 
             # Log transfer events (ERC20 and native value)
             transfer_logger = TransferLogger(self.account_service, chain_interface)
-            transfer_logger.log_transfers(receipt, tx)
+            transfer_logger.log_transfers(receipt)
 
         except Exception as log_err:
             logger.warning(f"Failed to log transaction: {log_err}")

{iwa-0.0.17 → iwa-0.0.19}/src/iwa/core/services/transfer/erc20.py

@@ -64,6 +64,14 @@ class ERC20TransferMixin:
             value_eur=v_eur,
             tags=["erc20-transfer", "safe-transaction"],
         )
+
+        # Log transfers extracted from receipt events
+        if receipt:
+            from iwa.core.services.transaction import TransferLogger
+
+            transfer_logger = TransferLogger(self.account_service, interface)
+            transfer_logger.log_transfers(receipt)
+
         return tx_hash
 
     def _send_erc20_via_eoa(

{iwa-0.0.17 → iwa-0.0.19}/src/iwa/core/services/transfer/native.py

@@ -61,6 +61,15 @@ class NativeTransferMixin:
             value_eur=v_eur,
             tags=["native-transfer", "safe-transaction"],
         )
+
+        # Log transfers extracted from receipt events
+        if receipt:
+            from iwa.core.services.transaction import TransferLogger
+
+            interface = ChainInterfaces().get(chain_name)
+            transfer_logger = TransferLogger(self.account_service, interface)
+            transfer_logger.log_transfers(receipt)
+
         return tx_hash
 
     def _send_native_via_eoa(
@@ -74,20 +83,38 @@ class NativeTransferMixin:
         to_tag: Optional[str],
         token_symbol: str,
     ) -> Optional[str]:
-        """Send native currency via EOA (externally owned account)."""
-        success, tx_hash = chain_interface.send_native_transfer(
-            from_address=from_account.address,
-            to_address=to_address,
-            value_wei=amount_wei,
-            sign_callback=lambda tx: self.key_storage.sign_transaction(tx, from_account.address),
+        """Send native currency via EOA using unified TransactionService."""
+        # Build transaction dict
+        try:
+            gas_price = chain_interface.web3.eth.gas_price
+            gas_estimate = chain_interface.web3.eth.estimate_gas({
+                "from": from_account.address,
+                "to": to_address,
+                "value": amount_wei,
+            })
+        except Exception as e:
+            logger.error(f"Failed to estimate gas for native transfer: {e}")
+            return None
+
+        tx = {
+            "from": from_account.address,
+            "to": to_address,
+            "value": amount_wei,
+            "gas": gas_estimate,
+            "gasPrice": gas_price,
+        }
+
+        # Use unified TransactionService
+        success, receipt = self.transaction_service.sign_and_send(
+            tx, from_account.address, chain_name, tags=["native-transfer"]
         )
-        if success and tx_hash:
-            # Get receipt for gas calculation
-            receipt = None
-            try:
-                receipt = chain_interface.web3.eth.get_transaction_receipt(tx_hash)
-            except Exception as e:
-                logger.warning(f"Could not get receipt for {tx_hash}: {e}")
+
+        if success and receipt:
+            tx_hash = receipt.get("transactionHash", b"")
+            if hasattr(tx_hash, "hex"):
+                tx_hash = tx_hash.hex()
+            elif isinstance(tx_hash, bytes):
+                tx_hash = tx_hash.hex()
 
             gas_cost, gas_value_eur = self._calculate_gas_info(receipt, chain_name)
             p_eur, v_eur = self._get_token_price_info(token_symbol, amount_wei, chain_name)
@@ -106,6 +133,13 @@ class NativeTransferMixin:
                 value_eur=v_eur,
                 tags=["native-transfer"],
             )
+
+            # Log transfers extracted from receipt events
+            from iwa.core.services.transaction import TransferLogger
+
+            transfer_logger = TransferLogger(self.account_service, chain_interface)
+            transfer_logger.log_transfers(receipt)
+
             return tx_hash
         return None
 

{iwa-0.0.17 → iwa-0.0.19}/src/iwa/plugins/olas/constants.py

@@ -54,10 +54,10 @@ OLAS_CONTRACTS: Dict[str, Dict[str, EthereumAddress]] = {
         # Legacy mech - used by NON-MM TRADER staking contracts (e.g., "Expert X (Yk OLAS)")
         # Activity checker calls agentMech.getRequestsCount(multisig) to count requests.
         "OLAS_MECH": EthereumAddress("0x77af31De935740567Cf4fF1986D04B2c964A786a"),
-        # NEW Marketplace (v2) - used by MM staking contracts (e.g., "Expert X MM (Yk OLAS)")
-        # Services staked in "Expert X MM" contracts MUST use marketplace requests.
+        # Marketplace v2 - used by newer MM staking contracts (e.g., "Expert X MM v2 (Yk OLAS)")
+        # Services staked in MM v2 contracts MUST use marketplace requests.
         # Legacy mech requests will NOT be counted by the activity checker.
-        "OLAS_MECH_MARKETPLACE": EthereumAddress("0x735FAAb1c4Ec41128c367AFb5c3baC73509f70bB"),
+        "OLAS_MECH_MARKETPLACE_V2": EthereumAddress("0x735FAAb1c4Ec41128c367AFb5c3baC73509f70bB"),
         # Default priority mech for marketplace requests (from olas-operate-middleware)
         # This is the mech that will process requests sent via the marketplace.
         # Source: https://github.com/valory-xyz/olas-operate-middleware/blob/main/operate/ledger/profiles.py
@@ -65,8 +65,9 @@ OLAS_CONTRACTS: Dict[str, Dict[str, EthereumAddress]] = {
         "OLAS_MECH_MARKETPLACE_PRIORITY": EthereumAddress(
             "0xC05e7412439bD7e91730a6880E18d5D5873F632C"
         ),
-        # OLD Marketplace (v1) - legacy, kept for reference
-        "OLAS_MECH_MARKETPLACE_OLD": EthereumAddress("0x4554fE75c1f5576c1d7F765B2A036c199Adae329"),
+        # Marketplace v1 (VERSION 1.0.0) - older MM contracts (e.g., "Expert 17 MM v1")
+        # Uses different request signature than v2. trader_ant uses this.
+        "OLAS_MECH_MARKETPLACE_V1": EthereumAddress("0x4554fE75c1f5576c1d7F765B2A036c199Adae329"),
     },
     "ethereum": {
         "OLAS_SERVICE_REGISTRY": EthereumAddress("0x48b6F34dDAf31f94086BFB45e69e0618DDe3677b"),
@@ -75,49 +76,50 @@ OLAS_CONTRACTS: Dict[str, Dict[str, EthereumAddress]] = {
     "base": {
         "OLAS_SERVICE_REGISTRY": EthereumAddress("0x3841C312061daB948332A78F042Ec61Ad09fc3D8"),
         "OLAS_SERVICE_MANAGER": EthereumAddress("0xF36183B106692DeD8b6e3B2B7347C9665f8a09B1"),
-        "OLAS_MECH_MARKETPLACE": EthereumAddress("0x4554fE75c1f5576c1d7F765B2A036c199Adae329"),
+        "OLAS_MECH_MARKETPLACE_V1": EthereumAddress("0x4554fE75c1f5576c1d7F765B2A036c199Adae329"),
     },
 }
 
 # TRADER-compatible staking contracts categorized by chain
 # See https://govern.olas.network/contracts
-# NOTE: All TRADER staking contracts use the LEGACY MECH for activity tracking.
-# The activity checker calls agentMech.getRequestsCount(multisig), where agentMech
-# is hardcoded to the legacy mech (0x77af31De935740567Cf4fF1986D04B2c964A786a).
 #
-# This means:
-#   - Legacy mech requests (use_marketplace=False) -> COUNT for liveness rewards
-#   - Marketplace mech requests (use_marketplace=True) -> DO NOT COUNT
+# Categories (verified on-chain via activity checker's mechMarketplace):
+#   - Legacy: No marketplace, uses legacy mech (0x77af31De...). agentMech.getRequestsCount()
+#   - MM v1: Old marketplace (0x4554fE75...). mechMarketplace.mapRequestCounts()
+#   - MM v2: New marketplace (0x735FAAb1...). mechMarketplace.mapRequestCounts()
 #
-# For staking rewards, services MUST use legacy mech requests.
+# IMPORTANT: Services MUST use the correct mech request type for their staking contract!
 OLAS_TRADER_STAKING_CONTRACTS: Dict[str, Dict[str, EthereumAddress]] = {
     "gnosis": {
-        "Hobbyist 1 (100 OLAS)": EthereumAddress("0x389B46C259631Acd6a69Bde8B6cEe218230bAE8C"),
-        "Hobbyist 2 (500 OLAS)": EthereumAddress("0x238EB6993b90A978ec6AAD7530D6429c949C08DA"),
-        "Expert (1k OLAS)": EthereumAddress("0x5344B7DD311e5d3DdDd46A4f71481Bd7b05AAA3e"),
-        "Expert 2 (1k OLAS)": EthereumAddress("0xb964e44c126410df341ae04B13aB10A985fE3513"),
-        "Expert 3 (2k OLAS)": EthereumAddress("0x80faD33Cadb5F53f9D29F02Db97D682E8B101618"),
-        "Expert 4 (10k OLAS)": EthereumAddress("0xaD9d891134443B443D7F30013c7e14Fe27F2E029"),
-        "Expert 5 (10k OLAS)": EthereumAddress("0xE56dF1E563De1B10715cB313D514af350D207212"),
-        "Expert 6 (1k OLAS)": EthereumAddress("0x2546214aEE7eEa4bEE7689C81231017CA231Dc93"),
-        "Expert 7 (10k OLAS)": EthereumAddress("0xD7A3C8b975f71030135f1a66E9e23164d54fF455"),
-        "Expert 8 (2k OLAS)": EthereumAddress("0x356C108D49C5eebd21c84c04E9162de41933030c"),
-        "Expert 9 (10k OLAS)": EthereumAddress("0x17dBAe44BC5618Cc254055B386A29576b4F87015"),
-        "Expert 10 (10k OLAS)": EthereumAddress("0xB0ef657b8302bd2c74B6E6D9B2b4b39145b19c6f"),
-        "Expert 11 (10k OLAS)": EthereumAddress("0x3112c1613eAC3dBAE3D4E38CeF023eb9E2C91CF7"),
-        "Expert 12 (10k OLAS)": EthereumAddress("0xF4a75F476801B3fBB2e7093aCDcc3576593Cc1fc"),
-        "Expert 15 (10k OLAS)": EthereumAddress("0x88eB38FF79fBa8C19943C0e5Acfa67D5876AdCC1"),
-        "Expert 16 (10k OLAS)": EthereumAddress("0x6c65430515c70a3f5E62107CC301685B7D46f991"),
-        "Expert 17 (10k OLAS)": EthereumAddress("0x1430107A785C3A36a0C1FC0ee09B9631e2E72aFf"),
-        "Expert 18 (10k OLAS)": EthereumAddress("0x041e679d04Fc0D4f75Eb937Dea729Df09a58e454"),
-        "Expert 3 MM (1k OLAS)": EthereumAddress("0x75eeca6207be98cac3fde8a20ecd7b01e50b3472"),
-        "Expert 4 MM (2k OLAS)": EthereumAddress("0x9c7f6103e3a72e4d1805b9c683ea5b370ec1a99f"),
-        "Expert 5 MM (10k OLAS)": EthereumAddress("0xcdC603e0Ee55Aae92519f9770f214b2Be4967f7d"),
-        "Expert 6 MM (10k OLAS)": EthereumAddress("0x22d6cd3d587d8391c3aae83a783f26c67ab54a85"),
-        "Expert 7 MM (10k OLAS)": EthereumAddress("0xaaecdf4d0cbd6ca0622892ac6044472f3912a5f3"),
-        "Expert 8 MM (10k OLAS)": EthereumAddress("0x168aed532a0cd8868c22fc77937af78b363652b1"),
-        "Expert 9 MM (10k OLAS)": EthereumAddress("0xdda9cd214f12e7c2d58e871404a0a3b1177065c8"),
-        "Expert 10 MM (10k OLAS)": EthereumAddress("0x53a38655b4e659ef4c7f88a26fbf5c67932c7156"),
+        # === LEGACY (no marketplace) ===
+        "Hobbyist 1 Legacy (100 OLAS)": EthereumAddress("0x389B46C259631Acd6a69Bde8B6cEe218230bAE8C"),
+        "Hobbyist 2 Legacy (500 OLAS)": EthereumAddress("0x238EB6993b90A978ec6AAD7530D6429c949C08DA"),
+        "Expert Legacy (1k OLAS)": EthereumAddress("0x5344B7DD311e5d3DdDd46A4f71481Bd7b05AAA3e"),
+        "Expert 2 Legacy (1k OLAS)": EthereumAddress("0xb964e44c126410df341ae04B13aB10A985fE3513"),
+        "Expert 3 Legacy (2k OLAS)": EthereumAddress("0x80faD33Cadb5F53f9D29F02Db97D682E8B101618"),
+        "Expert 4 Legacy (10k OLAS)": EthereumAddress("0xaD9d891134443B443D7F30013c7e14Fe27F2E029"),
+        "Expert 5 Legacy (10k OLAS)": EthereumAddress("0xE56dF1E563De1B10715cB313D514af350D207212"),
+        "Expert 6 Legacy (1k OLAS)": EthereumAddress("0x2546214aEE7eEa4bEE7689C81231017CA231Dc93"),
+        "Expert 7 Legacy (10k OLAS)": EthereumAddress("0xD7A3C8b975f71030135f1a66E9e23164d54fF455"),
+        "Expert 8 Legacy (2k OLAS)": EthereumAddress("0x356C108D49C5eebd21c84c04E9162de41933030c"),
+        "Expert 9 Legacy (10k OLAS)": EthereumAddress("0x17dBAe44BC5618Cc254055B386A29576b4F87015"),
+        "Expert 10 Legacy (10k OLAS)": EthereumAddress("0xB0ef657b8302bd2c74B6E6D9B2b4b39145b19c6f"),
+        "Expert 11 Legacy (10k OLAS)": EthereumAddress("0x3112c1613eAC3dBAE3D4E38CeF023eb9E2C91CF7"),
+        "Expert 12 Legacy (10k OLAS)": EthereumAddress("0xF4a75F476801B3fBB2e7093aCDcc3576593Cc1fc"),
+        # === MM v1 (old marketplace 0x4554fE75...) ===
+        "Expert 15 MM v1 (10k OLAS)": EthereumAddress("0x88eB38FF79fBa8C19943C0e5Acfa67D5876AdCC1"),
+        "Expert 16 MM v1 (10k OLAS)": EthereumAddress("0x6c65430515c70a3f5E62107CC301685B7D46f991"),
+        "Expert 17 MM v1 (10k OLAS)": EthereumAddress("0x1430107A785C3A36a0C1FC0ee09B9631e2E72aFf"),
+        "Expert 18 MM v1 (10k OLAS)": EthereumAddress("0x041e679d04Fc0D4f75Eb937Dea729Df09a58e454"),
+        # === MM v2 (new marketplace 0x735FAAb1...) ===
+        "Expert 3 MM v2 (1k OLAS)": EthereumAddress("0x75eeca6207be98cac3fde8a20ecd7b01e50b3472"),
+        "Expert 4 MM v2 (2k OLAS)": EthereumAddress("0x9c7f6103e3a72e4d1805b9c683ea5b370ec1a99f"),
+        "Expert 5 MM v2 (10k OLAS)": EthereumAddress("0xcdC603e0Ee55Aae92519f9770f214b2Be4967f7d"),
+        "Expert 6 MM v2 (10k OLAS)": EthereumAddress("0x22d6cd3d587d8391c3aae83a783f26c67ab54a85"),
+        "Expert 7 MM v2 (10k OLAS)": EthereumAddress("0xaaecdf4d0cbd6ca0622892ac6044472f3912a5f3"),
+        "Expert 8 MM v2 (10k OLAS)": EthereumAddress("0x168aed532a0cd8868c22fc77937af78b363652b1"),
+        "Expert 9 MM v2 (10k OLAS)": EthereumAddress("0xdda9cd214f12e7c2d58e871404a0a3b1177065c8"),
+        "Expert 10 MM v2 (10k OLAS)": EthereumAddress("0x53a38655b4e659ef4c7f88a26fbf5c67932c7156"),
     },
     "ethereum": {},
     "base": {},