intentkit 0.6.19.dev2__tar.gz → 0.6.20__tar.gz

{intentkit-0.6.19.dev2 → intentkit-0.6.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: intentkit
-Version: 0.6.19.dev2
+Version: 0.6.20
 Summary: Intent-based AI Agent Platform - Core Package
 Project-URL: Homepage, https://github.com/crestal-network/intentkit
 Project-URL: Repository, https://github.com/crestal-network/intentkit

{intentkit-0.6.19.dev2 → intentkit-0.6.20}/__init__.py

@@ -3,7 +3,7 @@
 A powerful platform for building AI agents with blockchain and cryptocurrency capabilities.
 """
 
-__version__ = "0.6.19-dev2"
+__version__ = "0.6.20"
 __author__ = "hyacinthus"
 __email__ = "hyacinthus@gmail.com"
 

{intentkit-0.6.19.dev2 → intentkit-0.6.20}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "intentkit"
-version = "0.6.19-dev2"
+version = "0.6.20"
 description = "Intent-based AI Agent Platform - Core Package"
 authors = [{ name = "hyacinthus", email = "hyacinthus@gmail.com" }]
 requires-python = ">=3.12"

{intentkit-0.6.19.dev2 → intentkit-0.6.20}/skills/base.py

@@ -1,4 +1,3 @@
-import asyncio
 import logging
 from typing import Any, Callable, Dict, Literal, NotRequired, Optional, TypedDict, Union
 
@@ -6,18 +5,21 @@ from langchain_core.tools import BaseTool
 from langchain_core.tools.base import ToolException
 from langgraph.runtime import get_runtime
 from pydantic import (
-    BaseModel,
     ValidationError,
 )
 from pydantic.v1 import ValidationError as ValidationErrorV1
 from redis.exceptions import RedisError
+from web3 import Web3
 
 from intentkit.abstracts.graph import AgentContext
 from intentkit.abstracts.skill import SkillStoreABC
-from intentkit.models.agent import Agent
 from intentkit.models.redis import get_redis
+from intentkit.utils.chain import ChainProvider
 from intentkit.utils.error import RateLimitExceeded
 
+# Global cache for Web3 clients by network_id
+_web3_client_cache: Dict[str, Web3] = {}
+
 SkillState = Literal["disabled", "public", "private"]
 SkillOwnerState = Literal["disabled", "private"]
 APIKeyProviderValue = Literal["platform", "agent_owner"]
@@ -32,36 +34,6 @@ class SkillConfig(TypedDict):
     __extra__: NotRequired[Dict[str, Any]]
 
 
-class SkillContext(BaseModel):
-    skill_category: str
-    agent_id: str
-    user_id: Optional[str] = None
-    chat_id: Optional[str] = None
-    app_id: Optional[str] = None
-    entrypoint: Literal["web", "twitter", "telegram", "trigger", "api"]
-    is_private: bool
-    payer: Optional[str] = None
-    _agent: Optional[Agent] = None
-
-    @property
-    def agent(self) -> Agent:
-        if self._agent is None:
-            self._agent = asyncio.run(Agent.get(self.agent_id))
-        return self._agent
-
-    @property
-    def config(self) -> Dict[str, Any]:
-        agent = self.agent
-        config = None
-        if agent.skills:
-            config = agent.skills.get(self.skill_category)
-        if not config:
-            raise ValueError(
-                f"Skill {self.skill_category} not found in agent {self.agent_id}"
-            )
-        return config
-
-
 class IntentKitSkill(BaseTool):
     """Abstract base class for IntentKit skills.
     Will have predefined abilities.
@@ -185,3 +157,23 @@ class IntentKitSkill(BaseTool):
         if runtime.context is None or not isinstance(runtime.context, AgentContext):
             raise ValueError("No AgentContext found")
         return runtime.context
+
+    def web3_client(self) -> Web3:
+        """Get a Web3 client for the skill."""
+        context = self.get_context()
+        agent = context.agent
+        network_id = agent.network_id
+
+        # Check global cache first
+        if network_id in _web3_client_cache:
+            return _web3_client_cache[network_id]
+
+        # Create new Web3 client and cache it
+        chain_provider: ChainProvider = self.skill_store.get_system_config(
+            "chain_provider"
+        )
+        chain = chain_provider.get_chain_config(network_id)
+        web3_client = Web3(Web3.HTTPProvider(chain.rpc_url))
+        _web3_client_cache[network_id] = web3_client
+
+        return web3_client

{intentkit-0.6.19.dev2 → intentkit-0.6.20}/skills/defillama/base.py

@@ -5,8 +5,9 @@ from typing import Type
 
 from pydantic import BaseModel, Field
 
+from intentkit.abstracts.graph import AgentContext
 from intentkit.abstracts.skill import SkillStoreABC
-from intentkit.skills.base import IntentKitSkill, SkillContext
+from intentkit.skills.base import IntentKitSkill
 from intentkit.skills.defillama.config.chains import (
     get_chain_from_alias,
 )
@@ -39,7 +40,7 @@ class DefiLlamaBaseTool(IntentKitSkill):
         return "defillama"
 
     async def check_rate_limit(
-        self, context: SkillContext, max_requests: int = 30, interval: int = 5
+        self, context: AgentContext, max_requests: int = 30, interval: int = 5
     ) -> tuple[bool, str | None]:
         """Check if the rate limit has been exceeded.
 

{intentkit-0.6.19.dev2 → intentkit-0.6.20}/skills/firecrawl/README.md

@@ -5,18 +5,22 @@ The Firecrawl skills provide advanced web scraping and content indexing capabili
 ## Skills Overview
 
 ### 1. firecrawl_scrape
-Scrapes a single webpage and optionally indexes the content for future querying.
+Scrapes a single webpage and REPLACES any existing indexed content for that URL, preventing duplicates.
 
 **Parameters:**
 - `url` (required): The URL to scrape
-- `formats` (optional): Output formats - markdown, html, rawHtml, screenshot, links, extract (default: ["markdown"])
+- `formats` (optional): Output formats - markdown, html, rawHtml, screenshot, links, json (default: ["markdown"])
+- `only_main_content` (optional): Extract only main content (default: true)
 - `include_tags` (optional): HTML tags to include (e.g., ["h1", "h2", "p"])
 - `exclude_tags` (optional): HTML tags to exclude
-- `only_main_content` (optional): Extract only main content (default: true)
+- `wait_for` (optional): Wait time in milliseconds before scraping
+- `timeout` (optional): Maximum timeout in milliseconds (default: 30000)
 - `index_content` (optional): Whether to index content for querying (default: true)
 - `chunk_size` (optional): Size of text chunks for indexing (default: 1000)
 - `chunk_overlap` (optional): Overlap between chunks (default: 200)
 
+**Use Case:** Use this when you want to refresh/update content from a URL that was previously scraped, ensuring no duplicate or stale content remains.
+
 ### 2. firecrawl_crawl
 Crawls multiple pages from a website and indexes all content.
 
@@ -158,8 +162,9 @@ Prompt: "Use firecrawl_scrape to scrape https://example.com and index the conten
 ### Documentation Indexing
 ```
 1. Scrape main documentation page
-2. Crawl related documentation sections
-3. Query for specific technical information
+2. Crawl related documentation sections  
+3. Use scrape again to update changed pages (replaces old content)
+4. Query for specific technical information
 ```
 
 ### Competitive Analysis
@@ -205,6 +210,7 @@ Prompt: "Use firecrawl_scrape to scrape https://example.com and index the conten
 - **PDF Support**: Can scrape and index PDF documents
 - **Intelligent Chunking**: Optimized text splitting for better search
 - **Independent Storage**: Uses its own dedicated vector store for Firecrawl content
+- **Content Replacement**: Replace mode prevents duplicate/stale content
 - **Metadata Rich**: Includes source URLs, timestamps, and content types
 - **Semantic Search**: Uses OpenAI embeddings for intelligent querying
 - **Batch Processing**: Efficient handling of multiple pages

{intentkit-0.6.19.dev2 → intentkit-0.6.20}/skills/firecrawl/schema.json

@@ -34,7 +34,7 @@
             "Agent Owner + All Users",
             "Agent Owner Only"
           ],
-          "description": "Scrape single web pages and extract content in various formats (markdown, HTML, JSON, etc.). Handles JavaScript-rendered content, PDFs, and dynamic websites.",
+          "description": "Scrape single web pages and REPLACE any existing indexed content for that URL. Unlike regular scrape, this prevents duplicate content when re-scraping the same page. Use this to refresh/update content from a previously scraped URL.",
           "default": "private"
         },
         "firecrawl_crawl": {

{intentkit-0.6.19.dev2 → intentkit-0.6.20}/skills/firecrawl/scrape.py

@@ -62,10 +62,11 @@ class FirecrawlScrapeInput(BaseModel):
 
 
 class FirecrawlScrape(FirecrawlBaseTool):
-    """Tool for scraping web pages using Firecrawl.
+    """Tool for scraping web pages using Firecrawl with REPLACE behavior.
 
-    This tool uses Firecrawl's API to scrape web pages and convert them into clean,
-    LLM-ready formats like markdown, HTML, or structured JSON data.
+    This tool uses Firecrawl's API to scrape web pages and REPLACES any existing
+    indexed content for the same URL instead of appending to it. This prevents
+    duplicate content when re-scraping the same page.
 
     Attributes:
         name: The name of the tool.
@@ -75,10 +76,10 @@ class FirecrawlScrape(FirecrawlBaseTool):
 
     name: str = "firecrawl_scrape"
     description: str = (
-        "Scrape a single web page and extract its content in various formats (markdown, HTML, JSON, etc.). "
+        "Scrape a single web page and REPLACE any existing indexed content for that URL. "
+        "Unlike regular scrape, this tool removes old content before adding new content, preventing duplicates. "
         "This tool can handle JavaScript-rendered content, PDFs, and dynamic websites. "
-        "Optionally indexes the content for later querying using the firecrawl_query_indexed_content tool. "
-        "Use this when you need to extract clean, structured content from a specific URL."
+        "Use this when you want to refresh/update content from a URL that was previously scraped."
     )
     args_schema: Type[BaseModel] = FirecrawlScrapeInput
 
@@ -187,7 +188,7 @@ class FirecrawlScrape(FirecrawlBaseTool):
                 result_data = data.get("data", {})
 
                 # Format the results based on requested formats
-                formatted_result = f"Successfully scraped: {url}\n\n"
+                formatted_result = f"Successfully scraped (REPLACE mode): {url}\n\n"
 
                 if "markdown" in formats and result_data.get("markdown"):
                     formatted_result += "## Markdown Content\n"
@@ -236,13 +237,16 @@ class FirecrawlScrape(FirecrawlBaseTool):
                         formatted_result += f"Language: {metadata['language']}\n"
                     formatted_result += "\n"
 
-                # Index content if requested
+                # Index content if requested - REPLACE MODE
                 if index_content and result_data.get("markdown"):
                     try:
-                        # Import indexing utilities from firecrawl utils
+                        # Import indexing utilities
+                        from langchain_community.vectorstores import FAISS
+
                         from intentkit.skills.firecrawl.utils import (
+                            FirecrawlDocumentProcessor,
                             FirecrawlMetadataManager,
-                            index_documents,
+                            FirecrawlVectorStoreManager,
                         )
 
                         # Create document from scraped content
@@ -261,38 +265,149 @@ class FirecrawlScrape(FirecrawlBaseTool):
                         # Get agent ID for indexing
                         agent_id = context.agent_id
                         if agent_id:
-                            # Index the document
-                            total_chunks, was_merged = await index_documents(
-                                [document],
-                                agent_id,
-                                self.skill_store,
-                                chunk_size,
-                                chunk_overlap,
-                            )
-
-                            # Update metadata
+                            # Initialize managers
+                            vs_manager = FirecrawlVectorStoreManager(self.skill_store)
                             metadata_manager = FirecrawlMetadataManager(
                                 self.skill_store
                             )
-                            new_metadata = metadata_manager.create_url_metadata(
-                                [url], [document], "firecrawl_scrape"
+
+                            # Load existing vector store
+                            existing_vector_store = await vs_manager.load_vector_store(
+                                agent_id
                             )
-                            await metadata_manager.update_metadata(
-                                agent_id, new_metadata
+
+                            # Split the new document into chunks
+                            split_docs = FirecrawlDocumentProcessor.split_documents(
+                                [document], chunk_size, chunk_overlap
                             )
 
-                            formatted_result += "\n## Content Indexing\n"
-                            formatted_result += (
-                                "Successfully indexed content into vector store:\n"
+                            # Create embeddings
+                            embeddings = vs_manager.create_embeddings()
+
+                            if existing_vector_store:
+                                # Get all existing documents and filter out those from the same URL
+                                try:
+                                    # Try to access documents directly if available
+                                    if hasattr(
+                                        existing_vector_store, "docstore"
+                                    ) and hasattr(
+                                        existing_vector_store.docstore, "_dict"
+                                    ):
+                                        # Access FAISS documents directly
+                                        all_docs = list(
+                                            existing_vector_store.docstore._dict.values()
+                                        )
+                                    else:
+                                        # Fallback: use a reasonable k value for similarity search
+                                        # Use a dummy query to retrieve documents
+                                        all_docs = existing_vector_store.similarity_search(
+                                            "dummy",  # Use a dummy query instead of empty string
+                                            k=1000,  # Use reasonable upper bound
+                                        )
+
+                                    # Filter out documents from the same URL
+                                    preserved_docs = [
+                                        doc
+                                        for doc in all_docs
+                                        if doc.metadata.get("source") != url
+                                    ]
+
+                                    logger.info(
+                                        f"firecrawl_scrape: Preserving {len(preserved_docs)} docs from other URLs, "
+                                        f"replacing content from {url}"
+                                    )
+
+                                    # Create new vector store with preserved docs + new docs
+                                    if preserved_docs:
+                                        # Combine preserved and new documents
+                                        all_documents = preserved_docs + split_docs
+                                        new_vector_store = FAISS.from_documents(
+                                            all_documents, embeddings
+                                        )
+                                        formatted_result += "\n## Content Replacement\n"
+                                        formatted_result += f"Replaced existing content for URL: {url}\n"
+                                        num_preserved_urls = len(
+                                            set(
+                                                doc.metadata.get("source", "")
+                                                for doc in preserved_docs
+                                            )
+                                        )
+                                        formatted_result += f"Preserved content from {num_preserved_urls} other URLs\n"
+                                    else:
+                                        # No other documents to preserve, just create from new docs
+                                        new_vector_store = FAISS.from_documents(
+                                            split_docs, embeddings
+                                        )
+                                        formatted_result += "\n## Content Replacement\n"
+                                        formatted_result += f"Created new index with content from: {url}\n"
+                                except Exception as e:
+                                    logger.warning(
+                                        f"Could not preserve other URLs, creating fresh index: {e}"
+                                    )
+                                    # Fallback: create new store with just the new documents
+                                    new_vector_store = FAISS.from_documents(
+                                        split_docs, embeddings
+                                    )
+                                    formatted_result += "\n## Content Replacement\n"
+                                    formatted_result += f"Created fresh index with content from: {url}\n"
+                            else:
+                                # No existing store, create new one
+                                new_vector_store = FAISS.from_documents(
+                                    split_docs, embeddings
+                                )
+                                formatted_result += "\n## Content Indexing\n"
+                                formatted_result += (
+                                    f"Created new index with content from: {url}\n"
+                                )
+
+                            # Save the new vector store
+                            await vs_manager.save_vector_store(
+                                agent_id, new_vector_store, chunk_size, chunk_overlap
                             )
-                            formatted_result += f"- Chunks created: {total_chunks}\n"
+
+                            # Update metadata to track all URLs
+                            # Get existing metadata to preserve other URLs
+                            metadata_key = f"indexed_urls_{agent_id}"
+                            existing_metadata = (
+                                await self.skill_store.get_agent_skill_data(
+                                    agent_id, "firecrawl", metadata_key
+                                )
+                            )
+
+                            if existing_metadata and existing_metadata.get("urls"):
+                                # Remove the current URL and add it back (to update timestamp)
+                                existing_urls = [
+                                    u for u in existing_metadata["urls"] if u != url
+                                ]
+                                existing_urls.append(url)
+                                updated_metadata = {
+                                    "urls": existing_urls,
+                                    "document_count": len(existing_urls),
+                                    "source_type": "firecrawl_mixed",
+                                    "indexed_at": str(len(existing_urls)),
+                                }
+                            else:
+                                # Create new metadata
+                                updated_metadata = metadata_manager.create_url_metadata(
+                                    [url], [document], "firecrawl_scrape"
+                                )
+
+                            await metadata_manager.update_metadata(
+                                agent_id, updated_metadata
+                            )
+
+                            formatted_result += "\n## Content Indexing (REPLACE MODE)\n"
+                            formatted_result += "Successfully REPLACED indexed content in vector store:\n"
+                            formatted_result += f"- Chunks created: {len(split_docs)}\n"
                             formatted_result += f"- Chunk size: {chunk_size}\n"
                             formatted_result += f"- Chunk overlap: {chunk_overlap}\n"
-                            formatted_result += f"- Content merged with existing: {'Yes' if was_merged else 'No'}\n"
+                            formatted_result += (
+                                "- Previous content for this URL: REPLACED\n"
+                            )
                             formatted_result += "Use the 'firecrawl_query_indexed_content' skill to search this content.\n"
 
                             logger.info(
-                                f"firecrawl_scrape: Successfully indexed {url} with {total_chunks} chunks"
+                                f"firecrawl_scrape: Successfully replaced content for {url} with {len(split_docs)} chunks"
                             )
                         else:
                             formatted_result += "\n## Content Indexing\n"

{intentkit-0.6.19.dev2 → intentkit-0.6.20}/skills/supabase/base.py

@@ -3,8 +3,9 @@ from typing import Type
 from langchain_core.tools import ToolException
 from pydantic import BaseModel, Field
 
+from intentkit.abstracts.graph import AgentContext
 from intentkit.abstracts.skill import SkillStoreABC
-from intentkit.skills.base import IntentKitSkill, SkillContext
+from intentkit.skills.base import IntentKitSkill
 
 
 class SupabaseBaseTool(IntentKitSkill):
@@ -21,9 +22,7 @@ class SupabaseBaseTool(IntentKitSkill):
     def category(self) -> str:
         return "supabase"
 
-    def get_supabase_config(
-        self, config: dict, context: SkillContext
-    ) -> tuple[str, str]:
+    def get_supabase_config(self, context: AgentContext) -> tuple[str, str]:
         """Get Supabase URL and key from config.
 
         Args:
@@ -36,6 +35,7 @@ class SupabaseBaseTool(IntentKitSkill):
         Raises:
             ValueError: If required config is missing
         """
+        config = context.agent.skill_config(self.category)
         supabase_url = config.get("supabase_url")
 
         # Use public_key for public operations if available, otherwise fall back to supabase_key
@@ -52,7 +52,7 @@ class SupabaseBaseTool(IntentKitSkill):
 
         return supabase_url, supabase_key
 
-    def validate_table_access(self, table: str, context: SkillContext) -> None:
+    def validate_table_access(self, table: str, context: AgentContext) -> None:
         """Validate if the table can be accessed for write operations in public mode.
 
         Args:
@@ -66,8 +66,10 @@ class SupabaseBaseTool(IntentKitSkill):
         if context.is_private:
             return
 
+        config = context.agent.skill_config(self.category)
+
         # In public mode, check if table is in allowed list
-        public_write_tables = context.config.get("public_write_tables", "")
+        public_write_tables = config.get("public_write_tables", "")
         if not public_write_tables:
             return
 

{intentkit-0.6.19.dev2 → intentkit-0.6.20}/skills/supabase/delete_data.py

@@ -45,12 +45,11 @@ class SupabaseDeleteData(SupabaseBaseTool):
     ):
         try:
             context = self.get_context()
