Add domain to beacon chain aggregation APIs

Author: hwwhww

eth/beacon/aggregation.py

@@ -16,6 +16,8 @@
 )
 from eth.utils.blake import blake
 
+from eth.beacon.enums.signature_domain import SignatureDomain
+
 
 def create_signing_message(slot: int,
                            parent_hashes: Iterable[Hash32],
@@ -37,7 +39,8 @@ def create_signing_message(slot: int,
 
 def verify_votes(
         message: bytes,
-        votes: Iterable[Tuple[int, bytes, int]]) -> Tuple[Tuple[bytes, ...], Tuple[int, ...]]:
+        votes: Iterable[Tuple[int, bytes, int]],
+        domain: SignatureDomain) -> Tuple[Tuple[bytes, ...], Tuple[int, ...]]:
     """
     Verify the given votes.
 
@@ -47,7 +50,7 @@ def verify_votes(
         (sig, committee_index)
         for (committee_index, sig, public_key)
         in votes
-        if bls.verify(message, public_key, sig)
+        if bls.verify(message, public_key, sig, domain)
     )
     try:
         sigs, committee_indices = zip(*sigs_with_committe_info)

eth/beacon/enums/signature_domain.py

@@ -1,7 +1,7 @@
 from enum import IntEnum
 
 
-class BLSDomain(IntEnum):
+class SignatureDomain(IntEnum):
     DOMAIN_DEPOSIT = 0
     DOMAIN_ATTESTATION = 1
     DOMAIN_PROPOSAL = 2

eth/utils/bls.py

@@ -1,6 +1,6 @@
 from typing import (  # noqa: F401
     Dict,
-    Iterable,
+    Sequence,
     Tuple,
 )
 
@@ -42,7 +42,7 @@
 #
 # Helpers
 #
-def modular_squareroot(value: int) -> int:
+def modular_squareroot(value: int) -> FQ2:
     """
     ``modular_squareroot(x)`` returns the value ``y`` such that ``y**2 % q == x``,
     and None if this is not possible. In cases where there are two solutions,
@@ -147,21 +147,24 @@ def verify(m: bytes, pub: int, sig: bytes, domain: int) -> bool:
     return final_exponentiation == FQ12.one()
 
 
-def aggregate_sigs(sigs: Iterable[bytes]) -> Tuple[int, int]:
+def aggregate_sigs(sigs: Sequence[bytes]) -> Tuple[int, int]:
     o = Z2
     for s in sigs:
         o = add(o, decompress_G2(s))
     return compress_G2(o)
 
 
-def aggregate_pubs(pubs: Iterable[int]) -> int:
+def aggregate_pubs(pubs: Sequence[int]) -> int:
     o = Z1
     for p in pubs:
         o = add(o, decompress_G1(p))
     return compress_G1(o)
 
 
-def multi_verify(pubs, msgs, sig, domain):
+def verify_multiple(pubs: Sequence[int],
+                    msgs: Sequence[bytes],
+                    sig: bytes,
+                    domain: int) -> bool:
     len_msgs = len(msgs)
     assert len(pubs) == len_msgs
 

tests/beacon/test_aggregation.py

@@ -31,18 +31,23 @@ def test_aggregate_votes(votes_count, random, privkeys, pubkeys):
     bit_count = 10
     pre_bitfield = get_empty_bitfield(bit_count)
     pre_sigs = ()
+    domain = 0
 
     random_votes = random.sample(range(bit_count), votes_count)
     message = b'hello'
 
     # Get votes: (committee_index, sig, public_key)
     votes = [
-        (committee_index, bls.sign(message, privkeys[committee_index]), pubkeys[committee_index])
+        (
+            committee_index,
+            bls.sign(message, privkeys[committee_index], domain),
+            pubkeys[committee_index],
+        )
         for committee_index in random_votes
     ]
 
     # Verify
-    sigs, committee_indices = verify_votes(message, votes)
+    sigs, committee_indices = verify_votes(message, votes, domain)
 
     # Aggregate the votes
     bitfield, sigs = aggregate_votes(
@@ -65,4 +70,4 @@ def test_aggregate_votes(votes_count, random, privkeys, pubkeys):
     assert len(voted_index) == len(votes)
 
     aggregated_pubs = bls.aggregate_pubs(pubs)
-    assert bls.verify(message, aggregated_pubs, sigs)
+    assert bls.verify(message, aggregated_pubs, sigs, domain)

tests/core/bls-utils/test_bls.py

@@ -15,7 +15,7 @@
     aggregate_sigs,
     aggregate_pubs,
     verify,
-    multi_verify,
+    verify_multiple,
 )
 
 
@@ -85,7 +85,7 @@ def test_multi_aggregation(msg_1, msg_2, privkeys):
     pubs = [aggpub_1, aggpub_2]
     aggsig = aggregate_sigs([aggsig_1, aggsig_2])
 
-    assert multi_verify(
+    assert verify_multiple(
         pubs=pubs,
         msgs=msgs,
         sig=aggsig,