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

Additional verify checks #5982

Merged
merged 5 commits into from
Feb 10, 2022
Merged

Additional verify checks #5982

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e4423b5
Additional verify checks
connorwstein Feb 10, 2022
7801498
Comments
connorwstein Feb 10, 2022
b467170
Merge branch 'develop' into check-sig-length
connorwstein Feb 10, 2022
13dad73
Merge branch 'develop' into check-sig-length
connorwstein Feb 10, 2022
029df81
Merge branch 'develop' into check-sig-length
jmank88 Feb 10, 2022
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
Next Next commit
Additional verify checks
  • Loading branch information
@connorwstein
connorwstein committed Feb 10, 2022
commit e4423b557aeae2034ad884a36144e3c0e8c5554c
2 changes: 2 additions & 0 deletions core/services/keystore/keys/ocr2key/key_bundle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ import (
)

type KeyBundle interface {
// OnchainKeyring is used for signing reports (groups of observations, verified onchain)
ocrtypes.OnchainKeyring
// OffchainKeyring is used for signing observations
ocrtypes.OffchainKeyring
ID() string
ChainType() chaintype.ChainType
Expand Down
1 change: 0 additions & 1 deletion core/services/keystore/keys/ocr2key/solana_keyring.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ func (ok *solanaKeyring) reportToSigData(reportCtx ocrtypes.ReportContext, repor

func (ok *solanaKeyring) Sign(reportCtx ocrtypes.ReportContext, report ocrtypes.Report) ([]byte, error) {
return crypto.Sign(ok.reportToSigData(reportCtx, report), &ok.privateKey)

}

func (ok *solanaKeyring) Verify(publicKey ocrtypes.OnchainPublicKey, reportCtx ocrtypes.ReportContext, report ocrtypes.Report, signature []byte) bool {
Expand Down
7 changes: 7 additions & 0 deletions core/services/keystore/keys/ocr2key/terra_keyring.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,14 @@ func (ok *terraKeyring) Sign(reportCtx ocrtypes.ReportContext, report ocrtypes.R
return utils.ConcatBytes(ok.PublicKey(), signedMsg), nil
}

// Note signature is prefixed with the public key.
connorwstein marked this conversation as resolved.
Show resolved Hide resolved
func (ok *terraKeyring) Verify(publicKey ocrtypes.OnchainPublicKey, reportCtx ocrtypes.ReportContext, report ocrtypes.Report, signature []byte) bool {
if len(signature) != ok.MaxSignatureLength() {
jmank88 marked this conversation as resolved.
Show resolved Hide resolved
return false
}
if len(publicKey) != ed25519.PublicKeySize {
return false
}
hash, err := ok.reportToSigData(reportCtx, report)
if err != nil {
return false
Expand Down
28 changes: 23 additions & 5 deletions core/services/keystore/keys/ocr2key/terra_keyring_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,27 @@ func TestTerraKeyRing_Sign_Verify(t *testing.T) {
kr2, err := newTerraKeyring(cryptorand.Reader)
require.NoError(t, err)
ctx := ocrtypes.ReportContext{}
report := ocrtypes.Report{}
sig, err := kr1.Sign(ctx, report)
require.NoError(t, err)
result := kr2.Verify(kr1.PublicKey(), ctx, report, sig)
require.True(t, result)

t.Run("can verify", func(t *testing.T) {
report := ocrtypes.Report{}
sig, err := kr1.Sign(ctx, report)
require.NoError(t, err)
t.Log(len(sig))
result := kr2.Verify(kr1.PublicKey(), ctx, report, sig)
require.True(t, result)
})

t.Run("invalid sig", func(t *testing.T) {
report := ocrtypes.Report{}
result := kr2.Verify(kr1.PublicKey(), ctx, report, []byte{0x01})
require.False(t, result)
})

t.Run("invalid pubkey", func(t *testing.T) {
report := ocrtypes.Report{}
sig, err := kr1.Sign(ctx, report)
require.NoError(t, err)
result := kr2.Verify([]byte{0x01}, ctx, report, sig)
require.False(t, result)
})
}