feat: update agent addresses

python/examples/06-send-tokens/main.py

@@ -36,7 +36,7 @@ async def request_funds(ctx: Context):
 @alice.on_message(model=TransactionInfo)
 async def confirm_transaction(ctx: Context, sender: str, msg: TransactionInfo):
     ctx.logger.info(f"Received transaction info from {sender}: {msg}")
-    tx_resp = await wait_for_tx_to_complete(msg.tx_hash)
+    tx_resp = await wait_for_tx_to_complete(msg.tx_hash, ctx.ledger)
 
     coin_received = tx_resp.events["coin_received"]
     if (

python/examples/08-local-network-interaction/agent2.py

@@ -6,7 +6,9 @@ class Message(Model):
     message: str
 
 
-RECIPIENT_ADDRESS = "agent1q2kxet3vh0scsf0sm7y2erzz33cve6tv5uk63x64upw5g68kr0chkv7hw50"
+RECIPIENT_ADDRESS = (
+    "test-agent://agent1q2kxet3vh0scsf0sm7y2erzz33cve6tv5uk63x64upw5g68kr0chkv7hw50"
+)
 
 alice = Agent(
     name="alice",

python/examples/09-booking-protocol-demo/user.py

@@ -8,7 +8,9 @@
 from uagents.setup import fund_agent_if_low
 
 
-RESTAURANT_ADDRESS = "agent1qfpqn9jhvp9cg33f27q6jvmuv52dgyg9rfuu37rmxrletlqe7lewwjed5gy"
+RESTAURANT_ADDRESS = (
+    "test-agent://agent1qfpqn9jhvp9cg33f27q6jvmuv52dgyg9rfuu37rmxrletlqe7lewwjed5gy"
+)
 
 user = Agent(
     name="user",

python/examples/10-cleaning-demo/user.py

@@ -12,7 +12,9 @@
 from uagents.setup import fund_agent_if_low
 
 
-CLEANER_ADDRESS = "agent1qdfdx6952trs028fxyug7elgcktam9f896ays6u9art4uaf75hwy2j9m87w"
+CLEANER_ADDRESS = (
+    "test-agent://agent1qdfdx6952trs028fxyug7elgcktam9f896ays6u9art4uaf75hwy2j9m87w"
+)
 
 user = Agent(
     name="user",

python/examples/13-agent-name-service/agent1.py

@@ -1,6 +1,6 @@
 from cosmpy.aerial.wallet import LocalWallet
 
-from uagents.network import get_ledger, get_name_service_contract
+from uagents.network import get_name_service_contract
 from uagents.setup import fund_agent_if_low
 from uagents import Agent, Context, Model
 
@@ -19,19 +19,20 @@ class Message(Model):
     endpoint=["http://localhost:8001/submit"],
 )
 
-ledger = get_ledger()
+
 my_wallet = LocalWallet.from_unsafe_seed("registration test wallet")
-name_service_contract = get_name_service_contract()
+name_service_contract = get_name_service_contract(test=True)
 DOMAIN = "agent"
 
+
 for wallet in [my_wallet, bob.wallet]:
     fund_agent_if_low(wallet.address())
 
 
 @bob.on_event("startup")
 async def register_agent_name(ctx: Context):
     await name_service_contract.register(
-        ledger, my_wallet, ctx.address, ctx.name, DOMAIN
+        bob.ledger, my_wallet, ctx.address, ctx.name, DOMAIN
     )
 
 

python/examples/13-agent-name-service/agent2.py

@@ -13,7 +13,6 @@ class Message(Model):
     endpoint=["http://localhost:8000/submit"],
 )
 
-
 fund_agent_if_low(alice.wallet.address())
 
 

python/src/uagents/agent.py

@@ -9,6 +9,7 @@
 
 from cosmpy.aerial.wallet import LocalWallet, PrivateKey
 from cosmpy.crypto.address import Address
+from cosmpy.aerial.client import LedgerClient
 
 from uagents.asgi import ASGIServer
 from uagents.context import (
@@ -34,6 +35,8 @@
     REGISTRATION_UPDATE_INTERVAL_SECONDS,
     LEDGER_PREFIX,
     REGISTRATION_RETRY_INTERVAL_SECONDS,
+    TESTNET_PREFIX,
+    MAINNET_PREFIX,
     parse_endpoint_config,
     parse_agentverse_config,
     get_logger,
@@ -125,10 +128,12 @@ class Agent(Sink):
         protocols (Dict[str, Protocol]): Dictionary mapping all supported protocol digests to their
         corresponding protocols.
         _ctx (Context): The context for agent interactions.
+        _test (bool): True if the agent will register and transact on the testnet.
 
     Properties:
         name (str): The name of the agent.
         address (str): The address of the agent used for communication.
+        identifier (str): The Agent Identifier, including network prefix and address.
         wallet (LocalWallet): The agent's wallet for transacting on the ledger.
         storage (KeyValueStore): The key-value store for storage operations.
         mailbox (Dict[str, str]): The mailbox configuration for the agent (deprecated and replaced
@@ -151,6 +156,7 @@ def __init__(
         resolve: Optional[Resolver] = None,
         max_resolver_endpoints: Optional[int] = None,
         version: Optional[str] = None,
+        test: Optional[bool] = True,
     ):
         """
         Initialize an Agent instance.
@@ -210,8 +216,8 @@ def __init__(
         else:
             self._mailbox_client = None
 
-        self._ledger = get_ledger()
-        self._almanac_contract = get_almanac_contract()
+        self._ledger = get_ledger(test)
+        self._almanac_contract = get_almanac_contract(test)
         self._storage = KeyValueStore(self.address[0:16])
         self._interval_handlers: List[Tuple[IntervalCallback, float]] = []
         self._interval_messages: Set[str] = set()
@@ -224,6 +230,7 @@ def __init__(
         self._message_queue = asyncio.Queue()
         self._on_startup = []
         self._on_shutdown = []
+        self._test = test
         self._version = version or "0.1.0"
 
         # initialize the internal agent protocol
@@ -234,6 +241,7 @@ def __init__(
 
         self._ctx = Context(
             self._identity.address,
+            self.identifier,
             self._name,
             self._storage,
             self._resolver,
@@ -308,6 +316,17 @@ def address(self) -> str:
         """
         return self._identity.address
 
+    @property
+    def identifier(self) -> str:
+        """
+        Get the Agent Identifier, including network prefix and address.
+
+        Returns:
+            str: The agent's identifier.
+        """
+        prefix = TESTNET_PREFIX if self._test else MAINNET_PREFIX
+        return prefix + self._identity.address
+
     @property
     def wallet(self) -> LocalWallet:
         """
@@ -318,6 +337,16 @@ def wallet(self) -> LocalWallet:
         """
         return self._wallet
 
+    @property
+    def ledger(self) -> LedgerClient:
+        """
+        Get the ledger of the agent.
+
+        Returns:
+            LedgerClient: The agent's ledger
+        """
+        return self._ledger
+
     @property
     def storage(self) -> KeyValueStore:
         """
@@ -358,6 +387,17 @@ def mailbox_client(self) -> MailboxClient:
         """
         return self._mailbox_client
 
+    @property
+    def balance(self) -> int:
+        """
+        Get the balance of the agent.
+
+        Returns:
+            int: Bank balance.
+        """
+
+        return self.ledger.query_bank_balance(Address(self.wallet.address()))
+
     @mailbox.setter
     def mailbox(self, config: Union[str, Dict[str, str]]):
         """
@@ -472,11 +512,7 @@ async def register(self):
             or list(self.protocols.keys())
             != self._almanac_contract.get_protocols(self.address)
         ):
-            agent_balance = self._ledger.query_bank_balance(
-                Address(self.wallet.address())
-            )
-
-            if agent_balance < REGISTRATION_FEE:
+            if self.balance < REGISTRATION_FEE:
                 self._logger.warning(
                     f"I do not have enough funds to register on Almanac contract\
                         \nFund using wallet address: {self.wallet.address()}"
@@ -485,7 +521,7 @@ async def register(self):
             self._logger.info("Registering on almanac contract...")
             signature = self.sign_registration()
             await self._almanac_contract.register(
-                self._ledger,
+                self.ledger,
                 self.wallet,
                 self.address,
                 list(self.protocols.keys()),
@@ -806,6 +842,7 @@ async def _process_message_queue(self):
 
             context = Context(
                 self._identity.address,
+                self.identifier,
                 self._name,
                 self._storage,
                 self._resolver,

python/src/uagents/config.py

@@ -1,31 +1,37 @@
 import logging
 import sys
-from enum import Enum
+
+
 from typing import Any, Dict, List, Optional, Union
 
 from uvicorn.logging import DefaultFormatter
 
 logging.basicConfig(level=logging.INFO)
 
 
-class AgentNetwork(Enum):
-    FETCHAI_TESTNET = 1
-    FETCHAI_MAINNET = 2
-
-
 AGENT_PREFIX = "agent"
 LEDGER_PREFIX = "fetch"
 USER_PREFIX = "user"
-CONTRACT_ALMANAC = "fetch1tjagw8g8nn4cwuw00cf0m5tl4l6wfw9c0ue507fhx9e3yrsck8zs0l3q4w"
-CONTRACT_NAME_SERVICE = (
+TESTNET_PREFIX = "test-agent"
+MAINNET_PREFIX = "agent"
+
+MAINNET_CONTRACT_ALMANAC = (
+    "fetch1mezzhfj7qgveewzwzdk6lz5sae4dunpmmsjr9u7z0tpmdsae8zmquq3y0y"
+)
+TESTNET_CONTRACT_ALMANAC = (
+    "fetch1tjagw8g8nn4cwuw00cf0m5tl4l6wfw9c0ue507fhx9e3yrsck8zs0l3q4w"
+)
+MAINNET_CONTRACT_NAME_SERVICE = (
+    "fetch1479lwv5vy8skute5cycuz727e55spkhxut0valrcm38x9caa2x8q99ef0q"
+)
+TESTNET_CONTRACT_NAME_SERVICE = (
     "fetch1mxz8kn3l5ksaftx8a9pj9a6prpzk2uhxnqdkwuqvuh37tw80xu6qges77l"
 )
 REGISTRATION_FEE = 500000000000000000
 REGISTRATION_DENOM = "atestfet"
 REGISTRATION_UPDATE_INTERVAL_SECONDS = 3600
 REGISTRATION_RETRY_INTERVAL_SECONDS = 60
 AVERAGE_BLOCK_INTERVAL = 5.7
-AGENT_NETWORK = AgentNetwork.FETCHAI_TESTNET
 
 AGENTVERSE_URL = "https://agentverse.ai"
 ALMANAC_API_URL = AGENTVERSE_URL + "/v1/almanac/"