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

2825 Commits

Author SHA1 Message Date
Iuri Matias 92e22ea519 support special imports 2017-12-13 15:53:29 -05:00
Iuri Matias 038f57e7d2 fix new index example 2017-12-13 15:53:29 -05:00
Iuri Matias 3d36aaaeb3 support both old system and imports in the pipeline 2017-12-13 15:53:29 -05:00
Iuri Matias 33711c8db2 support imports 2017-12-13 15:53:29 -05:00
Iuri Matias aa0f774f1d Merge branch 'release/2.6.0' into develop 2017-12-13 12:17:29 -05:00
Iuri Matias daba3b9319 remove extra character in template causing issues with the console 2017-12-13 11:38:36 -05:00
Iuri Matias 58cf9ca78d take into account config in ipfs service check 2017-12-07 10:26:17 -05:00
Iuri Matias be64d2ff6b fix IPFS dependency 2017-12-06 11:37:44 -05:00
Iuri Matias e2cbc2a488 fix linting issues 2017-12-05 18:14:46 -05:00
Antonio Tenorio Fornés 4bb77ae8d5 Merge branch 'develop' into buildFixes 2017-10-24 20:56:57 +02:00
Iuri Matias 2690ada62d Merge branch 'next' into develop 2017-10-22 09:47:11 -04:00
Iuri Matias 05ebefff9a downgrade to 0.4.17 2017-10-22 09:44:32 -04:00
Iuri Matias f3a8e68c60 Merge branch 'next' into develop 2017-10-22 08:37:24 -04:00
Iuri Matias 38b1cf480e update solc version 2017-10-21 15:17:54 -04:00
Iuri Matias 398aff3af7 fix multiple issues with multiple file writes 2017-10-21 14:21:18 -04:00
Iuri Matias 8c1b9b56cf update bundle; don't double add shh option 2017-10-21 08:42:29 -04:00
Iuri Matias a18fb65e53 Merge branch 'next' into develop 2017-10-19 19:16:18 -04:00
Iuri Matias e23e4bc417 add blockchain ws config support; fix whisper provider setting 2017-10-19 18:55:49 -04:00
Iuri Matias dd8135445d Merge branch 'next' into develop 2017-10-17 07:03:54 -04:00
Iuri Matias 460f78cc55 update events name for code generation 2017-10-17 07:03:13 -04:00
Iuri Matias 6157968c5e update default solc version; update spec; fix issue with compiler warnings 2017-10-17 06:51:52 -04:00
Iuri Matias 0e9b90b4ee comply with linter 2017-10-14 10:13:30 -04:00
Iuri Matias c5a7db2da0 cleanup 2017-10-14 06:12:54 -04:00
Iuri Matias 704a1ff517 cleanup 2017-10-14 06:06:09 -04:00
Iuri Matias f450bf2e6a fix lint; add eslint 2017-10-14 05:24:39 -04:00
Iuri Matias d1762a0fb4 refactor code generation 2017-10-13 20:01:35 -04:00
Iuri Matias 322fabab3d update tests; fix test module 2017-10-13 05:56:42 -04:00
Iuri Matias 2f25876722 fix jshint issues 2017-10-09 09:11:37 -04:00
Iuri Matias 09db4eaa53 re-add support for whisper 5 2017-10-09 08:59:02 -04:00
Iuri Matias 69fa1b24c3 adapt test app to work with 1.0 2017-10-07 21:02:05 -04:00
Iuri Matias ef98346963 fix issues with the console 2017-10-07 19:53:57 -04:00
Iuri Matias 3d88138804 fix loading order 2017-10-07 16:51:56 -04:00
Iuri Matias a9e63069fb fix connecting to correct provider 2017-10-07 15:20:51 -04:00
Iuri Matias e5aab5e2ea download target file instead of tarball 2017-10-06 16:17:13 -04:00
Iuri Matias a78d8b00bf fix support for 1.0 versions of web3 2017-10-06 07:30:34 -04:00
Iuri Matias f41702634f add deprecated warning for deprecated events 2017-08-03 20:03:17 -04:00
Iuri Matias 2dc1941e48 rename ABIGenerator (very old legacy reasons) to more apropriate CodeGenerator 2017-08-03 19:29:09 -04:00
Iuri Matias 29c343463b add support for whisper v5; make get url ipfs get configurable 2017-07-24 07:27:52 -04:00
Iuri Matias 2bf91b6d9a make storage getUrl configurable 2017-07-23 08:15:40 -04:00
Iuri Matias fbfb5269b0 update compiler spec 2017-07-16 14:40:06 -04:00
Iuri Matias fd5eca6856 replace all instances of matched lib 2017-07-16 13:38:12 -04:00
Iuri Matias c02e3e7ab8 treat library as dependencies for contract deployment 2017-07-16 13:31:40 -04:00
Iuri Matias 48f9c54d9d detect and replace library references with address 2017-07-16 12:10:17 -04:00
Iuri Matias b56b51cf6e don't stop when getting a compiler warning but print it as a warning 2017-07-15 11:35:29 -04:00
Iuri Matias aa5efab6f9 update tests 2017-07-08 12:39:53 -04:00
Todd Baur 094334fee7 code lint fix 2017-07-07 20:46:06 +09:00
Iuri Matias 414c875082 add versions command 2017-07-06 19:50:36 -04:00
Iuri Matias 232f6fc88b support list of fallbacks for dapp web3 connection, support separate connection config for deployment 2017-07-06 18:48:20 -04:00
Iuri Matias f882b3486b use deployment config from contracts.json instead of blockchain.json 2017-07-05 20:24:28 -04:00
Iuri Matias 408090a643 make linter happy 2017-07-05 19:38:53 -04:00
Iuri Matias 2ed4eee831 display loading message when new libs are being installed 2017-07-05 18:26:44 -04:00
Iuri Matias 5a2cdb19bf use existing version of lib if versions match 2017-07-05 09:12:11 -04:00
Iuri Matias f45ce963b4 add file type so files are loaded when needed; support to configure web3 and solc versions 2017-07-05 08:35:51 -04:00
Iuri Matias 0991a87b73 add support for embark_js directive 2017-07-03 18:54:31 -04:00
Iuri Matias 0e904bba33 support contract as an alias 2017-07-03 18:15:43 -04:00
Iuri Matias 8e349cc6ed support directive 2017-07-02 18:03:14 -04:00
Iuri Matias 61e44b31e9 support specifying web3.js separetly 2017-07-02 14:55:35 -04:00
Iuri Matias 31ecaf0837 support to download specified versions of web3 2017-07-02 13:33:11 -04:00
Iuri Matias 263fdb6d8b support specifying file or folder when running tests 2017-07-02 11:32:16 -04:00
Iuri Matias ec6fc4d967 get rid of npm install 2017-07-02 00:30:09 -04:00
Iuri Matias ec9293af60 get rid of mocha requirement 2017-07-02 00:27:14 -04:00
Iuri Matias ccf78b4ff2 exit process after each mocha run 2017-07-01 23:22:01 -04:00
Iuri Matias 9a8a8d7da2 first step at getting rid of mocha/embark on package.json 2017-07-01 23:11:42 -04:00
Iuri Matias 88c1a16453 fix contract address and make module exports compatible 2017-07-01 22:04:29 -04:00
Iuri Matias 0eb462a89c generate contract js file 2017-07-01 12:55:46 -04:00
Iuri Matias 4f90e62790 include specific contract config given contract name 2017-07-01 12:55:46 -04:00
Iuri Matias b473d68a1e include specific contract config given contract name 2017-07-01 12:55:46 -04:00
Iuri Matias cdc75c91e1 fix contract extension file matching 2017-06-29 07:39:12 -04:00
Iuri Matias ffbf6a70c5 include whisper version in the dashboard 2017-06-27 17:05:35 -04:00
Iuri Matias cbf6f6ec5c default to embarkDApp as the new dapp 2017-06-27 15:45:30 -04:00
Iuri Matias 590dfe8925 fix template generator 2017-06-26 16:48:05 -04:00
Iuri Matias 5b60c3effa fix issue with orbit config 2017-06-26 15:25:22 -04:00
Iuri Matias 1bbacd1c5d make linter happy 2017-06-26 09:02:58 -04:00
Iuri Matias 2a2a5820fc fix testing functionality in develop 2017-06-26 09:01:54 -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
Antonio Tenorio Fornés 6f93d7e824 use npm dependencies management for ipfs, web3 and orbit, and remove them from js/ folder. 2017-06-21 18:58:15 +02:00
Antonio Tenorio Fornés 46e18e34c5 remove duplicate dependency 2017-06-21 18:57:25 +02:00
Iuri Matias 4bb7f18155 Merge branch 'develop' of github.com:iurimatias/embark-framework into develop 2017-06-19 06:33:07 -04:00
Carl Mönnig f38b9bc1d6 fix for no accounts on init with warning messages 2017-06-18 13:16:11 +02: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
roo2 5232f0e74d fix crash in logger if message is null or undefined 2017-04-09 14:55:24 +10:00
Iuri Matias 47f313b12c generate json files 2017-04-04 06:37:50 -04:00
Iuri Matias 3c1ca7f457 remove unneded require 2017-04-02 14:54:34 -04:00
Iuri Matias dd7984bcda use version from constructor parameter 2017-04-02 14:49:19 -04:00
Iuri Matias 86335e0c74 move http request to utils 2017-04-02 14:40:10 -04:00
Iuri Matias 2373d14d6b add options to runCommand 2017-04-02 14:30:00 -04:00
Iuri Matias 9ce25d7651 refactor services check to use on/off and let monitor decide colors 2017-04-01 23:22:43 -04:00
Iuri Matias f4dbeb4b7e revert some of the recent changes 2017-03-31 07:39:33 -04:00
Iuri Matias faf0e1ff48 revert some of the recent changes 2017-03-31 07:34:43 -04:00
Todd Baur 780fc197f3 remove static since we want these exposed 2017-03-30 22:31:23 +09:00
Todd Baur 613e4e6abe integration testing fixes 2017-03-30 22:16:46 +09:00
Todd Baur 8a5604eec6 var -> let 2017-03-30 20:52:49 +09:00
Todd Baur 7599f43a3b fixed problem with double this.client in blockchain.js 2017-03-30 20:48:22 +09:00
Todd Baur fbe3f302b2 cleanup code from linter feedback 2017-03-30 20:38:14 +09:00
Todd Baur 65f6827b05 merge develop branch 2017-03-30 20:29:55 +09:00
Todd Baur 648b27920c merge develop branch 2017-03-30 20:26:03 +09:00
Iuri Matias 36633bf60c the lint is mother the lint is father 2017-03-30 07:16:15 -04:00
Todd Baur 67f325f5a0 migrate all the code to ES6 2017-03-30 20:12:39 +09:00
Iuri Matias c2ca2563bc revert change that was refering to a relative path for embark.json 2017-03-30 07:04:13 -04:00
Iuri Matias 504e68d5fc Merge pull request #259 from Exartu/develop 
readme documentation update
 2017-03-30 07:02:52 -04:00
