diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-04-24 19:34:51 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-04-24 19:34:51 +0800 |
| commit | 31811365e0991a190748721d1549334043fda73c (patch) | |
| tree | 98cd6f587e10fb8b1dc0685c1ee3b0e0c4eae29d /cmd | |
| parent | b6ec1c720fc65d8bac36bd2e28bf1df1de1ffe5b (diff) | |
| parent | dc62fb2ee927f1fe94cb6377fbde2ad6af3b9fac (diff) | |
| download | dexon-31811365e0991a190748721d1549334043fda73c.tar dexon-31811365e0991a190748721d1549334043fda73c.tar.gz dexon-31811365e0991a190748721d1549334043fda73c.tar.bz2 dexon-31811365e0991a190748721d1549334043fda73c.tar.lz dexon-31811365e0991a190748721d1549334043fda73c.tar.xz dexon-31811365e0991a190748721d1549334043fda73c.tar.zst dexon-31811365e0991a190748721d1549334043fda73c.zip | |
Merge pull request #800 from obscuren/ethereum_js_update
Ethereum js update
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/geth/js.go | 2 | ||||
| -rw-r--r-- | cmd/mist/assets/examples/coin.html | 3 | ||||
| m--------- | cmd/mist/assets/ext/ethereum.js | 0 |
3 files changed, 2 insertions, 3 deletions
diff --git a/cmd/geth/js.go b/cmd/geth/js.go index 6e5a6f1c7..abbd65513 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 e78f2d73f..e6baf4579 100644 --- a/cmd/mist/assets/examples/coin.html +++ b/cmd/mist/assets/examples/coin.html @@ -3,7 +3,7 @@ <title>JevCoin</title> <head> <script type="text/javascript" src="../ext/bignumber.min.js"></script> -<script type="text/javascript" src="../ext/ethereum.js/dist/ethereum-light.min.js"></script> +<script type="text/javascript" src="../ext/ethereum.js/dist/web3-light.min.js"></script> </head> <body> @@ -32,7 +32,6 @@ </body> <script type="text/javascript"> - var web3 = require('ethereum.js'); var eth = web3.eth; web3.setProvider(new web3.providers.HttpProvider('http://localhost:8545')); diff --git a/cmd/mist/assets/ext/ethereum.js b/cmd/mist/assets/ext/ethereum.js -Subproject c80ede50c3b60a482f1ec76038325ec52f5e73b +Subproject f8a43eddfb450d0e0ba1669a6916babe0ea4364 |