aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTaylor Gerring <taylor.gerring@gmail.com>2015-03-17 01:02:41 +0800
committerTaylor Gerring <taylor.gerring@gmail.com>2015-03-17 01:02:41 +0800
commite5e265d024403a779297cbaf5aa0f8759e3e76e4 (patch)
tree87258c3603fd5ecc1e792475b89e9fb89eb460b2
parent5757f547a6339c770a6d85ad067107d34878858f (diff)
parent22893b7ac925c49168c119f293ea8befc3aff5cc (diff)
downloadgo-tangerine-e5e265d024403a779297cbaf5aa0f8759e3e76e4.tar.gz
go-tangerine-e5e265d024403a779297cbaf5aa0f8759e3e76e4.tar.zst
go-tangerine-e5e265d024403a779297cbaf5aa0f8759e3e76e4.zip
Merge branch 'develop' into rpcfrontier
-rw-r--r--cmd/mist/bindings.go15
-rw-r--r--cmd/mist/ui_lib.go11
2 files changed, 4 insertions, 22 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) {
diff --git a/cmd/mist/ui_lib.go b/cmd/mist/ui_lib.go
index b33b81267..90237d4cb 100644
--- a/cmd/mist/ui_lib.go
+++ b/cmd/mist/ui_lib.go
@@ -25,9 +25,9 @@ import (
"io/ioutil"
"path"
+ "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/eth"
- "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/event/filter"
"github.com/ethereum/go-ethereum/javascript"
"github.com/ethereum/go-ethereum/xeth"
@@ -137,15 +137,6 @@ func (self *UiLib) Transact(params map[string]interface{}) (string, error) {
)
}
-func (self *UiLib) Compile(code string) (string, error) {
- bcode, err := common.Compile(code, false)
- if err != nil {
- return err.Error(), err
- }
-
- return common.Bytes2Hex(bcode), err
-}
-
func (self *UiLib) Call(params map[string]interface{}) (string, error) {
object := mapToTxParams(params)