roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Concat and pad data

Browse Source
This commit is contained in:
obscuren 2014-12-22 14:59:52 +01:00
parent 60b1f9629c
commit e32f7baa0d
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/mist/assets/qml/browser.qml
View File

@ -59,7 +59,8 @@ Rectangle {
} }
Component.onCompleted: { Component.onCompleted: {
webview.url = "http://etherian.io" //webview.url = "http://etherian.io"
webview.url = "file:///Users/jeffrey/test.html"
} }
signal messages(var messages, int id); signal messages(var messages, int id);
@ -350,7 +351,7 @@ Rectangle {
for(var i = 0; i < fields.length; i++) { for(var i = 0; i < fields.length; i++) {
params[fields[i]] = params[fields[i]] || ""; params[fields[i]] = params[fields[i]] || "";
} }
if(typeof params.payload === "object") { params.payload = params.payload.join(""); } if(typeof params.payload !== "object") { params.payload = [params.payload]; } //params.payload = params.payload.join(""); }
params.topics = params.topics || []; params.topics = params.topics || [];
params.priority = params.priority || 1000; params.priority = params.priority || 1000;
params.ttl = params.ttl || 100; params.ttl = params.ttl || 100;

2
cmd/mist/assets/qml/views/whisper.qml
View File

@ -52,7 +52,7 @@ Rectangle {
Button { Button {
text: "Send" text: "Send"
onClicked: { onClicked: {
shh.post(eth.toHex(data.text), "", identity, topics.text.split(","), 500, 50) shh.post([eth.toHex(data.text)], "", identity, topics.text.split(","), 500, 50)
} }
} }
} }

9
ui/qt/qwhisper/whisper.go
View File

@ -33,8 +33,13 @@ func (self *Whisper) SetView(view qml.Object) {
self.view = view self.view = view
} }
func (self *Whisper) Post(data, to, from string, topics []string, priority, ttl uint32) { func (self *Whisper) Post(payload []string, to, from string, topics []string, priority, ttl uint32) {
msg := whisper.NewMessage(fromHex(data)) var data []byte
for _, d := range payload {
data = append(data, fromHex(d)...)
}
msg := whisper.NewMessage(data)
envelope, err := msg.Seal(time.Duration(priority*100000), whisper.Opts{ envelope, err := msg.Seal(time.Duration(priority*100000), whisper.Opts{
Ttl: time.Duration(ttl), Ttl: time.Duration(ttl),
To: crypto.ToECDSAPub(fromHex(to)), To: crypto.ToECDSAPub(fromHex(to)),