intentkit 0.6.0.dev16__py3-none-any.whl → 0.6.0.dev17__py3-none-any.whl

intentkit/__init__.py

@@ -3,7 +3,7 @@
 A powerful platform for building AI agents with blockchain and cryptocurrency capabilities.
 """
 
-__version__ = "0.6.0-dev.16"
+__version__ = "0.6.0-dev.17"
 __author__ = "hyacinthus"
 __email__ = "hyacinthus@gmail.com"
 

intentkit/clients/cdp.py

@@ -2,11 +2,15 @@ import json
 import logging
 from typing import Dict, Optional
 
+from bip32 import BIP32
+from cdp import CdpClient as OriginCdpClient
 from cdp import EvmServerAccount
 from coinbase_agentkit import (
     CdpEvmServerWalletProvider,
     CdpEvmServerWalletProviderConfig,
 )
+from eth_keys.datatypes import PrivateKey
+from eth_utils import to_checksum_address
 
 from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.models.agent import Agent
@@ -14,6 +18,43 @@ from intentkit.models.agent_data import AgentData
 
 _clients: Dict[str, "CdpClient"] = {}
 
+logger = logging.getLogger(__name__)
+
+
+def bip39_seed_to_eth_keys(seed_hex: str) -> Dict[str, str]:
+    """
+    Converts a BIP39 seed to an Ethereum private key, public key, and address.
+
+    Args:
+        seed_hex: The BIP39 seed in hexadecimal format
+
+    Returns:
+        Dict containing private_key, public_key, and address
+    """
+    # Convert the hex seed to bytes
+    seed_bytes = bytes.fromhex(seed_hex)
+
+    # Derive the master key from the seed
+    bip32 = BIP32.from_seed(seed_bytes)
+
+    # Derive the Ethereum address using the standard derivation path
+    private_key_bytes = bip32.get_privkey_from_path("m/44'/60'/0'/0/0")
+
+    # Create a private key object
+    private_key = PrivateKey(private_key_bytes)
+
+    # Get the public key
+    public_key = private_key.public_key
+
+    # Get the Ethereum address
+    address = public_key.to_address()
+
+    return {
+        "private_key": private_key.to_hex(),
+        "public_key": public_key.to_hex(),
+        "address": to_checksum_address(address),
+    }
+
 
 class CdpClient:
     def __init__(self, agent_id: str, skill_store: SkillStoreABC) -> None:
@@ -29,37 +70,55 @@ class CdpClient:
         agent_data: AgentData = await self._skill_store.get_agent_data(self._agent_id)
         network_id = agent.network_id or agent.cdp_network_id
 
-        logger = logging.getLogger(__name__)
-
         # Get credentials from skill store system config
         api_key_id = self._skill_store.get_system_config("cdp_api_key_id")
         api_key_secret = self._skill_store.get_system_config("cdp_api_key_secret")
         wallet_secret = self._skill_store.get_system_config("cdp_wallet_secret")
 
-        address = None
-
-        # Attempt to override with any wallet-specific secret stored in wallet_data
-        if agent_data.cdp_wallet_data:
-            try:
+        # already have address
+        address = agent_data.evm_wallet_address
+
+        # new agent or address not migrated yet
+        if not address:
+            # create cdp client for later use
+            cdp_client = OriginCdpClient(
+                api_key_id=api_key_id,
+                api_key_secret=api_key_secret,
+                wallet_secret=wallet_secret,
+            )
+            # try migrating from v1 cdp_wallet_data
+            if agent_data.cdp_wallet_data:
                 wallet_data = json.loads(agent_data.cdp_wallet_data)
-                # Try to get address from the new format or fallback to old format
-                if "default_address_id" in wallet_data:
-                    address = wallet_data["default_address_id"]
-
-                # Prefer wallet_secret stored alongside the wallet data if present
-                if "wallet_secret" in wallet_data:
-                    wallet_secret = wallet_data["wallet_secret"]
-                elif "account_data" in wallet_data and wallet_data["account_data"]:
-                    # Some versions may nest the secret inside account_data
-                    wallet_secret = (
-                        wallet_data["account_data"].get("wallet_secret")
-                        or wallet_secret
+                if not isinstance(wallet_data, dict):
+                    raise ValueError("Invalid wallet data format")
+                if wallet_data.get("default_address_id") and wallet_data.get("seed"):
+                    # verify seed and convert to pk
+                    keys = bip39_seed_to_eth_keys(wallet_data["seed"])
+                    if keys["address"] != wallet_data["default_address_id"]:
+                        raise ValueError(
+                            "Bad wallet data, seed does not match default_address_id"
+                        )
+                    # try to import wallet to v2
+                    logger.info("Migrating wallet data to v2...")
+                    await cdp_client.evm.import_account(
+                        name=agent.id,
+                        private_key=keys["private_key"],
                     )
-            except json.JSONDecodeError:
-                logger.warning(
-                    "Invalid JSON in cdp_wallet_data for agent %s", self._agent_id
+                    address = keys["address"]
+                    logger.info("Migrated wallet data to v2 successfully: %s", address)
+            # still not address
+            if not address:
+                logger.info("Creating new wallet...")
+                new_account = await cdp_client.evm.create_account(
+                    name=agent.id,
                 )
+                address = new_account.address
+                logger.info("Created new wallet: %s", address)
+            # now it should be created or migrated, store it
+            agent_data.evm_wallet_address = address
+            await agent_data.save()
 
+        # it must have v2 account now, load agentkit wallet provider
         self._wallet_provider_config = CdpEvmServerWalletProviderConfig(
             api_key_id=api_key_id,
             api_key_secret=api_key_secret,

intentkit/core/prompt.py

@@ -1,5 +1,3 @@
-import json
-
 from intentkit.config.config import config
 from intentkit.models.agent import Agent
 from intentkit.models.agent_data import AgentData
@@ -34,10 +32,11 @@ def agent_prompt(agent: Agent, agent_data: AgentData) -> str:
         if agent_data.telegram_name:
             prompt += f"Your telegram bot name is {agent_data.telegram_name}.\n"
         # CDP
-        if agent_data.cdp_wallet_data:
-            network_id = agent.network_id or agent.cdp_network_id
-            wallet_data = json.loads(agent_data.cdp_wallet_data)
-            prompt += f"Your wallet address in {network_id} is {wallet_data['default_address_id']} .\n"
+        network_id = agent.network_id or agent.cdp_network_id
+        if agent_data.evm_wallet_address and network_id != "solana":
+            prompt += f"Your wallet address in {network_id} is {agent_data.evm_wallet_address} .\n"
+        if agent_data.solana_wallet_address and network_id == "solana":
+            prompt += f"Your wallet address in {network_id} is {agent_data.solana_wallet_address} .\n"
     prompt += "\n"
     if agent.purpose:
         prompt += f"## Purpose\n\n{agent.purpose}\n\n"

intentkit/models/agent.py

@@ -1564,7 +1564,6 @@ class AgentResponse(BaseModel):
             str: ETag value for the agent
         """
         import hashlib
