aboutsummaryrefslogtreecommitdiffstats
path: root/xeth
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-02-12 06:46:54 +0800
committerobscuren <geffobscura@gmail.com>2015-02-12 06:46:54 +0800
commitb64ad7a2a6544564b68f362f18c70476310396d6 (patch)
treee31866584192023142f17bad3aeff84a015c7f2c /xeth
parentda2fae0e437f9467a943acfe0571a8a24e8e76fd (diff)
parent3f6baa45a7fb1ae5fd7966d2763a2a776a65eb96 (diff)
downloaddexon-b64ad7a2a6544564b68f362f18c70476310396d6.tar
dexon-b64ad7a2a6544564b68f362f18c70476310396d6.tar.gz
dexon-b64ad7a2a6544564b68f362f18c70476310396d6.tar.bz2
dexon-b64ad7a2a6544564b68f362f18c70476310396d6.tar.lz
dexon-b64ad7a2a6544564b68f362f18c70476310396d6.tar.xz
dexon-b64ad7a2a6544564b68f362f18c70476310396d6.tar.zst
dexon-b64ad7a2a6544564b68f362f18c70476310396d6.zip
Merge branch 'develop' into miner
Diffstat (limited to 'xeth')
-rw-r--r--xeth/whisper.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/xeth/whisper.go b/xeth/whisper.go
index 8e3bcefd0..d9c7e1614 100644
--- a/xeth/whisper.go
+++ b/xeth/whisper.go
@@ -99,8 +99,9 @@ type Options struct {
type WhisperMessage struct {
ref *whisper.Message
Payload string `json:"payload"`
+ To string `json:"to"`
From string `json:"from"`
- Sent int64 `json:"time"`
+ Sent int64 `json:"sent"`
}
func NewWhisperMessage(msg *whisper.Message) WhisperMessage {
@@ -108,6 +109,7 @@ func NewWhisperMessage(msg *whisper.Message) WhisperMessage {
ref: msg,
Payload: toHex(msg.Payload),
From: toHex(crypto.FromECDSAPub(msg.Recover())),
+ To: toHex(crypto.FromECDSAPub(msg.To)),
Sent: msg.Sent,
}
}