-            skill_config = context.agent.skill_config(self.category)
 
             # Validate table access for public mode
             self.validate_table_access(table, context)
 
-            supabase_url, supabase_key = self.get_supabase_config(skill_config, context)
+            supabase_url, supabase_key = self.get_supabase_config(context)
 
             # Create Supabase client
             supabase: Client = create_client(supabase_url, supabase_key)

{intentkit-0.6.19.dev2 → intentkit-0.6.20}/skills/supabase/fetch_data.py

@@ -60,8 +60,7 @@ class SupabaseFetchData(SupabaseBaseTool):
     ):
         try:
             context = self.get_context()
-            skill_config = context.agent.skill_config(self.category)
-            supabase_url, supabase_key = self.get_supabase_config(skill_config, context)
+            supabase_url, supabase_key = self.get_supabase_config(context)
 
             # Create Supabase client
             supabase: Client = create_client(supabase_url, supabase_key)

{intentkit-0.6.19.dev2 → intentkit-0.6.20}/skills/supabase/insert_data.py

@@ -45,12 +45,11 @@ class SupabaseInsertData(SupabaseBaseTool):
     ):
         try:
             context = self.get_context()
-            skill_config = context.agent.skill_config(self.category)
 
             # Validate table access for public mode
             self.validate_table_access(table, context)
 
