roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

cmd/geth, jsre: updated ethereum.js => web3.js

Browse Source
This commit is contained in:
obscuren 2015-04-24 11:37:44 +02:00
parent 516f49c812
commit 92c6327593
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -1,3 +1,3 @@
[submodule "cmd/mist/assets/ext/ethereum.js"] [submodule "cmd/mist/assets/ext/ethereum.js"]
path = cmd/mist/assets/ext/ethereum.js path = cmd/mist/assets/ext/ethereum.js
url = https://github.com/ethereum/ethereum.js url = https://github.com/ethereum/web3.js

2
cmd/geth/js.go
View File

@ -118,7 +118,7 @@ func (js *jsre) apiBindings() {
utils.Fatalf("Error loading ethereum.js: %v", err) utils.Fatalf("Error loading ethereum.js: %v", err)
} }
_, err = js.re.Eval("var web3 = require('ethereum.js');") _, err = js.re.Eval("var web3 = require('web3');")
if err != nil { if err != nil {
utils.Fatalf("Error requiring web3: %v", err) utils.Fatalf("Error requiring web3: %v", err)
} }

4
jsre/ethereum_js.go
View File

File diff suppressed because one or more lines are too long