diff options
| author | obscuren <geffobscura@gmail.com> | 2014-12-02 18:52:56 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-12-02 18:52:56 +0800 |
| commit | 64f35ba8d1f31d6821a0a1bf946c71396a996f30 (patch) | |
| tree | 375a081536c7c0b329a3b0c2e812ff05f81dd64c /cmd/mist/ui_lib.go | |
| parent | 616066a598933df7ef126186eb9c647094f665ca (diff) | |
| parent | 99481a245adc2c4814ab6b38d94d63114f7bbb15 (diff) | |
| download | go-tangerine-64f35ba8d1f31d6821a0a1bf946c71396a996f30.tar.gz go-tangerine-64f35ba8d1f31d6821a0a1bf946c71396a996f30.tar.zst go-tangerine-64f35ba8d1f31d6821a0a1bf946c71396a996f30.zip | |
merge errors fixed
Diffstat (limited to 'cmd/mist/ui_lib.go')
| -rw-r--r-- | cmd/mist/ui_lib.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cmd/mist/ui_lib.go b/cmd/mist/ui_lib.go index 01352f192..a0786cf2f 100644 --- a/cmd/mist/ui_lib.go +++ b/cmd/mist/ui_lib.go @@ -128,7 +128,10 @@ func (self *UiLib) PastPeers() *ethutil.List { func (self *UiLib) ImportTx(rlpTx string) { tx := types.NewTransactionFromBytes(ethutil.Hex2Bytes(rlpTx)) - 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) { @@ -306,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( |