roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

whisper: rename EnvNonce to Nonce in the v6 Envelope (#15579)

Browse Source
This commit is contained in:
Guillaume Ballet 2017-12-01 12:50:19 +01:00 committed by Felix Lange
parent 54aeb8e4c0
commit 20fe928914
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
whisper/whisperv6/envelope.go
View File

@ -42,7 +42,7 @@ type Envelope struct {
Topic TopicType Topic TopicType
AESNonce []byte AESNonce []byte
Data []byte Data []byte
EnvNonce uint64 Nonce uint64
pow float64 // Message-specific PoW as described in the Whisper specification. pow float64 // Message-specific PoW as described in the Whisper specification.
hash common.Hash // Cached hash of the envelope to avoid rehashing every time. hash common.Hash // Cached hash of the envelope to avoid rehashing every time.
@ -70,7 +70,7 @@ func NewEnvelope(ttl uint32, topic TopicType, aesNonce []byte, msg *sentMessage)
Topic: topic, Topic: topic,
AESNonce: aesNonce, AESNonce: aesNonce,
Data: msg.Raw, Data: msg.Raw,
EnvNonce: 0, Nonce: 0,
} }
if EnvelopeVersion < 256 { if EnvelopeVersion < 256 {
@ -119,7 +119,7 @@ func (e *Envelope) Seal(options *MessageParams) error {
d := new(big.Int).SetBytes(crypto.Keccak256(buf)) d := new(big.Int).SetBytes(crypto.Keccak256(buf))
firstBit := math.FirstBitSet(d) firstBit := math.FirstBitSet(d)
if firstBit > bestBit { if firstBit > bestBit {
e.EnvNonce, bestBit = nonce, firstBit e.Nonce, bestBit = nonce, firstBit
if target > 0 && bestBit >= target { if target > 0 && bestBit >= target {
return nil return nil
} }
@ -146,7 +146,7 @@ func (e *Envelope) calculatePoW(diff uint32) {
buf := make([]byte, 64) buf := make([]byte, 64)
h := crypto.Keccak256(e.rlpWithoutNonce()) h := crypto.Keccak256(e.rlpWithoutNonce())
copy(buf[:32], h) copy(buf[:32], h)
binary.BigEndian.PutUint64(buf[56:], e.EnvNonce) binary.BigEndian.PutUint64(buf[56:], e.Nonce)
d := new(big.Int).SetBytes(crypto.Keccak256(buf)) d := new(big.Int).SetBytes(crypto.Keccak256(buf))
firstBit := math.FirstBitSet(d) firstBit := math.FirstBitSet(d)
x := gmath.Pow(2, float64(firstBit)) x := gmath.Pow(2, float64(firstBit))