fix: update aggregation API signature

Author: anshalshukla

packages/testing/src/consensus_testing/keys.py

@@ -333,13 +333,13 @@ def build_attestation_signatures(
 
             # If the caller supplied raw signatures and any are invalid,
             # aggregation should fail with exception.
-            payload = aggregate_signatures(
+            aggregated_signature = aggregate_signatures(
                 public_keys=public_keys,
                 signatures=signatures,
                 message=message,
                 epoch=epoch,
             )
-            proof_blobs.append(LeanAggregatedSignature(data=payload))
+            proof_blobs.append(aggregated_signature)
 
         return AttestationSignatures(data=proof_blobs)
 

src/lean_spec/subspecs/containers/block/block.py

@@ -192,7 +192,7 @@ def verify_signatures(
             try:
                 verify_aggregated_payload(
                     public_keys=public_keys,
-                    payload=bytes(aggregated_signature),
+                    payload=aggregated_signature,
                     message=attestation_data_root,
                     epoch=aggregated_attestation.data.slot,
                 )

src/lean_spec/subspecs/containers/state/state.py

@@ -640,13 +640,13 @@ def _aggregate_signatures_from_gossip(
             sigs.append(sig)
             pks.append(self.validators[vid].get_pubkey())
 
-        payload = aggregate_signatures(
+        aggregated_signature = aggregate_signatures(
             public_keys=pks,
             signatures=sigs,
             message=data_root,
             epoch=epoch,
         )
-        return LeanAggregatedSignature(data=payload)
+        return aggregated_signature
 
     def _common_block_payload(
         self,

src/lean_spec/subspecs/xmss/aggregation.py

@@ -16,6 +16,7 @@
 from lean_spec.subspecs.xmss.containers import PublicKey
 from lean_spec.subspecs.xmss.containers import Signature as XmssSignature
 from lean_spec.types import Uint64
+from lean_spec.types.byte_arrays import LeanAggregatedSignature
 
 
 class LeanMultisigError(RuntimeError):
@@ -33,7 +34,7 @@ def aggregate_signatures(
     signatures: Sequence[XmssSignature],
     message: bytes,
     epoch: Uint64,
-) -> bytes:
+) -> LeanAggregatedSignature:
     """
     Aggregate XMSS signatures using lean-multisig.
 
@@ -44,7 +45,7 @@ def aggregate_signatures(
         epoch: The epoch in which the signatures were created.
 
     Returns:
-        Raw bytes of the aggregated signature payload.
+        LeanAggregatedSignature of the aggregated signature payload.
 
     Raises:
         LeanMultisigError: If lean-multisig is unavailable or aggregation fails.
@@ -63,7 +64,7 @@ def aggregate_signatures(
             epoch,
             test_mode=True,
         )
-        return aggregated_bytes
+        return LeanAggregatedSignature(data=aggregated_bytes)
     except Exception as exc:
         raise LeanMultisigAggregationError(f"lean-multisig aggregation failed: {exc}") from exc
 
@@ -72,7 +73,7 @@ def aggregate_signatures(
 # which might additionally require hints.
 def verify_aggregated_payload(
     public_keys: Sequence[PublicKey],
-    payload: bytes,
+    payload: LeanAggregatedSignature,
     message: bytes,
     epoch: Uint64,
 ) -> None:
@@ -81,7 +82,7 @@ def verify_aggregated_payload(
 
     Args:
         public_keys: Public keys of the signers, one per original signature.
-        payload: Raw bytes of the aggregated signature payload.
+        payload: LeanAggregatedSignature of the aggregated signature payload.
         message: The 32-byte message that was signed.
         epoch: The epoch in which the signatures were created.
 
@@ -97,7 +98,7 @@ def verify_aggregated_payload(
         verify_aggregated_signatures_py(
             pub_keys_bytes,
             message,
-            payload,
+            payload.encode_bytes(),
             epoch,
             test_mode=True,
         )