Make merkle signer SNARK friendly

compactcert/worker_test.go

@@ -135,9 +135,8 @@ func (s *testWorkerStubs) CompactCertVoters(r basics.Round) (*ledgercore.VotersF
 	for i, k := range s.keysForVoters {
 		voters.AddrToPos[k.Parent] = uint64(i)
 		voters.Participants = append(voters.Participants, basics.Participant{
-			PK:         *k.StateProofSecrets.GetVerifier(),
-			Weight:     1,
-			FirstValid: uint64(k.FirstValid),
+			PK:     *k.StateProofSecrets.GetVerifier(),
+			Weight: 1,
 		})
 	}
 
@@ -265,11 +264,10 @@ func TestWorkerAllSigs(t *testing.T) {
 			require.False(t, overflowed)
 
 			ccparams := compactcert.Params{
-				Msg:               signedHdr,
-				ProvenWeight:      provenWeight,
-				SigRound:          basics.Round(signedHdr.Round),
-				SecKQ:             proto.CompactCertSecKQ,
-				CompactCertRounds: proto.CompactCertRounds,
+				Msg:          signedHdr,
+				ProvenWeight: provenWeight,
+				SigRound:     basics.Round(signedHdr.Round),
+				SecKQ:        proto.CompactCertSecKQ,
 			}
 
 			voters, err := s.CompactCertVoters(tx.Txn.CertRound - basics.Round(proto.CompactCertRounds) - basics.Round(proto.CompactCertVotersLookback))
@@ -329,11 +327,10 @@ func TestWorkerPartialSigs(t *testing.T) {
 	require.False(t, overflowed)
 
 	ccparams := compactcert.Params{
-		Msg:               signedHdr,
-		ProvenWeight:      provenWeight,
-		SigRound:          basics.Round(signedHdr.Round),
-		SecKQ:             proto.CompactCertSecKQ,
-		CompactCertRounds: proto.CompactCertRounds,
+		Msg:          signedHdr,
+		ProvenWeight: provenWeight,
+		SigRound:     basics.Round(signedHdr.Round),
+		SecKQ:        proto.CompactCertSecKQ,
 	}
 
 	voters, err := s.CompactCertVoters(tx.Txn.CertRound - basics.Round(proto.CompactCertRounds) - basics.Round(proto.CompactCertVotersLookback))

crypto/compactcert/builder.go

@@ -18,7 +18,6 @@ package compactcert
 
 import (
 	"fmt"
-
 	"github.com/algorand/go-algorand/data/basics"
 
 	"github.com/algorand/go-algorand/crypto"
@@ -102,7 +101,7 @@ func (b *Builder) Add(pos uint64, sig merklekeystore.Signature, verifySig bool)
 	// Check signature
 
 	if verifySig {
-		if err := p.PK.Verify(p.FirstValid, uint64(b.SigRound), b.CompactCertRounds, b.Msg, sig); err != nil {
+		if err := p.PK.Verify(uint64(b.SigRound), b.Msg, sig); err != nil {
 			return err
 		}
 	}
@@ -126,21 +125,6 @@ func (b *Builder) SignedWeight() uint64 {
 	return b.signedWeight
 }
 
-//msgp:ignore sigsToCommit
-type sigsToCommit []sigslot
-
-func (sc sigsToCommit) Length() uint64 {
-	return uint64(len(sc))
-}
-
-func (sc sigsToCommit) Marshal(pos uint64) ([]byte, error) {
-	if pos >= uint64(len(sc)) {
-		return nil, fmt.Errorf("pos %d past end %d", pos, len(sc))
-	}
-
-	return crypto.HashRep(&sc[pos].sigslotCommit), nil
-}
-
 // coinIndex returns the position pos in the sigs array such that the sum
 // of all signature weights before pos is less than or equal to coinWeight,
 // but the sum of all signature weights up to and including pos exceeds
@@ -192,7 +176,7 @@ func (b *Builder) Build() (*Cert, error) {
 	b.sigsHasValidL = true
 
 	hfactory := crypto.HashFactory{HashType: HashType}
-	sigtree, err := merklearray.Build(sigsToCommit(b.sigs), hfactory)
+	sigtree, err := merklearray.Build(committableSignatureSlotArray(b.sigs), hfactory)
 	if err != nil {
 		return nil, err
 	}