-        import json
 
         # Generate hash from the entire object data using json mode to handle datetime objects
         # Sort keys to ensure consistent ordering of dictionary keys
@@ -1622,13 +1621,7 @@ class AgentResponse(BaseModel):
             data["skills"] = filtered_skills
 
         # Process CDP wallet address
-        cdp_wallet_address = None
-        if agent_data and agent_data.cdp_wallet_data:
-            try:
-                wallet_data = json.loads(agent_data.cdp_wallet_data)
-                cdp_wallet_address = wallet_data.get("default_address_id")
-            except (json.JSONDecodeError, AttributeError):
-                pass
+        cdp_wallet_address = agent_data.evm_wallet_address if agent_data else None
 
         # Process Twitter linked status
         has_twitter_linked = False

intentkit/models/agent_data.py

@@ -29,6 +29,10 @@ class AgentDataTable(Base):
     __tablename__ = "agent_data"
 
     id = Column(String, primary_key=True, comment="Same as Agent.id")
+    evm_wallet_address = Column(String, nullable=True, comment="EVM wallet address")
+    solana_wallet_address = Column(
+        String, nullable=True, comment="Solana wallet address"
+    )
     cdp_wallet_data = Column(String, nullable=True, comment="CDP wallet data")
     crossmint_wallet_data = Column(
         JSON().with_variant(JSONB(), "postgresql"),
@@ -94,6 +98,20 @@ class AgentData(BaseModel):
             description="Same as Agent.id",
         ),
     ]
