Merge commit '1a6dbeff6e86d65cae6d7db366cbaa4182eaff7f' into ethereumjs

Conflicts: libjsqrc/ethereumjs/dist/ethereum.js libjsqrc/ethereumjs/dist/ethereum.js.map libjsqrc/ethereumjs/dist/ethereum.min.js libjsqrc/ethereumjs/lib/abi.js
2015-01-15 17:27:07 +01:00
parent 508f116738 ec74fc05d4
commit 6d02c0d392
22 changed files with 1542 additions and 598 deletions
@@ -43,7 +43,7 @@

        // create contract
        web3.eth.transact({code: web3.eth.solidity(source)}).then(function (address) {
-            contract = web3.contract(address, desc);
+            contract = web3.eth.contract(address, desc);
            document.getElementById('call').style.visibility = 'visible';
        });
    }