mark invalid encrypted shares as 'invalid' #1151
Conversation
AKorpusenko
changed the title
| @@ -233,11 +233,21 @@ func (eh *EventHandler) handleShareCreation( | |||
| sharePublicKeys, | |||
| encryptedKeys, | |||
| ) | |||
|
|
|||
| var malformedEventError *MalformedEventError = nil | |||
| return nil, fmt.Errorf("could not extract validator share from event: %w", err) | ||
| if errors.As(err, &malformedEventError) && | ||
| malformedEventError.IsInvalidEncryptedShare && | ||
| share.BelongsToOperator(eh.operatorData.GetOperatorData().ID) { |
There was a problem hiding this comment.
this error can't ever happen if this is not your validator, because you only try to decrypt your own shares, so maybe this check is redundant?
| if errors.As(err, &malformedEventError) && | ||
| malformedEventError.IsInvalidEncryptedShare && | ||
| share.BelongsToOperator(eh.operatorData.GetOperatorData().ID) { | ||
|
|
||
| share.Metadata.Invalid = true | ||
| } else { | ||
| return nil, fmt.Errorf("could not extract validator share from event: %w", err) | ||
| } |
There was a problem hiding this comment.
lets invert the condition to return if it's not the error we want, otherwise we continue with setting the invalid flag.
| @@ -686,6 +686,10 @@ func (c *controller) onShareStart(share *ssvtypes.SSVShare) (bool, error) { | |||
| c.logger.Warn("skipping validator until it becomes active", fields.PubKey(share.ValidatorPubKey)) | |||
| return false, nil | |||
| } | |||
| if share.Invalid { | |||
There was a problem hiding this comment.
maybe we can add it to the filter above in setupValidators like the ByNotLiquidated?
| // InitMaxPossibleShareSize - initial protocol max share size | ||
| InitMaxPossibleShareSize = 1245 | ||
|
|
||
| // CurrentMaxPossibleShareSize - Current protocol version max share size; | ||
| // can be generated by generateMaxPossibleShare | ||
| // Used only for testing purposes | ||
| CurrentMaxPossibleShareSize = 1257 |
There was a problem hiding this comment.
i think we can delete these and instead just update the old value MaxPossibleShareSize to 1257
| @@ -103,4 +112,5 @@ type Metadata struct { | |||
| BeaconMetadata *beaconprotocol.ValidatorMetadata | |||
| OwnerAddress common.Address | |||
| Liquidated bool | |||
| Invalid bool | |||
There was a problem hiding this comment.
maybe we can rename this to InvalidSecret so its more self-explanatory?
otherwise one might assume that something else in the event may have been invalid (such as invalid nonce)
| return &validatorShare, nil, &MalformedEventError{ | ||
| Err: fmt.Errorf("could not decrypt share private key: %w", err), | ||
| IsInvalidEncryptedShare: true, | ||
| } | ||
| } | ||
| if err = shareSecret.SetHexString(string(decryptedSharePrivateKey)); err != nil { | ||
| return nil, nil, &MalformedEventError{ | ||
| Err: fmt.Errorf("could not set decrypted share private key: %w", err), | ||
| return &validatorShare, nil, &MalformedEventError{ | ||
| Err: fmt.Errorf("could not set decrypted share private key: %w", err), | ||
| IsInvalidEncryptedShare: true, | ||
| } | ||
| } | ||
| if !bytes.Equal(shareSecret.GetPublicKey().Serialize(), validatorShare.SharePubKey) { | ||
| return nil, nil, &MalformedEventError{ | ||
| Err: errors.New("share private key does not match public key"), | ||
| return &validatorShare, nil, &MalformedEventError{ | ||
| Err: fmt.Errorf("share private key does not match public key"), | ||
| IsInvalidEncryptedShare: true, | ||
| } |
There was a problem hiding this comment.
can you please try to instead of returning malformed error, instead to just set the Invalid flag on the share and return no error?
with this you'd be able to just ask if the share is invalid rather than if there was a malformedError
|
replaced with #1313 |
No description provided.