+    evm_wallet_address: Annotated[
+        Optional[str],
+        PydanticField(
+            default=None,
+            description="EVM wallet address",
+        ),
+    ]
+    solana_wallet_address: Annotated[
+        Optional[str],
+        PydanticField(
+            default=None,
+            description="Solana wallet address",
+        ),
+    ]
     cdp_wallet_data: Annotated[
         Optional[str],
         PydanticField(

intentkit/skills/cdp/__init__.py

@@ -25,9 +25,6 @@ from intentkit.skills.base import SkillConfig, SkillState
 from intentkit.skills.cdp.base import CDPBaseTool
 from intentkit.skills.cdp.get_balance import GetBalance
 
-# Cache skills at the system level, because they are stateless
-_cache: dict[str, CDPBaseTool] = {}
-
 
 class SkillStates(TypedDict):
     get_balance: SkillState

{intentkit-0.6.0.dev16.dist-info → intentkit-0.6.0.dev17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: intentkit
-Version: 0.6.0.dev16
+Version: 0.6.0.dev17
 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.0.dev16.dist-info → intentkit-0.6.0.dev17.dist-info}/RECORD

@@ -1,4 +1,4 @@
-intentkit/__init__.py,sha256=hUWe3DJJ3b06wVI7VvqEEKBqFWh0FfoB-KjBqef10fM,385
+intentkit/__init__.py,sha256=oMztmHNzrAOrgpnkdinwmAhTrI5tdiQ98QZm6WfZWGA,385
 intentkit/abstracts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 intentkit/abstracts/agent.py,sha256=108gb5W8Q1Sy4G55F2_ZFv2-_CnY76qrBtpIr0Oxxqk,1489
 intentkit/abstracts/api.py,sha256=ZUc24vaQvQVbbjznx7bV0lbbQxdQPfEV8ZxM2R6wZWo,166
@@ -8,7 +8,7 @@ intentkit/abstracts/graph.py,sha256=QhaVLtKyo9iTotIWhjgUi7BbmRCcb8yrHCTSq4Hsvnw,
 intentkit/abstracts/skill.py,sha256=WS8G_XP0Ukw1eUB-dhbx6FrJUbvV4tqzRnkWa2dt9ck,3573
 intentkit/abstracts/twitter.py,sha256=cEtP7ygR_b-pHdc9i8kBuyooz1cPoGUGwsBHDpowJyY,1262
 intentkit/clients/__init__.py,sha256=sQ_6_bRC2MPWLPH-skQ3qsEe8ce-dUGL7i8VJOautHg,298
-intentkit/clients/cdp.py,sha256=9iK5t-zSITIWS-bdv1ymF-86FeblAh9QI9GjNP2Mg5Y,3783
+intentkit/clients/cdp.py,sha256=P-JbnrATEJhczsgByhnioZEkYKsMvI6TtCqV8AszXHY,5856
 intentkit/clients/twitter.py,sha256=JAc-skIhZZjAFcwzLSTiOPOonteGjrl_JwXoA8IVBmI,16934
 intentkit/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 intentkit/config/config.py,sha256=6RreVvQH1xuHVOnIJ3AcaRYzdMw1RLo0vYYtvPKvTds,7453
@@ -19,10 +19,10 @@ intentkit/core/client.py,sha256=rIwtJVVm-7piXtFNDbeykt9vWdNTecgjW0aA3N-lHnM,1495
 intentkit/core/credit.py,sha256=fpRe8BRNGGaumAvJFgce1T2zkclExSFWQdoUVnl6k5g,60789
 intentkit/core/engine.py,sha256=ZoMk8fBUg1fqbELT8Pi8vB667ytFqAT4mQfUNt5g_H0,41192
 intentkit/core/node.py,sha256=30ivwRfVRBCMrzgzXlBKfkkobZVbpIon5E4cuavmvvA,9155
-intentkit/core/prompt.py,sha256=9jxRYUUqSdBj8bdmCUAa-5yTbiQFVInOJsDqbAuUcfo,3512
+intentkit/core/prompt.py,sha256=RfLhlUktkB2kCr3wfldqq6ZP2l8heZIMc8jVp31KIyQ,3631
 intentkit/core/skill.py,sha256=fFM_HVc8Qam2zICb_dH3nRcInEXdtfgzFnL0vvMNz2Y,3830
-intentkit/models/agent.py,sha256=5amc4rjPHmZp7a4Z6chomDiFHaxgyr0Md5mKeI90jWQ,57487
-intentkit/models/agent_data.py,sha256=h__b3658ZOclV1Pwpp3UCCu0Nt49CKYfc2JZKG1dKeE,26929
+intentkit/models/agent.py,sha256=I9wAsDqdfILpXsj5H0sE0fNwX-enzuEdEvmx-rWt_5E,57221
+intentkit/models/agent_data.py,sha256=x3pYRpI0QUcaK09r0m8-06rSbQB4pKEymF5d9JCemlo,27465
 intentkit/models/agent_schema.json,sha256=M5MMMAVNJnp6kE8hjti6D0WLdFIGtIdF66_Cg6nZfJU,21724
 intentkit/models/app_setting.py,sha256=WgW-9t0EbiVemRLrVaC6evdfRU5QFSDK0elsnUU5nIo,5008
 intentkit/models/base.py,sha256=o-zRjVrak-f5Jokdvj8BjLm8gcC3yYiYMCTLegwT2lA,185
@@ -63,7 +63,7 @@ intentkit/skills/carv/fetch_news.py,sha256=-xCWPvdVQxI0tEynR8mnjNEFpDkE4k4vNo1A-
 intentkit/skills/carv/onchain_query.py,sha256=EYV7N2Y-CisyhNVyUm2NbJhdikeFg0Y_a6lToJ5iqDM,6371
 intentkit/skills/carv/schema.json,sha256=oSReeG50ZJTOxSRniQBJW6KfilscZfp66PiBVOjphS4,5021
 intentkit/skills/carv/token_info_and_price.py,sha256=R7M5-nkjrauvxaNkORYtLcP9yOYj8PvYu1xRkOBT6lU,4275
-intentkit/skills/cdp/__init__.py,sha256=wvPP3XfkHYddu2XlIeDKwLF_SteyX-MF1rFBsoqHKtw,4589
+intentkit/skills/cdp/__init__.py,sha256=VTBCyycdxsrrUaM8OZIbJDkEXeLDVun5Lo5a8oBW6mg,4489
 intentkit/skills/cdp/base.py,sha256=BcleKSXm0oNcHYky4uUPCJ3roXxMeTJs2OUS-8MkfMI,581
 intentkit/skills/cdp/cdp.png,sha256=dxPF6jPbKVfxJNMvbGTmBhXM-rSDvweF06txoX1cIM4,4425
 intentkit/skills/cdp/get_balance.py,sha256=IAsU7mQAPSQqCbYQsokkklsqESEVl82VxMt8dEDJ6cM,4211
@@ -390,7 +390,7 @@ intentkit/utils/random.py,sha256=DymMxu9g0kuQLgJUqalvgksnIeLdS-v0aRk5nQU0mLI,452
 intentkit/utils/s3.py,sha256=9trQNkKQ5VgxWsewVsV8Y0q_pXzGRvsCYP8xauyUYkg,8549
 intentkit/utils/slack_alert.py,sha256=s7UpRgyzLW7Pbmt8cKzTJgMA9bm4EP-1rQ5KXayHu6E,2264
 intentkit/utils/tx.py,sha256=2yLLGuhvfBEY5n_GJ8wmIWLCzn0FsYKv5kRNzw_sLUI,1454
-intentkit-0.6.0.dev16.dist-info/METADATA,sha256=w1LdgxgEmc6a3V6c0DEnlOOgRStElpNRjhNUg_gcF2I,7286
-intentkit-0.6.0.dev16.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-intentkit-0.6.0.dev16.dist-info/licenses/LICENSE,sha256=Bln6DhK-LtcO4aXy-PBcdZv2f24MlJFm_qn222biJtE,1071
-intentkit-0.6.0.dev16.dist-info/RECORD,,
+intentkit-0.6.0.dev17.dist-info/METADATA,sha256=ml-xJtWAndVheeiJIfeEz1QKhlerzjoBejx9CXcrK2w,7286
+intentkit-0.6.0.dev17.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+intentkit-0.6.0.dev17.dist-info/licenses/LICENSE,sha256=Bln6DhK-LtcO4aXy-PBcdZv2f24MlJFm_qn222biJtE,1071
+intentkit-0.6.0.dev17.dist-info/RECORD,,