Iuri Matias 8dc87b7cbc Merge pull request #258 from toadkicker/use_path_in_tmpl_gen 
this fixes problems where concatenating the path string would fail
 2017-03-30 07:01:11 -04:00
Iuri Matias 7bdc934e40 revert test change to previous state 2017-03-30 06:58:24 -04:00
Iuri Matias fc36bccee5 Merge pull request #257 from aletheia-foundation/develop 
Show error message if unable to deploy contracts. Include ethereumjs-testrpc
 2017-03-30 06:57:04 -04:00
ramiro 604635f3e3 added async simulator 2017-03-29 17:47:04 -03:00
Todd Baur a66f002a18 swap path -> util.joinPath 2017-03-30 03:13:48 +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 4ae5757bae add back in missing load commands 2017-03-30 02:04:35 +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
Todd Baur 20baf5ee9f call path.join once and store in fspath var 2017-03-22 21:46:59 +09:00
Todd Baur 37a7259999 this fixes problems where concatenating the path string would fail, e.g. non-unix systems. 2017-03-22 20:32:16 +09:00
Todd Baur b186bf966c fixed merge conflicts 2017-03-22 14:13:58 +09:00
ramiro 1a8e5a5abd fixes async on blockchains 2017-03-21 16:26:45 -03:00
ramiro af4cacf496 fixes async on blockchains 2017-03-21 15:28:36 -03:00
ramiro 3e0e1fda0c fixes for runing on meteor 2017-03-21 14:52:02 -03:00
roo2 3637b2e06e update the initTests method of embark to reflect the new structure of test.js 2017-03-21 18:55:15 +10:00
roo2 2a39290158 start the web3 service for the build task so that contracts can be deployed 2017-03-21 18:22:16 +10:00
roo2 5fa32754fb show error message if unable to deploy contracts due to web3 client being unavailable 2017-03-21 17:47:26 +10:00
Iuri Matias 447f967061 add service check functionality to plugin api 2017-03-16 07:31:52 -04:00
Iuri Matias e8c8a85713 fix broken js generation on asset change: (temporarily) revert change to not deploy on asset change and force redeploy of everything 2017-03-12 21:32:06 -04:00
Todd Baur 124177c8fc speed up testing 2017-03-13 00:21:19 +09:00
Todd Baur 383b3c31a5 speed up test class - unstable 2017-03-12 12:23:30 +09:00
Todd Baur f64474b861 dont require () at end of requires 2017-03-12 11:59:13 +09:00
Iuri Matias 9eb4887d37 add backwards compatbility for tests with a deprecation message 2017-03-11 21:49:12 -05:00
Iuri Matias 1534bf6207 Merge pull request #242 from toadkicker/make_cli_faster 
this is a quick attempt at speeding up the init of CLI…
 2017-03-11 21:18:20 -05:00
Iuri Matias 54420b327e detect when ethereum node comes back online and redeploy 2017-03-11 12:27:10 -05:00
Iuri Matias 8d8ff671f7 if monitor is already running then init service 2017-03-11 11:48:12 -05:00
Iuri Matias 5cf287a747 implement stopCheck 2017-03-11 11:23:42 -05:00
Iuri Matias 2dec088a9b add service check error 2017-03-11 11:17:52 -05: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 4bf31328e2 use eachObject to avoid async issues; support non-recurrent checks 2017-03-11 07:32:16 -05:00
Iuri Matias 173c571147 remove old services monitor; add new services monitor to engine; move previous checks to their modules inits 2017-03-10 22:00:30 -05:00
Todd Baur b25a0ecbc7 Merge branch 'develop' of github.com:iurimatias/embark-framework into make_cli_faster 2017-03-11 10:59:52 +09:00
Todd Baur b590312e20 cleanup empty lines after function 2017-03-11 00:13:59 +09:00
Todd Baur dc9084b8a6 Dropped 'this' in Cmd and set internal var Embar to self execute 2017-03-11 00:07:08 +09:00
Todd Baur 835899cf6e this is a quick attempt at speeding up the init of CLI by changing Embark.js to a reveal module pattern and moving the requires into the functions that need them. It removes the circular reference between Cmd and Embark, which is the biggest hit to speed. It also changes how the binary starts by importing Cmd instead of Embark. 2017-03-10 23:43:52 +09:00
Iuri Matias a4369ecd4e implement (previously empty) stopMonitor method 2017-03-10 06:44:17 -05:00
Iuri Matias 02cb5b7f1f Merge pull request #237 from nogueian/develop 
Fixed issue with logic to detect if IPFS node is online
 2017-03-08 20:34:20 -05:00
