Checksum client wallet address

Author: schoibs-virtuals

tests/integration/test_client_integration.py

@@ -58,7 +58,7 @@ def test_should_filter_out_self(self, acp_client):
 
             # Verify none of the agents are the client itself
             for agent in agents:
-                assert agent.wallet_address.lower() != acp_client.agent_address.lower()
+                assert agent.wallet_address.lower() != acp_client.wallet_address.lower()
 
         def test_should_respect_top_k_parameter(self, acp_client):
             """Should respect the top_k parameter for result limiting"""
@@ -92,12 +92,12 @@ class TestGetAgent:
 
         def test_should_get_own_agent_info(self, acp_client):
             """Should successfully retrieve own agent information"""
-            agent = acp_client.get_agent(acp_client.agent_address)
+            agent = acp_client.get_agent(acp_client.wallet_address)
 
             # Should return the agent or None
             # If the agent exists
             if agent:
-                assert agent.wallet_address.lower() == acp_client.agent_address.lower()
+                assert agent.wallet_address.lower() == acp_client.wallet_address.lower()
                 assert hasattr(agent, 'id')
                 assert hasattr(agent, 'job_offerings')
                 assert hasattr(agent, 'name')
@@ -161,7 +161,7 @@ def test_get_by_client_and_provider_should_handle_no_account(self, acp_client):
             fake_provider = "0x0000000000000000000000000000000000000001"
 
             account = acp_client.get_by_client_and_provider(
-                acp_client.agent_address,
+                acp_client.wallet_address,
                 fake_provider
             )
 

tests/unit/test_client.py

