fix decompress_G2 and use one BLSSignature only

Author: ChihChengLiang

eth/_utils/bls.py

@@ -35,8 +35,7 @@
 
 from eth.beacon.typing import (
     BLSPubkey,
-    BLSSignatureBytes,
-    BLSSignatureIntegers,
+    BLSSignature,
 )
 
 G2_cofactor = 305502333931268344200999753193121504214466019254188142667664032982267604182971884026507427359259977847832272839041616661285803823378372096355777062779109  # noqa: E501
@@ -139,7 +138,7 @@ def compress_G2(pt: Tuple[FQP, FQP, FQP]) -> Tuple[int, int]:
     )
 
 
-def decompress_G2(p: bytes) -> Tuple[FQP, FQP, FQP]:
+def decompress_G2(p: Tuple[int, int]) -> Tuple[FQP, FQP, FQP]:
     x1 = p[0] % 2**383
     y1_mod_2 = p[0] // 2**383
     x2 = p[1]
@@ -161,8 +160,8 @@ def decompress_G2(p: bytes) -> Tuple[FQP, FQP, FQP]:
 #
 def sign(message: bytes,
          privkey: int,
-         domain: int) -> BLSSignatureIntegers:
-    return BLSSignatureIntegers(
+         domain: int) -> BLSSignature:
+    return BLSSignature(
         compress_G2(
             multiply(
                 hash_to_G2(message, domain),
@@ -175,7 +174,7 @@ def privtopub(k: int) -> BLSPubkey:
     return BLSPubkey(compress_G1(multiply(G1, k)))
 
 
-def verify(message: bytes, pubkey: BLSPubkey, signature: BLSSignatureBytes, domain: int) -> bool:
+def verify(message: bytes, pubkey: BLSPubkey, signature: BLSSignature, domain: int) -> bool:
     try:
         final_exponentiation = final_exponentiate(
             pairing(
@@ -194,11 +193,11 @@ def verify(message: bytes, pubkey: BLSPubkey, signature: BLSSignatureBytes, doma
         return False
 
 
-def aggregate_signatures(signatures: Sequence[BLSSignatureBytes]) -> BLSSignatureIntegers:
+def aggregate_signatures(signatures: Sequence[BLSSignature]) -> BLSSignature:
     o = Z2
     for s in signatures:
         o = FQP_point_to_FQ2_point(add(o, decompress_G2(s)))
-    return BLSSignatureIntegers(compress_G2(o))
+    return BLSSignature(compress_G2(o))
 
 
 def aggregate_pubkeys(pubkeys: Sequence[BLSPubkey]) -> BLSPubkey:
@@ -210,7 +209,7 @@ def aggregate_pubkeys(pubkeys: Sequence[BLSPubkey]) -> BLSPubkey:
 
 def verify_multiple(pubkeys: Sequence[BLSPubkey],
                     messages: Sequence[bytes],
-                    signature: BLSSignatureBytes,
+                    signature: BLSSignature,
                     domain: int) -> bool:
     len_msgs = len(messages)
 

eth/beacon/aggregation.py

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

eth/beacon/constants.py

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

eth/beacon/deposit_helpers.py

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

eth/beacon/types/attestations.py

@@ -15,7 +15,7 @@
 
 from eth.beacon.typing import (
     Bitfield,
-    BLSSignatureIntegers,
+    BLSSignature,
 )
 from eth.beacon.constants import EMPTY_SIGNATURE
 
@@ -38,7 +38,7 @@ def __init__(self,
                  data: AttestationData,
                  participation_bitfield: Bitfield,
                  custody_bitfield: Bitfield,
-                 aggregate_signature: BLSSignatureIntegers=EMPTY_SIGNATURE) -> None:
+                 aggregate_signature: BLSSignature=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,
-    BLSSignatureIntegers,
+    BLSSignature,
 )
 
 
@@ -84,7 +84,7 @@ def __init__(self,
                  randao_reveal: Hash32,
                  candidate_pow_receipt_root: Hash32,
                  body: BeaconBlockBody,
-                 signature: BLSSignatureIntegers=EMPTY_SIGNATURE) -> None:
+                 signature: BLSSignature=EMPTY_SIGNATURE) -> None:
         super().__init__(
             slot,
             parent_root,

eth/beacon/types/deposit_input.py

@@ -13,7 +13,7 @@
 from eth.beacon._utils.hash import hash_eth2
 from eth.beacon.typing import (
     BLSPubkey,
-    BLSSignatureIntegers,
+    BLSSignature,
 )
 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: BLSSignatureIntegers=EMPTY_SIGNATURE) -> None:
+                 proof_of_possession: BLSSignature=EMPTY_SIGNATURE) -> None:
         super().__init__(
             pubkey=pubkey,
             withdrawal_credentials=withdrawal_credentials,

eth/beacon/types/exits.py

@@ -9,7 +9,7 @@
 )
 from eth.beacon.typing import (
     SlotNumber,
-    BLSSignatureIntegers,
+    BLSSignature,
 )
 from eth.beacon.constants import EMPTY_SIGNATURE
 
@@ -30,7 +30,7 @@ class Exit(rlp.Serializable):
     def __init__(self,
                  slot: SlotNumber,
                  validator_index: ValidatorIndex,
-                 signature: BLSSignatureIntegers=EMPTY_SIGNATURE) -> None:
+                 signature: BLSSignature=EMPTY_SIGNATURE) -> None:
         super().__init__(
             slot,
             validator_index,

eth/beacon/types/proposer_slashings.py

@@ -8,7 +8,7 @@
 )
 from .proposal_signed_data import ProposalSignedData
 from eth.beacon.typing import (
-    BLSSignatureIntegers,
+    BLSSignature,
 )
 from eth.beacon.constants import EMPTY_SIGNATURE
 
@@ -32,8 +32,8 @@ def __init__(self,
                  proposal_data_1: ProposalSignedData,
                  proposal_data_2: ProposalSignedData,
                  # default arguments follow non-default arguments
-                 proposal_signature_1: BLSSignatureIntegers = EMPTY_SIGNATURE,
-                 proposal_signature_2: BLSSignatureIntegers = EMPTY_SIGNATURE) -> None:
+                 proposal_signature_1: BLSSignature = EMPTY_SIGNATURE,
+                 proposal_signature_2: BLSSignature = EMPTY_SIGNATURE) -> None:
         super().__init__(
             proposer_index=proposer_index,
             proposal_data_1=proposal_data_1,

eth/beacon/types/slashable_vote_data.py

@@ -15,7 +15,7 @@
     uint384,
 )
 from eth.beacon.typing import (
-    BLSSignatureIntegers,
+    BLSSignature,
     ValidatorIndex,
 )
 from eth.beacon.constants import EMPTY_SIGNATURE
@@ -42,7 +42,7 @@ def __init__(self,
                  aggregate_signature_poc_0_indices: Sequence[ValidatorIndex],
                  aggregate_signature_poc_1_indices: Sequence[ValidatorIndex],
                  data: AttestationData,
-                 aggregate_signature: BLSSignatureIntegers = EMPTY_SIGNATURE) -> None:
+                 aggregate_signature: BLSSignature = EMPTY_SIGNATURE) -> None:
         super().__init__(
             aggregate_signature_poc_0_indices,
             aggregate_signature_poc_1_indices,