removed separate payload from signed request

compute_horde/compute_horde/fv_protocol/facilitator_requests.py

@@ -21,12 +21,12 @@ class Response(BaseModel, extra="forbid"):
     errors: list[Error] = []
 
 
-class SignedRequest(BaseModel, extra="forbid"):
-    signature_type: str
-    signatory: str
-    timestamp_ns: int
-    signature: str
-    signed_payload: JsonValue
+class Signature(BaseModel, extra="forbid"):
+    # has defaults to allow easy instantiation
+    signature_type: str = ""
+    signatory: str = ""
+    timestamp_ns: int = 0
+    signature: str = ""
 
 
 class V0JobRequest(BaseModel, extra="forbid"):
@@ -102,8 +102,10 @@ class V2JobRequest(BaseModel, extra="forbid"):
     # this points to a `ValidatorConsumer.job_new` handler (fuck you django-channels!)
     type: Literal["job.new"] = "job.new"
     message_type: Literal["V2JobRequest"] = "V2JobRequest"
+    signature: Signature | None = None
+
+    # !!! all fields below are included in the signed json payload
     uuid: str
-    miner_hotkey: str | None
     executor_class: ExecutorClass
     docker_image: str
     raw_script: str
@@ -112,11 +114,18 @@ class V2JobRequest(BaseModel, extra="forbid"):
     use_gpu: bool
     volume: Volume | None = None
     output_upload: OutputUpload | None = None
-    signed_request: SignedRequest
+    # !!! all fields above are included in the signed json payload
 
     def get_args(self):
         return self.args
 
+    def json_for_signing(self) -> JsonValue:
+        payload = self.model_dump(mode="json")
+        del payload["type"]
+        del payload["message_type"]
+        del payload["signature"]
+        return payload
+
     @model_validator(mode="after")
     def validate_at_least_docker_image_or_raw_script(self) -> Self:
         if not (bool(self.docker_image) or bool(self.raw_script)):

compute_horde/tests/test_job_request.py

@@ -0,0 +1,53 @@
+import base64
+import uuid
+
+from compute_horde.base.volume import VolumeType, ZipUrlVolume
+from compute_horde.executor_class import DEFAULT_EXECUTOR_CLASS
+from compute_horde.fv_protocol.facilitator_requests import Signature, V2JobRequest
+from compute_horde.signature import BittensorWalletSigner, BittensorWalletVerifier
+from compute_horde.signature import Signature as RawSignature
+
+
+def test_signed_job_roundtrip(signature_wallet):
+    volume = ZipUrlVolume(
+        volume_type=VolumeType.zip_url,
+        contents="https://example.com/input.zip",
+        relative_path="input",
+    )
+    job = V2JobRequest(
+        uuid=str(uuid.uuid4()),
+        executor_class=DEFAULT_EXECUTOR_CLASS,
+        docker_image="hello-world",
+        raw_script="bash",
+        args=["--verbose", "--dry-run"],
+        env={"CUDA": "1"},
+        use_gpu=False,
+        volume=volume,
+        output_upload=None,
+    )
+
+    signer = BittensorWalletSigner(signature_wallet)
+    payload = job.json_for_signing()
+    raw_signature = signer.sign(payload)
+
+    job.signature = Signature(
+        signature_type=raw_signature.signature_type,
+        signatory=raw_signature.signatory,
+        timestamp_ns=raw_signature.timestamp_ns,
+        signature=base64.b64encode(raw_signature.signature).decode("utf8"),
+    )
+
+    job_json = job.model_dump_json()
+    deserialized_job = V2JobRequest.model_validate_json(job_json)
+
+    assert deserialized_job.signature is not None
+    deserialized_raw_signature = RawSignature(
+        signature_type=deserialized_job.signature.signature_type,
+        signatory=deserialized_job.signature.signatory,
+        timestamp_ns=deserialized_job.signature.timestamp_ns,
+        signature=base64.b64decode(deserialized_job.signature.signature),
+    )
+
+    deserialized_payload = deserialized_job.json_for_signing()
+    verifier = BittensorWalletVerifier()
+    verifier.verify(deserialized_payload, deserialized_raw_signature)

validator/app/src/compute_horde_validator/validator/organic_jobs/facilitator_client.py

@@ -8,7 +8,7 @@
 import tenacity
 import websockets
 from channels.layers import get_channel_layer
-from compute_horde.fv_protocol.facilitator_requests import Error, JobRequest, Response
+from compute_horde.fv_protocol.facilitator_requests import Error, JobRequest, Response, V2JobRequest
 from compute_horde.fv_protocol.validator_requests import (
     V0AuthenticationRequest,
     V0Heartbeat,
@@ -243,7 +243,7 @@ async def get_miner_axon_info(self, hotkey: str) -> bittensor.AxonInfo:
 
     async def miner_driver(self, job_request: JobRequest):
         """drive a miner client from job start to completion, then close miner connection"""
-        assert job_request.miner_hotkey is not None
+        assert not isinstance(job_request, V2JobRequest)
         miner, _ = await Miner.objects.aget_or_create(hotkey=job_request.miner_hotkey)
         miner_axon_info = await self.get_miner_axon_info(job_request.miner_hotkey)
         job = await OrganicJob.objects.acreate(