Automatic update on Mon Aug 30 06:59:42 UTC 2021

Author: GitHub

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/urfave/cli v1.22.3
 	go.dedis.ch/cothority/v3 v3.4.0
 	go.dedis.ch/kyber/v3 v3.0.13
-	go.dedis.ch/onet/v3 v3.2.9
+	go.dedis.ch/onet/v3 v3.2.10
 	golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543
 )
 

go.sum

@@ -118,6 +118,7 @@ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=

pkg/cothority/blscosi/protocol/protocol.go

@@ -98,6 +98,16 @@ func DefaultThreshold(n int) int {
 	return n - DefaultFaultyThreshold(n)
 }
 
+// DefaultSubLeaders returns the number of sub-leaders, which is the
+// cube-root of the number of nodes.
+func DefaultSubLeaders(nodes int) int {
+	// As `math.Pow` calculates `8 ** (1/3) < 2`,
+	// we add 0.0001 for the rounding error.
+	// This works for up to 57 ** 3 = 185'193, which should be enough
+	// nodes.
+	return int(math.Pow(float64(nodes), 1.0/3.0) + 0.0001)
+}
+
 // NewBlsCosi method is used to define the blscosi protocol.
 func NewBlsCosi(n *onet.TreeNodeInstance, vf VerificationFn, subProtocolName string, suite *pairing.SuiteBn256) (onet.ProtocolInstance, error) {
 	nNodes := len(n.Roster().List)
@@ -173,8 +183,8 @@ func (p *BlsCosi) Start() error {
 	}
 
 	if p.subTrees == nil {
-		// the default number of subtree is the square root to
-		// distribute the nodes evenly
+		// the default number of subtrees is the square root of the number of
+		// nodes to distribute the nodes evenly
 		if err := p.SetNbrSubTree(int(math.Sqrt(float64(len(p.Roster().
 			List))))); err != nil {
 			p.Done()
@@ -409,7 +419,8 @@ func (p *BlsCosi) collectSignatures() (ResponseMap, error) {
 	}
 
 	if p.checkFailureThreshold(numFailure) {
-		return nil, fmt.Errorf("too many refusals (got %d), the threshold of %d cannot be achieved",
+		return nil, fmt.Errorf("too many signature-refusals (got %d), "+
+			"the threshold of %d cannot be achieved",
 			numFailure, p.Threshold)
 	}
 

pkg/cothority/blscosi/protocol/protocol_test.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"flag"
 	"fmt"
+	"math"
 	"testing"
 	"time"
 
@@ -188,6 +189,15 @@ func TestProtocol_FailingLeaves_25_9(t *testing.T) {
 	require.NoError(t, err)
 }
 
+func TestDefaultSubLeaders(t *testing.T) {
+	require.Equal(t, DefaultSubLeaders(1), 1)
+	for subleaders := 2; subleaders < 58; subleaders++ {
+		nodes := int(math.Pow(float64(subleaders), 3.0))
+		require.Equal(t, DefaultSubLeaders(nodes-1), subleaders-1)
+		require.Equal(t, DefaultSubLeaders(nodes), subleaders)
+	}
+}
+
 func runProtocolFailingNodes(nbrNodes, nbrTrees, nbrFailure, threshold int) error {
 	local := onet.NewLocalTest(testSuite)
 	defer local.CloseAll()

pkg/cothority/byzcoin/api.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"math"
+	"go.dedis.ch/cothority/v3/blscosi/protocol"
 	"math/rand"
 	"time"
 
@@ -678,7 +678,7 @@ func (c *Client) DownloadState(byzcoinID skipchain.SkipBlockID, nonce uint64, le
 	indexStart := 0
 	if l > 3 {
 		// This is the leader plus the subleaders, don't contact them
-		indexStart = 1 + int(math.Ceil(math.Pow(float64(l), 1./3.)))
+		indexStart = 1 + protocol.DefaultSubLeaders(l)
 	}
 
 	msg := &DownloadState{
@@ -694,9 +694,12 @@ func (c *Client) DownloadState(byzcoinID skipchain.SkipBlockID, nonce uint64, le
 		var po onet.ParallelOptions
 		if c.options != nil {
 			po = *c.options
+		} else {
+			po.Parallel = 1
+			po.StartNode = indexStart
+			po.DontShuffle = true
+			po.AskNodes = 1
 		}
-		po.Parallel = 1
-		po.StartNode = indexStart
 		si, err = c.SendProtobufParallel(c.Roster.List, msg, reply, &po)
 		err = cothority.ErrorOrNil(err, "request failed")
 		c.noncesSI[reply.Nonce] = si

pkg/cothority/byzcoin/service.go

@@ -1258,7 +1258,7 @@ func (s *Service) createUpgradeVersionBlock(scID skipchain.SkipBlockID, version
 // and recreating it on the remote side.
 // sb is a block in the byzcoin instance that we want
 // to download.
-func (s *Service) downloadDB(sb *skipchain.SkipBlock) error {
+func (s *Service) downloadDB(sb *skipchain.SkipBlock, node int) error {
 	log.Lvlf2("%s: downloading DB", s.ServerIdentity())
 	idStr := fmt.Sprintf("%x", sb.SkipChainID())
 
@@ -1284,6 +1284,9 @@ func (s *Service) downloadDB(sb *skipchain.SkipBlock) error {
 		// Then start downloading the stateTrie over the network.
 		cl := NewClient(sb.SkipChainID(), *sb.Roster)
 		cl.DontContact(s.ServerIdentity())
+		if err := cl.UseNode(node); err != nil {
+			return xerrors.Errorf("While setting node: %v", err)
+		}
 		var db *bbolt.DB
 		var bucketName []byte
 		var nonce uint64
@@ -1395,37 +1398,53 @@ func (s *Service) catchupAll() error {
 
 		log.Lvlf2("Our latest block: %d / %x", sb.Index, sb.Hash)
 
-		cl := skipchain.NewClient()
-		// Get the latest block known by the Cothority.
-		var reply *skipchain.GetUpdateChainReply
-		for i, node := range sb.Roster.List {
-			cl.UseNode(i)
-			replyTmp, err := cl.GetUpdateChain(sb.Roster, sb.Hash)
-			if err != nil {
-				log.Warn("couldn't get update from", node)
-				continue
-			}
-			if reply == nil || len(replyTmp.Update) > len(reply.Update) {
-				reply = replyTmp
-			}
+		if err := s.catchupID(scID, sb.Roster); err != nil {
+			return xerrors.Errorf("couldn't catchup: %v", err)
 		}
+	}
+	return nil
+}
 
-		if reply == nil {
-			// Might be that the other nodes are not yet up,
-			// so just continue with the other chains.
-			// Call to s.catchup will probably also fail, so skip it.
-			log.Error("couldn't get a new latest block")
+// catchupID forces the download of the given ID and tries its best to use
+// the given roster to download all necessary info.
+func (s *Service) catchupID(scID skipchain.SkipBlockID, roster *onet.Roster) error {
+	cl := skipchain.NewClient()
+	// Get the latest block known by the Cothority.
+	var reply *skipchain.GetUpdateChainReply
+	for i, node := range roster.List {
+		log.Lvlf2("Asking node %s for latest block", node)
+		cl.UseNode(i)
+		replyTmp, err := cl.GetUpdateChain(roster, scID)
+		if err != nil {
+			log.Warn("couldn't get update from", node)
 			continue
 		}
-
-		if len(reply.Update) == 0 {
-			return xerrors.New("no block found in chain update")
+		if reply == nil {
+			reply = replyTmp
+		} else {
+			latestTmp := replyTmp.Update[len(replyTmp.Update)-1]
+			latest := reply.Update[len(reply.Update)-1]
+			if latestTmp.Index > latest.Index {
+				reply = replyTmp
+			}
 		}
+	}
 
-		sb = reply.Update[len(reply.Update)-1]
-		log.Lvl2("Catching up with latest block:", sb.Index)
-		s.catchUp(sb)
+	if reply == nil {
+		// Might be that the other nodes are not yet up,
+		// so just continue with the other chains.
+		// Call to s.catchup will probably also fail, so skip it.
+		log.Error("couldn't get a new latest block")
+		return nil
 	}
+
+	if len(reply.Update) == 0 {
+		return xerrors.New("no block found in chain update")
+	}
+
+	sb := reply.Update[len(reply.Update)-1]
+	log.Lvl2("Catching up with latest block:", sb.Index)
+	s.catchUp(sb)
 	return nil
 }
 
@@ -1498,13 +1517,13 @@ func (s *Service) catchUp(sb *skipchain.SkipBlock) {
 
 	// Load the trie.
 	download := false
-	st, err := s.getStateTrie(sb.SkipChainID())
 	cl := skipchain.NewClient()
 	cl.DontContact(s.ServerIdentity())
+	st, err := s.getStateTrie(sb.SkipChainID())
 	if err != nil {
 		if sb.Index < catchupDownloadAll {
 			// Asked to catch up on an unknown chain, but don't want to download, instead only replay
-			// the blocks. This is mostly useful for testing, in a real deployement the catchupDownloadAll
+			// the blocks. This is mostly useful for testing, in a real deployment the catchupDownloadAll
 			// will be smaller than any chain that is online for more than a day.
 			log.Warnf("%s: problem with trie, "+
 				"will create a new one: %+v", s.ServerIdentity(), err)
@@ -1541,10 +1560,14 @@ func (s *Service) catchUp(sb *skipchain.SkipBlock) {
 
 	// Check if we are updating the right index.
 	if download {
-		log.Lvl2(s.ServerIdentity(), "Downloading whole DB for catching up")
-		err := s.downloadDB(sb)
-		if err != nil {
-			log.Error("Error while downloading trie:", err)
+		for i := range sb.Roster.List {
+			log.Lvl2(s.ServerIdentity(), "Downloading whole DB for catching up")
+			err := s.downloadDB(sb, i)
+			if err != nil {
+				log.Error("Error while downloading trie:", err)
+			} else {
+				return
+			}
 		}
 
 		// Note: in that case we don't get the previous blocks and therefore we can't
@@ -3126,13 +3149,6 @@ func newService(c *onet.Context) (onet.Service, error) {
 		return nil, xerrors.Errorf("unknown db version number %v", ver)
 	}
 
-	go func() {
-		// initialize the stats of the storage
-		if err := s.stateChangeStorage.calculateSize(); err != nil {
-			log.Errorf("couldn't calculate size: %v", err)
-		}
-	}()
-
 	if _, err := s.startAllChains(); err != nil {
 		return nil, xerrors.Errorf("starting chains: %v", err)
 	}

pkg/cothority/byzcoin/service_test.go

@@ -2132,7 +2132,7 @@ func TestService_DownloadState(t *testing.T) {
 		servers, _, _ := b.Local.MakeSRS(cothority.Suite, 1, ByzCoinID)
 		services := b.Local.GetServices(servers, ByzCoinID)
 		service := services[0].(*Service)
-		err := service.downloadDB(b.Genesis)
+		err := service.downloadDB(b.Genesis, 0)
 		require.NoError(t, err)
 		st, err := service.getStateTrie(b.Genesis.Hash)
 		require.NoError(t, err)
@@ -2632,6 +2632,30 @@ func TestService_GetUpdates(t *testing.T) {
 	require.False(t, gur.Proofs[1].Match(invID[:]))
 }
 
+// Tests if it can add a byzcoin-instance to a given node.
+func TestService_catchupID(t *testing.T) {
+	t.Skip("This is a manual test for the DEDIS chain")
+
+	b := newBCTRun(t, nil)
+	defer b.CloseAll()
+
+	dedisChain, err := hex.DecodeString("9cc36071ccb902a1de7e0d21a2c176d73894b1cf88ae4cc2ba4c95cd76f474f3")
+	require.NoError(t, err)
+	dedisRoster := onet.NewRoster([]*network.ServerIdentity{
+		{
+			URL:    "https://conode.c4dt.org",
+			Public: cothority.Suite.Point(),
+		},
+	})
+	cl := skipchain.NewClient()
+	gcr, err := cl.GetUpdateChain(dedisRoster, dedisChain)
+	require.NoError(t, err)
+	dedisRoster = gcr.Update[len(gcr.Update)-1].Roster
+
+	err = b.Services[0].catchupID(dedisChain, dedisRoster)
+	require.NoError(t, err)
+}
+
 func createBadConfigTx(b *BCTest, intervalBad,
 	szBad bool) (ClientTransaction, ChainConfig) {
 	switch {

pkg/cothority/byzcoinx/byzcoinx.go

@@ -8,7 +8,6 @@ package byzcoinx
 import (
 	"errors"
 	"fmt"
-	"math"
 	"time"
 
 	"go.dedis.ch/cothority/v3/blscosi/bdnproto"
@@ -133,11 +132,18 @@ func (bft *ByzCoinX) initCosiProtocol(phase phase) (*protocol.BlsCosi, error) {
 	// For each of the prepare and commit phase we get half of the time.
 	cosiProto.Timeout = bft.Timeout / 2
 
-	if bft.SubleaderFailures > 0 {
-		// Only update the parameter if it is defined, else keep the default
-		// value.
-		cosiProto.SubleaderFailures = bft.SubleaderFailures
+	if bft.SubleaderFailures == 0 && bft.Tree().Size() > 1 {
+		// There can be as many failures as the biggest subtree has leafs.
+		// The number of leafs is the following:
+		//   ceil( ( nodes - root - subleaders ) / subleaders )
+		// which equals to
+		//   ( nodes - root - subleaders + subleaders - 1 ) / subleaders
+		// which equals to
+		//   ( nodes - root - 1 )
+		bft.SubleaderFailures = (bft.Tree().Size() - 2) /
+			bft.nSubtrees
 	}
+	cosiProto.SubleaderFailures = bft.SubleaderFailures
 
 	return cosiProto, cosiProto.SetNbrSubTree(bft.nSubtrees)
 }
@@ -214,9 +220,7 @@ func NewByzCoinX(n *onet.TreeNodeInstance, prepCosiProtoName, commitCosiProtoNam
 		publics:             n.Publics(),
 		suite:               suite,
 		verifier:            verifier,
-		// We set nSubtrees to the cube root of n to evenly distribute the load,
-		// i.e. depth (=3) = log_f n, where f is the fan-out (branching factor).
-		nSubtrees: int(math.Pow(float64(len(n.List())), 1.0/3.0)),
+		nSubtrees:           protocol.DefaultSubLeaders(len(n.List())),
 	}, nil
 }
 

pkg/cothority/byzcoinx/byzcoinx_test.go

@@ -199,7 +199,8 @@ func runProtocol(t *testing.T, nbrHosts int, nbrFault int, refuseIndex int, prot
 	bftCosiProto.Threshold = nbrHosts - nbrFault
 	log.Lvl3("Added counter", counters.size()-1, refuseIndex)
 
-	require.Equal(t, bftCosiProto.nSubtrees, int(math.Pow(float64(nbrHosts), 1.0/3.0)))
+	require.True(t, int(math.Pow(float64(bftCosiProto.nSubtrees),
+		3.0)) <= nbrHosts)
 
 	// kill the leafs first
 	nbrFault = min(nbrFault, len(servers))

pkg/cothority/go.mod

@@ -46,7 +46,7 @@ require (
 	github.com/syndtr/goleveldb v1.0.0 // indirect
 	github.com/urfave/cli v1.22.3
 	go.dedis.ch/kyber/v3 v3.0.13
-	go.dedis.ch/onet/v3 v3.2.9
+	go.dedis.ch/onet/v3 v3.2.10
 	go.dedis.ch/protobuf v1.0.11
 	go.etcd.io/bbolt v1.3.4
 	golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37 // indirect

pkg/cothority/go.sum

@@ -127,7 +127,7 @@ github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
-github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
@@ -254,8 +254,8 @@ go.dedis.ch/kyber/v3 v3.0.4/go.mod h1:OzvaEnPvKlyrWyp3kGXlFdp7ap1VC6RkZDTaPikqhs
 go.dedis.ch/kyber/v3 v3.0.9/go.mod h1:rhNjUUg6ahf8HEg5HUvVBYoWY4boAafX8tYxX+PS+qg=
 go.dedis.ch/kyber/v3 v3.0.13 h1:s5Lm8p2/CsTMueQHCN24gPpZ4couBBeKU7r2Yl6r32o=
 go.dedis.ch/kyber/v3 v3.0.13/go.mod h1:kXy7p3STAurkADD+/aZcsznZGKVHEqbtmdIzvPfrs1U=
-go.dedis.ch/onet/v3 v3.2.9 h1:JwSjsWLCNhXIL8vFkelhMAXappyQoVXSJ1XXpTKBC3w=
-go.dedis.ch/onet/v3 v3.2.9/go.mod h1:uYgAS2Jr2h3wGctG+C/lokYY1o8rRqTN+taoiK5jdb8=
+go.dedis.ch/onet/v3 v3.2.10 h1:922Do54I7qxANwTuGcLEcOIzXH8n0FuEnZlmS37bmjU=
+go.dedis.ch/onet/v3 v3.2.10/go.mod h1:2TpqrnrRcefCXQuoU5OPmDtUJZGLvIVc1ZKW9NpOTsY=
 go.dedis.ch/protobuf v1.0.5/go.mod h1:eIV4wicvi6JK0q/QnfIEGeSFNG0ZeB24kzut5+HaRLo=
 go.dedis.ch/protobuf v1.0.7/go.mod h1:pv5ysfkDX/EawiPqcW3ikOxsL5t+BqnV6xHSmE79KI4=
 go.dedis.ch/protobuf v1.0.11 h1:FTYVIEzY/bfl37lu3pR4lIj+F9Vp1jE8oh91VmxKgLo=

pkg/onet/go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995 // indirect
 	github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e // indirect
 	github.com/google/uuid v1.1.2
-	github.com/gorilla/websocket v1.4.0
+	github.com/gorilla/websocket v1.4.1
 	github.com/honeycombio/beeline-go v0.4.11
 	github.com/honeycombio/libhoney-go v1.12.3 // indirect
 	github.com/klauspost/compress v1.10.3 // indirect