Skip to content

Improve dkg completion handler #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
keithsue merged 2 commits into from
Aug 8, 2024
Merged

Improve dkg completion handler #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d3a451
improve dkg completion handler
keithsue Aug 2, 2024
d7c7b52
Merge branch 'main' into sufay/improve-dkg-completion
keithsue Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions x/btcbridge/keeper/keeper_tss.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,14 @@ func (k Keeper) CompleteDKG(ctx sdk.Context, req *types.DKGCompletionRequest) er
return types.ErrDKGRequestDoesNotExist
}

if !types.ParticipantExists(dkgReq.Participants, req.Validator) {
return types.ErrUnauthorizedDKGCompletionRequest
}

if k.HasDKGCompletionRequest(ctx, req.Id, req.Validator) {
return types.ErrDKGCompletionRequestExists
}

if dkgReq.Status != types.DKGRequestStatus_DKG_REQUEST_STATUS_PENDING {
return types.ErrInvalidDKGCompletionRequest
}
Expand All @@ -175,8 +183,8 @@ func (k Keeper) CompleteDKG(ctx sdk.Context, req *types.DKGCompletionRequest) er
return types.ErrInvalidDKGCompletionRequest
}

if k.HasDKGCompletionRequest(ctx, req.Id, req.Validator) {
return types.ErrDKGCompletionRequestExists
if err := k.CheckVaults(ctx, req.Vaults); err != nil {
return err
}

validatorConsAddr, _ := sdk.ConsAddressFromHex(req.Validator)
Expand All @@ -185,14 +193,6 @@ func (k Keeper) CompleteDKG(ctx sdk.Context, req *types.DKGCompletionRequest) er
return types.ErrInvalidDKGCompletionRequest
}

if !types.ParticipantExists(dkgReq.Participants, req.Validator) {
return types.ErrUnauthorizedDKGCompletionRequest
}

if err := k.CheckVaults(ctx, req.Vaults); err != nil {
return err
}

pubKey, err := validator.ConsPubKey()
if err != nil {
return err
Expand Down Expand Up @@ -241,8 +241,7 @@ func (k Keeper) UpdateVaults(ctx sdk.Context, newVaults []string) {
k.SetParams(ctx, params)
}

// IncreaseVaultVersion increases the vault version by 1 and starts from 1
// Note: the genesis version is 0
// IncreaseVaultVersion increases the vault version by 1
func (k Keeper) IncreaseVaultVersion(ctx sdk.Context) uint64 {
store := ctx.KVStore(k.storeKey)

Expand Down
2 changes: 1 addition & 1 deletion x/btcbridge/types/keys.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ var (
DKGRequestIDKey = []byte{0x30} // key for the DKG request id
DKGRequestKeyPrefix = []byte{0x31} // prefix for each key to a DKG request
DKGCompletionRequestKeyPrefix = []byte{0x32} // prefix for each key to a DKG completion request
VaultVersionKey = []byte{0x33} // key for vault version; default to 0 in the genesis and increased by 1 once updated
VaultVersionKey = []byte{0x33} // key for vault version increased by 1 once updated
)

func Int64ToBytes(number uint64) []byte {
Expand Down