Disable batch verifier

Author: nkryuchkov

protocol/v2/types/batch_verifier.go

@@ -2,7 +2,6 @@ package types
 
 import (
 	"fmt"
-	"runtime"
 	"sync"
 	"sync/atomic"
 	"time"
@@ -13,11 +12,7 @@ import (
 	"golang.org/x/exp/maps"
 )
 
-var Verifier = NewBatchVerifier(runtime.NumCPU(), 10, time.Millisecond*5)
-
-func init() {
-	go Verifier.Start()
-}
+// TODO: remove the file after switching to RSA
 
 const messageSize = 32
 

protocol/v2/types/crypto.go

@@ -15,13 +15,11 @@ import (
 //
 // TODO: rethink this function and consider moving/refactoring it.
 func VerifyByOperators(s spectypes.Signature, data spectypes.MessageSignature, domain spectypes.DomainType, sigType spectypes.SignatureType, operators []*spectypes.Operator) error {
-	// decode sig
 	sign := &bls.Sign{}
 	if err := sign.Deserialize(s); err != nil {
 		return errors.Wrap(err, "failed to deserialize signature")
 	}
 
-	// find operators
 	pks := make([]bls.PublicKey, 0)
 	for _, id := range data.GetSigners() {
 		found := false
@@ -41,50 +39,11 @@ func VerifyByOperators(s spectypes.Signature, data spectypes.MessageSignature, d
 		}
 	}
 
-	// compute root
 	computedRoot, err := spectypes.ComputeSigningRoot(data, spectypes.ComputeSignatureDomain(domain, sigType))
 	if err != nil {
 		return errors.Wrap(err, "could not compute signing root")
 	}
 
-	// verify
-	// if res := sign.FastAggregateVerify(pks, computedRoot[:]); !res {
-	// 	return errors.New("failed to verify signature")
-	// }
-	if res := Verifier.AggregateVerify(sign, pks, computedRoot); !res {
-		return SingleVerifyByOperators(sign, data, domain, sigType, operators)
-	}
-	return nil
-}
-
-func SingleVerifyByOperators(sign *bls.Sign, data spectypes.MessageSignature, domain spectypes.DomainType, sigType spectypes.SignatureType, operators []*spectypes.Operator) error {
-	// find operators
-	pks := make([]bls.PublicKey, 0)
-	for _, id := range data.GetSigners() {
-		found := false
-		for _, n := range operators {
-			if id == n.GetID() {
-				pk, err := DeserializeBLSPublicKey(n.GetPublicKey())
-				if err != nil {
-					return errors.Wrap(err, "failed to deserialize public key")
-				}
-
-				pks = append(pks, pk)
-				found = true
-			}
-		}
-		if !found {
-			return errors.New("unknown signer")
-		}
-	}
-
-	// compute root
-	computedRoot, err := spectypes.ComputeSigningRoot(data, spectypes.ComputeSignatureDomain(domain, sigType))
-	if err != nil {
-		return errors.Wrap(err, "could not compute signing root")
-	}
-
-	// verify
 	if res := sign.FastAggregateVerify(pks, computedRoot[:]); !res {
 		return errors.New("failed to verify signature")
 	}
@@ -109,8 +68,7 @@ func VerifyReconstructedSignature(sig *bls.Sign, validatorPubKey []byte, root [3
 		return errors.Wrap(err, "could not deserialize validator pk")
 	}
 
-	// verify reconstructed sig
-	if res := Verifier.AggregateVerify(sig, []bls.PublicKey{pk}, root); !res {
+	if res := sig.VerifyByte(&pk, root[:]); !res {
 		return errors.New("could not reconstruct a valid signature")
 	}
 	return nil