message/validation: move signature verification outside validation lock #2728
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,224 @@ | ||
| package validation | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "maps" | ||
| "slices" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/attestantio/go-eth2-client/spec" | ||
| "github.com/attestantio/go-eth2-client/spec/phase0" | ||
| libp2ptest "github.com/libp2p/go-libp2p/core/test" | ||
| "github.com/stretchr/testify/require" | ||
| "go.uber.org/mock/gomock" | ||
| "go.uber.org/zap/zaptest" | ||
|
|
||
| spectypes "github.com/ssvlabs/ssv-spec/types" | ||
| spectestingutils "github.com/ssvlabs/ssv-spec/types/testingutils" | ||
|
|
||
| "github.com/ssvlabs/ssv/network/commons" | ||
| "github.com/ssvlabs/ssv/networkconfig" | ||
| "github.com/ssvlabs/ssv/operator/duties/dutystore" | ||
| "github.com/ssvlabs/ssv/operator/storage" | ||
| ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" | ||
| registrystorage "github.com/ssvlabs/ssv/registry/storage" | ||
| "github.com/ssvlabs/ssv/registry/storage/mocks" | ||
| kv "github.com/ssvlabs/ssv/storage/badger" | ||
| "github.com/ssvlabs/ssv/storage/basedb" | ||
| ) | ||
|
|
||
| type observingSignatureVerifier struct { | ||
| called chan struct{} | ||
| } | ||
|
|
||
| type validationLockTestEnv struct { | ||
| validator *messageValidator | ||
| committeeID spectypes.CommitteeID | ||
| committeeIdentifier spectypes.MessageID | ||
| netCfg *networkconfig.Network | ||
| ks *spectestingutils.TestKeySet | ||
| } | ||
|
|
||
| func (v *observingSignatureVerifier) VerifySignature(spectypes.OperatorID, *spectypes.SSVMessage, []byte) error { | ||
| select { | ||
| case v.called <- struct{}{}: | ||
| default: | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
nkryuchkov marked this conversation as resolved.
|
||
|
|
||
| func newValidationLockTestEnv(t *testing.T) validationLockTestEnv { | ||
| ctrl := gomock.NewController(t) | ||
|
|
||
| logger := zaptest.NewLogger(t) | ||
| db, err := kv.NewInMemory(logger, basedb.Options{}) | ||
| require.NoError(t, err) | ||
|
|
||
| ns, err := storage.NewNodeStorage(networkconfig.TestNetwork.Beacon, logger, db) | ||
| require.NoError(t, err) | ||
|
|
||
| netCfg := networkconfig.TestNetwork | ||
| ks := spectestingutils.Testing4SharesSet() | ||
| shares := generateShares(t, ks, ns, netCfg) | ||
|
|
||
| dutyStore := dutystore.New() | ||
| validatorStore := mocks.NewMockValidatorStore(ctrl) | ||
| operators := mocks.NewMockOperators(ctrl) | ||
|
|
||
| committee := slices.Collect(maps.Keys(ks.Shares)) | ||
| slices.Sort(committee) | ||
|
|
||
| committeeID := shares.active.CommitteeID() | ||
| validatorStore.EXPECT().Committee(gomock.Any()).DoAndReturn(func(id spectypes.CommitteeID) (*registrystorage.Committee, bool) { | ||
| if id != committeeID { | ||
| return nil, false | ||
| } | ||
|
|
||
| share1 := cloneSSVShare(t, shares.active) | ||
| share2 := cloneSSVShare(t, share1) | ||
| share2.ValidatorIndex = share1.ValidatorIndex + 1 | ||
| share3 := cloneSSVShare(t, share2) | ||
| share3.ValidatorIndex = share2.ValidatorIndex + 1 | ||
|
|
||
| return ®istrystorage.Committee{ | ||
| ID: id, | ||
| Operators: committee, | ||
| Shares: []*ssvtypes.SSVShare{ | ||
| share1, | ||
| share2, | ||
| share3, | ||
| }, | ||
| Indices: []phase0.ValidatorIndex{ | ||
| share1.ValidatorIndex, | ||
| share2.ValidatorIndex, | ||
| share3.ValidatorIndex, | ||
| }, | ||
| }, true | ||
| }).AnyTimes() | ||
|
|
||
| for _, id := range []spectypes.OperatorID{1, 2, 3, 4, 5} { | ||
| operators.EXPECT(). | ||
| OperatorsExist(gomock.Any(), []spectypes.OperatorID{id}). | ||
| Return(true, nil). | ||
| AnyTimes() | ||
| } | ||
|
|
||
| verifier := &observingSignatureVerifier{called: make(chan struct{}, 1)} | ||
|
|
||
| validator := New( | ||
| netCfg, | ||
| validatorStore, | ||
| operators, | ||
| dutyStore, | ||
| verifier, | ||
| ).(*messageValidator) | ||
|
|
||
| encodedCommitteeID := append(bytes.Repeat([]byte{0}, 16), committeeID[:]...) | ||
| committeeIdentifier := spectypes.NewMsgID(netCfg.DomainType, encodedCommitteeID, spectypes.RoleCommittee) | ||
|
|
||
| return validationLockTestEnv{ | ||
| validator: validator, | ||
| committeeID: committeeID, | ||
| committeeIdentifier: committeeIdentifier, | ||
| netCfg: netCfg, | ||
| ks: ks, | ||
| } | ||
| } | ||
|
|
||
| func TestConsensusSignatureVerificationOutsideValidationLock(t *testing.T) { | ||
| env := newValidationLockTestEnv(t) | ||
|
|
||
| slot := env.netCfg.FirstSlotAtEpoch(1) | ||
| signedSSVMessage := generateSignedMessage(env.ks, env.committeeIdentifier, slot) | ||
| topicID := commons.CommitteeTopicID(env.committeeID)[0] | ||
| peerID, err := libp2ptest.RandPeerID() | ||
| require.NoError(t, err) | ||
|
|
||
| validationMu := env.validator.getValidationLock(signedSSVMessage.SSVMessage.GetID()) | ||
| validationMu.Lock() | ||
| locked := true | ||
| defer func() { | ||
| if locked { | ||
| validationMu.Unlock() | ||
| } | ||
| }() | ||
|
|
||
| done := make(chan error, 1) | ||
| go func() { | ||
| _, err := env.validator.handleSignedSSVMessage(signedSSVMessage, topicID, peerID, env.netCfg.SlotStartTime(slot)) | ||
| done <- err | ||
| }() | ||
|
|
||
| select { | ||
| case <-env.validator.signatureVerifier.(*observingSignatureVerifier).called: | ||
|
Contributor
There was a problem hiding this comment. Worth considering whether this test actually proves the parallel-verify claim? Seems that it asserts verify runs while the test goroutine externally holds the lock, but the operational value of the PR is that two handler goroutines for the same MsgID can both be in verify simultaneously. A test that spawns two |
||
| case <-time.After(time.Second): | ||
| t.Fatal("signature verification did not start while the validation lock was held") | ||
| } | ||
|
|
||
| select { | ||
| case err := <-done: | ||
| t.Fatalf("validation completed before the lock was released: %v", err) | ||
| default: | ||
| } | ||
|
|
||
| validationMu.Unlock() | ||
| locked = false | ||
|
|
||
| select { | ||
| case err := <-done: | ||
| require.NoError(t, err) | ||
| case <-time.After(time.Second): | ||
| t.Fatal("validation did not complete after the lock was released") | ||
| } | ||
|
Comment on lines
+130
to
+174
Contributor
There was a problem hiding this comment.
leader := mv.roundRobinProposer(consensusMessage.Height, consensusMessage.Round, committeeInfo.committee)
if signedSSVMessage.OperatorIDs[0] != leader {
return ErrSignerNotLeader
}
For the test to succeed, If the test slot or committee size changes the modular arithmetic fails, Consider either using a |
||
| } | ||
|
|
||
| func TestPartialSignatureVerificationOutsideValidationLock(t *testing.T) { | ||
| env := newValidationLockTestEnv(t) | ||
|
|
||
| slot := env.netCfg.FirstSlotAtEpoch(1) | ||
| ssvMessage := spectestingutils.SSVMsgAggregator(nil, spectestingutils.PostConsensusAggregatorMsg(env.ks.Shares[1], 1, spec.DataVersionPhase0)) | ||
| ssvMessage.MsgID = env.committeeIdentifier | ||
| signedSSVMessage := spectestingutils.SignPartialSigSSVMessage(env.ks, ssvMessage) | ||
|
nkryuchkov marked this conversation as resolved.
|
||
| topicID := commons.CommitteeTopicID(env.committeeID)[0] | ||
| peerID, err := libp2ptest.RandPeerID() | ||
| require.NoError(t, err) | ||
|
|
||
| validationMu := env.validator.getValidationLock(signedSSVMessage.SSVMessage.GetID()) | ||
| validationMu.Lock() | ||
| locked := true | ||
| defer func() { | ||
| if locked { | ||
| validationMu.Unlock() | ||
| } | ||
| }() | ||
|
|
||
| done := make(chan error, 1) | ||
| go func() { | ||
| _, err := env.validator.handleSignedSSVMessage(signedSSVMessage, topicID, peerID, env.netCfg.SlotStartTime(slot)) | ||
| done <- err | ||
| }() | ||
|
|
||
| select { | ||
| case <-env.validator.signatureVerifier.(*observingSignatureVerifier).called: | ||
| case <-time.After(time.Second): | ||
| t.Fatal("partial signature verification did not start while the validation lock was held") | ||
| } | ||
|
|
||
| select { | ||
| case err := <-done: | ||
| t.Fatalf("partial validation completed before the lock was released: %v", err) | ||
| default: | ||
| } | ||
|
|
||
| validationMu.Unlock() | ||
| locked = false | ||
|
|
||
| select { | ||
| case err := <-done: | ||
| require.NoError(t, err) | ||
| case <-time.After(time.Second): | ||
| t.Fatal("partial validation did not complete after the lock was released") | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What do you think about per-peer CPU amplification here? I fear a single peer could send multiple structurally-different messages with the same MsgID (varying Round, FullData, etc.) that all pass semantic validation and enter
verifyConsensusMessageSignaturesin parallel before the per-peerSeenMsgTypeslimits kick in inside the lock. Pre-PR the outer lock capped simultaneous RSA work per MsgID at 1; now it's bounded only by libp2p's validation-worker pool. Maybe worth a follow-up: a cheap pre-verify per-peer counter keyed on(MsgID, peerID), or rely on topic scoring — could be bundled with the F-ssv-173 (2)/(3) follow-ups. Same applies topartial_validation.goverify path.