feat: updates for caboodle demo

examples/10-cleaning-demo/cleaner.py

@@ -44,8 +44,8 @@ async def startup():
 
     await Availability.create(
         provider=provider,
-        time_start=utc.localize(datetime.fromisoformat("2022-12-31 10:00:00")),
-        time_end=utc.localize(datetime.fromisoformat("2022-12-31 22:00:00")),
+        time_start=utc.localize(datetime.fromisoformat("2022-01-31 00:00:00")),
+        time_end=utc.localize(datetime.fromisoformat("2023-02-01 00:00:00")),
         max_distance=10,
         min_hourly_price=5,
     )

examples/10-cleaning-demo/protocols/cleaning/__init__.py

@@ -78,7 +78,7 @@ async def handle_query_request(ctx: Context, sender: str, msg: ServiceRequest):
 @cleaning_proto.on_message(model=ServiceBooking, replies=BookingResponse)
 async def handle_book_request(ctx: Context, sender: str, msg: ServiceBooking):
 
-    provider = await Provider.get(name=ctx.name)
+    provider = await Provider.filter(name=ctx.name).first()
     availability = await Availability.get(provider=provider)
     services = [int(service.type) for service in await provider.services]
 

src/nexus/agent.py

@@ -321,12 +321,12 @@ async def _process_message_queue(self):
             schema_digest, sender, message = await self._message_queue.get()
 
             # lookup the model definition
-            model_class = self._models.get(schema_digest)
+            model_class: Model = self._models.get(schema_digest)
             if model_class is None:
                 continue
 
             # parse the received message
-            recovered = model_class.parse_raw(message)
+            recovered = model_class.parse(message)
 
             context = Context(
                 self._identity.address,

src/nexus/asgi.py

@@ -63,7 +63,7 @@ async def __call__(self, scope, receive, send):
             return
 
         headers = dict(scope.get("headers", {}))
-        if headers[b"content-type"] != b"application/json":
+        if b"application/json" not in headers[b"content-type"]:
             await send(
                 {
                     "type": "http.response.start",
@@ -149,8 +149,9 @@ async def __call__(self, scope, receive, send):
         # wait for any queries to be resolved
         if expects_response:
             response_msg: Model = await self._queries[env.sender]
-            if datetime.now() > datetime.fromtimestamp(env.expires):
-                response_msg = ErrorMessage("Query envelope expired")
+            if env.expires is not None:
+                if datetime.now() > datetime.fromtimestamp(env.expires):
+                    response_msg = ErrorMessage("Query envelope expired")
             sender = env.target
             response = enclose_response(response_msg, sender, env.session)
         else:

src/nexus/context.py

@@ -10,7 +10,7 @@
 from cosmpy.aerial.wallet import LocalWallet
 
 from nexus.config import DEFAULT_ENVELOPE_TIMEOUT_SECONDS
-from nexus.crypto import Identity, is_user_address
+from nexus.crypto import Identity
 from nexus.dispatch import dispatcher
 from nexus.envelope import Envelope
 from nexus.models import Model, ErrorMessage
@@ -110,10 +110,7 @@ async def send(
             return
 
         # handle queries waiting for a response
-        if is_user_address(destination):
-            if destination not in self._queries:
-                logging.exception(f"Unable to resolve query to user {destination}")
-                return
+        if destination in self._queries:
             self._queries[destination].set_result(message)
             del self._queries[destination]
             return

src/nexus/models.py

@@ -1,4 +1,5 @@
 import hashlib
+from typing import Any, Dict
 
 from pydantic import BaseModel
 
@@ -14,6 +15,12 @@ def build_schema_digest(model: "Model") -> str:
             .hex()
         )
 
+    @classmethod
+    def parse(cls, model: Any) -> Dict[str, Any]:
+        if isinstance(model, dict):
+            return cls.parse_obj(model)
+        return cls.parse_raw(model)
+
 
 class ErrorMessage(Model):
     error: str

src/nexus/query.py

@@ -73,5 +73,5 @@ def enclose_response(message: Model, sender: str, session: str) -> dict:
         session=session,
         protocol=Model.build_schema_digest(message),
     )
-    response_env.encode_payload(message.json())
+    response_env.encode_payload(message.dict())
     return response_env.json()

tests/test_agent_registration.py

@@ -0,0 +1,46 @@
+# pylint: disable=protected-access
+import unittest
+
+from nexus import Agent
+from nexus.setup import fund_agent_if_low
+
+
+class TestVerify(unittest.TestCase):
+    def test_agent_registration(self):
+
+        agent = Agent(name="alice")
+
+        reg_fee = "500000000000000000atestfet"
+
+        fund_agent_if_low(agent.wallet.address())
+
+        sequence = agent.get_registration_sequence()
+
+        signature = agent._identity.sign_registration(
+            agent._reg_contract.address, agent.get_registration_sequence()
+        )
+
+        msg = {
+            "register": {
+                "record": {
+                    "service": {
+                        "protocols": [],
+                        "endpoints": [{"url": agent._endpoint, "weight": 1}],
+                    }
+                },
+                "signature": signature,
+                "sequence": sequence,
+                "agent_address": agent.address,
+            }
+        }
+
+        transaction = agent._reg_contract.execute(msg, agent.wallet, funds=reg_fee)
+        transaction.wait_to_complete()
+
+        is_registered = agent.registration_status()
+
+        self.assertEqual(is_registered, True, "Registration failed")
+
+
+if __name__ == "__main__":
+    unittest.main()

tests/test_verify_msg.py

@@ -12,7 +12,7 @@ def encode(message: str) -> bytes:
 
 
 class TestVerify(unittest.TestCase):
-    def test_verify_message(self):
+    def test_sign_and_verify_message(self):
         alice = Agent(name="alice", seed="alice recovery password")
 
         alice_msg = "hello there bob"
@@ -25,6 +25,22 @@ def test_verify_message(self):
 
         self.assertEqual(result, True, "Verification failed")
 
+    def test_verify_dart_digest(self):
+
+        # Generate public key
+        address = "agent1qf5gfqm48k9acegez3sg82ney2aa6l5fvpwh3n3z0ajh0nam3ssgwnn5me7"
+
+        # Signature
+        signature = "sig1qyvn5fjzrhjzqcmj2gfg4us6xj00gvscs4u9uqxy6wpvp9agxjf723eh5l6w878p67lycgd3fz77zr3h0q6mrheg48e35zsvv0rm2tsuvyn3l"  # pylint: disable=line-too-long
+
+        # Message
+        dart_digest = "a29af8b704077d394a9756dc04f0bb5f1424fc391b3de91144d683c5893ca234"
+        bytes_dart_digest = bytes.fromhex(dart_digest)
+
+        result = Identity.verify_digest(address, bytes_dart_digest, signature)
+
+        self.assertEqual(result, True, "Verification failed")
+
 
 if __name__ == "__main__":
     unittest.main()