tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into rpcfrontier

Browse Source
This commit is contained in:
Taylor Gerring 2015-03-16 13:02:41 -04:00
commit e5e265d024
2 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/mist/bindings.go
View File

@ -26,8 +26,8 @@ import (
"strconv" "strconv"
"github.com/ethereum/go-ethereum/cmd/utils" "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/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/state" "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) { func (gui *Gui) Transact(from, recipient, value, gas, gasPrice, d string) (string, error) {
var data string d = common.Bytes2Hex(utils.FormatTransactionData(d))
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))
}
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) { func (self *Gui) AddPlugin(pluginPath string) {

11
cmd/mist/ui_lib.go
View File

@ -25,9 +25,9 @@ import (
"io/ioutil" "io/ioutil"
"path" "path"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/eth" "github.com/ethereum/go-ethereum/eth"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/event/filter" "github.com/ethereum/go-ethereum/event/filter"
"github.com/ethereum/go-ethereum/javascript" "github.com/ethereum/go-ethereum/javascript"
"github.com/ethereum/go-ethereum/xeth" "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) { func (self *UiLib) Call(params map[string]interface{}) (string, error) {
object := mapToTxParams(params) object := mapToTxParams(params)