Skip to content
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

cache signatures only in acp118 handler #3474

Merged
merged 4 commits into from
Oct 17, 2024
Merged

cache signatures only in acp118 handler #3474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f8470b2
cache signatures only in acp118 handler
ceyonur Oct 15, 2024
95c10a3
remove len check for cache test
ceyonur Oct 16, 2024
0a6e5ea
Merge branch 'master' into cache-only-signatures
ceyonur Oct 16, 2024
5797ef8
Merge branch 'master' into cache-only-signatures
ceyonur Oct 17, 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
25 changes: 14 additions & 11 deletions network/p2p/acp118/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,26 +39,26 @@ func NewHandler(verifier Verifier, signer warp.Signer) *Handler {
}

// NewCachedHandler returns an instance of Handler that caches successful
// requests.
// signatures.
func NewCachedHandler(
cacher cache.Cacher[ids.ID, []byte],
verifier Verifier,
signer warp.Signer,
) *Handler {
return &Handler{
cacher: cacher,
verifier: verifier,
signer: signer,
signatureCache: cacher,
verifier: verifier,
signer: signer,
}
}

// Handler signs warp messages
type Handler struct {
p2p.NoOpHandler

cacher cache.Cacher[ids.ID, []byte]
verifier Verifier
signer warp.Signer
signatureCache cache.Cacher[ids.ID, []byte]
verifier Verifier
signer warp.Signer
}

func (h *Handler) AppRequest(
Expand All @@ -84,8 +84,8 @@ func (h *Handler) AppRequest(
}

msgID := msg.ID()
if responseBytes, ok := h.cacher.Get(msgID); ok {
return responseBytes, nil
if signatureBytes, ok := h.signatureCache.Get(msgID); ok {
return signatureToResponse(signatureBytes)
}

if err := h.verifier.Verify(ctx, msg, request.Justification); err != nil {
Expand All @@ -100,6 +100,11 @@ func (h *Handler) AppRequest(
}
}

h.signatureCache.Put(msgID, signature)
return signatureToResponse(signature)
}

func signatureToResponse(signature []byte) ([]byte, *common.AppError) {
response := &sdk.SignatureResponse{
Signature: signature,
}
Expand All @@ -111,7 +116,5 @@ func (h *Handler) AppRequest(
Message: fmt.Sprintf("failed to marshal response: %s", err),
}
}

h.cacher.Put(msgID, responseBytes)
return responseBytes, nil
}
6 changes: 6 additions & 0 deletions network/p2p/acp118/handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,12 @@ func TestHandler(t *testing.T) {
require.NoError(err)

require.True(bls.Verify(pk, signature, request.Message))

// Ensure the cache is populated with correct signature
sig, ok := tt.cacher.Get(unsignedMessage.ID())
if ok {
require.Equal(sig, response.Signature)
}
}

for _, expectedErr = range tt.expectedErrs {
Expand Down
Loading