aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-04-24 17:39:43 +0800
committerobscuren <geffobscura@gmail.com>2015-04-24 17:39:43 +0800
commitdc62fb2ee927f1fe94cb6377fbde2ad6af3b9fac (patch)
tree98cd6f587e10fb8b1dc0685c1ee3b0e0c4eae29d
parent92c63275938725061cbe3ff4c56ac08beca44e1e (diff)
downloaddexon-dc62fb2ee927f1fe94cb6377fbde2ad6af3b9fac.tar
dexon-dc62fb2ee927f1fe94cb6377fbde2ad6af3b9fac.tar.gz
dexon-dc62fb2ee927f1fe94cb6377fbde2ad6af3b9fac.tar.bz2
dexon-dc62fb2ee927f1fe94cb6377fbde2ad6af3b9fac.tar.lz
dexon-dc62fb2ee927f1fe94cb6377fbde2ad6af3b9fac.tar.xz
dexon-dc62fb2ee927f1fe94cb6377fbde2ad6af3b9fac.tar.zst
dexon-dc62fb2ee927f1fe94cb6377fbde2ad6af3b9fac.zip
web3: updated
-rw-r--r--.gitignore2
-rw-r--r--cmd/mist/assets/examples/coin.html3
m---------cmd/mist/assets/ext/ethereum.js0
3 files changed, 1 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 43061642a..a90cb225b 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/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