mirror of https://github.com/certusone/dc4bc.git
wip
This commit is contained in:
parent
bbaf781f80
commit
afaabe204e
|
@ -7,6 +7,7 @@ import (
|
||||||
"github.com/depools/dc4bc/fsm/fsm"
|
"github.com/depools/dc4bc/fsm/fsm"
|
||||||
"github.com/depools/dc4bc/fsm/state_machines/internal"
|
"github.com/depools/dc4bc/fsm/state_machines/internal"
|
||||||
"github.com/depools/dc4bc/fsm/types/requests"
|
"github.com/depools/dc4bc/fsm/types/requests"
|
||||||
|
"github.com/depools/dc4bc/fsm/types/responses"
|
||||||
"reflect"
|
"reflect"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -49,7 +50,20 @@ func (m *DKGProposalFSM) actionInitDKGProposal(inEvent fsm.Event, args ...interf
|
||||||
|
|
||||||
// Remove m.payload.SignatureProposalPayload?
|
// Remove m.payload.SignatureProposalPayload?
|
||||||
|
|
||||||
return
|
// Make response
|
||||||
|
|
||||||
|
responseData := make(responses.DKGProposalPubKeysParticipantResponse, 0)
|
||||||
|
|
||||||
|
for participantId, participant := range m.payload.DKGProposalPayload.Quorum {
|
||||||
|
responseEntry := &responses.DKGProposalPubKeysParticipantEntry{
|
||||||
|
ParticipantId: participantId,
|
||||||
|
Addr: participant.Addr,
|
||||||
|
DkgPubKey: participant.DkgPubKey,
|
||||||
|
}
|
||||||
|
responseData = append(responseData, responseEntry)
|
||||||
|
}
|
||||||
|
|
||||||
|
return inEvent, responseData, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Commits
|
// Commits
|
||||||
|
@ -86,7 +100,7 @@ func (m *DKGProposalFSM) actionCommitConfirmationReceived(inEvent fsm.Event, arg
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
copy(dkgProposalParticipant.Commit, request.Commit)
|
copy(dkgProposalParticipant.DkgCommit, request.Commit)
|
||||||
dkgProposalParticipant.Status = internal.CommitConfirmed
|
dkgProposalParticipant.Status = internal.CommitConfirmed
|
||||||
|
|
||||||
dkgProposalParticipant.UpdatedAt = request.CreatedAt
|
dkgProposalParticipant.UpdatedAt = request.CreatedAt
|
||||||
|
@ -135,6 +149,21 @@ func (m *DKGProposalFSM) actionValidateDkgProposalAwaitCommits(inEvent fsm.Event
|
||||||
participant.Status = internal.DealAwaitConfirmation
|
participant.Status = internal.DealAwaitConfirmation
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Make response
|
||||||
|
|
||||||
|
responseData := make(responses.DKGProposalCommitParticipantResponse, 0)
|
||||||
|
|
||||||
|
for participantId, participant := range m.payload.DKGProposalPayload.Quorum {
|
||||||
|
responseEntry := &responses.DKGProposalCommitParticipantEntry{
|
||||||
|
ParticipantId: participantId,
|
||||||
|
Addr: participant.Addr,
|
||||||
|
DkgCommit: participant.DkgCommit,
|
||||||
|
}
|
||||||
|
responseData = append(responseData, responseEntry)
|
||||||
|
}
|
||||||
|
|
||||||
|
response = responseData
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -172,7 +201,7 @@ func (m *DKGProposalFSM) actionDealConfirmationReceived(inEvent fsm.Event, args
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
copy(dkgProposalParticipant.Deal, request.Deal)
|
copy(dkgProposalParticipant.DkgDeal, request.Deal)
|
||||||
dkgProposalParticipant.Status = internal.DealConfirmed
|
dkgProposalParticipant.Status = internal.DealConfirmed
|
||||||
|
|
||||||
dkgProposalParticipant.UpdatedAt = request.CreatedAt
|
dkgProposalParticipant.UpdatedAt = request.CreatedAt
|
||||||
|
@ -221,6 +250,21 @@ func (m *DKGProposalFSM) actionValidateDkgProposalAwaitDeals(inEvent fsm.Event,
|
||||||
participant.Status = internal.ResponseAwaitConfirmation
|
participant.Status = internal.ResponseAwaitConfirmation
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Make response
|
||||||
|
|
||||||
|
responseData := make(responses.DKGProposalDealParticipantResponse, 0)
|
||||||
|
|
||||||
|
for participantId, participant := range m.payload.DKGProposalPayload.Quorum {
|
||||||
|
responseEntry := &responses.DKGProposalDealParticipantEntry{
|
||||||
|
ParticipantId: participantId,
|
||||||
|
Addr: participant.Addr,
|
||||||
|
DkgDeal: participant.DkgDeal,
|
||||||
|
}
|
||||||
|
responseData = append(responseData, responseEntry)
|
||||||
|
}
|
||||||
|
|
||||||
|
response = responseData
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -258,7 +302,7 @@ func (m *DKGProposalFSM) actionResponseConfirmationReceived(inEvent fsm.Event, a
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
copy(dkgProposalParticipant.Response, request.Response)
|
copy(dkgProposalParticipant.DkgResponse, request.Response)
|
||||||
dkgProposalParticipant.Status = internal.ResponseConfirmed
|
dkgProposalParticipant.Status = internal.ResponseConfirmed
|
||||||
|
|
||||||
dkgProposalParticipant.UpdatedAt = request.CreatedAt
|
dkgProposalParticipant.UpdatedAt = request.CreatedAt
|
||||||
|
@ -307,6 +351,21 @@ func (m *DKGProposalFSM) actionValidateDkgProposalAwaitResponses(inEvent fsm.Eve
|
||||||
participant.Status = internal.MasterKeyAwaitConfirmation
|
participant.Status = internal.MasterKeyAwaitConfirmation
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Make response
|
||||||
|
|
||||||
|
responseData := make(responses.DKGProposalResponseParticipantResponse, 0)
|
||||||
|
|
||||||
|
for participantId, participant := range m.payload.DKGProposalPayload.Quorum {
|
||||||
|
responseEntry := &responses.DKGProposalResponseParticipantEntry{
|
||||||
|
ParticipantId: participantId,
|
||||||
|
Addr: participant.Addr,
|
||||||
|
DkgResponse: participant.DkgResponse,
|
||||||
|
}
|
||||||
|
responseData = append(responseData, responseEntry)
|
||||||
|
}
|
||||||
|
|
||||||
|
response = responseData
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -344,7 +403,7 @@ func (m *DKGProposalFSM) actionMasterKeyConfirmationReceived(inEvent fsm.Event,
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
copy(dkgProposalParticipant.MasterKey, request.MasterKey)
|
copy(dkgProposalParticipant.DkgMasterKey, request.MasterKey)
|
||||||
dkgProposalParticipant.Status = internal.MasterKeyConfirmed
|
dkgProposalParticipant.Status = internal.MasterKeyConfirmed
|
||||||
|
|
||||||
dkgProposalParticipant.UpdatedAt = request.CreatedAt
|
dkgProposalParticipant.UpdatedAt = request.CreatedAt
|
||||||
|
@ -375,7 +434,7 @@ func (m *DKGProposalFSM) actionValidateDkgProposalAwaitMasterKey(inEvent fsm.Eve
|
||||||
if participant.Status == internal.MasterKeyConfirmationError {
|
if participant.Status == internal.MasterKeyConfirmationError {
|
||||||
isContainsError = true
|
isContainsError = true
|
||||||
} else if participant.Status == internal.MasterKeyConfirmed {
|
} else if participant.Status == internal.MasterKeyConfirmed {
|
||||||
masterKeys = append(masterKeys, participant.MasterKey)
|
masterKeys = append(masterKeys, participant.DkgMasterKey)
|
||||||
unconfirmedParticipants--
|
unconfirmedParticipants--
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -74,15 +74,15 @@ const (
|
||||||
)
|
)
|
||||||
|
|
||||||
type DKGProposalParticipant struct {
|
type DKGProposalParticipant struct {
|
||||||
Addr string
|
Addr string
|
||||||
DkgPubKey []byte
|
DkgPubKey []byte
|
||||||
Commit []byte
|
DkgCommit []byte
|
||||||
Deal []byte
|
DkgDeal []byte
|
||||||
Response []byte
|
DkgResponse []byte
|
||||||
MasterKey []byte
|
DkgMasterKey []byte
|
||||||
Status DKGParticipantStatus
|
Status DKGParticipantStatus
|
||||||
Error error
|
Error error
|
||||||
UpdatedAt time.Time
|
UpdatedAt time.Time
|
||||||
}
|
}
|
||||||
|
|
||||||
type DKGProposalQuorum map[int]*DKGProposalParticipant
|
type DKGProposalQuorum map[int]*DKGProposalParticipant
|
||||||
|
|
|
@ -61,15 +61,14 @@ func (m *SignatureProposalFSM) actionInitSignatureProposal(inEvent fsm.Event, ar
|
||||||
|
|
||||||
responseData := make(responses.SignatureProposalParticipantInvitationsResponse, 0)
|
responseData := make(responses.SignatureProposalParticipantInvitationsResponse, 0)
|
||||||
|
|
||||||
for participantId, proposal := range m.payload.SignatureProposalPayload.Quorum {
|
for participantId, participant := range m.payload.SignatureProposalPayload.Quorum {
|
||||||
responseEntry := &responses.SignatureProposalParticipantInvitationEntry{
|
responseEntry := &responses.SignatureProposalParticipantInvitationEntry{
|
||||||
ParticipantId: participantId,
|
ParticipantId: participantId,
|
||||||
Addr: proposal.Addr,
|
Addr: participant.Addr,
|
||||||
}
|
}
|
||||||
responseData = append(responseData, responseEntry)
|
responseData = append(responseData, responseEntry)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Change state
|
|
||||||
return inEvent, responseData, nil
|
return inEvent, responseData, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -167,7 +166,6 @@ func (m *SignatureProposalFSM) actionValidateSignatureProposal(inEvent fsm.Event
|
||||||
responseEntry := &responses.SignatureProposalParticipantStatusEntry{
|
responseEntry := &responses.SignatureProposalParticipantStatusEntry{
|
||||||
ParticipantId: participantId,
|
ParticipantId: participantId,
|
||||||
Addr: participant.Addr,
|
Addr: participant.Addr,
|
||||||
DkgPubKey: participant.DkgPubKey,
|
|
||||||
Status: uint8(participant.Status),
|
Status: uint8(participant.Status),
|
||||||
}
|
}
|
||||||
responseData = append(responseData, responseEntry)
|
responseData = append(responseData, responseEntry)
|
||||||
|
@ -186,7 +184,6 @@ func (m *SignatureProposalFSM) actionSignatureProposalCanceledByTimeout(inEvent
|
||||||
responseEntry := &responses.SignatureProposalParticipantStatusEntry{
|
responseEntry := &responses.SignatureProposalParticipantStatusEntry{
|
||||||
ParticipantId: participantId,
|
ParticipantId: participantId,
|
||||||
Addr: participant.Addr,
|
Addr: participant.Addr,
|
||||||
DkgPubKey: participant.DkgPubKey,
|
|
||||||
Status: uint8(participant.Status),
|
Status: uint8(participant.Status),
|
||||||
}
|
}
|
||||||
responseData = append(responseData, responseEntry)
|
responseData = append(responseData, responseEntry)
|
||||||
|
|
|
@ -134,7 +134,7 @@ func (m *SigningProposalFSM) actionProposalResponseByParticipant(inEvent fsm.Eve
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// copy(signingProposalParticipant.Commit, request.Commit)
|
// copy(signingProposalParticipant.DkgCommit, request.DkgCommit)
|
||||||
switch inEvent {
|
switch inEvent {
|
||||||
case EventConfirmSigningConfirmation:
|
case EventConfirmSigningConfirmation:
|
||||||
signingProposalParticipant.Status = internal.SigningConfirmed
|
signingProposalParticipant.Status = internal.SigningConfirmed
|
||||||
|
|
|
@ -1,17 +1,33 @@
|
||||||
package responses
|
package responses
|
||||||
|
|
||||||
|
type DKGProposalPubKeysParticipantResponse []*DKGProposalPubKeysParticipantEntry
|
||||||
|
|
||||||
|
type DKGProposalPubKeysParticipantEntry struct {
|
||||||
|
ParticipantId int
|
||||||
|
Addr string
|
||||||
|
DkgPubKey []byte
|
||||||
|
}
|
||||||
|
|
||||||
type DKGProposalCommitParticipantResponse []*DKGProposalCommitParticipantEntry
|
type DKGProposalCommitParticipantResponse []*DKGProposalCommitParticipantEntry
|
||||||
|
|
||||||
type DKGProposalCommitParticipantEntry struct {
|
type DKGProposalCommitParticipantEntry struct {
|
||||||
ParticipantId int
|
ParticipantId int
|
||||||
Title string
|
Addr string
|
||||||
Commit []byte
|
DkgCommit []byte
|
||||||
}
|
}
|
||||||
|
|
||||||
type DKGProposalDealParticipantResponse []*DKGProposalDealParticipantEntry
|
type DKGProposalDealParticipantResponse []*DKGProposalDealParticipantEntry
|
||||||
|
|
||||||
type DKGProposalDealParticipantEntry struct {
|
type DKGProposalDealParticipantEntry struct {
|
||||||
ParticipantId int
|
ParticipantId int
|
||||||
Title string
|
Addr string
|
||||||
Deal []byte
|
DkgDeal []byte
|
||||||
|
}
|
||||||
|
|
||||||
|
type DKGProposalResponseParticipantResponse []*DKGProposalResponseParticipantEntry
|
||||||
|
|
||||||
|
type DKGProposalResponseParticipantEntry struct {
|
||||||
|
ParticipantId int
|
||||||
|
Addr string
|
||||||
|
DkgResponse []byte
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,6 +20,5 @@ type SignatureProposalParticipantStatusResponse []*SignatureProposalParticipantS
|
||||||
type SignatureProposalParticipantStatusEntry struct {
|
type SignatureProposalParticipantStatusEntry struct {
|
||||||
ParticipantId int
|
ParticipantId int
|
||||||
Addr string
|
Addr string
|
||||||
DkgPubKey []byte
|
|
||||||
Status uint8
|
Status uint8
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue