diff options
| author | obscuren <geffobscura@gmail.com> | 2015-04-28 17:17:41 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-04-28 17:17:41 +0800 |
| commit | 99027c79fe7406919d654ab482d8ad37fcf098ce (patch) | |
| tree | 9f6625b30b9d63d28f7e86c69d31991daac4fbf7 /whisper/envelope.go | |
| parent | bac455c0117f7095ee9c60ac75a249ddd66c2660 (diff) | |
| parent | a05c420371aa56657b86ba3dce6ebb087adb708d (diff) | |
| download | go-tangerine-99027c79fe7406919d654ab482d8ad37fcf098ce.tar go-tangerine-99027c79fe7406919d654ab482d8ad37fcf098ce.tar.gz go-tangerine-99027c79fe7406919d654ab482d8ad37fcf098ce.tar.bz2 go-tangerine-99027c79fe7406919d654ab482d8ad37fcf098ce.tar.lz go-tangerine-99027c79fe7406919d654ab482d8ad37fcf098ce.tar.xz go-tangerine-99027c79fe7406919d654ab482d8ad37fcf098ce.tar.zst go-tangerine-99027c79fe7406919d654ab482d8ad37fcf098ce.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Conflicts:
rpc/api.go
Diffstat (limited to 'whisper/envelope.go')
| -rw-r--r-- | whisper/envelope.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/whisper/envelope.go b/whisper/envelope.go index 07762c300..a4e2fa031 100644 --- a/whisper/envelope.go +++ b/whisper/envelope.go @@ -72,6 +72,9 @@ func (self *Envelope) Open(key *ecdsa.PrivateKey) (msg *Message, err error) { message := &Message{ Flags: data[0], + Sent: time.Unix(int64(self.Expiry-self.TTL), 0), + TTL: time.Duration(self.TTL) * time.Second, + Hash: self.Hash(), } data = data[1:] |