Skip to content
This repository was archived by the owner on Nov 25, 2025. It is now read-only.

Commit 6d41dfb

Browse files
author
Darioush Jalali
committed
update signer type
1 parent a857e7c commit 6d41dfb

File tree

9 files changed

+51
-53
lines changed

9 files changed

+51
-53
lines changed

‎go.mod‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.22.8
44

55
require (
66
github.com/VictoriaMetrics/fastcache v1.12.1
7-
github.com/ava-labs/avalanchego v1.11.13-rc.0
7+
github.com/ava-labs/avalanchego v1.12.0-initial-poc.9.0.20241129153017-3f46a5a4a084
88
github.com/cespare/cp v0.1.0
99
github.com/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233
1010
github.com/davecgh/go-spew v1.1.1
@@ -131,5 +131,3 @@ require (
131131
gopkg.in/yaml.v3 v3.0.1 // indirect
132132
rsc.io/tmplfunc v0.0.3 // indirect
133133
)
134-
135-
replace github.com/ava-labs/avalanchego v1.11.13-rc.0 => github.com/ava-labs/avalanchego v1.12.0-initial-poc.9.0.20241129153017-3f46a5a4a084

‎plugin/evm/vm_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,12 +228,12 @@ func NewContext() *snow.Context {
228228
return subnetID, nil
229229
},
230230
}
231-
blsSecretKey, err := bls.NewSecretKey()
231+
blsSecretKey, err := bls.NewSigner()
232232
if err != nil {
233233
panic(err)
234234
}
235235
ctx.WarpSigner = avalancheWarp.NewSigner(blsSecretKey, ctx.NetworkID, ctx.ChainID)
236-
ctx.PublicKey = bls.PublicFromSecretKey(blsSecretKey)
236+
ctx.PublicKey = blsSecretKey.PublicKey()
237237
return ctx
238238
}
239239