Todd Baur 2de9292bd6 Merge branch 'develop' of github.com:iurimatias/embark-framework into one_version 2017-03-08 23:54:17 +09:00
Todd Baur 83f3e1c5ee dot notation preferred 2017-03-08 23:52:17 +09:00
Andy Nogueira f5aafa4242 Setting host and port parameters back according to develop branch 2017-03-08 09:51:58 -05:00
Iuri Matias c1d2bd170e Merge pull request #230 from toadkicker/add_mocha_timeouts 
add this.timeout(15000) to tests to allow the solc enough space to work
 2017-03-08 09:47:08 -05:00
Andy Nogueira 82042c01c6 Fixed issue with logic to detect if IPFS node is online. If the IPFS node is not running and there's another service in the computer running on port 5001 it could cause an exception. 2017-03-08 09:46:15 -05:00
Todd Baur 026909aa91 fix other timeout issues in tests outside of core framework code 2017-03-08 23:41:16 +09:00
Todd Baur 486fbec108 read version in from package.json instead of strings 2017-03-08 23:20:23 +09:00
Todd Baur 70868de81b changes undefined process.exit(code) to process.exit(9) 2017-03-08 19:29:19 +09:00
Iuri Matias 71121cdc4b update to 2.4.0 2017-03-07 06:39:56 -05:00
Iuri Matias b42031de6b fix cmd line webserver host override 2017-03-06 22:08:43 -05:00
Iuri Matias 96d1361dd8 support defaults when new config files are not found, for backwards compatibility 2017-03-05 21:27:33 -05:00
Iuri Matias 007be84f23 add config to the plugin api (temporary) 2017-03-05 20:25:09 -05:00
Iuri Matias 8325943bd7 add new events for output generation and first deployment 2017-03-05 11:00:47 -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 85659987d9 add support for website config file; reflect real web server config in the dashboard 2017-03-04 14:20:28 -05:00
Iuri Matias 269552aee0 add events to plugin api 2017-03-04 12:42:24 -05:00
Iuri Matias 3db27c14cb add exception to dealWithConfigsMethods; it's simple enough 2017-03-03 21:51:23 -05:00
Iuri Matias 617d263341 reduce complexity of engine main metod 2017-03-03 21:48:32 -05:00
Iuri Matias 383d69c194 handle cmd error 2017-03-03 21:11:53 -05:00
Iuri Matias 94cca83670 simplify test constructor 2017-03-03 21:06:44 -05:00
Iuri Matias 6799e1d8a5 remove comment 2017-03-03 01:25:14 -05:00
Iuri Matias cd45a2be77 refactor, move calls to engine; fix tests 2017-03-03 01:22:12 -05:00
Iuri Matias 6784fa662c pass path when listening to file change event 2017-03-02 21:31:07 -05:00
Iuri Matias d5ebd7d748 fix for current refactor: on an asset change don't redeploy 2017-03-02 20:23:03 -05:00
Iuri Matias fe30f4b040 make cmd call async 2017-03-02 08:15:35 -05:00
Iuri Matias 4c5cb95209 refactor: extract method for cmd interpreter 2017-03-02 07:44:24 -05:00
Iuri Matias 11eca918a1 add cc rule 2017-03-01 21:28:27 -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 1674adee4a add config to specify available providers for each component 2017-02-28 21:43:03 -05:00
Iuri Matias 09e58977e4 generate final embarkjs file depending on components enabled 2017-02-28 21:26:15 -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 5477b7f11c fix options varible; make cc happy 2017-02-27 07:49:25 -05:00
Iuri Matias e806a14af6 Merge branch 'develop' of github.com:iurimatias/embark-framework into develop 2017-02-27 06:57:30 -05:00
Iuri Matias 60a617a28e don't intercept console error in plugins, causes too much issues; need to research a better way 2017-02-26 18:47:52 -05:00
DeviateFish 2642325868 Fix scoping 2017-02-26 14:33:58 -08:00
DeviateFish 5cf9048099 Add more options to testing setup 
Ability to retrieve the logger from contract deployment, as well as
override the default `embark.json`
 2017-02-26 14:33:14 -08:00
Iuri Matias 0060dbe53f don't exit if blockchain is not available 2017-02-26 14:56:43 -05:00
Iuri Matias a153859caf herge branch 'refactor_e' into develop 2017-02-25 23:32:08 -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 85519e95d8 add new deploy manager to build cmd 2017-02-25 20:45:40 -05:00
DeviateFish 289ece9df6 Updates to boilerplate and template creation 
Update `test` command to run `embark test`
Update `name` in `package.json` to be something more easily replaceable.
Use `sed` to replace above flag with DApp name
 2017-02-25 14:34:45 -08: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 a0f4953c17 add TODO for pipeline event 2017-02-24 06:28:06 -05:00
