forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix personal functions

Browse source
This commit is contained in:
Guillaume Ballet 2019-12-02 18:51:44 +01:00
parent 2c78ae55f5
commit fe2b2e0033
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
console/bridge.go
View file

@ -58,6 +58,14 @@ func IsNumber(v goja.Value) bool {
} }
} }
func getJeth(r *goja.Runtime) *goja.Object {
jethObj := r.Get("jeth")
if jethObj == nil {
panic(r.ToValue("jeth object does not exist"))
}
return jethObj.ToObject(r)
}
// NewAccount is a wrapper around the personal.newAccount RPC method that uses a // NewAccount is a wrapper around the personal.newAccount RPC method that uses a
// non-echoing password prompt to acquire the passphrase and executes the original // non-echoing password prompt to acquire the passphrase and executes the original
// RPC method (saved in jeth.newAccount) with it to actually execute the RPC call. // RPC method (saved in jeth.newAccount) with it to actually execute the RPC call.
@ -89,7 +97,7 @@ func (b *bridge) NewAccount(call goja.FunctionCall) (response goja.Value) {
throwJSException(b.runtime, "expected 0 or 1 string argument") throwJSException(b.runtime, "expected 0 or 1 string argument")
} }
// Password acquired, execute the call and return // Password acquired, execute the call and return
newAccount, callable := goja.AssertFunction(b.runtime.Get("jeth.newAccount")) newAccount, callable := goja.AssertFunction(getJeth(b.runtime).Get("newAccount"))
if !callable { if !callable {
panic(b.runtime.ToValue("jeth.newAccount isn't callable")) panic(b.runtime.ToValue("jeth.newAccount isn't callable"))
} }
@ -116,7 +124,7 @@ func (b *bridge) OpenWallet(call goja.FunctionCall) (response goja.Value) {
passwd = call.Argument(1) passwd = call.Argument(1)
} }
// Open the wallet and return if successful in itself // Open the wallet and return if successful in itself
openWallet, callable := goja.AssertFunction(b.runtime.Get("jeth.openWallet")) openWallet, callable := goja.AssertFunction(getJeth(b.runtime).Get("openWallet"))
if !callable { if !callable {
panic(b.runtime.ToValue("jeth.openWallet is not callable")) panic(b.runtime.ToValue("jeth.openWallet is not callable"))
} }
@ -204,7 +212,7 @@ func (b *bridge) readPassphraseAndReopenWallet(call goja.FunctionCall) (goja.Val
} else { } else {
passwd = b.runtime.ToValue(input) passwd = b.runtime.ToValue(input)
} }
openWallet, callable := goja.AssertFunction(b.runtime.Get("jeth.openWallet")) openWallet, callable := goja.AssertFunction(getJeth(b.runtime).Get("openWallet"))
if !callable { if !callable {
return nil, fmt.Errorf("jeth.openWallet is not callable") return nil, fmt.Errorf("jeth.openWallet is not callable")
} }
@ -227,7 +235,7 @@ func (b *bridge) readPinAndReopenWallet(call goja.FunctionCall) (goja.Value, err
} else { } else {
passwd = b.runtime.ToValue(input) passwd = b.runtime.ToValue(input)
} }
openWallet, callable := goja.AssertFunction(b.runtime.Get("jeth.openWallet")) openWallet, callable := goja.AssertFunction(getJeth(b.runtime).Get("openWallet"))
if !callable { if !callable {
return nil, fmt.Errorf("jeth.openWallet is not callable") return nil, fmt.Errorf("jeth.openWallet is not callable")
} }
@ -270,7 +278,7 @@ func (b *bridge) UnlockAccount(call goja.FunctionCall) (response goja.Value) {
duration = call.Argument(2) duration = call.Argument(2)
} }
// Send the request to the backend and return // Send the request to the backend and return
unlockAccount, callable := goja.AssertFunction(b.runtime.Get("jeth.unlockAccount")) unlockAccount, callable := goja.AssertFunction(getJeth(b.runtime).Get("unlockAccount"))
if !callable { if !callable {
throwJSException(b.runtime, "jeth.unlockAccount is not callable") throwJSException(b.runtime, "jeth.unlockAccount is not callable")
} }
@ -312,7 +320,7 @@ func (b *bridge) Sign(call goja.FunctionCall) (response goja.Value) {
} }
// Send the request to the backend and return // Send the request to the backend and return
sign, callable := goja.AssertFunction(b.runtime.Get("jeth.unlockAccount")) sign, callable := goja.AssertFunction(getJeth(b.runtime).Get("unlockAccount"))
if !callable { if !callable {
throwJSException(b.runtime, "jeth.unlockAccount is not callable") throwJSException(b.runtime, "jeth.unlockAccount is not callable")
} }