diff options
author | Gustav Simonsson <gustav.simonsson@gmail.com> | 2015-02-26 20:22:09 +0800 |
---|---|---|
committer | Felix Lange <fjl@twurst.com> | 2015-03-06 21:10:42 +0800 |
commit | bc45e5c6de3052a4c853387dea0af5cd9207f1f7 (patch) | |
tree | 3230b89b3bf25eaf53e1b3b164cb72e89d8c4398 /javascript | |
parent | e64f727529287b7414af6d1f482ea5f318cbd2eb (diff) | |
download | go-tangerine-bc45e5c6de3052a4c853387dea0af5cd9207f1f7.tar.gz go-tangerine-bc45e5c6de3052a4c853387dea0af5cd9207f1f7.tar.zst go-tangerine-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 'javascript')
-rw-r--r-- | javascript/types.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/javascript/types.go b/javascript/types.go index 77e209d19..e07267c8f 100644 --- a/javascript/types.go +++ b/javascript/types.go @@ -70,8 +70,8 @@ func (self *JSEthereum) GetStateObject(addr string) otto.Value { return self.toVal(&JSStateObject{self.XEth.State().SafeGet(addr), self}) } -func (self *JSEthereum) Transact(key, recipient, valueStr, gasStr, gasPriceStr, dataStr string) otto.Value { - r, err := self.XEth.Transact(recipient, valueStr, gasStr, gasPriceStr, dataStr) +func (self *JSEthereum) Transact(fromStr, recipient, valueStr, gasStr, gasPriceStr, dataStr string) otto.Value { + r, err := self.XEth.Transact(fromStr, recipient, valueStr, gasStr, gasPriceStr, dataStr) if err != nil { fmt.Println(err) |