diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-17 20:09:22 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-17 20:09:22 +0800 |
| commit | ff55c6f5badda7ef11c38ef5d94b71420b14817c (patch) | |
| tree | 02c5fa61766a61224e8c33deed0c772b7e49e12b /cmd/mist/bindings.go | |
| parent | b0ebccb31e944e7cb7fabbbecf279a5507e513ab (diff) | |
| parent | 9663493ba0d493ec62153e725b5d30340f2aa525 (diff) | |
| download | dexon-ff55c6f5badda7ef11c38ef5d94b71420b14817c.tar dexon-ff55c6f5badda7ef11c38ef5d94b71420b14817c.tar.gz dexon-ff55c6f5badda7ef11c38ef5d94b71420b14817c.tar.bz2 dexon-ff55c6f5badda7ef11c38ef5d94b71420b14817c.tar.lz dexon-ff55c6f5badda7ef11c38ef5d94b71420b14817c.tar.xz dexon-ff55c6f5badda7ef11c38ef5d94b71420b14817c.tar.zst dexon-ff55c6f5badda7ef11c38ef5d94b71420b14817c.zip | |
Merge branch 'develop' into conversion
Conflicts:
common/types.go
Diffstat (limited to 'cmd/mist/bindings.go')
| -rw-r--r-- | cmd/mist/bindings.go | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/cmd/mist/bindings.go b/cmd/mist/bindings.go index 1371c752c..5d08e7dd7 100644 --- a/cmd/mist/bindings.go +++ b/cmd/mist/bindings.go @@ -26,8 +26,8 @@ import ( "strconv" "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/state" ) @@ -37,18 +37,9 @@ type plugin struct { } func (gui *Gui) Transact(from, recipient, value, gas, gasPrice, d string) (string, error) { - var data string - if len(recipient) == 0 { - code, err := common.Compile(d, false) - if err != nil { - return "", err - } - data = common.Bytes2Hex(code) - } else { - data = common.Bytes2Hex(utils.FormatTransactionData(d)) - } + d = common.Bytes2Hex(utils.FormatTransactionData(d)) - return gui.xeth.Transact(from, recipient, value, gas, gasPrice, data) + return gui.xeth.Transact(from, recipient, value, gas, gasPrice, d) } func (self *Gui) AddPlugin(pluginPath string) { |