Merge branch 'develop' into miner

2015-02-11 23:46:54 +01:00
parent da2fae0e43 3f6baa45a7
commit b64ad7a2a6
41 changed files with 1652 additions and 1098 deletions
--- 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,
 	}
 }