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

Benchmark message handling #455

Draft
wants to merge 9 commits into
base: main-gnosis-merge
Choose a base branch
from
Draft

Benchmark message handling #455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
16879ce
Fix message handling tests
jannikluhn Jun 13, 2024
f7a7a3e
Fix trigger test
jannikluhn Jun 14, 2024
8e4ab70
Fix key message handling tests
jannikluhn Jun 14, 2024
66e8886
Make test key generator usable from benchmarks
jannikluhn Jun 17, 2024
ec0f22a
fixup! Fix key message handling tests
jannikluhn Jun 17, 2024
e62b082
Get rid of test key generator
jannikluhn Jun 17, 2024
59eb4bd
Add benchmarks for key and share handling
jannikluhn Jun 17, 2024
f989179
Don't swallow db connection error in test
konradkonrad Jun 20, 2024
b371916
Suppress log and loop in bench
konradkonrad Jun 20, 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
102 changes: 74 additions & 28 deletions rolling-shutter/cmd/cryptocmd/jsontests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,8 +315,10 @@ var testSpecs = []struct {
}

func createJSONTests(enc testEncoder) {
keygen := testkeygen.NewKeyGenerator(12, 10)
var err error
keys, err := testkeygen.NewEonKeys(rand.Reader, 12, 10)
if err != nil {
panic(err)
}
for i := range testSpecs {
testSpec := testSpecs[i]

Expand All @@ -329,7 +331,7 @@ func createJSONTests(enc testEncoder) {
if err != nil {
panic(err)
}
et, err := createEncryptionTest(keygen, testSpec.payload)
et, err := createEncryptionTest(keys, testSpec.payload)
if err != nil {
panic(err)
}
Expand All @@ -345,7 +347,7 @@ func createJSONTests(enc testEncoder) {
}
enc.addTest(&testcase)

dt := createDecryptionTest(keygen, *et)
dt := createDecryptionTest(keys, *et)
testcase = testCase{
testCaseMeta: testCaseMeta{
Description: testSpec.description,
Expand All @@ -360,13 +362,13 @@ func createJSONTests(enc testEncoder) {
enc.addTest(&testcase)

case tampered:
et, err := createEncryptionTest(keygen, testSpec.payload)
et, err := createEncryptionTest(keys, testSpec.payload)
if err != nil {
panic(err)
}
tamperedEt := tamperEncryptedMessage(keygen, *et)
tamperedEt := tamperEncryptedMessage(keys, *et)

dt := createDecryptionTest(keygen, tamperedEt)
dt := createDecryptionTest(keys, tamperedEt)
dt.Expected, _ = hexutil.Decode("0x")
testcase := testCase{
testCaseMeta: testCaseMeta{
Expand All @@ -383,9 +385,9 @@ func createJSONTests(enc testEncoder) {
var err error
var vt verificationTest
if testSpec.style == verifying {
vt, err = createVerificationTest(keygen, testSpec.payload)
vt, err = createVerificationTest(keys, testSpec.payload)
} else {
vt, err = createFailedVerificationTest(keygen, testSpec.payload)
vt, err = createFailedVerificationTest(keys, testSpec.payload)
}
if err != nil {
panic(err)
Expand Down Expand Up @@ -415,16 +417,19 @@ func verifyTestCase(tc *testCase) error {
return tc.Test.Run()
}

func createEncryptionTest(keygen *testkeygen.KeyGenerator, message []byte) (*encryptionTest, error) {
epochID := keygen.RandomEpochID(make([]byte, 52))
func createEncryptionTest(keys *testkeygen.EonKeys, message []byte) (*encryptionTest, error) {
epochID, err := randomEpochID()
if err != nil {
return nil, err
}

et := encryptionTest{}

et.Message = message

et.EonPublicKey = keygen.EonPublicKey(epochID)
et.EonPublicKey = keys.EonPublicKey()
et.EpochID = epochID
sigma, err := keygen.RandomSigma()
sigma, err := shcrypto.RandomSigma(rand.Reader)
if err != nil {
return &et, err
}
Expand All @@ -434,7 +439,7 @@ func createEncryptionTest(keygen *testkeygen.KeyGenerator, message []byte) (*enc

encryptedMessage := shcrypto.Encrypt(
et.Message,
keygen.EonPublicKey(epochID),
keys.EonPublicKey(),
epochIDPoint,
sigma,
)
Expand All @@ -450,11 +455,13 @@ func createEncryptionTest(keygen *testkeygen.KeyGenerator, message []byte) (*enc
}

// tamperEncryptedMessage changes the C1 value of EncryptedMessage, which allows to test for malleability issues.
func tamperEncryptedMessage(keygen *testkeygen.KeyGenerator, et encryptionTest) encryptionTest {
decryptionKey := keygen.EpochSecretKey(et.EpochID)
func tamperEncryptedMessage(keys *testkeygen.EonKeys, et encryptionTest) encryptionTest {
decryptionKey, err := keys.EpochSecretKey(et.EpochID)
if err != nil {
panic(err)
}
g2 := bls12381.NewG2()
var c1 *bls12381.PointG2
var err error

for i := 1; i <= 10000; i++ {
c1 = et.Expected.C1
Expand All @@ -471,9 +478,12 @@ func tamperEncryptedMessage(keygen *testkeygen.KeyGenerator, et encryptionTest)
return et
}

func createDecryptionTest(keygen *testkeygen.KeyGenerator, et encryptionTest) decryptionTest {
func createDecryptionTest(keys *testkeygen.EonKeys, et encryptionTest) decryptionTest {
dt := decryptionTest{}
epochSecretKey := keygen.EpochSecretKey(et.EpochID)
epochSecretKey, err := keys.EpochSecretKey(et.EpochID)
if err != nil {
panic(err)
}
dt.EpochSecretKey = *epochSecretKey

dt.Cipher = *et.Expected
Expand All @@ -483,13 +493,20 @@ func createDecryptionTest(keygen *testkeygen.KeyGenerator, et encryptionTest) de
return dt
}

func createVerificationTest(keygen *testkeygen.KeyGenerator, payload []byte) (verificationTest, error) {
func createVerificationTest(keys *testkeygen.EonKeys, _ []byte) (verificationTest, error) {
var err error
vt := verificationTest{}
epochID := keygen.RandomEpochID(payload)
epochID, err := randomEpochID()
if err != nil {
return verificationTest{}, err
}
vt.EpochID = epochID
vt.EpochSecretKey = *keygen.EpochSecretKey(epochID)
vt.EonPublicKey = *keygen.EonPublicKey(epochID)
epochSecretKey, err := keys.EpochSecretKey(epochID)
if err != nil {
return verificationTest{}, err
}
vt.EpochSecretKey = *epochSecretKey
vt.EonPublicKey = *keys.EonPublicKey()
vt.Expected, err = shcrypto.VerifyEpochSecretKey(
&vt.EpochSecretKey,
&vt.EonPublicKey,
Expand All @@ -498,14 +515,25 @@ func createVerificationTest(keygen *testkeygen.KeyGenerator, payload []byte) (ve
return vt, err
}

func createFailedVerificationTest(keygen *testkeygen.KeyGenerator, _ []byte) (verificationTest, error) {
func createFailedVerificationTest(keys *testkeygen.EonKeys, _ []byte) (verificationTest, error) {
var err error
vt := verificationTest{}
epochID := keygen.RandomEpochID(make([]byte, 52))
mismatch := keygen.RandomEpochID(make([]byte, 52))
epochID, err := randomEpochID()
if err != nil {
return verificationTest{}, err
}
vt.EpochID = epochID
vt.EpochSecretKey = *keygen.EpochSecretKey(epochID)
vt.EonPublicKey = *keygen.EonPublicKey(mismatch)
epochSecretKey, err := keys.EpochSecretKey(epochID)
if err != nil {
return verificationTest{}, err
}
vt.EpochSecretKey = *epochSecretKey

keysMismatch, err := testkeygen.NewEonKeys(rand.Reader, 12, 10)
if err != nil {
return verificationTest{}, err
}
vt.EonPublicKey = *keysMismatch.EonPublicKey()
vt.Expected, err = shcrypto.VerifyEpochSecretKey(
&vt.EpochSecretKey,
&vt.EonPublicKey,
Expand Down Expand Up @@ -598,3 +626,21 @@ func testMarshalingRoundtrip(tc *testCase) error {
}
return nil
}

func randomEpochID() (identitypreimage.IdentityPreimage, error) {
epochID := make([]byte, 52)
_, err := rand.Read(epochID)
if err != nil {
return identitypreimage.IdentityPreimage{}, err
}
return identitypreimage.IdentityPreimage(epochID), nil
}

func randomSigma() shcrypto.Block {
sigma := make([]byte, 32)
_, err := rand.Read(sigma)
if err != nil {
panic(err)
}
return shcrypto.Block(sigma)
}
24 changes: 11 additions & 13 deletions rolling-shutter/collator/eonhandling_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"bytes"
"context"
"crypto/ecdsa"
"crypto/rand"
"testing"
"time"

Expand All @@ -15,7 +16,6 @@ import (
"github.com/shutter-network/rolling-shutter/rolling-shutter/collator/database"
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/configuration"
enctime "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/encodeable/time"
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/identitypreimage"
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/testkeygen"
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/testsetup"
"github.com/shutter-network/rolling-shutter/rolling-shutter/p2p"
Expand Down Expand Up @@ -140,16 +140,14 @@ func TestHandleEonKeyIntegration(t *testing.T) {
db := database.New(dbpool)

testConfig := newTestConfig(t)
tkgBefore := testkeygen.NewTestKeyGenerator(t, 3, 2, false)
tkg := testkeygen.NewTestKeyGenerator(t, 3, 2, false)

identityPreimage1 := identitypreimage.Uint64ToIdentityPreimage(1)
identityPreimage1000 := identitypreimage.Uint64ToIdentityPreimage(1000)
identityPreimage2000 := identitypreimage.Uint64ToIdentityPreimage(2000)
keysBefore, err := testkeygen.NewEonKeys(rand.Reader, 3, 2)
assert.NilError(t, err)
keys, err := testkeygen.NewEonKeys(rand.Reader, 3, 2)
assert.NilError(t, err)

eonPubKeyNoThreshold, _ = tkgBefore.EonPublicKey(identityPreimage1).GobEncode()
eonPubKeyBefore, _ = tkgBefore.EonPublicKey(identityPreimage1000).GobEncode()
eonPubKey, _ = tkg.EonPublicKey(identityPreimage2000).GobEncode()
eonPubKeyNoThreshold, _ = keysBefore.EonPublicKey().GobEncode()
eonPubKeyBefore, _ = keysBefore.EonPublicKey().GobEncode()
eonPubKey, _ = keys.EonPublicKey().GobEncode()

kpr1, _ := ethcrypto.GenerateKey()
kpr2, _ := ethcrypto.GenerateKey()
Expand All @@ -166,7 +164,7 @@ func TestHandleEonKeyIntegration(t *testing.T) {
keyperConfigIndex: uint64(0),
activationBlock: activationBlockNoThreshold,
eonPubKey: eonPubKeyNoThreshold,
threshold: tkg.Threshold,
threshold: keys.Threshold,
keypers: []*ecdsa.PrivateKey{kpr1},
})
assert.Check(t, len(keypersNoThreshold) > 0)
Expand All @@ -179,7 +177,7 @@ func TestHandleEonKeyIntegration(t *testing.T) {
keyperConfigIndex: uint64(1),
activationBlock: activationBlockBefore,
eonPubKey: eonPubKeyBefore,
threshold: tkg.Threshold,
threshold: keys.Threshold,
keypers: []*ecdsa.PrivateKey{kpr1, kpr2, kpr3},
})
assert.Check(t, len(keypersBefore) > 0)
Expand All @@ -190,7 +188,7 @@ func TestHandleEonKeyIntegration(t *testing.T) {
keyperConfigIndex: uint64(2),
activationBlock: activationBlock,
eonPubKey: eonPubKey,
threshold: tkg.Threshold,
threshold: keys.Threshold,
keypers: []*ecdsa.PrivateKey{kpr3, kpr1, kpr2},
})
assert.Check(t, len(keypers) > 0)
Expand Down
Loading