Iuri Matias 3433c75554 refactor pipeline to use events instead 2017-02-24 06:18:57 -05:00
Iuri Matias 3d240c9d84 temporary fix for --nodashboard issue in develop 2017-02-23 20:50:55 -05:00
Iuri Matias 550b81c9b2 remove unnecessary concatenation 2017-02-23 19:49:48 -05:00
Iuri Matias 0db2b663ad make cc happy 2017-02-23 19:45:25 -05:00
Andy Nogueira de37c94b2e Implemented logic to show version of the connected IPFS node on the dashboard 2017-02-23 17:18:05 -05:00
Andy Nogueira e3cbf3c680 Better name for services. Output Geth version is important 2017-02-22 08:21:45 -05:00
Andy Nogueira 4f1317dcdd Minor typo in help message 2017-02-22 08:10:33 -05:00
Iuri Matias 87ff194ce4 extract method for determing rpc options 2017-02-21 21:04:15 -05:00
Iuri Matias b29f23e28c extract method for determing network type 2017-02-21 21:01:38 -05:00
Iuri Matias d67982ac71 Merge branch 'develop' of github.com:iurimatias/embark-framework into develop 2017-02-21 20:54:16 -05:00
Iuri Matias b5ff1add40 simplify blockchain constructor 2017-02-21 20:54:07 -05:00
Andy Nogueira dd03c747f7 Fixed logic to prevent node exception when running command 'embark blockchain' outside the Dapp folder 2017-02-21 15:45:10 -05:00
Iuri Matias 0e03d8f435 refactor: move dashboard board init logic into a separate module 2017-02-20 18:02:17 -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 a9e4435b77 use specified environment when creating data dirs for .embark 2017-02-20 16:11:27 -05:00
Iuri Matias 1a436dcc12 add support for light and fast options; add default pass folders 2017-02-20 15:53:55 -05:00
Iuri Matias e4bcdf7f12 improve help message 2017-02-19 20:13:30 -05:00
Iuri Matias 3890b4a38e refactor to use method to determine app root path, instead of constantly using relative paths 2017-02-19 20:01:42 -05:00
Iuri Matias 73a536c52e refactor to use method to determine app root path, instead of constantly using relative paths 2017-02-19 19:44:16 -05:00
Iuri Matias 8b5e3aa3ab adjust paths 2017-02-19 18:52:41 -05:00
Iuri Matias a8193277da start refactoring index.js 2017-02-19 13:18:43 -05:00
Iuri Matias 5e4ad9a7e5 reorder requires in a more logical manner 2017-02-19 13:17:28 -05:00
Iuri Matias 07d1631d9d move command history to its own module 2017-02-19 12:59:02 -05:00
Iuri Matias 1868788342 reorgnize code structure 2017-02-19 12:51:32 -05:00
Iuri Matias 8da0e80751 move fs methods into their own module 2017-02-19 11:37:54 -05:00
Iuri Matias 4e8546863c remove unnecessary calls() 2017-02-19 09:11:17 -05:00
Iuri Matias 19d35a563e replace glob matching functionality 2017-02-19 00:00:01 -05:00
Iuri Matias 38c98f16fa use nodejs http lib directly to check service status 2017-02-18 23:17:43 -05:00
Iuri Matias c312943248 use saner library to deal with fs 2017-02-18 22:40:42 -05:00
Iuri Matias 3f3a129276 isolate eval in a module 2017-02-18 16:53:49 -05:00
Iuri Matias a83cc6a44a move shelljs scopes to utils; require locally so it doesn't polute the global space 2017-02-18 16:06:39 -05:00
Iuri Matias 08ba95576d move request to utils module 2017-02-18 15:27:08 -05:00
Iuri Matias 2596eb5873 add missing require 2017-02-18 15:07:19 -05:00
Iuri Matias 86cd2a15d1 move merge to utils module 2017-02-18 14:45:57 -05:00
Iuri Matias 58b1f504d5 move grunt methods to utils module 2017-02-18 14:37:07 -05:00
Iuri Matias 833102d175 advice on typing --help when a wrong command is inputed 2017-02-18 14:22:45 -05:00
Iuri Matias 561caa9b0b move join path into utils module 2017-02-18 14:10:01 -05:00
Iuri Matias 55275136b0 clean up; remove unneded requires 2017-02-18 09:39:13 -05:00
Iuri Matias 68d4f5e2fa avoid intercepting logs when using cmds that don't need plugins and the logger 2017-02-18 09:23:19 -05:00
Iuri Matias 38aca05e28 remove unneded plugin dependency from abi 2017-02-18 09:09:36 -05:00
Iuri Matias 655114b394 add config to specify geth command 2017-02-18 08:55:33 -05:00
Iuri Matias 03a6b6c48d option added 2017-02-18 08:41:18 -05:00
Iuri Matias eb36af87b0 add support for the bootnodes config 2017-02-18 08:24:23 -05:00
Iuri Matias 566812696d take configuration options from config and command line arguments when running simulator 2017-02-18 08:01:03 -05:00
Andy Nogueira e6d998fd1a If no arguments are passed to embark, then display help by default 2017-02-17 14:34:07 -05:00
Iuri Matias c339732cd6 make compiler module async 2017-02-17 07:14:44 -05:00
Iuri Matias 27a3a9c3f2 clean up compiler file; remove unused code 2017-02-17 06:16:56 -05:00
Iuri Matias fcd88b9e4a reorder component initialization make log clearer; improve log messages to make them clearer 2017-02-15 20:56:18 -05:00
Iuri Matias 617d40086c add web3 to console help 2017-02-15 20:35:42 -05:00
Iuri Matias bd99a75048 advice user when an unknown command is typed in the console 2017-02-15 20:24:42 -05:00
Iuri Matias a511979cd1 make console output clearer 2017-02-15 20:08:47 -05:00
Iuri Matias 63da0773ae log creating directory as a trace log level 2017-02-15 19:32:29 -05:00
Iuri Matias 097088821b support generating abi file only 2017-02-15 19:27:23 -05:00
Iuri Matias 40ddfff425 support configuring simulator in the tests 2017-02-12 10:01:46 -05:00
Iuri Matias ff09e05965 fix for when maxpeers config is 0 2017-02-11 11:53:11 -05:00
Iuri Matias 6984c13ac6 read storage and communication config files; use & initialize storage depending on config 2017-02-10 07:44:06 -05:00
Iuri Matias d0c020dce5 update to 2.3.0 2017-02-08 06:38:26 -05:00
Iuri Matias f37bc46f8e fix specs; clarify production enviroment (livenet not production); exec testrpc directly 2017-02-08 06:31:57 -05:00
Iuri Matias 135c3c06a7 finclude transaction cost in gas estimation 2017-02-06 21:34:10 -05:00
Iuri Matias fc2c6a41ee cleanup 2017-02-06 21:08:11 -05:00
Iuri Matias 5840e57079 log pipeline file read on a trace level instead of info to reduce initial console log size 2017-02-06 07:03:14 -05:00
Iuri Matias e8db6dc8a0 fix tests 2017-02-06 06:55:42 -05:00
Iuri Matias 4e026fb6e7 support directories in pipeline 2017-02-06 06:51:27 -05:00
Iuri Matias 1cdcaee7d9 fix specs 2017-02-06 06:51:27 -05:00
Iuri Matias 0ec3fba352 if target is directory then copy files 2017-02-06 06:51:27 -05:00
Iuri Matias 6822a9b08c implement compiler plugin 2017-02-06 06:51:27 -05:00
Iuri Matias 2e9a4bb28a implement several plugins 2017-02-06 06:51:27 -05:00
Iuri Matias 352eadab98 add console plugin support 2017-02-06 06:51:26 -05:00
Iuri Matias 0e0b0c99d3 update docs 2017-02-06 06:51:26 -05:00
Iuri Matias 0b88d2fa69 show loading message; immediatly check for services instead of waiting 5 secs 2017-02-06 06:51:26 -05:00
Iuri Matias 136f099b57 remove console log 2017-02-06 06:51:26 -05:00
Iuri Matias b72a42cfb3 add plugin config options; update pipeline plugin implementation 2017-02-06 06:51:26 -05:00
Iuri Matias 4075490fee add plugin for pipeline 2017-02-06 06:51:26 -05:00
Iuri Matias ccdfaf61f2 implement plugin support: implement support for client-side web3 providers and contracts plugins 2017-02-06 06:51:26 -05:00
Daniel Benton ce6c10b4d1 Actually use the fucking `options` object when setting up tests 2017-02-04 22:57:46 -05:00
Daniel Benton 0942b710e3 Fix broken test deployment shit 2017-02-04 18:04:38 -05:00
Iuri Matias 361e1ec94a compatbility fix for latest geth 2017-02-03 07:01:59 -05:00
Iuri Matias 87f1e01dd9 clear noise from demo generation 2017-01-13 19:17:29 -05:00
Iuri Matias f7bbc1ddc2 update to 2.2.1 2017-01-13 07:46:36 -05:00
Iuri Matias 087578c8e6 add spec for contracs config; fix contracts arguments when it's an instanceOf 2017-01-12 20:42:33 -05:00
Iuri Matias 97a49f3136 update to 2.2.0 2017-01-11 06:57:57 -05:00
Iuri Matias d1cb5266ca Merge branch 'swarm' into develop 2017-01-08 15:47:43 -05:00
Iuri Matias 26f2ad7407 refactor ipfs and swarm code 2017-01-08 13:19:27 -05:00
Iuri Matias c53d92baa5 refactor deployments to upload command 2017-01-07 20:37:48 -05:00
Iuri Matias 15b8d9b33e supporting uploading dapp to swarm 2017-01-07 16:52:29 -05:00
Iuri Matias 13cf92a4f5 add orbit to embarkjs 2017-01-07 00:03:03 -05:00
Steven Ireland 30b03383ee fix bug with adjusting gas 2016-12-26 11:47:57 -05:00
Iuri Matias 910cee5431 Merge branch 'develop' of github.com:iurimatias/embark-framework into develop 2016-12-02 06:51:10 -05:00
Iuri Matias 004d1eecf4 add missing return to determineArguments method 2016-12-02 06:48:32 -05:00
Iuri Matias f31a78754f Merge pull request #203 from webpolis/webpolis-patch-1 
Add missing argument
 2016-12-02 06:19:50 -05:00
