aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/mist/bindings.go
diff options
context:
space:
mode:
authorGustav Simonsson <gustav.simonsson@gmail.com>2015-02-26 20:22:09 +0800
committerFelix Lange <fjl@twurst.com>2015-03-06 21:10:42 +0800
commitbc45e5c6de3052a4c853387dea0af5cd9207f1f7 (patch)
tree3230b89b3bf25eaf53e1b3b164cb72e89d8c4398 /cmd/mist/bindings.go
parente64f727529287b7414af6d1f482ea5f318cbd2eb (diff)
downloaddexon-bc45e5c6de3052a4c853387dea0af5cd9207f1f7.tar
dexon-bc45e5c6de3052a4c853387dea0af5cd9207f1f7.tar.gz
dexon-bc45e5c6de3052a4c853387dea0af5cd9207f1f7.tar.bz2
dexon-bc45e5c6de3052a4c853387dea0af5cd9207f1f7.tar.lz
dexon-bc45e5c6de3052a4c853387dea0af5cd9207f1f7.tar.xz
dexon-bc45e5c6de3052a4c853387dea0af5cd9207f1f7.tar.zst
dexon-bc45e5c6de3052a4c853387dea0af5cd9207f1f7.zip
Integrate eth_accounts and eth_transact to use new account manager
* Add from to eth_transact / xeth.Transact and add static pass in lieu of integrating with native Mist window for user passphrase entry * Make eth_accounts return AccountManager.Accounts() * Add a Generate Key menu item in Mist
Diffstat (limited to 'cmd/mist/bindings.go')
-rw-r--r--cmd/mist/bindings.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/mist/bindings.go b/cmd/mist/bindings.go
index f21aa3135..fd89eb7e2 100644
--- a/cmd/mist/bindings.go
+++ b/cmd/mist/bindings.go
@@ -49,7 +49,7 @@ func (gui *Gui) LogPrint(level logger.LogLevel, msg string) {
}
*/
}
-func (gui *Gui) Transact(recipient, value, gas, gasPrice, d string) (string, error) {
+func (gui *Gui) Transact(from, recipient, value, gas, gasPrice, d string) (string, error) {
var data string
if len(recipient) == 0 {
code, err := ethutil.Compile(d, false)
@@ -61,7 +61,7 @@ func (gui *Gui) Transact(recipient, value, gas, gasPrice, d string) (string, err
data = ethutil.Bytes2Hex(utils.FormatTransactionData(d))
}
- return gui.xeth.Transact(recipient, value, gas, gasPrice, data)
+ return gui.xeth.Transact(from, recipient, value, gas, gasPrice, data)
}
// functions that allow Gui to implement interface guilogger.LogSystem