Guard Tower Redux: Initial interface and struct setups for distributed key generation

go/beacon/broadcast/broadcast.go

@@ -1,6 +1,8 @@
 package broadcast
 
 import (
+	"sync"
+
 	"github.com/dfinity/go-dfinity-crypto/bls"
 )
 
@@ -41,28 +43,33 @@ type Channel interface {
 }
 
 type localChannel struct {
-	name      string
-	recvChans []chan Message
+	name           string
+	recvChansMutex sync.Mutex
+	recvChans      []chan Message
 }
 
 func (channel *localChannel) Name() string {
 	return channel.name
 }
 
 func (channel *localChannel) Send(message Message) bool {
+	channel.recvChansMutex.Lock()
 	go func(recvChans []chan Message) {
 		for _, recvChan := range recvChans {
 			recvChan <- message
 		}
 	}(channel.recvChans)
+	channel.recvChansMutex.Unlock()
 
 	return true
 }
 
 func (channel *localChannel) RecvChan() <-chan Message {
-	newChan := make(chan Message)
+	newChan := make(chan Message, 62500)
 
+	channel.recvChansMutex.Lock()
 	channel.recvChans = append(channel.recvChans, newChan)
+	channel.recvChansMutex.Unlock()
 
 	return newChan
 }
@@ -73,5 +80,5 @@ func (channel *localChannel) RecvChan() <-chan Message {
 // that is returned to the caller, so that all receive channels can receive
 // the message.
 func LocalChannel(name string) Channel {
-	return &localChannel{name, make([]chan Message, 0)}
+	return &localChannel{name, sync.Mutex{}, make([]chan Message, 0)}
 }

go/beacon/chain/chain.go

@@ -53,7 +53,7 @@ func (counter *localBlockCounter) BlockWaiter(numBlocks int) <-chan int {
 }
 
 func (counter *localBlockCounter) count() {
-	ticker := time.NewTicker(time.Duration(time.Second / 2))
+	ticker := time.NewTicker(time.Duration(500 * time.Millisecond))
 
 	for _ = range ticker.C {
 		counter.structMutex.Lock()

go/beacon/relay/dkg.go

@@ -46,29 +46,31 @@ type JustificationsMessage struct {
 	justifications map[bls.ID]bls.SecretKey
 }
 
-// Execute runs the full distributed key generation lifecycle, given a broadcast
-// channel to mediate it and a group size and threshold. It returns a threshold
-// group member who is participating in the group if the generation was
-// successful, and an error representing what went wrong if not.
+// ExecuteDKG runs the full distributed key generation lifecycle, given a
+// broadcast channel to mediate it and a group size and threshold. It returns a
+// threshold group member who is participating in the group if the generation
+// was successful, and an error representing what went wrong if not.
 func ExecuteDKG(blockCounter chain.BlockCounter, channel broadcast.Channel, groupSize int, threshold int) (*thresholdgroup.Member, error) {
 	// FIXME Probably pass in a way to ask for a receiver's public key?
 	// FIXME Need a way to time out in a given stage, especially the waiting
 	//       ones.
 
-	memberID := rand.NewRand().String()
+	memberID := "0"
+	for memberID = rand.NewRand().String(); memberID == "0"; {
+	}
 	fmt.Printf("[member:%v] Initializing member.\n", memberID)
 	localMember := thresholdgroup.NewMember(memberID, threshold)
 
 	recvChan := channel.RecvChan()
 
 	fmt.Printf("[member:%v] Waiting for join timeout...\n", memberID)
-	blockCounter.WaitForBlocks(5)
+	blockCounter.WaitForBlocks(15)
 
 	fmt.Printf("[member:%v] Broadcasting join.\n", memberID)
 	channel.Send(broadcast.NewBroadcastMessage(localMember.BlsID, JoinMessage{}))
 
 	// Wait for all members.
-	waiter := blockCounter.BlockWaiter(3)
+	waiter := blockCounter.BlockWaiter(10)
 	fmt.Printf("[member:%v] Waiting for other members...\n", memberID)
 	memberIDs, err := waitForMemberIDs(&localMember.BlsID, recvChan, groupSize)
 	if err != nil {
@@ -78,7 +80,9 @@ func ExecuteDKG(blockCounter chain.BlockCounter, channel broadcast.Channel, grou
 	fmt.Printf("[member:%v] Waiting for member join timeout...\n", memberID)
 	<-waiter
 
-	waiter = blockCounter.BlockWaiter(3)
+	fmt.Printf("[member:%v] Saw IDs: %v\n", memberID, len(memberIDs))
+
+	waiter = blockCounter.BlockWaiter(15)
 	fmt.Printf("[member:%v] Initiating commitment broadcast phase.\n", memberID)
 	sharingMember := localMember.InitializeSharing(memberIDs)
 
@@ -97,7 +101,7 @@ func ExecuteDKG(blockCounter chain.BlockCounter, channel broadcast.Channel, grou
 	fmt.Printf("[member:%v] Waiting for commitment timeout...\n", memberID)
 	<-waiter
 
-	waiter = blockCounter.BlockWaiter(5)
+	waiter = blockCounter.BlockWaiter(20)
 	fmt.Printf("[member:%v] Sending private shares.\n", memberID)
 	err = sendShares(channel, &sharingMember)
 	if err != nil {
@@ -113,7 +117,7 @@ func ExecuteDKG(blockCounter chain.BlockCounter, channel broadcast.Channel, grou
 	fmt.Printf("[member:%v] Waiting for share exchange timeout...\n", memberID)
 	<-waiter
 
-	waiter = blockCounter.BlockWaiter(3)
+	waiter = blockCounter.BlockWaiter(15)
 	fmt.Printf("[member:%v] Initiating accusation/justification phase.\n", memberID)
 	justifyingMember := sharingMember.InitializeJustification()
 	fmt.Printf("[member:%v] Broadcasting accusations.\n", memberID)
@@ -123,7 +127,7 @@ func ExecuteDKG(blockCounter chain.BlockCounter, channel broadcast.Channel, grou
 	}
 
 	fmt.Printf("[member:%v] Waiting for other accusations...\n", memberID)
-	err = waitForAccusations(recvChan, &justifyingMember)
+	err = waitForAccusations(&justifyingMember.BlsID, recvChan, &justifyingMember)
 	if err != nil {
 		return nil, fmt.Errorf("failed to receive all accusations: [%v]", err)
 	}
@@ -138,7 +142,7 @@ func ExecuteDKG(blockCounter chain.BlockCounter, channel broadcast.Channel, grou
 	}
 
 	fmt.Printf("[member:%v] Waiting for other justifications...\n", memberID)
-	err = waitForJustifications(recvChan, &justifyingMember)
+	err = waitForJustifications(&justifyingMember.BlsID, recvChan, &justifyingMember)
 	if err != nil {
 		return nil, fmt.Errorf("failed to receive all justifications: [%v]", err)
 	}
@@ -197,11 +201,12 @@ done:
 }
 
 func sendShares(channel broadcast.Channel, member *thresholdgroup.SharingMember) error {
+	fmt.Printf("[member:%v] Despatching shares!\n", member.ID)
 	for _, receiverID := range member.OtherMemberIDs() {
 		share := member.SecretShareForID(receiverID)
-		fmt.Printf("[member:%v] Despatching a share!\n", member.ID)
 		channel.Send(broadcast.NewPrivateMessage(member.BlsID, receiverID, MemberShareMessage{share}))
 	}
+	fmt.Printf("[member:%v] Shares despatched!\n", member.ID)
 
 	return nil
 }
@@ -212,7 +217,6 @@ done:
 		switch shareMsg := msg.Data.(type) {
 		case MemberShareMessage:
 			if msg.Receiver.IsEqual(myID) {
-				fmt.Printf("[member:%v] Received one id from [%v].\n", myID.GetHexString(), msg.Sender.GetHexString())
 				sharingMember.AddShareFromID(msg.Sender, shareMsg.Share)
 
 				if sharingMember.SharesComplete() {
@@ -231,13 +235,17 @@ func sendAccusations(channel broadcast.Channel, member *thresholdgroup.Justifyin
 	return nil
 }
 
-func waitForAccusations(recvChan <-chan broadcast.Message, justifyingMember *thresholdgroup.JustifyingMember) error {
+func waitForAccusations(myID *bls.ID, recvChan <-chan broadcast.Message, justifyingMember *thresholdgroup.JustifyingMember) error {
 	memberIDs := justifyingMember.OtherMemberIDs()
 	seenAccusations := make(map[bls.ID]bool, len(memberIDs))
 done:
 	for msg := range recvChan {
 		switch accusationMsg := msg.Data.(type) {
 		case AccusationsMessage:
+			if msg.Sender.IsEqual(myID) {
+				continue
+			}
+
 			for _, accusedID := range accusationMsg.accusedIDs {
 				justifyingMember.AddAccusationFromID(msg.Sender, accusedID)
 			}
@@ -261,13 +269,17 @@ func sendJustifications(channel broadcast.Channel, justifyingMember *thresholdgr
 	return nil
 }
 
-func waitForJustifications(recvChan <-chan broadcast.Message, justifyingMember *thresholdgroup.JustifyingMember) error {
+func waitForJustifications(myID *bls.ID, recvChan <-chan broadcast.Message, justifyingMember *thresholdgroup.JustifyingMember) error {
 	memberIDs := justifyingMember.OtherMemberIDs()
 	seenJustifications := make(map[bls.ID]bool, len(memberIDs))
 done:
 	for msg := range recvChan {
 		switch justificationsMsg := msg.Data.(type) {
 		case JustificationsMessage:
+			if msg.Sender.IsEqual(myID) {
+				continue
+			}
+
 			for accuserID, justification := range justificationsMsg.justifications {
 				justifyingMember.RecordJustificationFromID(msg.Sender, accuserID, justification)
 			}

go/main.go

@@ -12,7 +12,7 @@ import (
 )
 
 func main() {
-	bls.Init(bls.CurveFp254BNb)
+	bls.Init(bls.CurveFp382_1)
 
 	beaconConfig := chain.GetBeaconConfig()