diff options
| author | obscuren <geffobscura@gmail.com> | 2014-12-02 03:18:09 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-12-02 03:18:09 +0800 |
| commit | 6dc46d3341dc5fa25bd005f9606de258874139be (patch) | |
| tree | 39b5d7dad5a943de4e187f99c93da5aa7fc9f2b8 /cmd | |
| parent | a3559c5e1b469890bb8d71e9992175febaae31c7 (diff) | |
| download | go-tangerine-6dc46d3341dc5fa25bd005f9606de258874139be.tar.gz go-tangerine-6dc46d3341dc5fa25bd005f9606de258874139be.tar.zst go-tangerine-6dc46d3341dc5fa25bd005f9606de258874139be.zip | |
Changed the way transactions are being added to the transaction pool
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/mist/bindings.go | 5 | ||||
| -rw-r--r-- | cmd/mist/ui_lib.go | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/cmd/mist/bindings.go b/cmd/mist/bindings.go index 480c38b2e..cd139c67f 100644 --- a/cmd/mist/bindings.go +++ b/cmd/mist/bindings.go @@ -26,7 +26,6 @@ import ( "github.com/ethereum/go-ethereum/cmd/utils" "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/xeth" ) type plugin struct { @@ -46,12 +45,12 @@ func (gui *Gui) LogPrint(level logger.LogLevel, msg string) { } */ } -func (gui *Gui) Transact(recipient, value, gas, gasPrice, d string) (*xeth.JSReceipt, error) { +func (gui *Gui) Transact(recipient, value, gas, gasPrice, d string) (string, error) { var data string if len(recipient) == 0 { code, err := ethutil.Compile(d, false) if err != nil { - return nil, err + return "", err } data = ethutil.Bytes2Hex(code) } else { diff --git a/cmd/mist/ui_lib.go b/cmd/mist/ui_lib.go index 4e480144f..15799eb6a 100644 --- a/cmd/mist/ui_lib.go +++ b/cmd/mist/ui_lib.go @@ -127,7 +127,11 @@ func (self *UiLib) PastPeers() *ethutil.List { func (self *UiLib) ImportTx(rlpTx string) { tx := chain.NewTransactionFromBytes(ethutil.Hex2Bytes(rlpTx)) - self.eth.TxPool().QueueTransaction(tx) + //self.eth.TxPool().QueueTransaction(tx) + err := self.eth.TxPool().Add(tx) + if err != nil { + guilogger.Infoln("import tx failed ", err) + } } func (self *UiLib) EvalJavascriptFile(path string) { @@ -305,7 +309,7 @@ func mapToTxParams(object map[string]interface{}) map[string]string { return conv } -func (self *UiLib) Transact(params map[string]interface{}) (*xeth.JSReceipt, error) { +func (self *UiLib) Transact(params map[string]interface{}) (string, error) { object := mapToTxParams(params) return self.JSXEth.Transact( |