aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-12-16 00:14:02 +0800
committerobscuren <geffobscura@gmail.com>2014-12-16 00:14:02 +0800
commit01a6db93241a01e98a0467b628423c9b5b1361cb (patch)
treedefc185c17bd88e32c021748ba7a19748496dac7 /ui
parent993280ec03a8bd8e108da7e222c98efa8482084b (diff)
downloadgo-tangerine-01a6db93241a01e98a0467b628423c9b5b1361cb.tar
go-tangerine-01a6db93241a01e98a0467b628423c9b5b1361cb.tar.gz
go-tangerine-01a6db93241a01e98a0467b628423c9b5b1361cb.tar.bz2
go-tangerine-01a6db93241a01e98a0467b628423c9b5b1361cb.tar.lz
go-tangerine-01a6db93241a01e98a0467b628423c9b5b1361cb.tar.xz
go-tangerine-01a6db93241a01e98a0467b628423c9b5b1361cb.tar.zst
go-tangerine-01a6db93241a01e98a0467b628423c9b5b1361cb.zip
Added whisper debug interface + whisper fixes
Diffstat (limited to 'ui')
-rw-r--r--ui/qt/qwhisper/whisper.go20
1 files changed, 15 insertions, 5 deletions
diff --git a/ui/qt/qwhisper/whisper.go b/ui/qt/qwhisper/whisper.go
index bed23c8a7..3e1ca7ab9 100644
--- a/ui/qt/qwhisper/whisper.go
+++ b/ui/qt/qwhisper/whisper.go
@@ -1,11 +1,13 @@
package qwhisper
import (
+ "fmt"
"time"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/whisper"
+ "gopkg.in/qml.v1"
)
func fromHex(s string) []byte {
@@ -18,25 +20,33 @@ func toHex(b []byte) string { return "0x" + ethutil.Bytes2Hex(b) }
type Whisper struct {
*whisper.Whisper
+ view qml.Object
}
func New(w *whisper.Whisper) *Whisper {
- return &Whisper{w}
+ return &Whisper{w, nil}
}
-func (self *Whisper) Post(data string, pow, ttl uint32, to, from string) {
+func (self *Whisper) SetView(view qml.Object) {
+ self.view = view
+}
+
+func (self *Whisper) Post(data string, to, from string, topics []string, pow, ttl uint32) {
msg := whisper.NewMessage(fromHex(data))
envelope, err := msg.Seal(time.Duration(pow), whisper.Opts{
- Ttl: time.Duration(ttl),
- To: crypto.ToECDSAPub(fromHex(to)),
- From: crypto.ToECDSA(fromHex(from)),
+ Ttl: time.Duration(ttl),
+ To: crypto.ToECDSAPub(fromHex(to)),
+ From: crypto.ToECDSA(fromHex(from)),
+ Topics: whisper.TopicsFromString(topics),
})
if err != nil {
+ fmt.Println(err)
// handle error
return
}
if err := self.Whisper.Send(envelope); err != nil {
+ fmt.Println(err)
// handle error
return
}