diff options
author | zelig <viktor.tron@gmail.com> | 2014-05-24 01:25:49 +0800 |
---|---|---|
committer | zelig <viktor.tron@gmail.com> | 2014-05-24 01:25:49 +0800 |
commit | 72df038d25c50a27adae8ea528dcedd3537267cf (patch) | |
tree | 44b358714448d492dcf8cdcddb4d1e6e57c4318b /ethereal/ui/gui.go | |
parent | 7f1a4c377c18055137909521d809251248b7b5af (diff) | |
parent | d35380c19e5ce92b57158e7780f7105dc4136916 (diff) | |
download | dexon-72df038d25c50a27adae8ea528dcedd3537267cf.tar dexon-72df038d25c50a27adae8ea528dcedd3537267cf.tar.gz dexon-72df038d25c50a27adae8ea528dcedd3537267cf.tar.bz2 dexon-72df038d25c50a27adae8ea528dcedd3537267cf.tar.lz dexon-72df038d25c50a27adae8ea528dcedd3537267cf.tar.xz dexon-72df038d25c50a27adae8ea528dcedd3537267cf.tar.zst dexon-72df038d25c50a27adae8ea528dcedd3537267cf.zip |
Merge branch 'develop' of github.com:ethereum/go-ethereum into develop
Diffstat (limited to 'ethereal/ui/gui.go')
-rw-r--r-- | ethereal/ui/gui.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ethereal/ui/gui.go b/ethereal/ui/gui.go index 7290bd6ec..022f192bf 100644 --- a/ethereal/ui/gui.go +++ b/ethereal/ui/gui.go @@ -9,7 +9,6 @@ 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" ) @@ -262,7 +261,7 @@ func (gui *Gui) Transact(recipient, value, gas, gasPrice, data string) (*ethpub. func (gui *Gui) Create(recipient, value, gas, gasPrice, data string) (*ethpub.PReceipt, error) { keyPair := ethutil.GetKeyRing().Get(0) - mainInput, initInput := mutan.PreParse(data) + //mainInput, initInput := mutan.PreParse(data) - return gui.pub.Create(ethutil.Hex(keyPair.PrivateKey), value, gas, gasPrice, initInput, mainInput) + return gui.pub.Create(ethutil.Hex(keyPair.PrivateKey), value, gas, gasPrice, data) } |