-            supabase_url, supabase_key = self.get_supabase_config(skill_config, context)
+            supabase_url, supabase_key = self.get_supabase_config(context)
 
             # Create Supabase client
             supabase: Client = create_client(supabase_url, supabase_key)

{intentkit-0.6.19.dev2 → intentkit-0.6.20}/skills/supabase/invoke_function.py

@@ -44,8 +44,7 @@ class SupabaseInvokeFunction(SupabaseBaseTool):
     ):
         try:
             context = self.get_context()
-            skill_config = context.agent.skill_config(self.category)
-            supabase_url, supabase_key = self.get_supabase_config(skill_config, context)
+            supabase_url, supabase_key = self.get_supabase_config(context)
 
             # Create Supabase client
             supabase: Client = create_client(supabase_url, supabase_key)

{intentkit-0.6.19.dev2 → intentkit-0.6.20}/skills/supabase/update_data.py

@@ -48,12 +48,11 @@ class SupabaseUpdateData(SupabaseBaseTool):
     ):
         try:
             context = self.get_context()
-            skill_config = context.agent.skill_config(self.category)
 
             # Validate table access for public mode
             self.validate_table_access(table, context)
 
-            supabase_url, supabase_key = self.get_supabase_config(skill_config, context)
+            supabase_url, supabase_key = self.get_supabase_config(context)
 
             # Create Supabase client
             supabase: Client = create_client(supabase_url, supabase_key)