‎plugin/evm/vm_warp_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -265,16 +265,16 @@ func testWarpVMTransaction(t *testing.T, unsignedMessage *avalancheWarp.Unsigned
265265
defer logsSub.Unsubscribe()
266266

267267
nodeID1 := ids.GenerateTestNodeID()
268-
blsSecretKey1, err := bls.NewSecretKey()
268+
blsSecretKey1, err := bls.NewSigner()
269269
require.NoError(err)
270-
blsPublicKey1 := bls.PublicFromSecretKey(blsSecretKey1)
271-
blsSignature1 := bls.Sign(blsSecretKey1, unsignedMessage.Bytes())
270+
blsPublicKey1 := blsSecretKey1.PublicKey()
271+
blsSignature1 := blsSecretKey1.Sign(unsignedMessage.Bytes())
272272

273273
nodeID2 := ids.GenerateTestNodeID()
274-
blsSecretKey2, err := bls.NewSecretKey()
274+
blsSecretKey2, err := bls.NewSigner()
275275
require.NoError(err)
276-
blsPublicKey2 := bls.PublicFromSecretKey(blsSecretKey2)
277-
blsSignature2 := bls.Sign(blsSecretKey2, unsignedMessage.Bytes())
276+
blsPublicKey2 := blsSecretKey2.PublicKey()
277+
blsSignature2 := blsSecretKey2.Sign(unsignedMessage.Bytes())
278278

279279
blsAggregatedSignature, err := bls.AggregateSignatures([]*bls.Signature{blsSignature1, blsSignature2})
280280
require.NoError(err)
@@ -523,18 +523,18 @@ func testReceiveWarpMessage(
523523
type signer struct {
524524
networkID ids.ID
525525
nodeID ids.NodeID
526-
secret *bls.SecretKey
526+
secret bls.Signer
527527
signature *bls.Signature
528528
weight uint64
529529
}
530530
newSigner := func(networkID ids.ID, weight uint64) signer {
531-
secret, err := bls.NewSecretKey()
531+
secret, err := bls.NewSigner()
532532
require.NoError(err)
533533
return signer{
534534
networkID: networkID,
535535
nodeID: ids.GenerateTestNodeID(),
536536
secret: secret,
537-
signature: bls.Sign(secret, unsignedMessage.Bytes()),
537+
signature: secret.Sign(unsignedMessage.Bytes()),
538538
weight: weight,
539539
}
540540
}
@@ -582,7 +582,7 @@ func testReceiveWarpMessage(
582582
for _, s := range signers {
583583
vdrOutput[s.nodeID] = &validators.GetValidatorOutput{
584584
NodeID: s.nodeID,
585-
PublicKey: bls.PublicFromSecretKey(s.secret),
585+
PublicKey: s.secret.PublicKey(),
586586
Weight: s.weight,
587587
}
588588
}

‎precompile/contracts/warp/predicate_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ func init() {
9393
}
9494

9595
for _, testVdr := range testVdrs {
96-
blsSignature := bls.Sign(testVdr.sk, unsignedMsg.Bytes())
96+
blsSignature := testVdr.sk.Sign(unsignedMsg.Bytes())
9797
blsSignatures = append(blsSignatures, blsSignature)
9898
}
9999

@@ -102,7 +102,7 @@ func init() {
102102

103103
type testValidator struct {
104104
nodeID ids.NodeID
105-
sk *bls.SecretKey
105+
sk bls.Signer
106106
vdr *avalancheWarp.Validator
107107
}
108108

@@ -111,13 +111,13 @@ func (v *testValidator) Compare(o *testValidator) int {
111111
}
112112

113113
func newTestValidator() *testValidator {
114-
sk, err := bls.NewSecretKey()
114+
sk, err := bls.NewSigner()
115115
if err != nil {
116116
panic(err)
117117
}
118118

119119
nodeID := ids.GenerateTestNodeID()
120-
pk := bls.PublicFromSecretKey(sk)
120+
pk := sk.PublicKey()
121121
return &testValidator{
122122
nodeID: nodeID,
123123
sk: sk,
@@ -240,7 +240,7 @@ func testWarpMessageFromPrimaryNetwork(t *testing.T, requirePrimaryNetworkSigner
240240
PublicKey: testVdrs[i].vdr.PublicKey,
241241
}
242242
getValidatorsOutput[testVdrs[i].nodeID] = validatorOutput
243-
blsSignatures = append(blsSignatures, bls.Sign(testVdrs[i].sk, unsignedMsg.Bytes()))
243+
blsSignatures = append(blsSignatures, testVdrs[i].sk.Sign(unsignedMsg.Bytes()))
244244
}
245245
aggregateSignature, err := bls.AggregateSignatures(blsSignatures)
246246
require.NoError(err)

‎precompile/contracts/warp/signature_verification_test.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,8 @@ func TestSignatureVerification(t *testing.T) {
212212
signers.Add(1)
213213

214214
unsignedBytes := unsignedMsg.Bytes()
215-
vdr0Sig := bls.Sign(testVdrs[0].sk, unsignedBytes)
216-
vdr1Sig := bls.Sign(testVdrs[1].sk, unsignedBytes)
215+
vdr0Sig := testVdrs[0].sk.Sign(unsignedBytes)
216+
vdr1Sig := testVdrs[1].sk.Sign(unsignedBytes)
217217
aggSig, err := bls.AggregateSignatures([]*bls.Signature{vdr0Sig, vdr1Sig})
218218
require.NoError(err)
219219
aggSigBytes := [bls.SignatureLen]byte{}
@@ -284,7 +284,7 @@ func TestSignatureVerification(t *testing.T) {
284284
require.NoError(err)
285285

286286
unsignedBytes := unsignedMsg.Bytes()
287-
vdr0Sig := bls.Sign(testVdrs[0].sk, unsignedBytes)
287+
vdr0Sig := testVdrs[0].sk.Sign(unsignedBytes)
288288
aggSigBytes := [bls.SignatureLen]byte{}
289289
copy(aggSigBytes[:], bls.SignatureToBytes(vdr0Sig))
290290

@@ -323,10 +323,10 @@ func TestSignatureVerification(t *testing.T) {
323323
signers.Add(1)
324324

325325
unsignedBytes := unsignedMsg.Bytes()
326-
vdr0Sig := bls.Sign(testVdrs[0].sk, unsignedBytes)
326+
vdr0Sig := testVdrs[0].sk.Sign(unsignedBytes)
327327
// Give sig from vdr[2] even though the bit vector says it
328328
// should be from vdr[1]
329-
vdr2Sig := bls.Sign(testVdrs[2].sk, unsignedBytes)
329+
vdr2Sig := testVdrs[2].sk.Sign(unsignedBytes)
330330
aggSig, err := bls.AggregateSignatures([]*bls.Signature{vdr0Sig, vdr2Sig})
331331
require.NoError(err)
332332
aggSigBytes := [bls.SignatureLen]byte{}
@@ -367,7 +367,7 @@ func TestSignatureVerification(t *testing.T) {
367367
signers.Add(1)
368368

369369
unsignedBytes := unsignedMsg.Bytes()
370-
vdr0Sig := bls.Sign(testVdrs[0].sk, unsignedBytes)
370+
vdr0Sig := testVdrs[0].sk.Sign(unsignedBytes)
371371
// Don't give the sig from vdr[1]
372372
aggSigBytes := [bls.SignatureLen]byte{}
373373
copy(aggSigBytes[:], bls.SignatureToBytes(vdr0Sig))
@@ -407,11 +407,11 @@ func TestSignatureVerification(t *testing.T) {
407407
signers.Add(1)
408408

409409
unsignedBytes := unsignedMsg.Bytes()
410-
vdr0Sig := bls.Sign(testVdrs[0].sk, unsignedBytes)
411-
vdr1Sig := bls.Sign(testVdrs[1].sk, unsignedBytes)
410+
vdr0Sig := testVdrs[0].sk.Sign(unsignedBytes)
411+
vdr1Sig := testVdrs[1].sk.Sign(unsignedBytes)
412412
// Give sig from vdr[2] even though the bit vector doesn't have
413413
// it
414-
vdr2Sig := bls.Sign(testVdrs[2].sk, unsignedBytes)
414+
vdr2Sig := testVdrs[2].sk.Sign(unsignedBytes)
415415
aggSig, err := bls.AggregateSignatures([]*bls.Signature{vdr0Sig, vdr1Sig, vdr2Sig})
416416
require.NoError(err)
417417
aggSigBytes := [bls.SignatureLen]byte{}
@@ -454,8 +454,8 @@ func TestSignatureVerification(t *testing.T) {
454454
signers.Add(2)
455455

456456
unsignedBytes := unsignedMsg.Bytes()
457-
vdr1Sig := bls.Sign(testVdrs[1].sk, unsignedBytes)
458-
vdr2Sig := bls.Sign(testVdrs[2].sk, unsignedBytes)
457+
vdr1Sig := testVdrs[1].sk.Sign(unsignedBytes)
458+
vdr2Sig := testVdrs[2].sk.Sign(unsignedBytes)
459459
aggSig, err := bls.AggregateSignatures([]*bls.Signature{vdr1Sig, vdr2Sig})
460460
require.NoError(err)
461461
aggSigBytes := [bls.SignatureLen]byte{}
@@ -498,8 +498,8 @@ func TestSignatureVerification(t *testing.T) {
498498
signers.Add(2)
499499

500500
unsignedBytes := unsignedMsg.Bytes()
501-
vdr1Sig := bls.Sign(testVdrs[1].sk, unsignedBytes)
502-
vdr2Sig := bls.Sign(testVdrs[2].sk, unsignedBytes)
501+
vdr1Sig := testVdrs[1].sk.Sign(unsignedBytes)
502+
vdr2Sig := testVdrs[2].sk.Sign(unsignedBytes)
503503
aggSig, err := bls.AggregateSignatures([]*bls.Signature{vdr1Sig, vdr2Sig})
504504
require.NoError(err)
505505
aggSigBytes := [bls.SignatureLen]byte{}
@@ -559,8 +559,8 @@ func TestSignatureVerification(t *testing.T) {
559559
signers.Add(1) // vdr[2]
560560

561561
unsignedBytes := unsignedMsg.Bytes()
562-
vdr1Sig := bls.Sign(testVdrs[1].sk, unsignedBytes)
563-
vdr2Sig := bls.Sign(testVdrs[2].sk, unsignedBytes)
562+
vdr1Sig := testVdrs[1].sk.Sign(unsignedBytes)
563+
vdr2Sig := testVdrs[2].sk.Sign(unsignedBytes)
564564
aggSig, err := bls.AggregateSignatures([]*bls.Signature{vdr1Sig, vdr2Sig})
565565
require.NoError(err)
566566
aggSigBytes := [bls.SignatureLen]byte{}
@@ -621,7 +621,7 @@ func TestSignatureVerification(t *testing.T) {
621621

622622
unsignedBytes := unsignedMsg.Bytes()
623623
// Because vdr[1] and vdr[2] share a key, only one of them sign.
624-
vdr2Sig := bls.Sign(testVdrs[2].sk, unsignedBytes)
624+
vdr2Sig := testVdrs[2].sk.Sign(unsignedBytes)
625625
aggSigBytes := [bls.SignatureLen]byte{}
626626
copy(aggSigBytes[:], bls.SignatureToBytes(vdr2Sig))
627627

‎warp/aggregator/aggregator_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ import (
1717
avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp"
1818
)
1919

20-
func newValidator(t testing.TB, weight uint64) (*bls.SecretKey, *avalancheWarp.Validator) {
21-
sk, err := bls.NewSecretKey()
20+
func newValidator(t testing.TB, weight uint64) (bls.Signer, *avalancheWarp.Validator) {
21+
sk, err := bls.NewSigner()
2222
require.NoError(t, err)
23-
pk := bls.PublicFromSecretKey(sk)
23+
pk := sk.PublicKey()
2424
return sk, &avalancheWarp.Validator{
2525
PublicKey: pk,
2626
PublicKeyBytes: bls.PublicKeyToCompressedBytes(pk),
@@ -43,17 +43,17 @@ func TestAggregateSignatures(t *testing.T) {
4343
vdr1sk, vdr1 := newValidator(t, vdrWeight)
4444
vdr2sk, vdr2 := newValidator(t, vdrWeight+1)
4545
vdr3sk, vdr3 := newValidator(t, vdrWeight-1)
46-
sig1 := bls.Sign(vdr1sk, unsignedMsg.Bytes())
47-
sig2 := bls.Sign(vdr2sk, unsignedMsg.Bytes())
48-
sig3 := bls.Sign(vdr3sk, unsignedMsg.Bytes())
46+
sig1 := vdr1sk.Sign(unsignedMsg.Bytes())
47+
sig2 := vdr2sk.Sign(unsignedMsg.Bytes())
48+
sig3 := vdr3sk.Sign(unsignedMsg.Bytes())
4949
vdrToSig := map[*avalancheWarp.Validator]*bls.Signature{
5050
vdr1: sig1,
5151
vdr2: sig2,
5252
vdr3: sig3,
5353
}
54-
nonVdrSk, err := bls.NewSecretKey()
54+
nonVdrSk, err := bls.NewSigner()
5555
require.NoError(t, err)
56-
nonVdrSig := bls.Sign(nonVdrSk, unsignedMsg.Bytes())
56+
nonVdrSig := nonVdrSk.Sign(unsignedMsg.Bytes())
5757
vdrs := []*avalancheWarp.Validator{
5858
{
5959
PublicKey: vdr1.PublicKey,

‎warp/backend_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func init() {
4040
func TestAddAndGetValidMessage(t *testing.T) {
4141
db := memdb.New()
4242

43-
sk, err := bls.NewSecretKey()
43+
sk, err := bls.NewSigner()
4444
require.NoError(t, err)
4545
warpSigner := avalancheWarp.NewSigner(sk, networkID, sourceChainID)
4646
messageSignatureCache := &cache.LRU[ids.ID, []byte]{Size: 500}
@@ -63,7 +63,7 @@ func TestAddAndGetValidMessage(t *testing.T) {
6363
func TestAddAndGetUnknownMessage(t *testing.T) {
6464
db := memdb.New()
6565

66-
sk, err := bls.NewSecretKey()
66+
sk, err := bls.NewSigner()
6767
require.NoError(t, err)
6868
warpSigner := avalancheWarp.NewSigner(sk, networkID, sourceChainID)
6969
messageSignatureCache := &cache.LRU[ids.ID, []byte]{Size: 500}
@@ -82,7 +82,7 @@ func TestGetBlockSignature(t *testing.T) {
8282
blockClient := warptest.MakeBlockClient(blkID)
8383
db := memdb.New()
8484

85-
sk, err := bls.NewSecretKey()
85+
sk, err := bls.NewSigner()
8686
require.NoError(err)
8787
warpSigner := avalancheWarp.NewSigner(sk, networkID, sourceChainID)
8888
messageSignatureCache := &cache.LRU[ids.ID, []byte]{Size: 500}
@@ -107,7 +107,7 @@ func TestGetBlockSignature(t *testing.T) {
107107
func TestZeroSizedCache(t *testing.T) {
108108
db := memdb.New()
109109

110-
sk, err := bls.NewSecretKey()
110+
sk, err := bls.NewSigner()
111111
require.NoError(t, err)
112112
warpSigner := avalancheWarp.NewSigner(sk, networkID, sourceChainID)
113113

@@ -135,7 +135,7 @@ func TestOffChainMessages(t *testing.T) {
135135
check func(require *require.Assertions, b Backend)
136136
err error
137137
}
138-
sk, err := bls.NewSecretKey()
138+
sk, err := bls.NewSigner()
139139
require.NoError(t, err)
140140
warpSigner := avalancheWarp.NewSigner(sk, networkID, sourceChainID)
141141

‎warp/handlers/signature_request_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
func TestMessageSignatureHandler(t *testing.T) {
2424
database := memdb.New()
2525
snowCtx := utils.TestSnowContext()
26-
blsSecretKey, err := bls.NewSecretKey()
26+
blsSecretKey, err := bls.NewSigner()
2727
require.NoError(t, err)
2828
warpSigner := avalancheWarp.NewSigner(blsSecretKey, snowCtx.NetworkID, snowCtx.ChainID)
2929

@@ -127,7 +127,7 @@ func TestMessageSignatureHandler(t *testing.T) {
127127
func TestBlockSignatureHandler(t *testing.T) {
128128
database := memdb.New()
129129
snowCtx := utils.TestSnowContext()
130-
blsSecretKey, err := bls.NewSecretKey()
130+
blsSecretKey, err := bls.NewSigner()
131131
require.NoError(t, err)
132132

133133
warpSigner := avalancheWarp.NewSigner(blsSecretKey, snowCtx.NetworkID, snowCtx.ChainID)

‎warp/verifier_backend_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
func TestAddressedCallSignatures(t *testing.T) {
2727
database := memdb.New()
2828
snowCtx := utils.TestSnowContext()
29-
blsSecretKey, err := bls.NewSecretKey()
29+
blsSecretKey, err := bls.NewSigner()
3030
require.NoError(t, err)
3131
warpSigner := avalancheWarp.NewSigner(blsSecretKey, snowCtx.NetworkID, snowCtx.ChainID)
3232

@@ -140,7 +140,7 @@ func TestAddressedCallSignatures(t *testing.T) {
140140
func TestBlockSignatures(t *testing.T) {
141141
database := memdb.New()
142142
snowCtx := utils.TestSnowContext()
143-
blsSecretKey, err := bls.NewSecretKey()
143+
blsSecretKey, err := bls.NewSigner()
144144
require.NoError(t, err)
145145

146146
warpSigner := avalancheWarp.NewSigner(blsSecretKey, snowCtx.NetworkID, snowCtx.ChainID)

0 commit comments

Comments
 (0)