Merge pull request #536 from zsfelfoldi/develop

using robertkrimen/otto, godeps updated

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"
 )
 
 /*

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)
 

cmd/ethereum/js_test.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/obscuren/otto"
+	"github.com/robertkrimen/otto"
 	"os"
 	"path"
 	"testing"