Nicolas Iglesias cae39d85be embark build wasn't deploying assets 2016-11-28 17:14:39 -03:00
Nicolas Iglesias a100d307ff Add missing argument 2016-11-27 13:59:54 -03:00
ed0wolf 668e0be0c3 Setting web3 on Embark Test constructor so it can be used before deploying contracts 2016-11-08 09:31:02 +00:00
Iuri Matias 0a26fa98ce define version in the main object 2016-10-30 22:37:06 -04:00
Iuri Matias 59f9d9fdf0 handle errors 2016-10-30 22:04:25 -04:00
Iuri Matias c7bd478dde handle error if no accounts are found 2016-10-30 21:56:19 -04:00
Iuri Matias b01f18916e return callback 2016-10-30 21:52:58 -04:00
Iuri Matias eb7c89045e log any error with the services 2016-10-30 21:47:21 -04:00
Iuri Matias c893c34fd2 add errors in test 2016-10-30 21:35:08 -04:00
Iuri Matias 52244cca8e move gas adjust to its own method 2016-10-30 21:31:29 -04:00
Iuri Matias 99c528c230 simplify method dealing with instanceOf 2016-10-30 20:48:16 -04:00
Iuri Matias 5c283b5232 support maxpeers option 2016-10-30 20:35:11 -04:00
Iuri Matias 6920ae9481 refactor to use commonOptions method 2016-10-30 20:21:28 -04:00
Iuri Matias a5bc17f0de use config port when calling geth 2016-10-30 20:15:57 -04:00
Iuri Matias e58671e742 refactor common geth command options into the a common method 2016-10-30 20:08:45 -04:00
Iuri Matias 0a2a26fd29 fix network config type 2016-10-30 20:01:25 -04:00
Iuri Matias 5c05b7f8d9 simplify whisper config condition 2016-10-30 19:53:23 -04:00
Iuri Matias 88bdd662de refactor determining method arguments 2016-10-30 19:38:40 -04:00
Iuri Matias df7ff3916f handle error on deploy all 2016-10-30 19:28:45 -04:00
Iuri Matias e44bd3a22e handle error on contract deplyoment 2016-10-30 19:22:09 -04:00
Iuri Matias ac67c80576 return callbacks 2016-10-30 19:17:31 -04:00
Iuri Matias c30a289945 handle error if no accounts are found 2016-10-30 19:14:38 -04:00
Iuri Matias 67074ee60f update to 2.1.3 2016-10-30 08:57:44 -04:00
Iuri Matias 0524b17309 update to 2.1.3 2016-10-30 08:56:13 -04:00
Iuri Matias a9fbd5f6a5 make --no-color option available 2016-10-29 22:35:22 -04:00
Iuri Matias 7bccb73f01 support --dashboard option 2016-10-29 22:30:41 -04:00
Iuri Matias 655f56f893 support --noserver option 2016-10-29 22:00:54 -04:00
Iuri Matias 60285ea1c0 support specifying web server hostname through -b option 2016-10-29 21:41:50 -04:00
Iuri Matias caaf3acde5 use path join 2016-10-29 14:13:06 -04:00
Iuri Matias 41273a4517 remove trailing commas 2016-10-29 14:07:42 -04:00
Iuri Matias 06879ccdd6 return callback 2016-10-29 13:55:06 -04:00
Iuri Matias 549e33317b use path join 2016-10-29 13:50:54 -04:00
Iuri Matias 60f487da38 use path join 2016-10-29 12:35:16 -04:00
Iuri Matias bd3b05bb00 refactor condition to avoid checking for void 0 2016-10-29 12:24:13 -04:00
Iuri Matias 814c2bc4a4 return callbacks 2016-10-29 12:15:50 -04:00
Iuri Matias 9a09e206ae refactor contract build method 2016-10-29 12:02:07 -04:00
Iuri Matias 215a823c35 update to 2.1.2 2016-10-29 11:16:43 -04:00
Iuri Matias 00dd8ecf91 display compilation and/or deployment error in the logs and status instead of crashing 2016-10-29 11:08:10 -04:00
Iuri Matias 816e67370a refactor duplicated build & deploy process 2016-10-29 10:33:54 -04:00
Iuri Matias c9a52c11b0 update to 2.1.1 2016-10-25 19:44:12 -04:00
Iuri Matias 19735884c0 add support for -p option in embark run to specify web server port 2016-10-25 19:33:24 -04:00
Iuri Matias a6397b3fe9 update to 2.1.0 2016-10-24 06:14:35 -04:00
Iuri Matias 3ea6e53218 get contract from contract list, not compiled contracts 2016-10-23 11:15:35 -04:00
Iuri Matias 42fd369cf4 remove trailing commas 2016-10-22 20:16:00 -04:00
Iuri Matias 9de3d20ee9 remove trailing commas 2016-10-22 20:10:25 -04:00
Iuri Matias 4b1a16b100 add jshint exceptions and TODO 2016-10-22 17:29:06 -04:00
Aleš Katona 835047c755 fix lint errors 2016-10-22 13:29:41 -06:00
Iuri Matias 4989876135 display ethereum node name and embark version in available services 2016-10-22 12:11:47 -04:00
Iuri Matias f337ffd418 clarify web3 error msg 2016-10-22 11:57:36 -04:00
Iuri Matias bcdba3f8bc clarify gas amount msg 2016-10-22 11:48:47 -04:00
Iuri Matias ae3bcb1060 fix gas settings; add information of gas used with deployment 2016-10-22 09:42:52 -04:00
Iuri Matias d05cf90b5b display error in contract status 2016-10-21 07:16:15 -04:00
Iuri Matias 907a358e5b add some tabs to adjust status message 2016-10-20 23:34:31 -04:00
Iuri Matias f747c757c5 if the contract is set to not deploy, display information correctly on the dashboard 2016-10-20 23:31:42 -04:00
Iuri Matias 727e2d0923 set the default limit if the contract deploy option is false 2016-10-20 23:22:31 -04:00
Iuri Matias bf509e8b27 don't return a contract from the chains.json if it has no address 2016-10-20 23:21:32 -04:00
Iuri Matias f9dbbd9243 update to 2.0.1 2016-10-19 07:38:32 -04:00
Iuri Matias fa17170878 add version number to cmd 2016-10-16 12:41:28 -04:00
Iuri Matias 23a7f03cc4 add more tests; fix issue with selecting selecting non-default environment contract configuration 2016-10-15 15:54:19 -04:00
Iuri Matias 5a6a9e8b94 join serpent and solidity contracts 2016-10-15 08:22:18 -04:00
Iuri Matias 969e4015cb add test for abi and blockchain config; fix whisper config 2016-10-14 07:01:54 -04:00
Iuri Matias ab42ae92d5 support nodiscover option; add warnings to cors settings 2016-10-07 07:15:29 -04:00
Iuri Matias 47736b6eed add check for ipfs 2016-10-06 07:40:24 -04:00
Iuri Matias a19a690d3d fix relative paths to js files 2016-10-06 07:40:24 -04:00
Iuri Matias 8a1fd3a165 jshint it 2016-10-06 07:40:24 -04:00
Iuri Matias 8711b75462 add support for more simulators 2016-10-06 07:40:24 -04:00
Iuri Matias 9d6e7b79bd implement onDeploy 2016-10-06 07:40:24 -04:00
Iuri Matias fcc808b9f4 add ipfs and tests cmd 2016-10-06 07:40:24 -04:00
Iuri Matias b0458c6fab fix logging in test 2016-10-06 07:40:23 -04:00
Iuri Matias 5ae091ffb5 refactor ipfs module 2016-10-06 07:40:23 -04:00
Iuri Matias fb41ce8a66 remove old files 2016-10-06 07:40:23 -04:00
Iuri Matias ed6b1fd5c2 implement test functionality 2016-10-06 07:40:23 -04:00
Iuri Matias 97954ead32 refactor contract builder 2016-10-06 07:40:23 -04:00
Iuri Matias 4b4b15f405 add support for static addresses in contracts config 2016-10-06 07:40:23 -04:00
Iuri Matias 2b6e5e834a support instanceOf config 2016-10-06 07:40:23 -04:00
Iuri Matias 2a8f0635b9 implement contract dependencies 2016-10-06 07:40:23 -04:00
Iuri Matias d21f385fc0 fix rpccorsdomain; deployment to livenet and testnet 2016-10-06 07:40:23 -04:00
Iuri Matias 2e79299f14 cleanup; add todo to add other items to chains file 2016-10-06 07:40:23 -04:00
Iuri Matias 3d672a0f63 make sure code exists when tracking it 2016-10-06 07:40:23 -04:00
Iuri Matias 4af36ce1e4 refactor blockchain module; support more options 2016-10-06 07:40:23 -04:00
Iuri Matias 2eef8b46ae make address green in dashboard 2016-10-06 07:40:22 -04:00
Iuri Matias 7f31566684 adjust log levels of watcher 2016-10-06 07:40:22 -04:00
Iuri Matias 4c1f3fb8f6 refactor watch module 2016-10-06 07:40:22 -04:00
Iuri Matias 656ac157d3 refactor watch module 2016-10-06 07:40:22 -04:00
Iuri Matias 3a5891810a jshint it 2016-10-06 07:40:22 -04:00
Iuri Matias 03f81c47d7 implement contract tracking 2016-10-06 07:40:22 -04:00
Iuri Matias c3beb51327 fix contract arguments 2016-10-06 07:40:22 -04:00
Iuri Matias df508e4e8d watch for config file changes and redeploy 2016-10-06 07:40:22 -04:00
Iuri Matias 89c0001dcb make contract gas calculation automatic 2016-10-06 07:40:22 -04:00
Iuri Matias f004a1a7e1 fix pipeline and watching of contracts and assets 2016-10-06 07:40:22 -04:00
Iuri Matias 432bc5a5b1 clear cmd line on ctrl-w 2016-10-06 07:40:22 -04:00
Iuri Matias 556c799869 add command line history and navigation to the console 2016-10-06 07:40:22 -04:00
Iuri Matias 9e61009942 watch contract files 2016-10-06 07:40:22 -04:00
Iuri Matias a1bedff7e1 add error message if attemping to start without node already running 2016-10-06 07:40:21 -04:00
Iuri Matias 2f9c0a2996 add more support for the console 2016-10-06 07:40:21 -04:00
Iuri Matias 70c9a1d9c5 add more functionality to the logs and update the dashboard 2016-10-06 07:40:21 -04:00
Iuri Matias 26e178f91c adjust monitor and improve error msgs 2016-10-06 07:40:21 -04:00
Iuri Matias ea0ea6599e exit from monitor on ctrl+c 2016-10-06 07:40:21 -04:00
Iuri Matias 7b45f8d6ea basic monitor 2016-10-06 07:40:21 -04:00
Iuri Matias f38d0e886c use blockchain config to determine rpc host and port 2016-10-06 07:40:21 -04:00
Iuri Matias e9e71da81a support IPFS 2016-10-06 07:40:21 -04:00
Iuri Matias b9c93fe97d refactor config into its own module 2016-10-06 07:40:21 -04:00
Iuri Matias 95615d14a7 some progress with new tests 2016-10-06 07:40:21 -04:00
Iuri Matias 0f14c247b0 refactor run and build functions 2016-10-06 07:40:20 -04:00
Iuri Matias f6c8b7a301 refactor watch 2016-10-06 07:40:20 -04:00
Iuri Matias eb95ae7fd6 refactor server 2016-10-06 07:40:20 -04:00
Iuri Matias 6f5c5fae36 implement templates, build, and blockchain 2016-10-06 07:40:20 -04:00
Iuri Matias d1dae1bade initial embarkjs implementation with support for client side deploys 2016-10-06 07:40:20 -04:00
Iuri Matias 88381bdda1 working run 2016-10-06 07:40:20 -04:00
Iuri Matias 421a0af41e implement watch functionality 2016-10-06 07:40:20 -04:00
Iuri Matias 00a7dbe2f1 add server functionality 2016-10-06 07:40:20 -04:00
Iuri Matias dfb365d07e implement simple pipeline system 2016-10-06 07:40:20 -04:00
Iuri Matias 2064b72ac6 redone deployment system 2016-10-06 07:40:20 -04:00
Iuri Matias 22f7e6d6d4 move some of the old code 2016-10-06 07:39:33 -04:00
Iuri Matias 0faa649c2f add single deploy support 2016-08-10 07:58:11 -04:00
Iuri Matias 60d860f27a support deploying a single contract with custom arguments in the tests 2016-08-09 21:59:49 -04:00
Iuri Matias cf3cfe51ca generate an abi file compatible with mist and metamask 2016-08-09 20:50:12 -04:00
Iuri Matias da92171818 fix testnet support 2016-05-31 22:10:46 -04:00
Iuri Matias 00543f3830 fix deployment for tests 2016-05-29 20:14:27 -04:00
Iuri Matias b78b742ab4 fix solc input 2016-05-29 15:09:57 -04:00
Iuri Matias 7b9de1b259 make ethersim optional 2016-05-23 16:00:54 -04:00
Iuri Matias fe02278179 update web3 to latest version 2016-05-23 09:20:11 -04:00
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 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 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
Aakil Fernandes c1195b4e03 remove extra quotes 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 cb0ac1e3ca use last part of contract file rather than 1st 2016-02-25 14:08:24 -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 648382bd15 fix blockchain config specs 2016-02-09 15:45:48 -05:00
Iuri Matias a74e0aaa8c update compiler spec 2016-02-09 15:25:23 -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
VoR0220 4b451f0290 Update contracts.js 2016-02-08 21:58:00 -05:00
VoR0220 9e8ebe9cb3 Update compiler.js 2016-02-08 21:57:59 -05:00
RJ Catalano d8881dd674 changes to bootpeers and ending console toggle 2016-02-08 21:56:44 -05:00
VoR0220 2c1804d01f Update blockchain.js 2016-02-08 21:54:34 -05:00
VoR0220 1228a639e7 update config 2016-02-08 21:54:34 -05:00
VoR0220 ac268c0cd7 add NAT options 2016-02-08 21:54:34 -05:00
VoR0220 94276e8407 changes to rpc_api 2016-02-08 21:54:34 -05:00
VoR0220 482a630294 changes to bootnodes, kill console toggle option 2016-02-08 21:54:34 -05:00
VoR0220 76ec8442ee Update blockchain.js 2016-02-08 21:54:34 -05:00
VoR0220 4625fd6b5a Update blockchain.js 2016-02-08 21:54:34 -05:00
VoR0220 ce36265c39 Update blockchain.js 2016-02-08 21:53:14 -05:00
VoR0220 916437fd4c Update compiler.js 2016-02-08 21:53:14 -05:00
RJ Catalano e0d9931a74 change back to original version of solc 2016-02-08 21:53:13 -05:00
RJ Catalano 2a1ec1b2d7 change back to old compiler 2016-02-08 21:53:13 -05:00
Iuri Matias 0c6ced4dc9 instantiate web3 object 2016-02-08 21:50:01 -05:00
Iuri Matias 84191a241c update specs 2016-02-08 21:12:09 -05:00
area 3512de6ba2 Add support for other paths for ipfs binary 
Use `which` to locate `ipfs` rather than guessing.
 2016-01-11 14:54:02 +00:00
