aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBas van Kervel <bas@ethdev.com>2015-12-18 22:23:43 +0800
committerBas van Kervel <bas@ethdev.com>2015-12-18 22:30:08 +0800
commit3c9a2c752fcc1d85d1e026ac498b2e092725db61 (patch)
tree60231ca682a4bafdeca506c32171d57eb15cc910
parentfd69d2b7a87d9f00854e7d8939a6b3ab53cf8c9b (diff)
downloaddexon-3c9a2c752fcc1d85d1e026ac498b2e092725db61.tar
dexon-3c9a2c752fcc1d85d1e026ac498b2e092725db61.tar.gz
dexon-3c9a2c752fcc1d85d1e026ac498b2e092725db61.tar.bz2
dexon-3c9a2c752fcc1d85d1e026ac498b2e092725db61.tar.lz
dexon-3c9a2c752fcc1d85d1e026ac498b2e092725db61.tar.xz
dexon-3c9a2c752fcc1d85d1e026ac498b2e092725db61.tar.zst
dexon-3c9a2c752fcc1d85d1e026ac498b2e092725db61.zip
console: bugfix that causes the console to crash when connection to an endpoint without the personal api enabled
-rw-r--r--cmd/geth/js.go11
1 files changed, 6 insertions, 5 deletions
diff --git a/cmd/geth/js.go b/cmd/geth/js.go
index 56b7a8b00..9329eaa0e 100644
--- a/cmd/geth/js.go
+++ b/cmd/geth/js.go
@@ -341,11 +341,12 @@ func (js *jsre) apiBindings(f xeth.Frontend) error {
// Override the unlockAccount and newAccount methods on the personal object since these require user interaction.
// Assign the jeth.unlockAccount and jeth.newAccount in the jsre the original web3 callbacks. These will be called
// by the jeth.* methods after they got the password from the user and send the original web3 request to the backend.
- persObj := p.Object()
- js.re.Run(`jeth.unlockAccount = personal.unlockAccount;`)
- persObj.Set("unlockAccount", jeth.UnlockAccount)
- js.re.Run(`jeth.newAccount = personal.newAccount;`)
- persObj.Set("newAccount", jeth.NewAccount)
+ if persObj := p.Object(); persObj != nil { // make sure the personal api is enabled over the interface
+ js.re.Run(`jeth.unlockAccount = personal.unlockAccount;`)
+ persObj.Set("unlockAccount", jeth.UnlockAccount)
+ js.re.Run(`jeth.newAccount = personal.newAccount;`)
+ persObj.Set("newAccount", jeth.NewAccount)
+ }
return nil
}