embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,477 Commits 171 Branches 184 Tags 104 MiB
Commit Graph

1477 Commits

Author SHA1 Message Date
Iuri Matias faf626be93 make embark blockchain compatible with latest geth 2016-05-22 11:23:04 -04:00
Iuri Matias c168d103cb remove no longer supported log file option when calling geth 2016-05-20 23:26:17 -04:00
Iuri Matias 1affc9807a use ethersim 0.3.0 2016-05-20 22:04:46 -04:00
Iuri Matias 558de7c136 Merge branch 'upcoming' into develop 2016-03-08 15:00:03 -05:00
Iuri Matias feb582a7b8 Merge pull request #148 from SafeMarket/miner-stop 
miner stop config threads
 2016-03-08 14:59:05 -05:00
Iuri Matias 5216d20062 update tests 2016-03-08 14:57:29 -05:00
Iuri Matias 7afed75e58 update tests 2016-03-08 14:44:40 -05:00
Aakil Fernandes 6559cfdd5c miner stop config threads 2016-03-08 14:13:11 -05:00
Iuri Matias 2eaa5fc0a4 Merge pull request #146 from iurimatias/upcoming 
Upcoming
 2016-02-29 10:03:48 -05:00
Iuri Matias 32ef27212b update specs; remove unused env config 2016-02-29 09:59:34 -05:00
Iuri Matias f032256552 remove exit - for now - when getting an error deploying 2016-02-29 09:50:17 -05:00
Iuri Matias 54eb8771f3 update web3 to 0.15.0 2016-02-29 09:48:51 -05:00
Iuri Matias 676c598b4a Merge pull request #142 from SafeMarket/console-log-deploy-errors 
Console log deploy errors
 2016-02-28 12:58:03 -05:00
Iuri Matias 0fda113db3 Merge pull request #143 from SafeMarket/extension-fix 
Extension fix
 2016-02-28 12:57:52 -05:00
Iuri Matias 30fd0a9489 Merge pull request #144 from SafeMarket/deploy_synchronously 
Deploy synchronously
 2016-02-28 12:57:05 -05:00
Iuri Matias 6ebbe59892 Merge pull request #145 from SafeMarket/localhost 
Localhost
 2016-02-28 12:54:36 -05:00
Aakil Fernandes c1195b4e03 remove extra quotes 2016-02-25 15:56:40 -05:00
Aakil Fernandes e6ee0395d0 localhost 2016-02-25 15:56:40 -05:00
Aakil Fernandes 07ec906766 add blockchain config to abi 2016-02-25 15:23:11 -05:00
Aakil Fernandes 8af4282ed7 deployed_contracts_count fix 2016-02-25 15:23:11 -05:00
Aakil Fernandes 8ea13b4da5 sync->synchronously 2016-02-25 15:23:11 -05:00
Aakil Fernandes 7dac3c0832 deploy_synchronously 2016-02-25 15:23:11 -05:00
Iuri Matias bd76193ac8 add bignumber to dependencies so BigNumber can be used in onDeploy 2016-02-25 15:21:45 -05:00
Aakil Fernandes 171fefbda1 expose runtimeBytecode 2016-02-25 15:20:47 -05:00
Aakil Fernandes 83520affa3 add contractdb 2016-02-25 15:20:47 -05:00
Aakil Fernandes 7392afbbf2 merge fix 2016-02-25 14:10:45 -05:00
Aakil Fernandes cb0ac1e3ca use last part of contract file rather than 1st 2016-02-25 14:08:24 -05:00
Aakil Fernandes b69864f22e Merge branch 'console-log-deploy-errors' of https://github.com/safemarket/embark-framework into HEAD 2016-02-25 13:41:05 -05:00
Aakil Fernandes c2ae0c5b4f rebase 2016-02-25 13:40:09 -05:00
Iuri Matias 9f21e35607 Merge pull request #136 from area/develop 
Add support for other paths for ipfs binary
 2016-02-09 16:19:31 -05:00
Iuri Matias d72ee89cbf Merge pull request #131 from iurimatias/upcoming 
Upcoming
 2016-02-09 16:14:05 -05:00
Iuri Matias 9c3f31e351 update contracts config 2016-02-09 15:57:16 -05:00
Iuri Matias 648382bd15 fix blockchain config specs 2016-02-09 15:45:48 -05:00
Iuri Matias 2bbd5f418c comment out stub contract 2016-02-09 15:36:56 -05:00
Iuri Matias a74e0aaa8c update compiler spec 2016-02-09 15:25:23 -05:00
Iuri Matias 1b858514e8 update chain manager spec 2016-02-09 15:08:19 -05:00
Iuri Matias ef94b9ad96 remove extra minethreads config 2016-02-09 15:05:04 -05:00
Iuri Matias 3ec1fdb6d9 add filename to compiler hash 2016-02-09 14:44:40 -05:00
Iuri Matias 991abb2c7d remove extra { 2016-02-08 22:07:30 -05:00
VoR0220 1bd6c89f0c small corrections 2016-02-08 21:59:44 -05:00
VoR0220 8d2d4f8df4 Throw errors for solidity compiler 2016-02-08 21:59:44 -05:00
VoR0220 a221b1b6b9 fixed interface issues, stubs work again 2016-02-08 21:59:44 -05:00
VoR0220 078e3240db Update compiler.js 2016-02-08 21:59:44 -05:00
VoR0220 f864bb6098 compiling correctly and moved wall of code 
is_a_token I think is no longer necessary methinks...because now you can just draw up your coin as is. At the very least the function needs to be rewritten. In addition I moved the wall of code that you had a TODO to move on...and I put it in its own separate function configureContractsParameters. Let me know what we should do with is_a_token.
 2016-02-08 21:59:44 -05:00
VoR0220 b7c03ac06b Update compiler.js 2016-02-08 21:59:44 -05:00
VoR0220 f5595adb43 Update compiler.js 2016-02-08 21:59:44 -05:00
VoR0220 867b7a16fc Update compiler.js 2016-02-08 21:59:44 -05:00
VoR0220 f2e4333d1e couple of forgotten things needed to be fixed up 2016-02-08 21:59:44 -05:00
VoR0220 ce7693eca2 Update compiler.js 2016-02-08 21:59:44 -05:00
VoR0220 a734eb2b7c Update blockchain.js 2016-02-08 21:59:44 -05:00