Skip to content

Commit 9225ac9

Browse files
blockchainluffyblockchainluffy
committed
shutter-service: update golangci-lint version and added ignore for eon key conversion as max is already not allowed
1 parent 57f80ee commit 9225ac9

File tree

9 files changed

+55
-36
lines changed

9 files changed

+55
-36
lines changed

‎rolling-shutter/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ install-oapi-codegen: ${GOPATH}/bin/oapi-codegen
9191

9292
# non code generation tools
9393
install-golangci-lint:
94-
${GO} install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.55.2
94+
${GO} install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.62.2
9595

9696
install-gofumpt:
9797
${GO} install mvdan.cc/gofumpt@latest

‎rolling-shutter/keyperimpl/shutterservice/handlers.go

+14-5
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ func (h *DecryptionKeySharesHandler) ValidateMessage(ctx context.Context, msg p2
3939
}
4040

4141
obsKeyperDB := obskeyperdatabase.New(h.dbpool)
42-
keyperSet, err := obsKeyperDB.GetKeyperSetByKeyperConfigIndex(ctx, int64(keyShares.Eon))
42+
43+
keyperSet, err := obsKeyperDB.GetKeyperSetByKeyperConfigIndex(ctx, int64(keyShares.Eon)) //nolint:gosec // disable G115
4344
if err != nil {
4445
return pubsub.ValidationReject, errors.Wrapf(err,
4546
"failed to get keyper set from database for keyper set index %d",
@@ -90,19 +91,21 @@ func (h *DecryptionKeySharesHandler) HandleMessage(ctx context.Context, msg p2pm
9091

9192
identitiesHash := computeIdentitiesHashFromShares(keyShares.Shares)
9293
err := serviceDB.InsertDecryptionSignature(ctx, database.InsertDecryptionSignatureParams{
93-
Eon: int64(keyShares.Eon),
94-
KeyperIndex: int64(keyShares.KeyperIndex),
94+
Eon: int64(keyShares.Eon), //nolint:gosec // disable G115
95+
KeyperIndex: int64(keyShares.KeyperIndex), //nolint:gosec // disable G115
9596
IdentitiesHash: identitiesHash,
9697
Signature: extra.Signature,
9798
})
9899
if err != nil {
99100
return []p2pmsg.Message{}, errors.Wrap(err, "failed to insert vote")
100101
}
101102

102-
keyperSet, err := obsKeyperDB.GetKeyperSetByKeyperConfigIndex(ctx, int64(keyShares.Eon))
103+
keyperSet, err := obsKeyperDB.GetKeyperSetByKeyperConfigIndex(ctx, int64(keyShares.Eon)) //nolint:gosec // disable G115
103104
if err != nil {
104105
return []p2pmsg.Message{}, errors.Wrapf(err, "failed to get keyper set from database for index %d", keyShares.Eon)
105106
}
107+
108+
//nolint:gosec // disable G115
106109
signatures, err := serviceDB.GetDecryptionSignatures(ctx, database.GetDecryptionSignaturesParams{
107110
Eon: int64(keyShares.Eon),
108111
IdentitiesHash: identitiesHash,
@@ -117,6 +120,7 @@ func (h *DecryptionKeySharesHandler) HandleMessage(ctx context.Context, msg p2pm
117120
keys := []*p2pmsg.Key{}
118121
for _, share := range keyShares.GetShares() {
119122
decryptionKeyDB, err := keyperCoreDB.GetDecryptionKey(ctx, corekeyperdatabase.GetDecryptionKeyParams{
123+
//nolint:gosec // disable G115
120124
Eon: int64(keyShares.Eon),
121125
EpochID: share.IdentityPreimage,
122126
})
@@ -132,6 +136,7 @@ func (h *DecryptionKeySharesHandler) HandleMessage(ctx context.Context, msg p2pm
132136
signerIndices := []uint64{}
133137
signaturesCum := [][]byte{}
134138
for _, signature := range signatures {
139+
//nolint:gosec // disable G115
135140
signerIndices = append(signerIndices, uint64(signature.KeyperIndex))
136141
signaturesCum = append(signaturesCum, signature.Signature)
137142
}
@@ -170,6 +175,7 @@ func validateSignerIndices(extra *p2pmsg.ShutterServiceDecryptionKeysExtra, n in
170175
return pubsub.ValidationReject, errors.New("signer indices not ordered")
171176
}
172177
}
178+
//nolint:gosec // disable G115
173179
if signerIndex >= uint64(n) {
174180
return pubsub.ValidationReject, errors.New("signer index out of range")
175181
}
@@ -182,6 +188,7 @@ func ValidateDecryptionKeysSignatures(
182188
extra *p2pmsg.ShutterServiceDecryptionKeysExtra,
183189
keyperSet *obskeyperdatabase.KeyperSet,
184190
) (pubsub.ValidationResult, error) {
191+
//nolint:gosec // disable G115
185192
if int32(len(extra.SignerIndices)) != keyperSet.Threshold {
186193
return pubsub.ValidationReject, errors.Errorf("expected %d signers, got %d", keyperSet.Threshold, len(extra.SignerIndices))
187194
}
@@ -230,6 +237,7 @@ func (h *DecryptionKeysHandler) ValidateMessage(ctx context.Context, msg p2pmsg.
230237
}
231238

232239
obsKeyperDB := obskeyperdatabase.New(h.dbpool)
240+
//nolint:gosec // disable G115
233241
keyperSet, err := obsKeyperDB.GetKeyperSetByKeyperConfigIndex(ctx, int64(keys.Eon))
234242
if err != nil {
235243
return pubsub.ValidationReject, errors.Wrapf(err, "failed to get keyper set from database for eon %d", keys.Eon)
@@ -256,8 +264,9 @@ func (h *DecryptionKeysHandler) HandleMessage(ctx context.Context, msg p2pmsg.Me
256264
identitiesHash := computeIdentitiesHash(identityPreimages)
257265
for i, keyperIndex := range extra.SignerIndices {
258266
err := serviceDB.InsertDecryptionSignature(ctx, database.InsertDecryptionSignatureParams{
267+
//nolint:gosec // disable G115
259268
Eon: int64(keys.Eon),
260-
KeyperIndex: int64(keyperIndex),
269+
KeyperIndex: int64(keyperIndex), //nolint:gosec // disable G115
261270
IdentitiesHash: identitiesHash,
262271
Signature: extra.Signature[i],
263272
})

‎rolling-shutter/keyperimpl/shutterservice/handlers_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ func TestHandleDecryptionKeySharesThresholdNotReached(t *testing.T) {
9191
assert.Equal(t, len(msgs), 0)
9292
}
9393

94+
//nolint:funlen
9495
func TestHandleDecryptionKeySharesThresholdReached(t *testing.T) {
9596
if testing.Short() {
9697
t.Skip("skipping integration test")
@@ -393,7 +394,7 @@ func TestInValidateDecryptionKey(t *testing.T) {
393394
func intTo32ByteArray(num int) []byte {
394395
b := make([]byte, 32)
395396
tempBuffer := make([]byte, 8)
396-
binary.BigEndian.PutUint64(tempBuffer, uint64(num))
397+
binary.BigEndian.PutUint64(tempBuffer, uint64(num)) //nolint:gosec // disable G115
397398
copy(b[24:], tempBuffer)
398399
return b
399400
}

‎rolling-shutter/keyperimpl/shutterservice/messagingmiddleware.go

+9-7
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ func (i *MessagingMiddleware) interceptDecryptionKeyShares(
105105
) (p2pmsg.Message, error) {
106106
queries := database.New(i.dbpool)
107107

108-
currentDecryptionTrigger, err := queries.GetCurrentDecryptionTrigger(ctx, int64(originalMsg.Eon))
108+
currentDecryptionTrigger, err := queries.GetCurrentDecryptionTrigger(ctx, int64(originalMsg.Eon)) //nolint:gosec // disable G115
109109
if err == pgx.ErrNoRows {
110110
log.Warn().
111111
Uint64("eon", originalMsg.Eon).
@@ -114,6 +114,7 @@ func (i *MessagingMiddleware) interceptDecryptionKeyShares(
114114
} else if err != nil {
115115
return nil, errors.Wrapf(err, "failed to get current decryption trigger for eon %d", originalMsg.Eon)
116116
}
117+
//nolint:gosec // disable G115
117118
if originalMsg.Eon != uint64(currentDecryptionTrigger.Eon) {
118119
log.Warn().
119120
Uint64("eon-got", originalMsg.Eon).
@@ -151,8 +152,8 @@ func (i *MessagingMiddleware) interceptDecryptionKeyShares(
151152
}
152153

153154
err = queries.InsertDecryptionSignature(ctx, database.InsertDecryptionSignatureParams{
154-
Eon: int64(originalMsg.Eon),
155-
KeyperIndex: int64(originalMsg.KeyperIndex),
155+
Eon: int64(originalMsg.Eon), //nolint:gosec // disable G115
156+
KeyperIndex: int64(originalMsg.KeyperIndex), //nolint:gosec // disable G115
156157
IdentitiesHash: identitiesHash,
157158
Signature: signature,
158159
})
@@ -183,7 +184,7 @@ func (i *MessagingMiddleware) interceptDecryptionKeys(
183184

184185
serviceDB := database.New(i.dbpool)
185186
obsKeyperDB := obskeyperdatabase.New(i.dbpool)
186-
trigger, err := serviceDB.GetCurrentDecryptionTrigger(ctx, int64(originalMsg.Eon))
187+
trigger, err := serviceDB.GetCurrentDecryptionTrigger(ctx, int64(originalMsg.Eon)) //nolint:gosec // disable G115
187188
if err == pgx.ErrNoRows {
188189
log.Warn().
189190
Uint64("eon", originalMsg.Eon).
@@ -194,13 +195,13 @@ func (i *MessagingMiddleware) interceptDecryptionKeys(
194195
return nil, errors.Wrapf(err, "failed to get current decryption trigger for eon %d", originalMsg.Eon)
195196
}
196197

197-
keyperSet, err := obsKeyperDB.GetKeyperSetByKeyperConfigIndex(ctx, int64(originalMsg.Eon))
198+
keyperSet, err := obsKeyperDB.GetKeyperSetByKeyperConfigIndex(ctx, int64(originalMsg.Eon)) //nolint:gosec // disable G115
198199
if err != nil {
199200
return nil, errors.Wrapf(err, "failed to get keyper set from database for eon %d", originalMsg.Eon)
200201
}
201202

202203
signatures, err := serviceDB.GetDecryptionSignatures(ctx, database.GetDecryptionSignaturesParams{
203-
Eon: int64(originalMsg.Eon),
204+
Eon: int64(originalMsg.Eon), //nolint:gosec // disable G115
204205
IdentitiesHash: trigger.IdentitiesHash,
205206
Limit: keyperSet.Threshold,
206207
})
@@ -222,6 +223,7 @@ func (i *MessagingMiddleware) interceptDecryptionKeys(
222223
signerIndices := []uint64{}
223224
signaturesCum := [][]byte{}
224225
for _, signature := range signatures {
226+
//nolint:gosec // disable G115
225227
signerIndices = append(signerIndices, uint64(signature.KeyperIndex))
226228
signaturesCum = append(signaturesCum, signature.Signature)
227229
}
@@ -252,7 +254,7 @@ func updateEventFlag(ctx context.Context, serviceDB *database.Queries, keys *p2p
252254
column1 := make([]int64, 0)
253255
column2 := make([][]byte, 0)
254256
for _, key := range keys.Keys {
255-
column1 = append(column1, int64(keys.Eon))
257+
column1 = append(column1, int64(keys.Eon)) //nolint:gosec // disable G115
256258
column2 = append(column2, key.IdentityPreimage)
257259
}
258260

‎rolling-shutter/keyperimpl/shutterservice/newblock.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func (kpr *Keyper) maybeTriggerDecryption(ctx context.Context, block *syncevent.
3838

3939
lastTriggeredTime := 0
4040
if kpr.latestTriggeredTime != nil {
41-
lastTriggeredTime = int(*kpr.latestTriggeredTime)
41+
lastTriggeredTime = int(*kpr.latestTriggeredTime) //nolint:gosec // disable G115
4242
}
4343
kpr.latestTriggeredTime = &block.Header.Time
4444

@@ -50,7 +50,7 @@ func (kpr *Keyper) maybeTriggerDecryption(ctx context.Context, block *syncevent.
5050
nonTriggeredEvents, err := serviceDB.GetNotDecryptedIdentityRegisteredEvents(ctx,
5151
servicedatabase.GetNotDecryptedIdentityRegisteredEventsParams{
5252
Timestamp: int64(lastTriggeredTime),
53-
Timestamp_2: int64(block.Header.Time),
53+
Timestamp_2: int64(block.Header.Time), //nolint:gosec // disable G115
5454
})
5555
if err != nil && err != pgx.ErrNoRows {
5656
// pgx.ErrNoRows is expected if we're not part of the keyper set (which is checked later).
@@ -88,7 +88,7 @@ func (kpr *Keyper) shouldTriggerDecryption(
8888
return false
8989
}
9090

91-
if event.Timestamp >= int64(triggeredBlock.Header.Time) {
91+
if event.Timestamp >= int64(triggeredBlock.Header.Time) { //nolint:gosec // disable G115
9292
return false
9393
}
9494

@@ -154,13 +154,13 @@ func (kpr *Keyper) triggerDecryption(ctx context.Context,
154154

155155
trigger := epochkghandler.DecryptionTrigger{
156156
// sending last block available for that eon as the key shares will be generated based on the eon associated with this block number
157-
BlockNumber: uint64(lastEonBlock[eon]),
157+
BlockNumber: uint64(lastEonBlock[eon]), //nolint:gosec // disable G115
158158
IdentityPreimages: sortedIdentityPreimages,
159159
}
160160

161161
event := broker.NewEvent(&trigger)
162162
log.Debug().
163-
Uint64("block-number", uint64(lastEonBlock[eon])).
163+
Uint64("block-number", uint64(lastEonBlock[eon])). //nolint:gosec // disable G115
164164
Int("num-identities", len(trigger.IdentityPreimages)).
165165
Msg("sending decryption trigger")
166166
kpr.decryptionTriggerChannel <- event

‎rolling-shutter/keyperimpl/shutterservice/newblock_test.go

+10-6
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ func TestProcessBlockSuccess(t *testing.T) {
6969
keyperConfigIndex := uint64(1)
7070

7171
err := coreKeyperDB.InsertEon(ctx, corekeyperdatabase.InsertEonParams{
72+
//nolint:gosec // disable G115
7273
Eon: int64(config.GetEon()),
7374
Height: 0,
7475
ActivationBlockNumber: int64(activationBlockNumber),
@@ -77,10 +78,11 @@ func TestProcessBlockSuccess(t *testing.T) {
7778
assert.NilError(t, err)
7879

7980
_, err = serviceDB.InsertIdentityRegisteredEvent(ctx, servicedatabase.InsertIdentityRegisteredEventParams{
80-
BlockNumber: int64(activationBlockNumber + 1),
81-
BlockHash: blockHash,
82-
TxIndex: 1,
83-
LogIndex: 1,
81+
BlockNumber: int64(activationBlockNumber + 1),
82+
BlockHash: blockHash,
83+
TxIndex: 1,
84+
LogIndex: 1,
85+
//nolint:gosec // disable G115
8486
Eon: int64(config.GetEon()),
8587
IdentityPrefix: identityPrefix,
8688
Sender: sender.Hex(),
@@ -103,6 +105,7 @@ func TestProcessBlockSuccess(t *testing.T) {
103105
case <-ctx.Done():
104106
return
105107
case ev := <-decryptionTriggerChannel:
108+
//nolint:gosec // disable G115
106109
assert.Equal(t, ev.Value.BlockNumber, uint64(activationBlockNumber+1))
107110
assert.DeepEqual(t, ev.Value.IdentityPreimages, []identitypreimage.IdentityPreimage{identity})
108111
}
@@ -115,7 +118,7 @@ func TestProcessBlockSuccess(t *testing.T) {
115118
},
116119
BlockHash: common.Hash(blockHash),
117120
Header: &types.Header{
118-
Time: uint64(blockTimestamp),
121+
Time: uint64(blockTimestamp), //nolint:gosec // disable G115
119122
Number: big.NewInt(int64(blockNumber)),
120123
},
121124
})
@@ -176,7 +179,7 @@ func TestShouldTriggerDecryption(t *testing.T) {
176179
Int: big.NewInt(int64(blockNumber)),
177180
},
178181
Header: &types.Header{
179-
Time: uint64(blockTimestamp),
182+
Time: uint64(blockTimestamp), //nolint:gosec // disable G115
180183
Number: big.NewInt(int64(blockNumber)),
181184
},
182185
},
@@ -238,6 +241,7 @@ func TestShouldNotTriggerDecryption(t *testing.T) {
238241
Int: big.NewInt(int64(blockNumber)),
239242
},
240243
Header: &types.Header{
244+
//nolint:gosec // disable G115
241245
Time: uint64(blockTimestamp),
242246
Number: big.NewInt(int64(blockNumber)),
243247
},

‎rolling-shutter/keyperimpl/shutterservice/newkeyperset.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func (kpr *Keyper) processNewKeyperSet(ctx context.Context, ev *syncevent.Keyper
5050
KeyperConfigIndex: keyperConfigIndex,
5151
ActivationBlockNumber: activationBlockNumber,
5252
Keypers: shdb.EncodeAddresses(ev.Members),
53-
Threshold: int32(threshold),
53+
Threshold: int32(threshold), //nolint:gosec // disable G115
5454
})
5555
})
5656
}

‎rolling-shutter/keyperimpl/shutterservice/registrysyncer.go

+9-7
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ func (s *RegistrySyncer) Sync(ctx context.Context, header *types.Header) error {
131131
if err == pgx.ErrNoRows {
132132
start = s.SyncStartBlockNumber
133133
} else {
134-
start = uint64(syncedUntil.BlockNumber + 1)
134+
start = uint64(syncedUntil.BlockNumber + 1) //nolint:gosec // disable G115
135135
}
136136
endBlock := header.Number.Uint64()
137137
log.Debug().
@@ -169,7 +169,7 @@ func (s *RegistrySyncer) syncRange(
169169
return err
170170
}
171171
return database.New(tx).SetIdentityRegisteredEventSyncedUntil(ctx, database.SetIdentityRegisteredEventSyncedUntilParams{
172-
BlockNumber: int64(end),
172+
BlockNumber: int64(end), //nolint:gosec // disable G115
173173
BlockHash: header.Hash().Bytes(),
174174
})
175175
})
@@ -239,15 +239,17 @@ func (s *RegistrySyncer) insertIdentityRegisteredEvents(
239239
for _, event := range events {
240240
identity := computeIdentity(event)
241241
_, err := queries.InsertIdentityRegisteredEvent(ctx, database.InsertIdentityRegisteredEventParams{
242+
//nolint:gosec // disable G115
242243
BlockNumber: int64(event.Raw.BlockNumber),
243244
BlockHash: event.Raw.BlockHash[:],
244-
TxIndex: int64(event.Raw.TxIndex),
245-
LogIndex: int64(event.Raw.Index),
246-
Eon: int64(event.Eon),
245+
TxIndex: int64(event.Raw.TxIndex), //nolint:gosec // disable G115
246+
LogIndex: int64(event.Raw.Index), //nolint:gosec // disable G115
247+
Eon: int64(event.Eon), //nolint:gosec // disable G115
247248
IdentityPrefix: event.IdentityPrefix[:],
248249
Sender: shdb.EncodeAddress(event.Sender),
249-
Timestamp: int64(event.Timestamp),
250-
Identity: identity,
250+
//nolint:gosec // disable G115
251+
Timestamp: int64(event.Timestamp),
252+
Identity: identity,
251253
})
252254
if err != nil {
253255
return errors.Wrap(err, "failed to insert identity registered event into db")

‎rolling-shutter/keyperimpl/shutterservice/registrysyncer_test.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,11 @@ func TestFilterIdentityRegisteredEvents(t *testing.T) {
2828
_, sender, err := generateRandomAccount()
2929
assert.NilError(t, err)
3030
events[i] = &registryBindings.ShutterregistryIdentityRegistered{
31+
//nolint:gosec // disable G115
3132
Eon: uint64(i),
3233
IdentityPrefix: [32]byte(identityPrefix),
3334
Sender: sender,
34-
Timestamp: uint64(time.Now().Unix()),
35+
Timestamp: uint64(time.Now().Unix()), //nolint:gosec // disable G115
3536
}
3637
}
3738

@@ -54,10 +55,10 @@ func TestInsertIdentityRegisteredEvents(t *testing.T) {
5455
_, sender, err := generateRandomAccount()
5556
assert.NilError(t, err)
5657
events[i] = &registryBindings.ShutterregistryIdentityRegistered{
57-
Eon: uint64(i),
58+
Eon: uint64(i), //nolint:gosec // disable G115
5859
IdentityPrefix: [32]byte(identityPrefix),
5960
Sender: sender,
60-
Timestamp: uint64(time.Now().Unix()),
61+
Timestamp: uint64(time.Now().Unix()), //nolint:gosec // disable G115
6162
}
6263
}
6364

0 commit comments

Comments
 (0)