Iuri Matias b9a9de0a32 don't print primary address 2015-12-06 16:01:37 -05:00
Iuri Matias 47a63844fd add better defaults to blockchain config 2015-12-06 16:01:17 -05:00
Iuri Matias 58b2cb84ae Merge pull request #120 from SafeMarket/testnet 
Testnet
 2015-11-23 08:25:19 -05:00
Aakil Fernandes af25780866 add testnet to config 2015-11-20 11:57:51 -05:00
Aakil Fernandes b5fc0f5b9a add testnet option 2015-11-20 11:18:32 -05:00
Aakil Fernandes 81fd274786 throw error when solc fails 2015-10-14 15:53:57 -04:00
Iuri Matias 82b9af2a14 get test config files from embark config 2015-10-12 17:49:54 -04:00
Iuri Matias d45f76beec read embark config file to get contract files for testing 2015-10-12 12:25:43 -04:00
Iuri Matias d33d986f36 update specs 2015-10-12 10:50:52 -04:00
Iuri Matias 38445c9e7f fix deployment 2015-10-09 13:20:35 -04:00
Iuri Matias a7da9bc3c5 remove sync-me dependency 2015-10-09 11:09:26 -04:00
Iuri Matias 2be2a80c31 remove method missing dependency 2015-10-09 11:05:43 -04:00
Iuri Matias 0e867c2a03 remove jasmine dependency 2015-10-09 11:03:02 -04:00
Iuri Matias fb2fbca8f7 remove hashmerge dependency 2015-10-09 11:01:55 -04:00
Iuri Matias b4d659a3d1 move spec code to lib 2015-10-09 10:57:30 -04:00
Iuri Matias c550b688d3 add flag to include provider in abi; update spec 2015-10-09 10:18:18 -04:00
Iuri Matias 95823a8e54 make deployment async 2015-10-08 15:30:47 -04:00
Iuri Matias 32ac41a9cb compile using js solc 2015-10-01 23:04:15 -04:00
Iuri Matias 02a52f718f change enodes config to boot 2015-10-01 22:37:47 -04:00
Iuri Matias 6fcc9c7481 Merge pull request #95 from VoR0220/develop 
Ability to boot enodes from a list in blockchain.yml, support for solc 1.0
 2015-10-01 22:36:17 -04:00
