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.

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

Warp signer #69

Merged
merged 2 commits into from
Dec 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 14 additions & 14 deletions warp/backend.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (

dbm "github.com/cometbft/cometbft-db"
"github.com/cometbft/cometbft/libs/log"
"github.com/landslidenetwork/slide-sdk/utils/crypto/bls"
"github.com/landslidenetwork/slide-sdk/utils/ids"
warputils "github.com/landslidenetwork/slide-sdk/utils/warp"
"github.com/landslidenetwork/slide-sdk/utils/warp/payload"
Expand All @@ -19,7 +18,7 @@ type Backend interface {
// AddMessage signs [unsignedMessage] and adds it to the warp backend database
AddMessage(unsignedMessage *warputils.UnsignedMessage) error
// GetMessageSignature returns the signature of the requested message.
GetMessageSignature(message *warputils.UnsignedMessage) ([bls.SignatureLen]byte, error)
GetMessageSignature(message *warputils.UnsignedMessage) ([]byte, error)
// GetMessage retrieves the [unsignedMessage] from the warp backend database if available
// TODO: After E-Upgrade, the backend no longer needs to store the mapping from messageHash
// to unsignedMessage (and this method can be removed).
Expand Down Expand Up @@ -56,8 +55,7 @@ func (b *backend) AddMessage(unsignedMessage *warputils.UnsignedMessage) error {
return fmt.Errorf("failed to put warp signature in db: %w", err)
}

_, err := b.warpSigner.Sign(unsignedMessage)
if err != nil {
if _, err := b.signMessage(unsignedMessage); err != nil {
return fmt.Errorf("failed to sign warp message: %w", err)
}
//TODO: save message signature to prefixdb
Expand All @@ -79,22 +77,15 @@ func (b *backend) GetMessage(messageID ids.ID) (*warputils.UnsignedMessage, erro
return unsignedMessage, nil
}

func (b *backend) GetMessageSignature(unsignedMessage *warputils.UnsignedMessage) ([bls.SignatureLen]byte, error) {
func (b *backend) GetMessageSignature(unsignedMessage *warputils.UnsignedMessage) ([]byte, error) {
messageID := unsignedMessage.ID()

b.logger.Debug("Getting warp message from backend", "messageID", messageID)
if err := b.ValidateMessage(unsignedMessage); err != nil {
return [bls.SignatureLen]byte{}, fmt.Errorf("failed to validate warp message: %w", err)
}

var signature [bls.SignatureLen]byte
sig, err := b.warpSigner.Sign(unsignedMessage)
if err != nil {
return [bls.SignatureLen]byte{}, fmt.Errorf("failed to sign warp message: %w", err)
return []byte{}, fmt.Errorf("failed to validate warp message: %w", err)
}

copy(signature[:], sig)
return signature, nil
return b.signMessage(unsignedMessage)
}

func (b *backend) ValidateMessage(unsignedMessage *warputils.UnsignedMessage) error {
Expand Down Expand Up @@ -127,3 +118,12 @@ func (b *backend) ValidateMessage(unsignedMessage *warputils.UnsignedMessage) er
}
return nil
}

func (b *backend) signMessage(unsignedMessage *warputils.UnsignedMessage) ([]byte, error) {
sig, err := b.warpSigner.Sign(unsignedMessage)
if err != nil {
return nil, fmt.Errorf("failed to sign warp message: %w", err)
}

return sig, nil
}
2 changes: 1 addition & 1 deletion warp/backend_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func TestAddAndGetValidMessage(t *testing.T) {
signature, err := backend.GetMessageSignature(testUnsignedMessage)
require.NoError(t, err)
require.NoError(t, err)
require.Equal(t, expectedSig, signature[:])
require.Equal(t, expectedSig, signature)
}

func TestAddAndGetUnknownMessage(t *testing.T) {
Expand Down
Loading