embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'debris-web3_5'

This commit is contained in:
Iuri Matias 2015-06-04 07:26:10 -04:00
parent 7ccec28402 084008c6d3
commit b352fc9b4f
3 changed files with 2307 additions and 427 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2718
js/web3.js
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@ -24,7 +24,7 @@
"matchdep": "^0.3.0",
"read-yaml": "^1.0.0",
"shelljs": "^0.5.0",
"web3": "^0.4.3",
"web3": "^0.5.0",
"wrench": "^1.5.8"
},
"author": "Iuri Matias <iuri.matias@gmail.com>",

4
tasks/deploy.coffee
View File

@ -37,7 +37,7 @@ module.exports = (grunt) ->
result += "var #{className}Abi = #{abi};"
result += "var #{className}Contract = web3.eth.contract(#{className}Abi);"
result += "var #{className} = new #{className}Contract('#{contractAddress}');";
result += "var #{className} = #{className}Contract.at('#{contractAddress}');";
else
#for geth < 0.9.23
contract = compiled_contracts
@ -49,7 +49,7 @@ module.exports = (grunt) ->
result += "var #{className}Abi = #{abi};"
result += "var #{className}Contract = web3.eth.contract(#{className}Abi);"
result += "var #{className} = new #{className}Contract('#{contractAddress}');";
result += "var #{className} = #{className}Contract.at('#{contractAddress}');";
destFile = grunt.config.get("deploy.dest")
grunt.file.write(destFile, result)