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

709 Commits

Author SHA1 Message Date
Iuri Matias 26b070b27f minor refactor: simplify options setting 2017-12-16 11:11:29 -05:00
Iuri Matias fb8d3c4c0a refactor availableServices 2017-12-16 10:54:17 -05:00
Iuri Matias a76dbb69b9 tolerate lack of blockchain config file 2017-12-16 08:48:37 -05:00
Iuri Matias 747237de76 fix defaults when contracts config file is not present 2017-12-16 08:12:38 -05:00
Iuri Matias e093ff5b30 refactor utils http get 2017-12-15 22:15:24 -05:00
Iuri Matias 301ba94ef6 refactor httpGet 2017-12-15 22:11:55 -05:00
Iuri Matias e88b51bdfd add err arg 2017-12-15 22:06:33 -05:00
Iuri Matias 510bc2c542 refactor httpsGet 2017-12-15 22:05:38 -05:00
Iuri Matias bee4d0e1f2 extract file download 2017-12-15 21:53:11 -05:00
Iuri Matias c4e13f9ea8 minor refactor on setprovider code 2017-12-15 18:02:50 -05:00
Iuri Matias d42a34b342 comply with eslint 2017-12-15 17:30:29 -05:00
Iuri Matias 1666be1158 fix contract directories config 2017-12-15 17:14:00 -05:00
Iuri Matias 68886d7095 add error for reference issues 2017-12-15 16:39:13 -05:00
Iuri Matias cfaccb307b throw error when target lib is not found 2017-12-15 16:18:19 -05:00
Iuri Matias 7c33720c98 fix onDeploy cmds 2017-12-15 15:50:42 -05:00
Iuri Matias 0a4a757af8 fix deploy intention so interfaces can be detected automatically 2017-12-14 16:16:51 -05:00
Iuri Matias 34cec58f32 cleanup 2017-12-14 15:27:19 -05:00
Iuri Matias 1cb6581fde better display error contract deployment errors in the dashbord 2017-12-14 15:03:08 -05:00
Iuri Matias c55b011675 fix eslint issues 2017-12-13 20:15:57 -05:00
Iuri Matias 2c8f049f4a remove unused import 2017-12-13 19:51:34 -05:00
Iuri Matias bed7e7afc6 clean up 2017-12-13 19:49:59 -05:00
Iuri Matias 9211279f8e fix eslint issues 2017-12-13 19:49:05 -05:00
Iuri Matias 6098d3cca6 add alias for exit cmd 2017-12-13 19:31:16 -05:00
Iuri Matias ccb77051f8 import bootstrap in test_app 2017-12-13 19:24:20 -05:00
Iuri Matias 4106531bd7 warn user when IPFS comes back online 2017-12-13 18:15:59 -05:00
Iuri Matias d32d5f50bd check if geth command exists and warn user if not 2017-12-13 17:58:07 -05:00
Iuri Matias 19d061e5f3 remove commented out line 2017-12-13 17:25:29 -05:00
Iuri Matias e2dcad07ce update tests 2017-12-13 16:28:23 -05:00
Iuri Matias 0b00f99f09 include ipfs lib in embarkjs 2017-12-13 15:53:29 -05:00
Iuri Matias 3ddd492e83 refactor building web3 obj 2017-12-13 15:53:29 -05:00
Iuri Matias c160ac616f refactor building web3 obj 2017-12-13 15:53:29 -05:00
Iuri Matias a174b94702 move basic import so it's always available 2017-12-13 15:53:29 -05:00
Iuri Matias 99a66a05ef import web3 object on contract import 2017-12-13 15:53:29 -05:00
Iuri Matias b7b5fae2c8 imports with shared web3 object 2017-12-13 15:53:29 -05:00
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