Iuri Matias e78554b02f Merge pull request #93 from SafeMarket/minefix 
only mine if config.mine is true
 2015-10-01 22:33:06 -04:00
Iuri Matias 0c233d968d Merge pull request #89 from FinclusionSystems/develop 
show grunt stacktrace
 2015-10-01 22:32:41 -04:00
VoR0220 b3cec8287b added ability to boot nodes via a list 2015-10-01 08:23:41 -05:00
Aakil Fernandes 03c7f25219 config.address -> config.account.address 2015-09-27 15:14:07 -04:00
Aakil Fernandes 2526ba47fd use account if expliciitly set in config 2015-09-27 15:13:57 -04:00
Aakil Fernandes f818faf680 only mine if config.mine is true 2015-09-27 15:11:36 -04:00
VoR0220 1a147ab01a Merge branch 'develop' of https://github.com/iurimatias/embark-framework into develop 2015-09-26 01:51:22 -05:00
Frederic Heem 6b7b88d58a don-'t call web3.eth.getBlock twice 2015-09-25 08:55:35 +01:00
Frederic Heem 8f96834596 add geth_extra_opts options, can be used to set --vmdebug to geth 2015-09-25 08:47:51 +01:00
Frederic Heem 3c17582bd5 throw error when block cannot be found 2015-09-25 08:44:37 +01:00
VoR0220 1a4bcd168b support solc version 1.0 2015-09-16 15:25:50 -05:00
Iuri Matias 92ca694d35 fix embarassing typo 2015-09-15 09:02:43 -04:00
Iuri Matias 052c2de4b9 get correct compiled code 2015-09-14 21:35:44 -04:00
VoR0220 bc96708d13 correcting some changes I made in error 2015-09-14 20:06:36 -05:00
Iuri Matias fd46b0217d support for both solc 0.1.1 and 0.1.2 2015-09-14 21:01:42 -04:00
VoR0220 6f808cfeb0 ability to create multiple contracts with a single password for testing purposes 2015-09-14 19:58:52 -05:00
Iuri Matias 775b043209 Merge pull request #79 from RCasatta/develop 
Support for solc 0.1.2
 2015-09-14 08:00:24 -04:00
Joris Bontje 1d54018d2e configurable deploy timeout per environment. fixes #63 2015-09-08 11:52:39 +02:00
Riccardo Casatta a64dc60bab Support for solc 0.1.2 2015-09-07 11:32:57 +02:00
Iuri Matias 7c4f3ef1d9 Merge pull request #78 from gerbrand/develop 
Allowing to define chains file per environment/chain
 2015-09-05 06:48:49 -04:00
Gerbrand van DIeijen 98054a2cbb Allowing to define chains file per environment/chain 2015-09-04 10:55:19 +02:00
Chris Hitchcott 95a1c5a550 make `copyMinerJavascriptToTemp` step public 2015-09-03 18:45:06 +08:00
Iuri Matias 3d2a14e28b check if contract exists 2015-08-31 21:14:12 -04:00
Iuri Matias e1ae6dae0c implement deploy field 2015-08-31 20:53:17 -04:00
Iuri Matias 2d82f6e480 Merge branch 'develop' of github.com:iurimatias/embark-framework into develop 2015-08-31 20:17:41 -04:00
Chris Hitchcott b3b1b13795 implement `getStartBlockchainCommand` to return geth CLI string 2015-08-31 21:11:21 +08:00
Iuri Matias f8ba2acf71 workaround for abi issues 2015-08-31 08:24:09 -04:00
Iuri Matias 59d42104b0 add supprot for serpent 2015-08-30 22:10:45 -04:00
Iuri Matias 467713fe87 support solc compiler; display syntax errors 2015-08-30 21:35:34 -04:00
Ryan Casey 274524e456 Sometimes it's nice to get beneath the framework and work with web3 directly. 2015-08-21 12:34:02 -07:00
Gerbrand van DIeijen 92173c9907 Add option to run geth with any command 2015-08-18 12:05:20 +02:00
Iuri Matias 4609a21643 add support to enable whisper 2015-08-09 16:41:42 -04:00
Iuri Matias 4260122238 don't track contract if there was an error deploying it 2015-08-08 11:53:57 -04:00
Iuri Matias 14560913b6 take into account when no cmds are specified 2015-08-08 11:36:00 -04:00
Iuri Matias 39840bbd7a take into account contract args and classname when recording contract 2015-08-05 22:19:21 -04:00
Iuri Matias d5d4cb81e3 Merge pull request #51 from jorisbontje/47-default-chains-json 
default to empty set when chains.json is missing
 2015-08-05 21:06:30 -04:00
