removed compile
This commit is contained in:
parent
3cf51d5479
commit
22893b7ac9
@ -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) {
|
||||||
|
@ -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)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user