Merge pull request #1297 from debris/quick_fix

fixed ethereum.js for mix

libjsqrc/ethereumjs/bower.json

@@ -1,7 +1,7 @@
 {
   "name": "ethereum.js",
   "namespace": "ethereum",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Ethereum Compatible JavaScript API",
   "main": [
     "./dist/ethereum.js",

libjsqrc/ethereumjs/dist/ethereum.js

@@ -2656,7 +2656,7 @@ var requestManager = function() {
     var poll = function () {
         polls.forEach(function (data) {
             // send async
-            send(data.data, function(result){
+            send(data.data, function(error, result){
                 if (!(result instanceof Array) || result.length === 0) {
                     return;
                 }

libjsqrc/ethereumjs/lib/web3/requestmanager.js

@@ -136,7 +136,7 @@ var requestManager = function() {
     var poll = function () {
         polls.forEach(function (data) {
             // send async
-            send(data.data, function(result){
+            send(data.data, function(error, result){
                 if (!(result instanceof Array) || result.length === 0) {
                     return;
                 }

libjsqrc/ethereumjs/package.js

@@ -1,7 +1,7 @@
 /* jshint ignore:start */
 Package.describe({
   name: 'ethereum:js',
-  version: '0.1.1',
+  version: '0.1.2',
   summary: 'Ethereum JavaScript API, middleware to talk to a ethreum node over RPC',
   git: 'https://github.com/ethereum/ethereum.js',
   // By default, Meteor will default to using README.md for documentation.

libjsqrc/ethereumjs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ethereum.js",
   "namespace": "ethereum",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Ethereum JavaScript API, middleware to talk to a ethreum node over RPC",
   "main": "./index.js",
   "directories": {

mix/qml/html/WebContainer.html

@@ -33,7 +33,7 @@ updateContracts = function(contracts) {
 init = function(url) {
 	web3 = require('web3');
 	window.web3 = web3;
-	web3.setProvider(new web3.providers.HttpSyncProvider(url));
+	web3.setProvider(new web3.providers.HttpProvider(url));
 };
 
 executeJavaScript = function(script) {