gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

using robertkrimen/otto, godeps updated

Browse Source
This commit is contained in:
zsfelfoldi
2015-03-20 13:22:01 +01:00
parent 91f9f355b2
commit 8324b683b4
144 changed files with 4987 additions and 13117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/ethereum/admin.go
View File

@ -8,13 +8,13 @@ import (
"time"
"github.com/ethereum/go-ethereum/cmd/utils"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/rlp"
"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"
)
/*

9
cmd/ethereum/js.go
View File

@ -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)

2
cmd/ethereum/js_test.go
View File

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