Skip to content

Wrap specific error msg #26

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 1 commit into from
Aug 13, 2024
Merged

Wrap specific error msg #26

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 9 additions & 7 deletions x/btcbridge/keeper/keeper_tss.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"time"

sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"

"github.com/sideprotocol/side/x/btcbridge/types"
)
Expand Down Expand Up @@ -176,11 +177,11 @@ func (k Keeper) CompleteDKG(ctx sdk.Context, req *types.DKGCompletionRequest) er
}

if dkgReq.Status != types.DKGRequestStatus_DKG_REQUEST_STATUS_PENDING {
return types.ErrInvalidDKGCompletionRequest
return sdkerrors.Wrap(types.ErrInvalidDKGCompletionRequest, "invalid dkg request status")
}

if !ctx.BlockTime().Before(*dkgReq.Expiration) {
return types.ErrInvalidDKGCompletionRequest
return sdkerrors.Wrap(types.ErrInvalidDKGCompletionRequest, "dkg request expired")
}

if err := k.CheckVaults(ctx, req.Vaults); err != nil {
Expand All @@ -190,7 +191,7 @@ func (k Keeper) CompleteDKG(ctx sdk.Context, req *types.DKGCompletionRequest) er
consAddress, _ := sdk.ConsAddressFromHex(req.ConsensusAddress)
validator, found := k.stakingKeeper.GetValidatorByConsAddr(ctx, consAddress)
if !found {
return types.ErrInvalidDKGCompletionRequest
return sdkerrors.Wrap(types.ErrInvalidDKGCompletionRequest, "non validator")
}

pubKey, err := validator.ConsPubKey()
Expand All @@ -199,7 +200,7 @@ func (k Keeper) CompleteDKG(ctx sdk.Context, req *types.DKGCompletionRequest) er
}

if !types.VerifySignature(req.Signature, pubKey.Bytes(), req) {
return types.ErrInvalidDKGCompletionRequest
return sdkerrors.Wrap(types.ErrInvalidDKGCompletionRequest, "invalid signature")
}

k.SetDKGCompletionRequest(ctx, req)
Expand All @@ -211,9 +212,10 @@ func (k Keeper) CompleteDKG(ctx sdk.Context, req *types.DKGCompletionRequest) er
func (k Keeper) CheckVaults(ctx sdk.Context, vaults []string) error {
currentVaults := k.GetParams(ctx).Vaults

if len(vaults) != len(currentVaults) {
return types.ErrInvalidDKGCompletionRequest
}
// commented out for now
// if len(vaults) != len(currentVaults) {
// return sdkerrors.Wrap(types.ErrInvalidDKGCompletionRequest, "invalid vaults")
// }

for _, v := range vaults {
if types.SelectVaultByAddress(currentVaults, v) != nil {
Expand Down