{intentkit-0.6.19.dev2 → intentkit-0.6.20}/skills/supabase/upsert_data.py

@@ -50,12 +50,11 @@ class SupabaseUpsertData(SupabaseBaseTool):
     ):
         try:
             context = self.get_context()
-            skill_config = context.agent.skill_config(self.category)
 
             # Validate table access for public mode
             self.validate_table_access(table, context)
 
-            supabase_url, supabase_key = self.get_supabase_config(skill_config, context)
+            supabase_url, supabase_key = self.get_supabase_config(context)
 
             # Create Supabase client
             supabase: Client = create_client(supabase_url, supabase_key)

{intentkit-0.6.19.dev2 → intentkit-0.6.20}/skills/xmtp/transfer.py

@@ -1,6 +1,7 @@
 from typing import List, Optional, Tuple, Type
 
 from pydantic import BaseModel, Field
+from web3.exceptions import ContractLogicError
 
 from intentkit.models.chat import ChatMessageAttachment, ChatMessageAttachmentType
 from intentkit.skills.xmtp.base import XmtpBaseTool
@@ -14,9 +15,6 @@ class TransferInput(BaseModel):
     amount: str = Field(
         description="The amount to transfer (as string to handle large numbers)"
     )
-    decimals: int = Field(
-        description="Number of decimal places for the token (18 for ETH, varies for ERC20 tokens)"
-    )
     currency: str = Field(description="Currency symbol (e.g., 'ETH', 'USDC', 'DAI')")
     token_contract_address: Optional[str] = Field(
         default=None,
@@ -44,7 +42,6 @@ class XmtpTransfer(XmtpBaseTool):
         from_address: str,
         to_address: str,
         amount: str,
-        decimals: int,
         currency: str,
         token_contract_address: Optional[str],
     ) -> Tuple[str, List[ChatMessageAttachment]]:
