diff options
Diffstat (limited to 'ethereal/ui')
| -rw-r--r-- | ethereal/ui/gui.go | 7 | ||||
| -rw-r--r-- | ethereal/ui/ui_lib.go | 10 |
2 files changed, 6 insertions, 11 deletions
diff --git a/ethereal/ui/gui.go b/ethereal/ui/gui.go index 39da5f246..25f6e2fed 100644 --- a/ethereal/ui/gui.go +++ b/ethereal/ui/gui.go @@ -9,6 +9,7 @@ import ( "github.com/ethereum/eth-go/ethpub" "github.com/ethereum/eth-go/ethutil" "github.com/go-qml/qml" + "github.com/obscuren/mutan" "math/big" "strings" ) @@ -220,5 +221,9 @@ func (gui *Gui) Transact(recipient, value, gas, gasPrice, data string) (*ethpub. } func (gui *Gui) Create(recipient, value, gas, gasPrice, data string) (*ethpub.PReceipt, error) { - return gui.Transact(recipient, value, gas, gasPrice, data) + keyPair := ethutil.Config.Db.GetKeys()[0] + + mainInput, initInput := mutan.PreProcess(data) + + return gui.pub.Create(ethutil.Hex(keyPair.PrivateKey), value, gas, gasPrice, initInput, mainInput) } diff --git a/ethereal/ui/ui_lib.go b/ethereal/ui/ui_lib.go index 7fe610c6a..35ceb7d79 100644 --- a/ethereal/ui/ui_lib.go +++ b/ethereal/ui/ui_lib.go @@ -59,14 +59,6 @@ func (ui *UiLib) OpenHtml(path string) { go app.run() } -func (ui *UiLib) Watch(addr, storageAddr string) { - if len(storageAddr) == 0 { - ui.eth.Reactor().Subscribe("storage:"+string(ethutil.FromHex(addr))+":"+string(ethutil.FromHex(storageAddr)), nil) - } else { - ui.eth.Reactor().Subscribe("object:"+string(ethutil.FromHex(addr)), nil) - } -} - func (ui *UiLib) Muted(content string) { component, err := ui.engine.LoadFile(ui.AssetPath("qml/muted.qml")) if err != nil { @@ -78,8 +70,6 @@ func (ui *UiLib) Muted(content string) { go func() { path := "file://" + ui.AssetPath("muted/index.html") win.Set("url", path) - //debuggerPath := "file://" + ui.AssetPath("muted/debugger.html") - //win.Set("debugUrl", debuggerPath) win.Show() win.Wait() |