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

API changed to use Pubkey only. Reflected that change in the rest of the api

Browse Source
This commit is contained in:
obscuren 2015-02-05 15:00:59 -08:00
parent 6b5f25802e
commit e40c1c62ce
6 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/mist/assets/examples/coin.html
View File

@ -29,7 +29,8 @@
var web3 = require('web3'); var web3 = require('web3');
var eth = web3.eth; var eth = web3.eth;
web3.setProvider(new web3.providers.HttpSyncProvider('http://localhost:8080')); web3.setProvider(new
web3.providers.HttpSyncProvider('http://localhost:8545'));
var desc = [{ var desc = [{
"name": "balance(address)", "name": "balance(address)",
"type": "function", "type": "function",

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

@ -106,7 +106,7 @@ func (self *Whisper) Messages(id int) (messages *ethutil.List) {
func filterFromMap(opts map[string]interface{}) (f whisper.Filter) { func filterFromMap(opts map[string]interface{}) (f whisper.Filter) {
if to, ok := opts["to"].(string); ok { if to, ok := opts["to"].(string); ok {
f.To = crypto.ToECDSA(fromHex(to)) f.To = crypto.ToECDSAPub(fromHex(to))
} }
if from, ok := opts["from"].(string); ok { if from, ok := opts["from"].(string); ok {
f.From = crypto.ToECDSAPub(fromHex(from)) f.From = crypto.ToECDSAPub(fromHex(from))

2
whisper/filter.go
View File

@ -3,7 +3,7 @@ package whisper
import "crypto/ecdsa" import "crypto/ecdsa"
type Filter struct { type Filter struct {
To *ecdsa.PrivateKey To *ecdsa.PublicKey
From *ecdsa.PublicKey From *ecdsa.PublicKey
Topics [][]byte Topics [][]byte
Fn func(*Message) Fn func(*Message)

2
whisper/whisper.go
View File

@ -118,7 +118,7 @@ func (self *Whisper) GetIdentity(key *ecdsa.PublicKey) *ecdsa.PrivateKey {
func (self *Whisper) Watch(opts Filter) int { func (self *Whisper) Watch(opts Filter) int {
return self.filters.Install(filter.Generic{ return self.filters.Install(filter.Generic{
Str1: string(crypto.FromECDSA(opts.To)), Str1: string(crypto.FromECDSAPub(opts.To)),
Str2: string(crypto.FromECDSAPub(opts.From)), Str2: string(crypto.FromECDSAPub(opts.From)),
Data: bytesToMap(opts.Topics), Data: bytesToMap(opts.Topics),
Fn: func(data interface{}) { Fn: func(data interface{}) {

2
whisper/whisper_test.go
View File

@ -11,7 +11,7 @@ func TestEvent(t *testing.T) {
whisper := New() whisper := New()
id := whisper.NewIdentity() id := whisper.NewIdentity()
whisper.Watch(Filter{ whisper.Watch(Filter{
To: id, To: &id.PublicKey,
Fn: func(msg *Message) { Fn: func(msg *Message) {
res <- msg res <- msg
}, },

2
xeth/whisper.go
View File

@ -64,7 +64,7 @@ func (self *Whisper) HasIdentity(key string) bool {
func (self *Whisper) Watch(opts *Options) int { func (self *Whisper) Watch(opts *Options) int {
filter := whisper.Filter{ filter := whisper.Filter{
To: crypto.ToECDSA(fromHex(opts.To)), To: crypto.ToECDSAPub(fromHex(opts.To)),
From: crypto.ToECDSAPub(fromHex(opts.From)), From: crypto.ToECDSAPub(fromHex(opts.From)),
Topics: whisper.TopicsFromString(opts.Topics...), Topics: whisper.TopicsFromString(opts.Topics...),
} }