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

fix: p2p connect #145

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: p2p connect #145

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f060cb7
Merge pull request #1 from eoscanada/master
lockp111 Aug 7, 2020
e142d8f
fix: p2p SendHandshake
lockp111 Aug 7, 2020
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
12 changes: 8 additions & 4 deletions p2p/peer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,9 +278,13 @@ func (p *Peer) SendHandshake(info *HandshakeInfo) error {

tstamp := eos.Tstamp{Time: info.HeadBlockTime}

signature := ecc.Signature{
Curve: ecc.CurveK1,
Content: make([]byte, 65, 65),
data := []byte{
byte(ecc.CurveK1),
}
data = append(data, make([]byte, 65, 65)...)
signature, err := ecc.NewSignatureFromData(data)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The NewSignatureFromData(data) does this internally:

	signature := Signature{
		Curve:   CurveID(data[0]), // 1 byte
		Content: data[1:],         // 65 bytes for K1 and R1, variable length for WA
	}

Which is equivalent to the previous as far as I can tell. So what is being fixed here exactly? I'm not sure I follow.

Copy link

@angrypie angrypie Jun 16, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which is equivalent to the previous as far as I can tell. So what is being fixed here exactly? I'm not sure I follow.

@maoueh Curve is copied to Content, without this fix I'm getting an error

unable to encode message handshake ...... invalid signature: the inner signature structure must be present, was nil

The problem is either here or in the encoder I guess

if err != nil {
return errors.Wrapf(err, "handshake signature from data")
}

handshake := &eos.HandshakeMessage{
Expand All @@ -303,7 +307,7 @@ func (p *Peer) SendHandshake(info *HandshakeInfo) error {

err = p.WriteP2PMessage(handshake)
if err != nil {
err = errors.Wrapf(err, "sending handshake to %s", p.Address)
return errors.Wrapf(err, "sending handshake to %s", p.Address)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Definitely mergeable right away.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I merged this fix in.

}

return nil
Expand Down