aboutsummaryrefslogtreecommitdiffstats
path: root/xeth
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2015-04-21 16:43:11 +0800
committerPéter Szilágyi <peterke@gmail.com>2015-04-28 15:49:04 +0800
commit7f48eb8737878e352a65475382532db26f9fbc52 (patch)
tree7db869690505978a4f111b996e7357572f64211c /xeth
parent19bc4624eaefc2c8201260e7afa1a5893159bffc (diff)
downloaddexon-7f48eb8737878e352a65475382532db26f9fbc52.tar
dexon-7f48eb8737878e352a65475382532db26f9fbc52.tar.gz
dexon-7f48eb8737878e352a65475382532db26f9fbc52.tar.bz2
dexon-7f48eb8737878e352a65475382532db26f9fbc52.tar.lz
dexon-7f48eb8737878e352a65475382532db26f9fbc52.tar.xz
dexon-7f48eb8737878e352a65475382532db26f9fbc52.tar.zst
dexon-7f48eb8737878e352a65475382532db26f9fbc52.zip
whisper, xeth/whisper: surface TTL and hash to the API
Diffstat (limited to 'xeth')
-rw-r--r--xeth/whisper_message.go8
1 files changed, 7 insertions, 1 deletions
diff --git a/xeth/whisper_message.go b/xeth/whisper_message.go
index 14796cfbc..c8195cec1 100644
--- a/xeth/whisper_message.go
+++ b/xeth/whisper_message.go
@@ -3,6 +3,8 @@
package xeth
import (
+ "time"
+
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/whisper"
@@ -16,6 +18,8 @@ type WhisperMessage struct {
To string `json:"to"`
From string `json:"from"`
Sent int64 `json:"sent"`
+ TTL int64 `json:"ttl"`
+ Hash string `json:"hash"`
}
// NewWhisperMessage converts an internal message into an API version.
@@ -26,6 +30,8 @@ func NewWhisperMessage(message *whisper.Message) WhisperMessage {
Payload: common.ToHex(message.Payload),
From: common.ToHex(crypto.FromECDSAPub(message.Recover())),
To: common.ToHex(crypto.FromECDSAPub(message.To)),
- Sent: message.Sent,
+ Sent: message.Sent.Unix(),
+ TTL: int64(message.TTL / time.Second),
+ Hash: common.ToHex(message.Hash.Bytes()),
}
}