feat: update agent addresses

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

@@ -2,6 +2,8 @@
 from uagents.network import wait_for_tx_to_complete
 from uagents.setup import fund_agent_if_low
 
+# pylint: disable=protected-access
+
 
 class PaymentRequest(Model):
     wallet_address: str
@@ -19,8 +21,8 @@ class TransactionInfo(Model):
 alice = Agent(name="alice", seed="alice secret phrase")
 bob = Agent(name="bob", seed="bob secret phrase")
 
-fund_agent_if_low(alice.wallet.address())
-fund_agent_if_low(bob.wallet.address())
+fund_agent_if_low(alice)
+fund_agent_if_low(bob)
 
 
 @alice.on_interval(period=10.0)
@@ -36,7 +38,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/agent1.py

@@ -16,7 +16,7 @@ class Message(Model):
     endpoint=["http://127.0.0.1:8001/submit"],
 )
 
-fund_agent_if_low(bob.wallet.address())
+fund_agent_if_low(bob)
 
 
 @bob.on_message(model=Message)

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",
@@ -15,7 +17,7 @@ class Message(Model):
     endpoint=["http://127.0.0.1:8000/submit"],
 )
 
-fund_agent_if_low(alice.wallet.address())
+fund_agent_if_low(alice)
 
 
 @alice.on_interval(period=2.0)

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

@@ -15,7 +15,7 @@
     },
 )
 
-fund_agent_if_low(restaurant.wallet.address())
+fund_agent_if_low(restaurant)
 
 # build the restaurant agent from stock protocols and publish their details
 restaurant.include(query_proto, publish_manifest=True)

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

@@ -19,7 +19,7 @@
     },
 )
 
-fund_agent_if_low(user.wallet.address())
+fund_agent_if_low(user)
 
 table_query = QueryTableRequest(
     guests=3,

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

@@ -19,7 +19,7 @@
     },
 )
 
-fund_agent_if_low(cleaner.wallet.address())
+fund_agent_if_low(cleaner)
 
 
 # build the cleaning service agent from the cleaning protocol

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

@@ -23,7 +23,7 @@
     },
 )
 
-fund_agent_if_low(user.wallet.address())
+fund_agent_if_low(user)
 
 request = ServiceRequest(
     user=user.name,

python/examples/11-mailbox-agents/alice.py

@@ -22,7 +22,7 @@ class Message(Model):
     mailbox=f"{API_KEY}@wss://agentverse.ai",
 )
 
-fund_agent_if_low(agent.wallet.address())
+fund_agent_if_low(agent)
 
 
 @agent.on_message(model=Message, replies={Message})

python/examples/11-mailbox-agents/bob.py

@@ -25,7 +25,7 @@ class Message(Model):
     mailbox=f"{API_KEY}@wss://agentverse.ai",
 )
 
-fund_agent_if_low(agent.wallet.address())
+fund_agent_if_low(agent)
 
 
 @agent.on_interval(period=2.0)

python/examples/12-remote-agents/agent1.py

@@ -29,7 +29,7 @@ class Message(Model):
     endpoint=[f"{http_tunnel.public_url}/submit"],
 )
 
-fund_agent_if_low(alice.wallet.address())
+fund_agent_if_low(alice)
 
 
 @alice.on_message(model=Message)

python/examples/12-remote-agents/agent2.py

@@ -16,7 +16,7 @@ class Message(Model):
     endpoint=["http://127.0.0.1:8001/submit"],
 )
 
-fund_agent_if_low(bob.wallet.address())
+fund_agent_if_low(bob)
 
 ALICE_ADDRESS = "agent1qv2l7qzcd2g2rcv2p93tqflrcaq5dk7c2xc7fcnfq3s37zgkhxjmq5mfyvz"
 

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

@@ -1,12 +1,16 @@
 from cosmpy.aerial.wallet import LocalWallet
 
-from uagents.network import get_ledger, get_name_service_contract
+from uagents.network import get_faucet, get_name_service_contract
 from uagents.setup import fund_agent_if_low
 from uagents import Agent, Context, Model
 
+from uagents.config import REGISTRATION_FEE
+
 
 # NOTE: Run agent1.py before running agent2.py
 
+# pylint: disable=protected-access
+
 
 class Message(Model):
     message: str
@@ -19,19 +23,25 @@ class Message(Model):
     endpoint=["http://localhost:8001/submit"],
 )
 
-ledger = get_ledger()
+fund_agent_if_low(bob)
+
 my_wallet = LocalWallet.from_unsafe_seed("registration test wallet")
 name_service_contract = get_name_service_contract()
 DOMAIN = "agent"
 
-for wallet in [my_wallet, bob.wallet]:
-    fund_agent_if_low(wallet.address())
+faucet = get_faucet()
+AGENT_BALANCE = bob._ledger.query_bank_balance(my_wallet)
+
+if AGENT_BALANCE < REGISTRATION_FEE:
+    print("Adding funds to wallet...")
+    faucet.get_wealth(my_wallet)
+    print("Adding funds to wallet...complete")
 
 
 @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[-65:], ctx.name, DOMAIN
     )
 
 

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

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

python/examples/14-broadcast/main.py

@@ -8,9 +8,9 @@
 bob = Agent(name="bob", seed="bob recovery phrase")
 charles = Agent(name="charles", seed="charles recovery phrase")
 