@@ -54,10 +51,8 @@ class XmtpTransfer(XmtpBaseTool):
             from_address: The sender address
             to_address: The recipient address
             amount: Amount to transfer
-            decimals: Token decimals
             currency: Currency symbol
             token_contract_address: Token contract address (None for ETH)
-            config: LangChain runnable config
 
         Returns:
             Tuple of (content_message, list_of_attachments)
@@ -80,6 +75,65 @@ class XmtpTransfer(XmtpBaseTool):
 
         chain_id_hex = chain_id_hex_by_network[agent.network_id]
 
+        # Validate token contract and get decimals
+        if token_contract_address:
+            # Validate ERC20 contract and get token info
+            web3 = self.web3_client()
+
+            # ERC20 ABI for symbol() and decimals() functions
+            erc20_abi = [
+                {
+                    "constant": True,
+                    "inputs": [],
+                    "name": "symbol",
+                    "outputs": [{"name": "", "type": "string"}],
+                    "type": "function",
+                },
+                {
+                    "constant": True,
+                    "inputs": [],
+                    "name": "decimals",
+                    "outputs": [{"name": "", "type": "uint8"}],
+                    "type": "function",
+                },
+            ]
+
+            try:
+                # Create contract instance
+                contract = web3.eth.contract(
+                    address=web3.to_checksum_address(token_contract_address),
+                    abi=erc20_abi,
+                )
+
+                # Get token symbol and decimals
+                token_symbol = contract.functions.symbol().call()
+                decimals = contract.functions.decimals().call()
+
+                # Validate symbol matches currency (case insensitive)
+                if token_symbol.upper() != currency.upper():
+                    raise ValueError(
+                        f"Token symbol mismatch: contract symbol is '{token_symbol}', "
+                        f"but currency parameter is '{currency}'"
+                    )
+
+            except ContractLogicError:
+                raise ValueError(
+                    f"Invalid ERC20 contract address: {token_contract_address}. "
+                    "The address does not point to a valid ERC20 token contract."
+                )
+            except Exception as e:
+                raise ValueError(
+                    f"Failed to validate ERC20 contract {token_contract_address}: {str(e)}"
+                )
+        else:
+            # For ETH transfers, use 18 decimals
+            decimals = 18
+            # Validate currency is ETH for native transfers
+            if currency.upper() != "ETH":
+                raise ValueError(
+                    f"For native transfers, currency must be 'ETH', got '{currency}'"
+                )
+
         # Calculate amount in smallest unit (wei for ETH, token units for ERC20)
         amount_int = int(float(amount) * (10**decimals))