diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-14 00:23:18 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-14 00:23:18 +0800 |
| commit | 00fca409398172811e71158e0ca9f6229e0f815b (patch) | |
| tree | 8f7dc62676e519236b69a977c7af00d81b1e0406 /cmd/mist/ui_lib.go | |
| parent | 5c251b69282b3992512d0c17ed0063f294a0e663 (diff) | |
| parent | 8a0f23915e4feb9aabe21bd075416bc0f32bbc43 (diff) | |
| download | go-tangerine-00fca409398172811e71158e0ca9f6229e0f815b.tar.gz go-tangerine-00fca409398172811e71158e0ca9f6229e0f815b.tar.zst go-tangerine-00fca409398172811e71158e0ca9f6229e0f815b.zip | |
Merge branch 'miner' into develop
Diffstat (limited to 'cmd/mist/ui_lib.go')
| -rw-r--r-- | cmd/mist/ui_lib.go | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/cmd/mist/ui_lib.go b/cmd/mist/ui_lib.go index ba3ac3b61..ab48386f4 100644 --- a/cmd/mist/ui_lib.go +++ b/cmd/mist/ui_lib.go @@ -209,17 +209,20 @@ func (self *UiLib) Call(params map[string]interface{}) (string, error) { } func (self *UiLib) AddLocalTransaction(to, data, gas, gasPrice, value string) int { - return self.miner.AddLocalTx(&miner.LocalTx{ - To: ethutil.Hex2Bytes(to), - Data: ethutil.Hex2Bytes(data), - Gas: gas, - GasPrice: gasPrice, - Value: value, - }) - 1 + return 0 + /* + return self.miner.AddLocalTx(&miner.LocalTx{ + To: ethutil.Hex2Bytes(to), + Data: ethutil.Hex2Bytes(data), + Gas: gas, + GasPrice: gasPrice, + Value: value, + }) - 1 + */ } func (self *UiLib) RemoveLocalTransaction(id int) { - self.miner.RemoveLocalTx(id) + //self.miner.RemoveLocalTx(id) } func (self *UiLib) SetGasPrice(price string) { |