-fund_agent_if_low(alice.wallet.address())
-fund_agent_if_low(bob.wallet.address())
-fund_agent_if_low(charles.wallet.address())
+fund_agent_if_low(alice)
+fund_agent_if_low(bob)
+fund_agent_if_low(charles)
 
 
 class BroadcastExampleRequest(Model):

python/src/uagents/agent.py

@@ -143,6 +143,7 @@ class Agent(Sink):
     def __init__(
         self,
         name: Optional[str] = None,
+        test: Optional[bool] = True,
         port: Optional[int] = None,
         seed: Optional[str] = None,
         endpoint: Optional[Union[str, List[str], Dict[str, dict]]] = None,
@@ -167,6 +168,7 @@ def __init__(
             version (Optional[str]): The version of the agent.
         """
         self._name = name
+        self._test = test
         self._port = port if port is not None else 8000
         self._background_tasks: Set[asyncio.Task] = set()
         self._resolver = (
@@ -210,9 +212,9 @@ def __init__(
         else:
             self._mailbox_client = None
 
-        self._ledger = get_ledger()
-        self._almanac_contract = get_almanac_contract()
-        self._storage = KeyValueStore(self.address[0:16])
+        self._ledger = get_ledger(self._test)
+        self._almanac_contract = get_almanac_contract(self._test)
+        self._storage = KeyValueStore(self._identity.address[0:16])
         self._interval_handlers: List[Tuple[IntervalCallback, float]] = []
         self._interval_messages: Set[str] = set()
         self._signed_message_handlers: Dict[str, MessageCallback] = {}
@@ -233,7 +235,7 @@ def __init__(
         self.protocols: Dict[str, Protocol] = {}
 
         self._ctx = Context(
-            self._identity.address,
+            self.address,
             self._name,
             self._storage,
             self._resolver,
@@ -248,7 +250,7 @@ def __init__(
         )
 
         # register with the dispatcher
-        self._dispatcher.register(self.address, self)
+        self._dispatcher.register(self._identity.address, self)
 
         if not self._use_mailbox:
             self._server = ASGIServer(
@@ -281,7 +283,7 @@ def _initialize_wallet_and_identity(self, seed, name):
                 prefix=LEDGER_PREFIX,
             )
         if name is None:
-            self._name = self.address[0:16]
+            self._name = self._identity.address[0:16]
 
     @property
     def name(self) -> str:
@@ -301,7 +303,8 @@ def address(self) -> str:
         Returns:
             str: The agent's address.
         """
-        return self._identity.address
+        prefix = "test-agent://" if self._test else "agent://"
+        return prefix + self._identity.address
 
     @property
     def wallet(self) -> LocalWallet:
@@ -413,7 +416,7 @@ def sign_registration(self) -> str:
         assert self._almanac_contract.address is not None
         return self._identity.sign_registration(
             str(self._almanac_contract.address),
-            self._almanac_contract.get_sequence(self.address),
+            self._almanac_contract.get_sequence(self._identity.address),
         )
 
     def update_endpoints(self, endpoints: List[Dict[str, Any]]):
@@ -460,12 +463,13 @@ async def register(self):
         # register if not yet registered or registration is about to expire
         # or anything has changed from the last registration
         if (
-            not self._almanac_contract.is_registered(self.address)
-            or self._almanac_contract.get_expiry(self.address)
+            not self._almanac_contract.is_registered(self._identity.address)
+            or self._almanac_contract.get_expiry(self._identity.address)
             < REGISTRATION_UPDATE_INTERVAL_SECONDS
-            or self._endpoints != self._almanac_contract.get_endpoints(self.address)
+            or self._endpoints
+            != self._almanac_contract.get_endpoints(self._identity.address)
             or list(self.protocols.keys())
-            != self._almanac_contract.get_protocols(self.address)
+            != self._almanac_contract.get_protocols(self._identity.address)
         ):
             agent_balance = self._ledger.query_bank_balance(
                 Address(self.wallet.address())
@@ -482,7 +486,7 @@ async def register(self):
             await self._almanac_contract.register(
                 self._ledger,
                 self.wallet,
-                self.address,
+                self._identity.address,
                 list(self.protocols.keys()),
                 self._endpoints,
                 signature,
@@ -800,7 +804,7 @@ async def _process_message_queue(self):
                 continue
 
             context = Context(
-                self._identity.address,
+                self.address,
                 self._name,
                 self._storage,
                 self._resolver,

python/src/uagents/config.py

@@ -1,22 +1,24 @@
 import logging
 import sys
-from enum import Enum
+
+# 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"
+TESTNET_PREFIX = "test-agent://"
+MAINNET_PREFIX = "agent://"
+
 CONTRACT_ALMANAC = "fetch1tjagw8g8nn4cwuw00cf0m5tl4l6wfw9c0ue507fhx9e3yrsck8zs0l3q4w"
+TESTNET_CONTRACT_ALMANAC = (
+    "fetch1tjagw8g8nn4cwuw00cf0m5tl4l6wfw9c0ue507fhx9e3yrsck8zs0l3q4w"
+)
 CONTRACT_NAME_SERVICE = (
     "fetch1mxz8kn3l5ksaftx8a9pj9a6prpzk2uhxnqdkwuqvuh37tw80xu6qges77l"
 )
@@ -25,7 +27,6 @@ class AgentNetwork(Enum):
 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/"