Commit Graph

44 Commits

Author SHA1 Message Date
Iuri Matias 88c1a16453 fix contract address and make module exports compatible 2017-07-01 22:04:29 -04:00
Iuri Matias cdc75c91e1 fix contract extension file matching 2017-06-29 07:39:12 -04:00
Iuri Matias 5b60c3effa fix issue with orbit config 2017-06-26 15:25:22 -04:00
Iuri Matias 84f7149aaf fix contracts loading; add warning for whisper version; update web3.js 2017-06-25 12:56:14 -04:00
Iuri Matias a6c8e83d40 fix conflicts 2017-06-24 22:35:27 -04:00
Iuri Matias 4bb7f18155 Merge branch 'develop' of github.com:iurimatias/embark-framework into develop 2017-06-19 06:33:07 -04:00
Nathan Hernandez 4202d5e832 Update solc to 0.4.11
The solidity compiler was at 0.4.8, 3 patches behind. At some point the
output of the compiler changed, `compiler.js` reflects those changes.
I'm not sure if other properties changed.
2017-06-02 21:20:27 -04:00
Iuri Matias 47f313b12c generate json files 2017-04-04 06:37:50 -04:00
Iuri Matias faf0e1ff48 revert some of the recent changes 2017-03-31 07:34:43 -04:00
Todd Baur fbe3f302b2 cleanup code from linter feedback 2017-03-30 20:38:14 +09:00
Todd Baur 67f325f5a0 migrate all the code to ES6 2017-03-30 20:12:39 +09:00
Todd Baur 5bf1475ea4 swap more var -> let 2017-03-30 02:50:05 +09:00
Todd Baur e3b9c01205 fix linter complaints 2017-03-30 02:18:00 +09:00
Todd Baur 2f5c647c39 this changes Embark to an EventEmitter and adds more event handling for loading and fetching plugins. It introduces a dependency on underscore and underscore string. It adds defenses against null/invalid options objects. 2017-03-30 00:37:30 +09:00
Iuri Matias c514765d0b move misc utils modules to their own folder 2017-03-11 11:03:20 -05:00
Iuri Matias 92f9df4117 remove async extension to a module 2017-03-11 10:52:02 -05:00
Iuri Matias c2c41549c1 cleanup; remove unneded requires 2017-03-11 10:38:05 -05:00
Iuri Matias ea70d09e8c move ethereum and whisper checks; refactor web3 connection 2017-03-11 10:29:45 -05:00
Iuri Matias a797f8fcf6 fix account selection when it isn't configured; improve error message on tests 2017-03-04 21:51:28 -05:00
Iuri Matias fd6af8af2e refactor condition 2017-03-04 20:35:15 -05:00
Iuri Matias a527573796 separate the different functions in deployContracts 2017-03-04 20:14:47 -05:00
Iuri Matias 16275f13e5 if any account is configured in blockchain.json then use it as the default account for deploying contracts 2017-03-04 19:17:39 -05:00
Iuri Matias 3db27c14cb add exception to dealWithConfigsMethods; it's simple enough 2017-03-03 21:51:23 -05:00
Iuri Matias cd45a2be77 refactor, move calls to engine; fix tests 2017-03-03 01:22:12 -05:00
Iuri Matias d4f7eca2c5 make cc happy; use join path 2017-03-01 21:15:02 -05:00
Iuri Matias 09fbd66417 put callback call at the end 2017-03-01 21:09:55 -05:00
Iuri Matias c0bcc15023 simplify condition; return callback 2017-03-01 21:08:28 -05:00
Iuri Matias dbb0b0b171 track deployed contracts taking into account swarm hash inserted by solc 2017-03-01 20:52:58 -05:00
Iuri Matias b7cd296716 make abi generation independent of deployment 2017-02-28 23:29:16 -05:00
Iuri Matias e61f0f102d generate storage and communication abi; disable deployment if config is disabled 2017-02-28 20:42:03 -05:00
Iuri Matias c500bb4988 fix error display with refactored compilation module 2017-02-28 08:03:03 -05:00
Iuri Matias 0060dbe53f don't exit if blockchain is not available 2017-02-26 14:56:43 -05:00
Iuri Matias 0dc21abd3c fix compiler argument 2017-02-25 23:20:57 -05:00
Iuri Matias 562efc6f14 test fixes 2017-02-25 22:57:22 -05:00
Iuri Matias 5fc2d97609 fix so child process doesn't hang some cmds 2017-02-25 22:39:40 -05:00
Iuri Matias e9ce9dc6f1 add redeploy; don't reload compiler if it's already loaded 2017-02-25 15:47:35 -05:00
Iuri Matias d73eb802ea refactor deployment 2017-02-24 22:49:34 -05:00
Iuri Matias 4b119fffde add solc wrapper 2017-02-24 19:27:27 -05:00
Iuri Matias a2a27bb0c2 start refactoring deployment steps 2017-02-24 08:20:03 -05:00
Iuri Matias 550b81c9b2 remove unnecessary concatenation 2017-02-23 19:49:48 -05:00
Iuri Matias cf0ea4299e support disabling blockchain stack; tolerate lack of web3 object 2017-02-20 17:12:13 -05:00
Iuri Matias d1701c4031 add missing enable options to boilerplate configs; add communication initializer 2017-02-20 16:29:59 -05:00
Iuri Matias 5e4ad9a7e5 reorder requires in a more logical manner 2017-02-19 13:17:28 -05:00
Iuri Matias 1868788342 reorgnize code structure 2017-02-19 12:51:32 -05:00