Iuri Matias c667d8ad66 fix contact address 2015-08-05 10:11:32 -04:00
Iuri Matias efdf24c49b if contract already deployed record it and generate api; also re-run ondeploy 2015-08-05 10:01:44 -04:00
Joris Bontje 01260b889d default to empty set when chains.json is missing 2015-08-05 14:35:39 +02:00
Iuri Matias 8544756684 manage chain when deploying contracts 2015-08-04 08:18:04 -04:00
Iuri Matias f8db3c2920 save chain; add chain manager to deployment 2015-08-03 21:54:39 -04:00
Iuri Matias 56e59d814b get contract 2015-08-03 21:01:15 -04:00
Iuri Matias fab0df5c8b add contract to chain 2015-08-03 08:44:16 -04:00
Iuri Matias ea54f7524d initialize chain 2015-08-03 08:03:55 -04:00
Iuri Matias c0420d74a8 support deploy commands specifying contract 2015-08-02 20:50:12 -04:00
Iuri Matias 3757e41ea0 support deploy commands on contracts config 2015-08-02 19:43:37 -04:00
Iuri Matias 159d68dcd2 Merge branch 'develop' of github.com:iurimatias/embark-framework into develop 2015-08-02 06:58:47 -04:00
Tim Watts a4e4dee48c Allow blockchain rpchost to be configurable 2015-08-02 09:02:09 +00:00
Iuri Matias 90a1f8cd65 warn user if there was issues deploying a contract 2015-08-01 19:34:26 -04:00
Iuri Matias 3a1828f1f6 fix contract deployment; timeout & retry 2015-08-01 18:04:22 -04:00
Iuri Matias dec7ae8a94 fix blockchain environment 2015-08-01 11:19:21 -04:00
Iuri Matias e9fab5451f support for stubs 2015-07-31 22:50:51 -04:00
Iuri Matias 6ff72432d6 make maxpeers configurable 2015-07-29 21:40:49 -04:00
Iuri Matias 29d25e3621 Merge pull request #43 from jorisbontje/41-genesis-block-not-found 
make genesis block configurable
 2015-07-29 10:10:46 -04:00
Joris Bontje f1a02711bd make genesis block configurable. fixes #41 2015-07-29 15:49:02 +02:00
Joris Bontje fb8eb8e34c ensure datadir exists, bypassing the interactive liabilities prompt 2015-07-29 14:54:39 +02:00
linagee 634a7bfe1e Keep looping if address is null 
This made embark-framework work for me. (More often than not.)
 2015-07-24 18:06:02 -06:00
Iuri Matias 335eab8e57 remove unneded packages 2015-07-22 18:59:46 -04:00
Iuri Matias 60b39cd159 fix issue where tmp folder would get deleted 2015-07-22 08:30:04 -04:00
Iuri Matias 88866f1357 add meteor build and ipfs support 2015-07-12 22:11:59 -04:00
Iuri Matias ea16259f34 support embark blockchain without node modules 2015-07-12 21:33:36 -04:00
Iuri Matias 505ca5d14f wait & set contract addresses on deployment 2015-07-09 08:23:04 -04:00
Iuri Matias b9c0b8f9e5 use correct variable when determing output from cmd 2015-07-09 07:43:53 -04:00
Iuri Matias 3d7c1c629c fix merge errors 2015-07-09 07:31:37 -04:00
Iuri Matias 0655957e0f Merge branch 'develop' of github.com:iurimatias/embark-framework into develop 2015-07-09 07:24:21 -04:00
Marek Kotewicz 13e33dd192 web3.js 0.8.1, fixed obtaining contract addresses 2015-07-09 10:49:04 +02:00
Marek Kotewicz b6d22f1a3f fixed error on embark deploy when deploying contracts from new boilerplate 2015-07-09 09:21:18 +02:00
Iuri Matias ce681de06b add support for main config file 2015-07-07 06:51:03 -04:00
Iuri Matias 4492db4603 define contracts type with address defined as static 2015-07-06 08:33:26 -04:00
Iuri Matias fe8b8e805e support specifying a contract address 2015-07-06 08:19:25 -04:00
Iuri Matias ea2a162d4b fix contract creation defaults; add test for contract instances 2015-07-04 18:59:57 -04:00
Iuri Matias 5d9f7f32da fix deployment script 2015-07-04 17:02:01 -04:00
Iuri Matias 4481938ccd implement contract instances 2015-07-04 16:52:05 -04:00
Iuri Matias c2416389fc abstract compiler into its own module 2015-07-03 23:23:21 -04:00
Iuri Matias 3f86244fbd cleanup 2015-07-03 22:41:39 -04:00
Iuri Matias b7bdd841c9 refactor modules; update grunt tasks 2015-07-03 22:27:17 -04:00
Iuri Matias e43c0a38d6 refactor blockchain lib + tests 2015-07-03 08:53:42 -04:00
Iuri Matias 1a5ddea9a8 restructure lib initialization 2015-07-03 07:59:35 -04:00
Iuri Matias ad071bc1b2 refactor deploy script + tests 2015-07-03 04:59:33 -04:00
Iuri Matias de9dff3397 refactor: determine contract dependencies + add specs 2015-07-02 08:50:32 -04:00
Iuri Matias 4499fc6c13 restructure; move code from tasks into libs 2015-07-02 08:34:39 -04:00
linagee 872d9364ab No reason for peers with test 
This made mine start to mine. (Would not start without it.)
 2015-07-02 07:43:43 -04:00
Iuri Matias eac991971a refactor: start moving contracts code to its own file + specs 2015-07-02 07:43:43 -04:00
Iuri Matias 676b28c35b move blockchain config to its own file 2015-07-02 07:43:00 -04:00
Iuri Matias 3b5c45a29f refactor blockchain config 2015-07-02 07:43:00 -04:00
Iuri Matias 12f84bf403 restructure; move code from tasks into libs 2015-07-02 07:43:00 -04:00
Iuri Matias 27c45ba62d remove log 2015-06-15 06:12:53 -04:00
Iuri Matias dca33e02fc add spec to boilerplate 2015-06-15 05:46:18 -04:00
Iuri Matias 1e5d704061 support constructor arguments in specs 2015-06-14 21:38:00 -04:00
Iuri Matias 55cdf4c878 compile contracts and request correct contract to proxy 2015-06-13 16:57:44 -04:00
Iuri Matias bda4267fa2 request needed class 2015-06-13 09:21:29 -04:00
Iuri Matias 7695c1616f move test code into module 2015-06-13 09:02:19 -04:00