Skip to content

Commit b3b05cc

Browse files
mpetrun5mpetrun5
authored
feat: allow for coordinator to be set manually (#9)
* Allow coordinator to be set manually * Add manual coordinator test
1 parent 05467cd commit b3b05cc

File tree

5 files changed

+79
-14
lines changed

5 files changed

+79
-14
lines changed

‎chains/evm/listener/eventHandlers/tss.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
"github.com/ethereum/go-ethereum/common"
1515
"github.com/ethereum/go-ethereum/core/types"
1616
"github.com/libp2p/go-libp2p/core/host"
17+
"github.com/libp2p/go-libp2p/core/peer"
1718
"github.com/sprintertech/sprinter-signing/chains/evm/calls/events"
1819
"github.com/sprintertech/sprinter-signing/comm"
1920
"github.com/sprintertech/sprinter-signing/comm/p2p"
@@ -86,7 +87,7 @@ func (eh *KeygenEventHandler) HandleEvents(
8687

8788
keygenBlockNumber := big.NewInt(0).SetUint64(keygenEvents[0].BlockNumber)
8889
keygen := keygen.NewKeygen(eh.sessionID(keygenBlockNumber), eh.threshold, eh.host, eh.communication, eh.storer)
89-
err = eh.coordinator.Execute(context.Background(), []tss.TssProcess{keygen}, make(chan interface{}, 1))
90+
err = eh.coordinator.Execute(context.Background(), []tss.TssProcess{keygen}, make(chan interface{}, 1), peer.ID(""))
9091
if err != nil {
9192
log.Err(err).Msgf("Failed executing keygen")
9293
}
@@ -178,7 +179,7 @@ func (eh *RefreshEventHandler) HandleEvents(
178179
resharing := resharing.NewResharing(
179180
eh.sessionID(startBlock), topology.Threshold, eh.host, eh.communication, eh.ecdsaStorer,
180181
)
181-
err = eh.coordinator.Execute(context.Background(), []tss.TssProcess{resharing}, make(chan interface{}, 1))
182+
err = eh.coordinator.Execute(context.Background(), []tss.TssProcess{resharing}, make(chan interface{}, 1), peer.ID(""))
182183
if err != nil {
183184
log.Err(err).Msgf("Failed executing ecdsa key refresh")
184185
return nil

‎tss/coordinator.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func NewCoordinator(
7272
// Execute calculates process leader and coordinates party readiness and start the tss processes.
7373
// Array of processes can be passed if all the processes have to have the same peer subset and
7474
// the result of all of them is needed. The processes should have an unique session ID for each one.
75-
func (c *Coordinator) Execute(ctx context.Context, tssProcesses []TssProcess, resultChn chan interface{}) error {
75+
func (c *Coordinator) Execute(ctx context.Context, tssProcesses []TssProcess, resultChn chan interface{}, coordinator peer.ID) error {
7676
sessionID := tssProcesses[0].SessionID()
7777
value, ok := c.pendingProcesses[sessionID]
7878
if ok && value {
@@ -98,7 +98,9 @@ func (c *Coordinator) Execute(ctx context.Context, tssProcesses []TssProcess, re
9898
}()
9999

100100
coordinatorElector := c.electorFactory.CoordinatorElector(sessionID, elector.Static)
101-
coordinator, _ := coordinatorElector.Coordinator(ctx, tssProcesses[0].ValidCoordinators())
101+
if coordinator.String() == "" {
102+
coordinator, _ = coordinatorElector.Coordinator(ctx, tssProcesses[0].ValidCoordinators())
103+
}
102104

103105
log.Info().Str("SessionID", sessionID).Msgf("Starting process with coordinator %s", coordinator.String())
104106

‎tss/ecdsa/keygen/keygen_test.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ func (s *KeygenTestSuite) Test_ValidKeygenProcess() {
5050
s.MockECDSAStorer.EXPECT().StoreKeyshare(gomock.Any()).Times(3)
5151
pool := pool.New().WithContext(context.Background()).WithCancelOnError()
5252
for i, coordinator := range coordinators {
53-
pool.Go(func(ctx context.Context) error { return coordinator.Execute(ctx, []tss.TssProcess{processes[i]}, nil) })
53+
pool.Go(func(ctx context.Context) error {
54+
return coordinator.Execute(ctx, []tss.TssProcess{processes[i]}, nil, peer.ID(""))
55+
})
5456
}
5557

5658
err := pool.Wait()
@@ -81,7 +83,9 @@ func (s *KeygenTestSuite) Test_KeygenTimeout() {
8183
s.MockECDSAStorer.EXPECT().StoreKeyshare(gomock.Any()).Times(0)
8284
pool := pool.New().WithContext(context.Background())
8385
for i, coordinator := range coordinators {
84-
pool.Go(func(ctx context.Context) error { return coordinator.Execute(ctx, []tss.TssProcess{processes[i]}, nil) })
86+
pool.Go(func(ctx context.Context) error {
87+
return coordinator.Execute(ctx, []tss.TssProcess{processes[i]}, nil, peer.ID(""))
88+
})
8589
}
8690

8791
err := pool.Wait()

‎tss/ecdsa/resharing/resharing_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func (s *ResharingTestSuite) Test_ValidResharingProcess_OldAndNewSubset() {
6969
pool := pool.New().WithContext(context.Background()).WithCancelOnError()
7070
for i, coordinator := range coordinators {
7171
pool.Go(func(ctx context.Context) error {
72-
return coordinator.Execute(ctx, []tss.TssProcess{processes[i]}, resultChn)
72+
return coordinator.Execute(ctx, []tss.TssProcess{processes[i]}, resultChn, peer.ID(""))
7373
})
7474
}
7575

@@ -116,7 +116,7 @@ func (s *ResharingTestSuite) Test_ValidResharingProcess_RemovePeer() {
116116
pool := pool.New().WithContext(context.Background()).WithCancelOnError()
117117
for i, coordinator := range coordinators {
118118
pool.Go(func(ctx context.Context) error {
119-
return coordinator.Execute(ctx, []tss.TssProcess{processes[i]}, resultChn)
119+
return coordinator.Execute(ctx, []tss.TssProcess{processes[i]}, resultChn, peer.ID(""))
120120
})
121121
}
122122

@@ -166,7 +166,7 @@ func (s *ResharingTestSuite) Test_InvalidResharingProcess_InvalidOldThreshold_Le
166166
pool := pool.New().WithContext(context.Background())
167167
for i, coordinator := range coordinators {
168168
pool.Go(func(ctx context.Context) error {
169-
return coordinator.Execute(ctx, []tss.TssProcess{processes[i]}, resultChn)
169+
return coordinator.Execute(ctx, []tss.TssProcess{processes[i]}, resultChn, peer.ID(""))
170170
})
171171
}
172172
err := pool.Wait()
@@ -215,7 +215,7 @@ func (s *ResharingTestSuite) Test_InvalidResharingProcess_InvalidOldThreshold_Bi
215215
pool := pool.New().WithContext(context.Background())
216216
for i, coordinator := range coordinators {
217217
pool.Go(func(ctx context.Context) error {
218-
return coordinator.Execute(ctx, []tss.TssProcess{processes[i]}, resultChn)
218+
return coordinator.Execute(ctx, []tss.TssProcess{processes[i]}, resultChn, peer.ID(""))
219219
})
220220
}
221221

‎tss/ecdsa/signing/signing_test.go

+62-4
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func (s *SigningTestSuite) Test_ValidSigningProcess() {
6363
for i, coordinator := range coordinators {
6464
coordinator := coordinator
6565
pool.Go(func(ctx context.Context) error {
66-
return coordinator.Execute(ctx, []tss.TssProcess{processes[i]}, resultChn)
66+
return coordinator.Execute(ctx, []tss.TssProcess{processes[i]}, resultChn, peer.ID(""))
6767
})
6868
}
6969

@@ -80,6 +80,60 @@ func (s *SigningTestSuite) Test_ValidSigningProcess() {
8080
s.Nil(err)
8181
}
8282

83+
func (s *SigningTestSuite) Test_ValidSigningProcess_ManualCoordinator() {
84+
communicationMap := make(map[peer.ID]*tsstest.TestCommunication)
85+
coordinators := []*tss.Coordinator{}
86+
processes := []tss.TssProcess{}
87+
88+
for i, host := range s.Hosts {
89+
communication := tsstest.TestCommunication{
90+
Host: host,
91+
Subscriptions: make(map[comm.SubscriptionID]chan *comm.WrappedMessage),
92+
}
93+
communicationMap[host.ID()] = &communication
94+
fetcher := keyshare.NewECDSAKeyshareStore(fmt.Sprintf("../../test/keyshares/%d.keyshare", i))
95+
96+
msgBytes := []byte("Message")
97+
msg := big.NewInt(0)
98+
msg.SetBytes(msgBytes)
99+
signing, err := signing.NewSigning(msg, "signing1", "signing1", host, &communication, fetcher)
100+
if err != nil {
101+
panic(err)
102+
}
103+
electorFactory := elector.NewCoordinatorElectorFactory(host, s.BullyConfig)
104+
coordinators = append(coordinators, tss.NewCoordinator(host, &communication, electorFactory))
105+
processes = append(processes, signing)
106+
}
107+
tsstest.SetupCommunication(communicationMap)
108+
109+
resultChn := make(chan interface{}, 2)
110+
111+
coordinatorPeerID := s.Hosts[1].ID()
112+
ctx, cancel := context.WithCancel(context.Background())
113+
pool := pool.New().WithContext(ctx)
114+
for i, coordinator := range coordinators {
115+
coordinator := coordinator
116+
117+
if s.Hosts[i].ID().String() == coordinatorPeerID.String() {
118+
pool.Go(func(ctx context.Context) error {
119+
return coordinator.Execute(ctx, []tss.TssProcess{processes[i]}, resultChn, coordinatorPeerID)
120+
})
121+
} else {
122+
pool.Go(func(ctx context.Context) error {
123+
return coordinator.Execute(ctx, []tss.TssProcess{processes[i]}, make(chan interface{}, 1), coordinatorPeerID)
124+
})
125+
}
126+
}
127+
128+
sig := <-resultChn
129+
s.NotNil(sig)
130+
131+
time.Sleep(time.Millisecond * 100)
132+
cancel()
133+
err := pool.Wait()
134+
s.Nil(err)
135+
}
136+
83137
func (s *SigningTestSuite) Test_SigningTimeout() {
84138
communicationMap := make(map[peer.ID]*tsstest.TestCommunication)
85139
coordinators := []*tss.Coordinator{}
@@ -113,7 +167,7 @@ func (s *SigningTestSuite) Test_SigningTimeout() {
113167
for i, coordinator := range coordinators {
114168
coordinator := coordinator
115169
pool.Go(func(ctx context.Context) error {
116-
return coordinator.Execute(ctx, []tss.TssProcess{processes[i]}, resultChn)
170+
return coordinator.Execute(ctx, []tss.TssProcess{processes[i]}, resultChn, peer.ID(""))
117171
})
118172
}
119173

@@ -142,8 +196,12 @@ func (s *SigningTestSuite) Test_PendingProcessExists() {
142196
s.MockECDSAStorer.EXPECT().UnlockKeyshare().AnyTimes()
143197
pool := pool.New().WithContext(context.Background()).WithCancelOnError()
144198
for i, coordinator := range coordinators {
145-
pool.Go(func(ctx context.Context) error { return coordinator.Execute(ctx, []tss.TssProcess{processes[i]}, nil) })
146-
pool.Go(func(ctx context.Context) error { return coordinator.Execute(ctx, []tss.TssProcess{processes[i]}, nil) })
199+
pool.Go(func(ctx context.Context) error {
200+
return coordinator.Execute(ctx, []tss.TssProcess{processes[i]}, nil, peer.ID(""))
201+
})
202+
pool.Go(func(ctx context.Context) error {
203+
return coordinator.Execute(ctx, []tss.TssProcess{processes[i]}, nil, peer.ID(""))
204+
})
147205
}
148206

149207
err := pool.Wait()

0 commit comments

Comments
 (0)