@@ -1002,7 +1002,7 @@ def test_should_raise_error_when_provider_is_self(self, acp_client, mock_fare_am
             """Should raise ACPError when provider address is same as client"""
             with pytest.raises(ACPError, match="Provider address cannot be the same as the client address"):
                 acp_client.initiate_job(
-                    provider_address=acp_client.agent_address,
+                    provider_address=acp_client.wallet_address,
                     service_requirement={"task": "test"},
                     fare_amount=mock_fare_amount
                 )
@@ -1017,12 +1017,12 @@ def test_should_use_create_job_when_no_account_exists(
 
             # Mock contract client methods
             mock_create_op = MagicMock()
-            acp_client.contract_client.create_job = MagicMock(return_value=mock_create_op)
-            acp_client.contract_client.handle_operation = MagicMock(return_value="tx_response")
-            acp_client.contract_client.get_job_id = MagicMock(return_value=42)
+            acp_client.acp_contract_client.create_job = MagicMock(return_value=mock_create_op)
+            acp_client.acp_contract_client.handle_operation = MagicMock(return_value="tx_response")
+            acp_client.acp_contract_client.get_job_id = MagicMock(return_value=42)
 
             mock_memo_op = MagicMock()
-            acp_client.contract_client.create_memo = MagicMock(return_value=mock_memo_op)
+            acp_client.acp_contract_client.create_memo = MagicMock(return_value=mock_memo_op)
 
             job_id = acp_client.initiate_job(
                 provider_address=TEST_PROVIDER_ADDRESS,
@@ -1031,7 +1031,7 @@ def test_should_use_create_job_when_no_account_exists(
             )
 
             # Verify create_job was called (not create_job_with_account)
-            acp_client.contract_client.create_job.assert_called_once()
+            acp_client.acp_contract_client.create_job.assert_called_once()
             assert job_id == 42
 
         @patch('virtuals_acp.client.VirtualsACP.get_by_client_and_provider')
@@ -1046,15 +1046,15 @@ def test_should_use_create_job_with_account_when_account_exists(
 
             # Mock contract client methods
             mock_create_op = MagicMock()
-            acp_client.contract_client.create_job_with_account = MagicMock(return_value=mock_create_op)
-            acp_client.contract_client.handle_operation = MagicMock(return_value="tx_response")
-            acp_client.contract_client.get_job_id = MagicMock(return_value=43)
+            acp_client.acp_contract_client.create_job_with_account = MagicMock(return_value=mock_create_op)
+            acp_client.acp_contract_client.handle_operation = MagicMock(return_value="tx_response")
+            acp_client.acp_contract_client.get_job_id = MagicMock(return_value=43)
 
             mock_memo_op = MagicMock()
-            acp_client.contract_client.create_memo = MagicMock(return_value=mock_memo_op)
+            acp_client.acp_contract_client.create_memo = MagicMock(return_value=mock_memo_op)
 
             # Set config to NOT be a base contract (to trigger account path)
-            acp_client.contract_client.config.contract_address = "0xCustomContract123456789012345678901234567"
+            acp_client.acp_contract_client.config.contract_address = "0xCustomContract123456789012345678901234567"
 
             job_id = acp_client.initiate_job(
                 provider_address=TEST_PROVIDER_ADDRESS,
@@ -1063,8 +1063,8 @@ def test_should_use_create_job_with_account_when_account_exists(
             )
 
             # Verify create_job_with_account was called with account ID
-            acp_client.contract_client.create_job_with_account.assert_called_once()
-            call_args = acp_client.contract_client.create_job_with_account.call_args[0]
+            acp_client.acp_contract_client.create_job_with_account.assert_called_once()
+            call_args = acp_client.acp_contract_client.create_job_with_account.call_args[0]
             assert call_args[0] == 5  # account.id
             assert job_id == 43
 
@@ -1076,12 +1076,12 @@ def test_should_convert_dict_requirement_to_json(
             mock_get_account.return_value = None
 
             mock_create_op = MagicMock()
-            acp_client.contract_client.create_job = MagicMock(return_value=mock_create_op)
-            acp_client.contract_client.handle_operation = MagicMock(return_value="tx_response")
-            acp_client.contract_client.get_job_id = MagicMock(return_value=44)
+            acp_client.acp_contract_client.create_job = MagicMock(return_value=mock_create_op)
+            acp_client.acp_contract_client.handle_operation = MagicMock(return_value="tx_response")
+            acp_client.acp_contract_client.get_job_id = MagicMock(return_value=44)
 
             mock_memo_op = MagicMock()
-            acp_client.contract_client.create_memo = MagicMock(return_value=mock_memo_op)
+            acp_client.acp_contract_client.create_memo = MagicMock(return_value=mock_memo_op)
 
             requirement_dict = {"task": "translate", "language": "spanish"}
 
@@ -1092,8 +1092,8 @@ def test_should_convert_dict_requirement_to_json(
             )
 
             # Verify create_memo was called with JSON string
-            acp_client.contract_client.create_memo.assert_called_once()
-            call_args = acp_client.contract_client.create_memo.call_args[0]
+            acp_client.acp_contract_client.create_memo.assert_called_once()
+            call_args = acp_client.acp_contract_client.create_memo.call_args[0]
 
             # The second argument should be the JSON-stringified requirement
             import json
@@ -1107,12 +1107,12 @@ def test_should_use_string_requirement_as_is(
             mock_get_account.return_value = None
 
             mock_create_op = MagicMock()
-            acp_client.contract_client.create_job = MagicMock(return_value=mock_create_op)
-            acp_client.contract_client.handle_operation = MagicMock(return_value="tx_response")
-            acp_client.contract_client.get_job_id = MagicMock(return_value=45)
+            acp_client.acp_contract_client.create_job = MagicMock(return_value=mock_create_op)
+            acp_client.acp_contract_client.handle_operation = MagicMock(return_value="tx_response")
+            acp_client.acp_contract_client.get_job_id = MagicMock(return_value=45)
 
             mock_memo_op = MagicMock()
-            acp_client.contract_client.create_memo = MagicMock(return_value=mock_memo_op)
+            acp_client.acp_contract_client.create_memo = MagicMock(return_value=mock_memo_op)
 
             requirement_str = "Please translate this document"
 
@@ -1123,8 +1123,8 @@ def test_should_use_string_requirement_as_is(
             )
 
             # Verify create_memo was called with the string as-is
-            acp_client.contract_client.create_memo.assert_called_once()
-            call_args = acp_client.contract_client.create_memo.call_args[0]
+            acp_client.acp_contract_client.create_memo.assert_called_once()
+            call_args = acp_client.acp_contract_client.create_memo.call_args[0]
             assert call_args[1] == requirement_str
 
         @patch('virtuals_acp.client.VirtualsACP.get_by_client_and_provider')
@@ -1137,12 +1137,12 @@ def test_should_use_default_expiry_if_not_provided(
             mock_get_account.return_value = None
 
             mock_create_op = MagicMock()
-            acp_client.contract_client.create_job = MagicMock(return_value=mock_create_op)
-            acp_client.contract_client.handle_operation = MagicMock(return_value="tx_response")
-            acp_client.contract_client.get_job_id = MagicMock(return_value=46)
+            acp_client.acp_contract_client.create_job = MagicMock(return_value=mock_create_op)
+            acp_client.acp_contract_client.handle_operation = MagicMock(return_value="tx_response")
+            acp_client.acp_contract_client.get_job_id = MagicMock(return_value=46)
 
             mock_memo_op = MagicMock()
-            acp_client.contract_client.create_memo = MagicMock(return_value=mock_memo_op)
+            acp_client.acp_contract_client.create_memo = MagicMock(return_value=mock_memo_op)
 
             before = datetime.now(timezone.utc) + timedelta(days=1)
 
@@ -1156,8 +1156,8 @@ def test_should_use_default_expiry_if_not_provided(
             after = datetime.now(timezone.utc) + timedelta(days=1)
 
             # Verify create_job was called with an expiry around 1 day from now
-            acp_client.contract_client.create_job.assert_called_once()
-            call_args = acp_client.contract_client.create_job.call_args[0]
+            acp_client.acp_contract_client.create_job.assert_called_once()
+            call_args = acp_client.acp_contract_client.create_job.call_args[0]
             expired_at = call_args[2]  # Third argument is expired_at
 
             # Should be within a few seconds of 1 day from now
@@ -1171,12 +1171,12 @@ def test_should_use_custom_evaluator_address(
             mock_get_account.return_value = None
 
             mock_create_op = MagicMock()
-            acp_client.contract_client.create_job = MagicMock(return_value=mock_create_op)
-            acp_client.contract_client.handle_operation = MagicMock(return_value="tx_response")
-            acp_client.contract_client.get_job_id = MagicMock(return_value=47)
+            acp_client.acp_contract_client.create_job = MagicMock(return_value=mock_create_op)
+            acp_client.acp_contract_client.handle_operation = MagicMock(return_value="tx_response")
+            acp_client.acp_contract_client.get_job_id = MagicMock(return_value=47)
 
             mock_memo_op = MagicMock()
-            acp_client.contract_client.create_memo = MagicMock(return_value=mock_memo_op)
+            acp_client.acp_contract_client.create_memo = MagicMock(return_value=mock_memo_op)
 
             custom_evaluator = "0x7777777777777777777777777777777777777777"
 
@@ -1188,8 +1188,8 @@ def test_should_use_custom_evaluator_address(
             )
 
             # Verify create_job was called with custom evaluator
-            acp_client.contract_client.create_job.assert_called_once()
-            call_args = acp_client.contract_client.create_job.call_args[0]
+            acp_client.acp_contract_client.create_job.assert_called_once()
+            call_args = acp_client.acp_contract_client.create_job.call_args[0]
 
             # Second argument is evaluator address
             from web3 import Web3

virtuals_acp/client.py

@@ -224,8 +224,7 @@ def acp_contract_client(self):
     @property
     def wallet_address(self):
         """Get the wallet address from the first contract client."""
-        # return Web3.to_checksum_address(self.acp_contract_client.agent_wallet_address)
-        return self.acp_contract_client.agent_wallet_address
+        return Web3.to_checksum_address(self.acp_contract_client.agent_wallet_address)
 
     @property
     def acp_url(self):
@@ -494,8 +493,8 @@ def browse_agents(
         if top_k:
             url += f"&top_k={top_k}"
 
-        if self.agent_address:
-            url += f"&walletAddressesToExclude={self.agent_address}"
+        if self.wallet_address:
+            url += f"&walletAddressesToExclude={self.wallet_address}"
 
         if cluster:
             url += f"&cluster={cluster}"
@@ -525,7 +524,7 @@ def browse_agents(
             filtered_agents = [
                 agent
                 for agent in agents_data
-                if agent["walletAddress"].lower() != self.agent_address.lower()
+                if agent["walletAddress"].lower() != self.wallet_address.lower()
                    and agent.get("contractAddress", "").lower()
                    in available_contract_addresses
             ]
@@ -555,18 +554,18 @@ def initiate_job(
         if expired_at is None:
             expired_at = datetime.now(timezone.utc) + timedelta(days=1)
 
-        if provider_address == self.agent_address:
+        if provider_address == self.wallet_address:
             raise ACPError("Provider address cannot be the same as the client address")
 
         eval_addr = (
             Web3.to_checksum_address(evaluator_address)
             if evaluator_address
-            else self.agent_address
+            else self.wallet_address
         )
 
         # Lookup existing account between client and provider
         account = self.get_by_client_and_provider(
-            self.agent_address, provider_address, self.acp_contract_client
+            self.wallet_address, provider_address, self.acp_contract_client
         )
 
         # Determine whether to call createJob or createJobWithAccount
@@ -611,7 +610,7 @@ def initiate_job(
         response = self.acp_contract_client.handle_operation([create_job_operation])
 
         job_id = self.acp_contract_client.get_job_id(
-            response, self.agent_address, provider_address
+            response, self.wallet_address, provider_address
         )
 
         operations = self.acp_contract_client.create_memo(
@@ -828,7 +827,7 @@ def _hydrate_jobs(
 
     def get_job_by_onchain_id(self, onchain_job_id: int) -> "ACPJob":
         url = f"{self.acp_url}/jobs/{onchain_job_id}"
-        headers = {"wallet-address": self.agent_address}
+        headers = {"wallet-address": self.wallet_address}
 
         try:
             response = requests.get(url, headers=headers)
@@ -888,7 +887,7 @@ def get_job_by_onchain_id(self, onchain_job_id: int) -> "ACPJob":
 
     def get_memo_by_id(self, onchain_job_id: int, memo_id: int) -> "ACPMemo":
         url = f"{self.acp_url}/jobs/{onchain_job_id}/memos/{memo_id}"
-        headers = {"wallet-address": self.agent_address}
+        headers = {"wallet-address": self.wallet_address}
 
         try:
             response = requests.get(url, headers=headers)