Update queue waiting logic

README.md

@@ -19,6 +19,9 @@ Documents used for this implementation:
 - [KZG10-Ceremony-audit-report.pdf, section *3.1 Overview of PoT ceremonies*](https://github.com/ethereum/kzg-ceremony/blob/main/KZG10-Ceremony-audit-report.pdf)
 - [*Why and how zkSNARKs work*, by Maksym Petkus](https://arxiv.org/abs/1906.07221v1)
 
+
+You can find more info on the logic behind the powers of tau computation & verification in these notes: http://arnaucube.com/blog/powersoftau.html
+
 ### Usage
 Get the binary from the [releases](https://github.com/arnaucube/eth-kzg-ceremony-alt/releases) (alternative you can compile it from source), and run:
 ```
@@ -28,13 +31,13 @@ eth-kzg-ceremony-alt
 ====================
 
 Usage of ./kzgceremony:
-  -u, --url string       sequencer url (default "https://kzg-ceremony-sequencer-dev.fly.dev")
-  -r, --rand string      randomness
-  -s, --sleeptime uint   time (seconds) sleeping before trying again to be the next contributor (default 10)
+  -u, --url string       sequencer url (default "https://seq.ceremony.ethereum.org")
+  -r, --rand string      randomness, needs to be bigger than 64 bytes
+  -s, --sleeptime uint   time (seconds) sleeping before trying again to be the next contributor (default 30)
 ```
 
 So for example, run your contribution with:
 ```
-./kzgceremony -r 1111111111111111111111111111111111111111111111111111111111111111
+./kzgceremony -r "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod"
 ```
-(where the 111...111 is your source of randomness)
+(where the "Lorem ipsum..." is your source of randomness)

client/req.go

@@ -132,38 +132,47 @@ func (c *Client) PostAuthCallback() (*MsgRequestLink, error) {
 	return &msg, err
 }
 
-func (c *Client) PostTryContribute(sessionID string) (*kzgceremony.BatchContribution, bool, error) {
+type Status int
+
+const (
+	StatusReauth = Status(iota)
+	StatusError
+	StatusWait
+	StatusProceed
+)
+
+func (c *Client) PostTryContribute(sessionID string) (*kzgceremony.BatchContribution, Status, error) {
 	bearer := "Bearer " + sessionID
 	resp, err := c.postWithAuth(
 		c.url+"/lobby/try_contribute", "application/json", nil, bearer)
 	if err != nil {
-		return nil, false, err
+		return nil, StatusError, err
 	}
 
 	body, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
-		return nil, false, err
+		return nil, StatusError, err
 	}
 
 	if resp.StatusCode != http.StatusOK {
 		fmt.Println(string(body))
 		switch resp.StatusCode {
 		case http.StatusBadRequest:
-			return nil, true, fmt.Errorf("call came to early. rate limited")
+			return nil, StatusWait, fmt.Errorf("call came to early. rate limited")
 		case http.StatusUnauthorized:
-			return nil, false, fmt.Errorf("unkown session id. unauthorized access")
+			return nil, StatusReauth, fmt.Errorf("unkown session id. unauthorized access")
 		default:
-			return nil, false, fmt.Errorf("unexpected http code: %d", resp.StatusCode)
+			return nil, StatusWait, fmt.Errorf("unexpected http code: %d", resp.StatusCode)
 		}
 	}
 
 	err = ioutil.WriteFile("prevBatchContribution.json", body, 0600)
 	if err != nil {
-		return nil, false, err
+		return nil, StatusError, err
 	}
 	bc := &kzgceremony.BatchContribution{}
 	err = json.Unmarshal(body, bc)
-	return bc, false, err
+	return bc, StatusError, err
 }
 
 func (c *Client) PostAbortContribution(sessionID string) ([]byte, error) {

cmd/cmd.go

@@ -15,25 +15,28 @@ import (
 	flag "github.com/spf13/pflag"
 )
 
+var (
+	redB   = color.New(color.FgRed, color.Bold)
+	cyan   = color.New(color.FgCyan)
+	cyanB  = color.New(color.FgCyan, color.Bold)
+	green  = color.New(color.FgHiGreen)
+	greenB = color.New(color.FgHiGreen, color.Bold)
+)
+
 func main() {
 	fmt.Println("eth-kzg-ceremony-alt")
-	fmt.Printf("====================\n\n")
-
-	redB := color.New(color.FgRed, color.Bold)
-	cyan := color.New(color.FgCyan)
-	cyanB := color.New(color.FgCyan, color.Bold)
-	green := color.New(color.FgHiGreen)
-	greenB := color.New(color.FgHiGreen, color.Bold)
+	fmt.Printf("====================\n")
+	fmt.Printf("            https://github.com/arnaucube/eth-kzg-ceremony-alt\n\n")
 
 	var sequencerURL string
 	var randomness string
 	var sleepTime uint64
 	flag.StringVarP(&sequencerURL, "url", "u",
-		"https://kzg-ceremony-sequencer-dev.fly.dev", "sequencer url")
+		"https://seq.ceremony.ethereum.org", "sequencer url")
 	flag.StringVarP(&randomness, "rand", "r",
-		"", fmt.Sprintf("randomness, needs to be bigger than %d", kzgceremony.MinRandomnessLen))
+		"", fmt.Sprintf("randomness, needs to be bigger than %d bytes", kzgceremony.MinRandomnessLen))
 	flag.Uint64VarP(&sleepTime, "sleeptime", "s",
-		10, "time (seconds) sleeping before trying again to be the next contributor")
+		30, "time (seconds) sleeping before trying again to be the next contributor")
 
 	flag.CommandLine.SortFlags = false
 	flag.Parse()
@@ -60,25 +63,8 @@ func main() {
 	}
 
 	// Auth
-	msgReqLink, err := c.GetRequestLink()
-	if err != nil {
-		printErrAndExit(err)
-	}
-
-	_, _ = green.Printf("Please go to\n%s\n and authenticate with Github.\n", msgReqLink.GithubAuthURL)
-	fmt.Println("(currently only Github auth is supported)")
-
-	_, _ = greenB.Printf("Paste here the RawData from the auth answer:\n")
-	s, err := readInput()
-	if err != nil {
-		printErrAndExit(err)
-	}
-	var authMsg client.MsgAuthCallback
-	if err = json.Unmarshal([]byte(s), &authMsg); err != nil {
-		printErrAndExit(err)
-	}
-	fmt.Print("Parsed auth msg: ")
-	_, _ = cyan.Printf("%#v\n", authMsg)
+	fmt.Println("Github Authorization:")
+	authMsg := authGH(c)
 
 	// TODO this will be only triggered by a flag
 	// msg, err := c.PostAbortContribution(authMsg.SessionID)
@@ -93,16 +79,27 @@ func main() {
 	var prevBatchContribution *kzgceremony.BatchContribution
 	for {
 		fmt.Printf("%s sending try_contribute\n", time.Now().Format("2006-01-02 15:04:05"))
-		var retry bool
-		prevBatchContribution, retry, err = c.PostTryContribute(authMsg.SessionID)
+		var status client.Status
+		prevBatchContribution, status, err = c.PostTryContribute(authMsg.SessionID)
 		if err != nil {
 			_, _ = cyan.Println(err)
 		}
-		if !retry {
+		if status == client.StatusProceed {
 			break
 		}
-		fmt.Printf("%s try_contribute unsuccessful, going to sleep %d seconds\n",
-			time.Now().Format("2006-01-02 15:04:05"), sleepTime)
+		if status == client.StatusReauth {
+			fmt.Println("SessionID has expired, authenticate again with Github:")
+			authMsg = authGH(c)
+		}
+		msgStatus, err := c.GetCurrentStatus()
+		if err != nil {
+			printErrAndExit(err)
+		}
+		fmt.Printf("%s try_contribute unsuccessful, lobby size %d, num contrib %d,"+
+			"\n    going to sleep %d seconds\n",
+			time.Now().Format("2006-01-02 15:04:05"),
+			msgStatus.LobbySize, msgStatus.NumContributions,
+			sleepTime)
 		time.Sleep(time.Duration(sleepTime) * time.Second)
 	}
 
@@ -114,10 +111,13 @@ func main() {
 	// }
 
 	fmt.Println("starting to compute new contribution")
+	t0 := time.Now()
 	newBatchContribution, err := prevBatchContribution.Contribute([]byte(randomness))
 	if err != nil {
 		printErrAndExit(err)
 	}
+	fmt.Println("Contribution computed in", time.Since(t0))
+
 	// store contribution
 	fmt.Println("storing contribution.json")
 	b, err := json.Marshal(newBatchContribution)
@@ -150,6 +150,29 @@ func main() {
 	}
 }
 
+func authGH(c *client.Client) client.MsgAuthCallback {
+	msgReqLink, err := c.GetRequestLink()
+	if err != nil {
+		printErrAndExit(err)
+	}
+
+	_, _ = green.Printf("Please go to\n%s\n and authenticate with Github.\n", msgReqLink.GithubAuthURL)
+	fmt.Println("(currently only Github auth is supported)")
+
+	_, _ = greenB.Printf("Paste here the RawData from the auth answer:\n")
+	s, err := readInput()
+	if err != nil {
+		printErrAndExit(err)
+	}
+	var authMsg client.MsgAuthCallback
+	if err = json.Unmarshal([]byte(s), &authMsg); err != nil {
+		printErrAndExit(err)
+	}
+	fmt.Print("Parsed auth msg: ")
+	_, _ = cyan.Printf("%#v\n", authMsg)
+	return authMsg
+}
+
 func printErrAndExit(err error) {
 	red := color.New(color.FgRed)
 	_, _ = red.Println(err)

go.mod

@@ -7,6 +7,7 @@ require (
 	github.com/frankban/quicktest v1.14.4
 	github.com/kilic/bls12-381 v0.1.0
 	github.com/spf13/pflag v1.0.5
+	golang.org/x/crypto v0.4.0
 )
 
 require (
@@ -16,5 +17,5 @@ require (
 	github.com/mattn/go-colorable v0.1.12 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/rogpeppe/go-internal v1.9.0 // indirect
-	golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
+	golang.org/x/sys v0.3.0 // indirect
 )

go.sum

@@ -22,10 +22,12 @@ github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZV
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+golang.org/x/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8=
+golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
+golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

powersoftau.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"math/big"
 
+	"golang.org/x/crypto/blake2b"
+
 	bls12381 "github.com/kilic/bls12-381"
 )
 
@@ -81,7 +83,7 @@ func (cs *State) Contribute(randomness []byte) (*State, error) {
 		ns.Transcripts[i].NumG1Powers = cs.Transcripts[i].NumG1Powers
 		ns.Transcripts[i].NumG2Powers = cs.Transcripts[i].NumG2Powers
 
-		newSRS, proof, err := Contribute(cs.Transcripts[i].PowersOfTau, randomness)
+		newSRS, proof, err := Contribute(cs.Transcripts[i].PowersOfTau, i, randomness)
 		if err != nil {
 			return nil, err
 		}
@@ -109,7 +111,7 @@ func (pb *BatchContribution) Contribute(randomness []byte) (*BatchContribution,
 		nb.Contributions[i].NumG1Powers = pb.Contributions[i].NumG1Powers
 		nb.Contributions[i].NumG2Powers = pb.Contributions[i].NumG2Powers
 
-		newSRS, proof, err := Contribute(pb.Contributions[i].PowersOfTau, randomness)
+		newSRS, proof, err := Contribute(pb.Contributions[i].PowersOfTau, i, randomness)
 		if err != nil {
 			return nil, err
 		}
@@ -135,9 +137,10 @@ func newEmptySRS(nG1, nG2 int) *SRS {
 	return &SRS{g1s, g2s}
 }
 
-func tau(randomness []byte) *toxicWaste {
+func tau(round int, randomness []byte) *toxicWaste {
+	val := blake2b.Sum256(randomness)
 	tau := new(big.Int).Mod(
-		new(big.Int).SetBytes(randomness),
+		new(big.Int).SetBytes(val[:]),
 		g2.Q())
 	tau_Fr := bls12381.NewFr().FromBytes(tau.Bytes())
 	TauG2 := g2.New()
@@ -176,12 +179,12 @@ func genProof(toxicWaste *toxicWaste, prevSRS, newSRS *SRS) *Proof {
 
 // Contribute takes as input the previous SRS and a random
 // byte slice, and returns the new SRS together with the Proof
-func Contribute(prevSRS *SRS, randomness []byte) (*SRS, *Proof, error) {
+func Contribute(prevSRS *SRS, round int, randomness []byte) (*SRS, *Proof, error) {
 	if len(randomness) < MinRandomnessLen {
 		return nil, nil, fmt.Errorf("err randomness") // WIP
 	}
 	// set tau from randomness
-	tw := tau(randomness)
+	tw := tau(round, randomness)
 
 	newSRS := computeContribution(tw, prevSRS)
 

powersoftau_test.go

@@ -13,13 +13,13 @@ func TestContribution(t *testing.T) {
 
 	srs_0 := newEmptySRS(10, 10)
 
-	srs_1, proof_1, err := Contribute(srs_0,
+	srs_1, proof_1, err := Contribute(srs_0, 0,
 		[]byte("1111111111111111111111111111111111111111111111111111111111111111"))
 	c.Assert(err, qt.IsNil)
 
 	c.Assert(Verify(srs_0, srs_1, proof_1), qt.IsTrue)
 
-	srs_2, proof_2, err := Contribute(srs_1,
+	srs_2, proof_2, err := Contribute(srs_1, 0,
 		[]byte("2222222222222222222222222222222222222222222222222222222222222222"))
 	c.Assert(err, qt.IsNil)
 	c.Assert(Verify(srs_1, srs_2, proof_2), qt.IsTrue)