rename BLSSignature types, add CommitteeIndex

Author: ChihChengLiang

eth/_utils/bls.py

@@ -35,8 +35,8 @@
 
 from eth.beacon.typing import (
     BLSPubkey,
-    BLSSignature,
-    BLSSignatureAggregated,
+    BLSSignatureBytes,
+    BLSSignatureIntegers,
 )
 
 G2_cofactor = 305502333931268344200999753193121504214466019254188142667664032982267604182971884026507427359259977847832272839041616661285803823378372096355777062779109  # noqa: E501
@@ -161,8 +161,8 @@ def decompress_G2(p: bytes) -> Tuple[FQP, FQP, FQP]:
 #
 def sign(message: bytes,
          privkey: int,
-         domain: int) -> BLSSignatureAggregated:
-    return BLSSignatureAggregated(
+         domain: int) -> BLSSignatureIntegers:
+    return BLSSignatureIntegers(
         compress_G2(
             multiply(
                 hash_to_G2(message, domain),
@@ -175,7 +175,7 @@ def privtopub(k: int) -> BLSPubkey:
     return BLSPubkey(compress_G1(multiply(G1, k)))
 
 
-def verify(message: bytes, pubkey: BLSPubkey, signature: BLSSignature, domain: int) -> bool:
+def verify(message: bytes, pubkey: BLSPubkey, signature: BLSSignatureBytes, domain: int) -> bool:
     try:
         final_exponentiation = final_exponentiate(
             pairing(
@@ -194,11 +194,11 @@ def verify(message: bytes, pubkey: BLSPubkey, signature: BLSSignature, domain: i
         return False
 
 
-def aggregate_signatures(signatures: Sequence[BLSSignature]) -> BLSSignatureAggregated:
+def aggregate_signatures(signatures: Sequence[BLSSignatureBytes]) -> BLSSignatureIntegers:
     o = Z2
     for s in signatures:
         o = FQP_point_to_FQ2_point(add(o, decompress_G2(s)))
-    return BLSSignatureAggregated(compress_G2(o))
+    return BLSSignatureIntegers(compress_G2(o))
 
 
 def aggregate_pubkeys(pubkeys: Sequence[BLSPubkey]) -> BLSPubkey:
@@ -210,7 +210,7 @@ def aggregate_pubkeys(pubkeys: Sequence[BLSPubkey]) -> BLSPubkey:
 
 def verify_multiple(pubkeys: Sequence[BLSPubkey],
                     messages: Sequence[bytes],
-                    signature: BLSSignature,
+                    signature: BLSSignatureBytes,
                     domain: int) -> bool:
     len_msgs = len(messages)
 

eth/beacon/aggregation.py

@@ -13,16 +13,18 @@
 from eth.beacon.enums import SignatureDomain
 from eth.beacon.typing import (
     BLSPubkey,
-    BLSSignature,
-    BLSSignatureAggregated,
+    BLSSignatureBytes,
+    BLSSignatureIntegers,
     Bitfield,
+    CommitteeIndex,
 )
 
 
 def verify_votes(
-        message: bytes,
-        votes: Iterable[Tuple[int, BLSSignature, BLSPubkey]],
-        domain: SignatureDomain) -> Tuple[Tuple[bytes, ...], Tuple[int, ...]]:
+    message: bytes,
+    votes: Iterable[Tuple[CommitteeIndex, BLSSignatureBytes, BLSPubkey]],
+    domain: SignatureDomain
+) -> Tuple[Tuple[BLSSignatureBytes, ...], Tuple[CommitteeIndex, ...]]:
     """
     Verify the given votes.
 
@@ -44,10 +46,11 @@ def verify_votes(
 
 
 def aggregate_votes(
-        bitfield: Bitfield,
-        sigs: Iterable[BLSSignature],
-        voting_sigs: Iterable[BLSSignature],
-        voting_committee_indices: Iterable[int]) -> Tuple[Bitfield, BLSSignatureAggregated]:
+    bitfield: Bitfield,
+    sigs: Iterable[BLSSignatureBytes],
+    voting_sigs: Iterable[BLSSignatureBytes],
+    voting_committee_indices: Iterable[CommitteeIndex]
+) -> Tuple[Bitfield, BLSSignatureIntegers]:
     """
     Aggregate the votes.
     """

eth/beacon/constants.py

@@ -1,4 +1,4 @@
-from eth.beacon.typing import BLSSignatureAggregated
+from eth.beacon.typing import BLSSignatureIntegers
 
 #
 # shuffle function
@@ -13,4 +13,4 @@
 # The highest possible result of the RNG.
 RAND_MAX = 2 ** (RAND_BYTES * 8) - 1
 
-EMPTY_SIGNATURE = BLSSignatureAggregated((0, 0))
+EMPTY_SIGNATURE = BLSSignatureIntegers((0, 0))

eth/beacon/deposit_helpers.py

@@ -29,7 +29,7 @@
 )
 from eth.beacon.typing import (
     BLSPubkey,
-    BLSSignature,
+    BLSSignatureBytes,
     Gwei,
 )
 
@@ -50,7 +50,7 @@ def get_min_empty_validator_index(validators: Sequence[ValidatorRecord],
 
 def validate_proof_of_possession(state: BeaconState,
                                  pubkey: BLSPubkey,
-                                 proof_of_possession: BLSSignature,
+                                 proof_of_possession: BLSSignatureBytes,
                                  withdrawal_credentials: Hash32,
                                  randao_commitment: Hash32) -> None:
     deposit_input = DepositInput(
@@ -115,7 +115,7 @@ def process_deposit(*,
                     state: BeaconState,
                     pubkey: BLSPubkey,
                     deposit: Gwei,
-                    proof_of_possession: BLSSignature,
+                    proof_of_possession: BLSSignatureBytes,
                     withdrawal_credentials: Hash32,
                     randao_commitment: Hash32,
                     zero_balance_validator_ttl: int) -> Tuple[BeaconState, int]:

eth/beacon/state_machines/configs.py

@@ -9,7 +9,7 @@
     SlotNumber,
     ShardNumber,
     Ether,
-    Seconds,
+    Second,
 )
 
 
@@ -37,7 +37,7 @@
         ('INITIAL_FORK_VERSION', int),
         ('INITIAL_SLOT_NUMBER', SlotNumber),
         # Time parameters
-        ('SLOT_DURATION', Seconds),
+        ('SLOT_DURATION', Second),
         ('MIN_ATTESTATION_INCLUSION_DELAY', int),
         ('EPOCH_LENGTH', int),
         ('POW_RECEIPT_ROOT_VOTING_PERIOD', int),

eth/beacon/state_machines/forks/serenity/configs.py

@@ -6,7 +6,7 @@
     SlotNumber,
     ShardNumber,
     Ether,
-    Seconds,
+    Second,
 )
 
 
@@ -30,7 +30,7 @@
     INITIAL_FORK_VERSION=0,
     INITIAL_SLOT_NUMBER=SlotNumber(0),
     # Time parameters
-    SLOT_DURATION=Seconds(6),  # seconds
+    SLOT_DURATION=Second(6),  # seconds
     MIN_ATTESTATION_INCLUSION_DELAY=2**2,  # (= 4) slots
     EPOCH_LENGTH=2**6,  # (= 64) slots
     POW_RECEIPT_ROOT_VOTING_PERIOD=2**10,  # (= 1,024) slots

eth/beacon/types/attestations.py

@@ -15,7 +15,7 @@
 
 from eth.beacon.typing import (
     Bitfield,
-    BLSSignatureAggregated,
+    BLSSignatureIntegers,
 )
 from eth.beacon.constants import EMPTY_SIGNATURE
 
@@ -38,7 +38,7 @@ def __init__(self,
                  data: AttestationData,
                  participation_bitfield: Bitfield,
                  custody_bitfield: Bitfield,
-                 aggregate_signature: BLSSignatureAggregated=EMPTY_SIGNATURE) -> None:
+                 aggregate_signature: BLSSignatureIntegers=EMPTY_SIGNATURE) -> None:
         super().__init__(
             data,
             participation_bitfield,

eth/beacon/types/blocks.py

@@ -24,7 +24,7 @@
 from eth.beacon._utils.hash import hash_eth2
 from eth.beacon.typing import (
     SlotNumber,
-    BLSSignatureAggregated,
+    BLSSignatureIntegers,
 )
 
 
@@ -84,7 +84,7 @@ def __init__(self,
                  randao_reveal: Hash32,
                  candidate_pow_receipt_root: Hash32,
                  body: BeaconBlockBody,
-                 signature: BLSSignatureAggregated=EMPTY_SIGNATURE) -> None:
+                 signature: BLSSignatureIntegers=EMPTY_SIGNATURE) -> None:
         super().__init__(
             slot,
             parent_root,

eth/beacon/types/deposit_data.py

@@ -3,7 +3,7 @@
 from eth.rlp.sedes import uint64
 from .deposit_input import DepositInput
 from eth.beacon.typing import (
-    UnixTime,
+    Timestamp,
     Gwei,
 )
 
@@ -23,7 +23,7 @@ class DepositData(rlp.Serializable):
     def __init__(self,
                  deposit_input: DepositInput,
                  value: Gwei,
-                 timestamp: UnixTime) -> None:
+                 timestamp: Timestamp) -> None:
 
         super().__init__(
             deposit_input,

eth/beacon/types/deposit_input.py

@@ -13,7 +13,7 @@
 from eth.beacon._utils.hash import hash_eth2
 from eth.beacon.typing import (
     BLSPubkey,
-    BLSSignatureAggregated,
+    BLSSignatureIntegers,
 )
 from eth.beacon.constants import EMPTY_SIGNATURE
 
@@ -37,7 +37,7 @@ def __init__(self,
                  pubkey: BLSPubkey,
                  withdrawal_credentials: Hash32,
                  randao_commitment: Hash32,
-                 proof_of_possession: BLSSignatureAggregated=EMPTY_SIGNATURE) -> None:
+                 proof_of_possession: BLSSignatureIntegers=EMPTY_SIGNATURE) -> None:
         super().__init__(
             pubkey=pubkey,
             withdrawal_credentials=withdrawal_credentials,