coosld/ceremonyclient
1
0
Fork 0
mirror of https://github.com/QuilibriumNetwork/ceremonyclient.git synced 2026-02-21 10:27:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: remove merge conflict markers?

Browse Source
This commit is contained in:
Cassandra Heart 2025-10-23 02:29:06 -05:00
parent 6d5dac23cf
commit ab34157f03
No known key found for this signature in database
GPG Key ID: 371083BFA6C240AA
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
protobufs/keys.go
View File

@ -186,13 +186,8 @@ func (s *SignedDecaf448Key) Validate() error {
)
}
<<<<<<< HEAD
// Parent key address should be 32 bytes
if len(s.ParentKeyAddress) != 32 {
=======
// Parent key address should be non-zero bytes
if len(s.ParentKeyAddress) == 0 {
>>>>>>> 2fec50e (amend: missing keys.go change)
return errors.Wrap(
errors.New("invalid parent key address length"),
"validate",
@ -563,15 +558,6 @@ func (s *SignedDecaf448Key) Verify(
return errors.Wrap(err, "verify signature")
}
<<<<<<< HEAD
// Check that parent key address matches the public key
addrBI, err := poseidon.HashBytes(sig.Ed448Signature.PublicKey.KeyValue)
if err != nil {
return errors.Wrap(err, "compute address from public key")
}
addressToCheck := addrBI.FillBytes(make([]byte, 32))
if !bytes.Equal(addressToCheck, s.ParentKeyAddress) {
=======
pubKey, err := pcrypto.UnmarshalEd448PublicKey(
s.Key.KeyValue,
)
@ -586,7 +572,6 @@ func (s *SignedDecaf448Key) Verify(
// Check that parent key address matches the public key
identityPeerID := []byte(peerID.String())
if !bytes.Equal(identityPeerID, s.ParentKeyAddress) {
>>>>>>> 2fec50e (amend: missing keys.go change)
return errors.Wrap(
errors.New("parent key address does not match public key"),
"verify",