diff --git a/.gitignore b/.gitignore index 43061642a61d1e3810d093a8ca9d3e6a2cd67acc..a90cb225b9df811e3967057e18aae0e2d6e8eae5 100644 --- a/.gitignore +++ b/.gitignore @@ -23,8 +23,6 @@ Godeps/_workspace/bin .project .settings -mist -cmd/mist/mist deploy/osx/Mist.app deploy/osx/Mist\ Installer.dmg diff --git a/.gitmodules b/.gitmodules index 3284c329d5b6b9627edd1a09a1d761a9d578dd02..219564eb7b0fdff08b40d95a75f8c920c6da2d7d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "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 diff --git a/cmd/geth/js.go b/cmd/geth/js.go index 6e5a6f1c79a19d758a9bcbac8d15c6ab89aa4d9e..abbd655137b3e898b7e862e1ff85d8cacb8ef3fa 100644 --- a/cmd/geth/js.go +++ b/cmd/geth/js.go @@ -118,7 +118,7 @@ func (js *jsre) apiBindings() { 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 { utils.Fatalf("Error requiring web3: %v", err) } diff --git a/cmd/mist/assets/examples/coin.html b/cmd/mist/assets/examples/coin.html index e78f2d73f15c031c9b46ea4799c79febcbc1cd66..e6baf45793fdf63153e8d870f4089ba91ce20ae0 100644 --- a/cmd/mist/assets/examples/coin.html +++ b/cmd/mist/assets/examples/coin.html @@ -3,7 +3,7 @@ JevCoin - + @@ -32,7 +32,6 @@