diff options
Diffstat (limited to 'mist/ui_lib.go')
| -rw-r--r-- | mist/ui_lib.go | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/mist/ui_lib.go b/mist/ui_lib.go index e77336c90..90ba0bbaf 100644 --- a/mist/ui_lib.go +++ b/mist/ui_lib.go @@ -13,6 +13,7 @@ import ( "github.com/ethereum/eth-go/ethpipe" "github.com/ethereum/eth-go/ethstate" "github.com/ethereum/eth-go/ethutil" + "github.com/ethereum/eth-go/ui/qt" "github.com/ethereum/go-ethereum/javascript" "gopkg.in/qml.v1" ) @@ -51,7 +52,7 @@ func (self *UiLib) LookupDomain(domain string) string { world := self.World() if len(domain) > 32 { - domain = string(ethcrypto.Sha3Bin([]byte(domain))) + domain = string(ethcrypto.Sha3([]byte(domain))) } data := world.Config().Get("DnsReg").StorageString(domain).Bytes() @@ -193,21 +194,21 @@ func (self *UiLib) StartDebugger() { dbWindow.Show() } -func (self *UiLib) NewFilter(object map[string]interface{}) int { - filter, id := self.eth.InstallFilter(object) +func (self *UiLib) NewFilter(object map[string]interface{}) (id int) { + filter := qt.NewFilterFromMap(object, self.eth) filter.MessageCallback = func(messages ethstate.Messages) { self.win.Root().Call("invokeFilterCallback", ethpipe.ToJSMessages(messages), id) } - + id = self.eth.InstallFilter(filter) return id } -func (self *UiLib) NewFilterString(typ string) int { - filter, id := self.eth.InstallFilter(nil) +func (self *UiLib) NewFilterString(typ string) (id int) { + filter := ethchain.NewFilter(self.eth) filter.BlockCallback = func(block *ethchain.Block) { self.win.Root().Call("invokeFilterCallback", "{}", id) } - + id = self.eth.InstallFilter(filter) return id } |