@@ -10,8 +10,7 @@ import (
1010
1111 "github.com/cometbft/cometbft/crypto"
1212 "github.com/cometbft/cometbft/crypto/tmhash"
13-
14- bls12381 "github.com/cosmos/crypto/curves/bls12381"
13+ "github.com/cometbft/cometbft/crypto/bls12381"
1514
1615 "github.com/cosmos/cosmos-sdk/codec"
1716 cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
@@ -32,20 +31,20 @@ var (
3231
3332// NewPrivateKeyFromBytes build a new key from the given bytes.
3433func NewPrivateKeyFromBytes (bz []byte ) (PrivKey , error ) {
35- secretKey , err := bls12381 .SecretKeyFromBytes (bz )
34+ secretKey , err := bls12381 .NewPrivateKeyFromBytes (bz )
3635 if err != nil {
3736 return PrivKey {}, err
3837 }
3938 return PrivKey {
40- Key : secretKey .Marshal (),
39+ Key : secretKey .Bytes (),
4140 }, nil
4241}
4342
4443// GenPrivKey generates a new key.
4544func GenPrivKey () (PrivKey , error ) {
46- secretKey , err := bls12381 .RandKey ()
45+ secretKey , err := bls12381 .GenPrivKey ()
4746 return PrivKey {
48- Key : secretKey .Marshal (),
47+ Key : secretKey .Bytes (),
4948 }, err
5049}
5150
@@ -57,13 +56,13 @@ func (privKey PrivKey) Bytes() []byte {
5756// PubKey returns the private key's public key. If the privkey is not valid
5857// it returns a nil value.
5958func (privKey PrivKey ) PubKey () cryptotypes.PubKey {
60- secretKey , err := bls12381 .SecretKeyFromBytes (privKey .Key )
59+ secretKey , err := bls12381 .NewPrivateKeyFromBytes (privKey .Key )
6160 if err != nil {
6261 return nil
6362 }
6463
6564 return & PubKey {
66- Key : secretKey .PublicKey ().Marshal (),
65+ Key : secretKey .PubKey ().Bytes (),
6766 }
6867}
6968
@@ -74,24 +73,23 @@ func (privKey PrivKey) Equals(other cryptotypes.LedgerPrivKey) bool {
7473
7574// Type returns the type.
7675func (PrivKey ) Type () string {
77- return KeyType
76+ return bls12381 . KeyType
7877}
7978
8079// Sign signs the given byte array. If msg is larger than
8180// MaxMsgLen, SHA256 sum will be signed instead of the raw bytes.
8281func (privKey PrivKey ) Sign (msg []byte ) ([]byte , error ) {
83- secretKey , err := bls12381 .SecretKeyFromBytes (privKey .Key )
82+ secretKey , err := bls12381 .NewPrivateKeyFromBytes (privKey .Key )
8483 if err != nil {
8584 return nil , err
8685 }
8786
88- if len (msg ) > MaxMsgLen {
87+ if len (msg ) > bls12381 . MaxMsgLen {
8988 hash := sha256 .Sum256 (msg )
90- sig := secretKey .Sign (hash [:])
91- return sig .Marshal (), nil
89+ return secretKey .Sign (hash [:])
9290 }
93- sig := secretKey . Sign ( msg )
94- return sig . Marshal (), nil
91+
92+ return secretKey . Sign ( msg )
9593}
9694
9795// MarshalAmino overrides Amino binary marshaling.
@@ -101,7 +99,7 @@ func (privKey PrivKey) MarshalAmino() ([]byte, error) {
10199
102100// UnmarshalAmino overrides Amino binary marshaling.
103101func (privKey * PrivKey ) UnmarshalAmino (bz []byte ) error {
104- if len (bz ) != PrivKeySize {
102+ if len (bz ) != bls12381 . PrivKeySize {
105103 return errors .New ("invalid privkey size" )
106104 }
107105 privKey .Key = bz
@@ -135,35 +133,30 @@ var _ cryptotypes.PubKey = &PubKey{}
135133//
136134// The function will panic if the public key is invalid.
137135func (pubKey PubKey ) Address () crypto.Address {
138- pk , _ := bls12381 .PublicKeyFromBytes (pubKey .Key )
139- if len (pk .Marshal ()) != PubKeySize {
136+ pk , _ := bls12381 .NewPublicKeyFromBytes (pubKey .Key )
137+ if len (pk .Bytes ()) != bls12381 . PubKeySize {
140138 panic ("pubkey is incorrect size" )
141139 }
142140 return crypto .Address (tmhash .SumTruncated (pubKey .Key ))
143141}
144142
145143// VerifySignature verifies the given signature.
146144func (pubKey PubKey ) VerifySignature (msg , sig []byte ) bool {
147- if len (sig ) != SignatureLength {
145+ if len (sig ) != bls12381 . SignatureLength {
148146 return false
149147 }
150148
151- pubK , err := bls12381 .PublicKeyFromBytes (pubKey .Key )
149+ pubK , err := bls12381 .NewPublicKeyFromBytes (pubKey .Key )
152150 if err != nil { // invalid pubkey
153151 return false
154152 }
155153
156- if len (msg ) > MaxMsgLen {
154+ if len (msg ) > bls12381 . MaxMsgLen {
157155 hash := sha256 .Sum256 (msg )
158156 msg = hash [:]
159157 }
160158
161- ok , err := bls12381 .VerifySignature (sig , [MaxMsgLen ]byte (msg [:MaxMsgLen ]), pubK )
162- if err != nil { // bad signature
163- return false
164- }
165-
166- return ok
159+ return pubK .VerifySignature (msg , sig )
167160}
168161
169162// Bytes returns the byte format.
@@ -173,7 +166,7 @@ func (pubKey PubKey) Bytes() []byte {
173166
174167// Type returns the key's type.
175168func (PubKey ) Type () string {
176- return KeyType
169+ return bls12381 . KeyType
177170}
178171
179172// Equals returns true if the other's type is the same and their bytes are deeply equal.
0 commit comments