5 files changed, 16 insertions, 9 deletions
diff --git a/cmd/ethereum/admin.go b/cmd/ethereum/admin.go
index 41aaf46d8..65adb4086 100644
--- a/cmd/ethereum/admin.go
+++ b/cmd/ethereum/admin.go
@@ -14,7 +14,7 @@ import (
 	"github.com/ethereum/go-ethereum/rpc"
 	"github.com/ethereum/go-ethereum/state"
 	"github.com/ethereum/go-ethereum/xeth"
-	"github.com/obscuren/otto"
+	"github.com/robertkrimen/otto"
 )
 
 /*
diff --git a/cmd/ethereum/js.go b/cmd/ethereum/js.go
index b4b54b7e6..88d16d6a8 100644
--- a/cmd/ethereum/js.go
+++ b/cmd/ethereum/js.go
@@ -91,7 +91,14 @@ func newJSRE(ethereum *eth.Ethereum, libPath string) *jsre {
 func (js *jsre) apiBindings() {
 
 	ethApi := rpc.NewEthereumApi(js.xeth, js.ethereum.DataDir)
-	js.re.Bind("jeth", rpc.NewJeth(ethApi, js.re.ToVal))
+	//js.re.Bind("jeth", rpc.NewJeth(ethApi, js.re.ToVal))
+
+	jeth := rpc.NewJeth(ethApi, js.re.ToVal, js.re)
+	//js.re.Bind("jeth", jeth)
+	js.re.Set("jeth", struct{}{})
+	t, _ := js.re.Get("jeth")
+	jethObj := t.Object()
+	jethObj.Set("send", jeth.Send)
 
 	_, err := js.re.Eval(re.BigNumber_JS)
 
diff --git a/cmd/ethereum/js_test.go b/cmd/ethereum/js_test.go
index 0d3c22553..e3806d24d 100644
--- a/cmd/ethereum/js_test.go
+++ b/cmd/ethereum/js_test.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/obscuren/otto"
+	"github.com/robertkrimen/otto"
 	"os"
 	"path"
 	"testing"
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index b9a4ff045..e351453b1 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -135,7 +135,7 @@ The Ethereum JavaScript VM exposes a node admin interface as well as the DAPP Ja
 		utils.JSpathFlag,
 		utils.ListenPortFlag,
 		utils.LogFileFlag,
-		utils.LogFormatFlag,
+		utils.LogJSONFlag,
 		utils.LogLevelFlag,
 		utils.MaxPeersFlag,
 		utils.MinerThreadsFlag,
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 1d8f6382b..f87d25ce9 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -117,10 +117,10 @@ var (
 		Usage: "0-5 (silent, error, warn, info, debug, debug detail)",
 		Value: int(logger.InfoLevel),
 	}
-	LogFormatFlag = cli.StringFlag{
-		Name:  "logformat",
-		Usage: `"std" or "raw"`,
-		Value: "std",
+	LogJSONFlag = cli.StringFlag{
+		Name:  "logjson",
+		Usage: "Send json structured log output to a file or '-' for standard output (default: no json output)",
+		Value: "",
 	}
 	VMDebugFlag = cli.BoolFlag{
 		Name:  "vmdebug",
@@ -213,7 +213,7 @@ func MakeEthConfig(clientID, version string, ctx *cli.Context) *eth.Config {
 		NetworkId:       ctx.GlobalInt(NetworkIdFlag.Name),
 		LogFile:         ctx.GlobalString(LogFileFlag.Name),
 		LogLevel:        ctx.GlobalInt(LogLevelFlag.Name),
-		LogFormat:       ctx.GlobalString(LogFormatFlag.Name),
+		LogJSON:         ctx.GlobalString(LogJSONFlag.Name),
 		MinerThreads:    ctx.GlobalInt(MinerThreadsFlag.Name),
 		AccountManager:  GetAccountManager(ctx),
 		VmDebug:         ctx.GlobalBool(VMDebugFlag.Name),