diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-07 02:23:58 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-07 02:23:58 +0800 |
| commit | 323216ed85b48abec07266a203b731e7491d4286 (patch) | |
| tree | e9ac9734d08effe53094f6cb00ff306dc51ffe73 /cmd/mist | |
| parent | 1f26a1b86319f9468395e0772b5ae8f02cce8ec8 (diff) | |
| parent | 05ac1209c731722a486fb54d3b5cc9282c760c81 (diff) | |
| download | dexon-323216ed85b48abec07266a203b731e7491d4286.tar dexon-323216ed85b48abec07266a203b731e7491d4286.tar.gz dexon-323216ed85b48abec07266a203b731e7491d4286.tar.bz2 dexon-323216ed85b48abec07266a203b731e7491d4286.tar.lz dexon-323216ed85b48abec07266a203b731e7491d4286.tar.xz dexon-323216ed85b48abec07266a203b731e7491d4286.tar.zst dexon-323216ed85b48abec07266a203b731e7491d4286.zip | |
Merge pull request #861 from obscuren/transaction_pool_fixes
core: transaction pool fixes & resending transactions
Diffstat (limited to 'cmd/mist')
| -rw-r--r-- | cmd/mist/bindings.go | 2 | ||||
| -rw-r--r-- | cmd/mist/ui_lib.go | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/cmd/mist/bindings.go b/cmd/mist/bindings.go index e7ce50c35..7512421a1 100644 --- a/cmd/mist/bindings.go +++ b/cmd/mist/bindings.go @@ -40,7 +40,7 @@ type plugin struct { func (gui *Gui) Transact(from, recipient, value, gas, gasPrice, d string) (string, error) { d = common.Bytes2Hex(utils.FormatTransactionData(d)) - return gui.xeth.Transact(from, recipient, value, gas, gasPrice, d) + return gui.xeth.Transact(from, recipient, "", value, gas, gasPrice, d) } func (self *Gui) AddPlugin(pluginPath string) { diff --git a/cmd/mist/ui_lib.go b/cmd/mist/ui_lib.go index 34ce56e77..2de71491c 100644 --- a/cmd/mist/ui_lib.go +++ b/cmd/mist/ui_lib.go @@ -119,6 +119,7 @@ func (self *UiLib) Transact(params map[string]interface{}) (string, error) { return self.XEth.Transact( object["from"], object["to"], + "", object["value"], object["gas"], object["gasPrice"], |