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

996 Commits

Author SHA1 Message Date
Jonathan Rainville 05b1f61c9b download files in full path of url 2018-04-19 15:25:26 -04:00
Jonathan Rainville 6c5415b27f base code for import parse 2018-04-19 15:25:26 -04:00
Iuri Matias e1a9023bb2
Merge pull request #370 from embark-framework/feature/log-level-as-argument 
Support setting log level as an argument
 2018-04-19 13:03:00 -04:00
emizzle 09ca551a22 Add --loglevel validation for `run` and `build` 2018-04-19 14:43:41 +10:00
emizzle 96495b99c3 Support setting log level as an argument 
* Add loglevel and logfile switch to `embark build`
* Support existing `loglevel` and `logfile` switch for `embark run/upload`
* make casing consistent for `loglevel` and `logfile`
* remove passing engine to `build()` and instead pass needed objects in options.
* prevent duplicate plugin initiation (above point)
* allow `Events` object to be passed to `Engine` constructor and `init()`
* prevent echo of upload commands to allow interception and control via logging
 2018-04-19 14:25:43 +10:00
Jonathan Rainville df226919c0 change file creation with using File.types 2018-04-18 15:02:50 -04:00
Jonathan Rainville 5925124978 fix unit tests and add test_appp test for http contracts 2018-04-18 14:56:18 -04:00
Jonathan Rainville b931efcf7d fix dir in contractsDirectory 2018-04-18 12:59:58 -04:00
Jonathan Rainville 9faf644c31 add loading in file.js but includes a patch to fix 2018-04-18 12:09:42 -04:00
Jonathan Rainville ce34d40fe7 integrate downloadCOntract function in contract get function 2018-04-18 09:07:39 -04:00
Jonathan Rainville 2568ec1aec implement the download function 2018-04-17 16:34:37 -04:00
Jonathan Rainville cf14b3784f add getUrl function for external contracts + tests 2018-04-17 15:07:00 -04:00
Iuri Matias e5ae6bc86e
Merge pull request #367 from embark-framework/refactor/vyper-utils 
Refactor Vyper compiler
 2018-04-17 11:35:38 -04:00
Jonathan Rainville 6f119eeb1b move vyper contract compile to static util function 2018-04-17 11:25:46 -04:00
emizzle d985a5ed69 Fixing `--logLevel` option for `embark run` 
Intercepting logs for embark run and including logLevel for displayed logs.
 2018-04-17 16:17:59 +10:00
emizzle a3d2cc9a2c Moved console "ready" message to write after outputDone event is emitted 2018-04-17 14:11:22 +10:00
Jonathan Rainville dd1c10fe85 remove useless waterfall 2018-04-16 13:11:55 -04:00
Iuri Matias ad136802da
Merge pull request #365 from embark-framework/bug_fix/fix-versions-with-spaces 
Fix versions with spaces and add warning
 2018-04-16 12:07:02 -04:00
Jonathan Rainville 891a4e0a0f fix versions with spaces and add warning 2018-04-16 11:38:46 -04:00
Eric Mastro 8bdf79b19a Handling for error during build. 2018-04-15 20:31:26 +10:00
Eric Mastro 8fc978eb50 * Removed duplicated code to build and deploy contracts and replaced with a call to the build function. 
* Updated upload functions to use async `exec` and removed returns from the callbacks.
 2018-04-15 20:31:16 +10:00
Eric Mastro c1c61de2d5 Passed in success messaging to async callback. 2018-04-15 20:31:08 +10:00
Eric Mastro 31a2a27e9a #156326148 Updates to build and upload process and fixes for test_app/test.html 
* Updated build to include deployment of contracts 
* updated the plugin uploadCmd to be a Promise for better bubbling of errors and messaging.
* updated test.js imports so functionality works correctly.
 2018-04-15 20:30:59 +10:00
Eric Mastro 6b7af4b647 #156326148 Build contracts and dapp before upload. 2018-04-15 20:30:52 +10:00
Jonathan Rainville 99c04b405f fix clas name and bytecode 2018-04-13 15:48:19 -04:00
Jonathan Rainville 17e1c71506 submit contract for deployment, not working yet 2018-04-13 14:59:01 -04:00
Jonathan Rainville dc9e6c168b start vyper implementation 2018-04-13 14:59:01 -04:00
Jonathan Rainville 7d8c7b119c add warning after compile for files without a compatible compiler 2018-04-13 14:59:01 -04:00
Jonathan Rainville 6647c31d38 hotfix: callback with wrong parameter order 2018-04-13 14:54:46 -04:00
Iuri Matias 82726e07e1
Merge pull request #361 from embark-framework/graphviz-contracts 
Graphviz contracts
 2018-04-13 11:29:23 -04:00
Iuri Matias b56f20db8a
Merge pull request #359 from embark-framework/node_module_import 
better mappings
 2018-04-12 20:41:52 -04:00
Iuri Matias 5ed1e787b2 print error if contract file is not found 2018-04-12 20:30:20 -04:00
Iuri Matias 7dd36a7a3b support getting contract from module; fix bug in which entire contract path was being replaced instead of just the beginning (if matching contracts in embark.json) 2018-04-12 18:50:47 -04:00
Iuri Matias e0ab9cbde4 refactor findImports 2018-04-12 17:57:55 -04:00
Iuri Matias db61e355c1 look for contract import in dapp dir and node_modules 2018-04-12 17:55:57 -04:00
Iuri Matias e3fde1ad22 support mapping contract file in contracts config 2018-04-12 17:54:08 -04:00
emizzle 4a9b52e5df Removed annoying [Object object] from the log that was appearing during contract compilation. 
The warnings in object that were attempted to be logged were already being logged in a previous loop, so this was simply removed.
 2018-04-12 13:47:34 +10:00
Iuri Matias e0982e0427
Merge pull request #355 from embark-framework/bug_fix/node_name 
restore properly display node name and version
 2018-04-11 08:06:42 -04:00
Iuri Matias 282067649c
Merge pull request #356 from embark-framework/bug_fix/fix-tests-in-windows 
Fix tests breaking because of line-endings
 2018-04-10 17:08:27 -04:00
Jonathan Rainville e90cead578 fix tests breaking because of line-endings 2018-04-10 16:38:49 -04:00
Jonathan Rainville 6905698bcc fix swarm upload too 2018-04-10 16:02:59 -04:00
Iuri Matias 9d261472f9 extract node name and version (so it displays just like in 2.6.0) 2018-04-10 15:14:00 -04:00
Iuri Matias 044759ef52 get node name and version 2018-04-10 15:08:08 -04:00
Jonathan Rainville e731495109 fix upload on windows 2018-04-10 14:17:59 -04:00
Jonathan Rainville 2907510b6e fix arrows in ipfs get by using ipfsConnection.get 2018-04-10 13:33:13 -04:00
RJ Catalano 586ecd00c8
Merge pull request #352 from embark-framework/bug_fix/async_log_fix 
Fix console.dir messing up the console
 2018-04-09 16:22:02 -05:00
Jonathan Rainville 3ecb195b38 move import list out of loop to accelerate build process 2018-04-09 16:29:49 -04:00
Jonathan Rainville f37b09a371 fix build process on windows 2018-04-09 16:14:07 -04:00
Iuri Matias 3a89b3f951 intercept dir and pass it to the logger 2018-04-09 15:24:01 -04:00
Richard Ramos f56b42d91f Linting 2018-04-05 11:41:28 -04:00
Richard Ramos d038ed414d Merge branch 'develop' of https://github.com/embark-framework/embark into graphviz-contracts 2018-04-05 11:35:19 -04:00
Iuri Matias 5a91b2d44a remove unneeded require 2018-04-02 15:32:09 -04:00
Iuri Matias 2ec7589f90 refactor to use dappPath 2018-04-02 15:30:16 -04:00
Iuri Matias e0db5ed61a refactor to use dappPath 2018-04-02 15:06:56 -04:00
Iuri Matias 10f7d21f81 fix tests, enable blockchain component by default 2018-04-02 14:44:55 -04:00
Iuri Matias d3b0787895 eslint is king 2018-03-31 21:15:53 -04:00
Iuri Matias 02e407f90b completly disable opted-out components 2018-03-31 21:08:25 -04:00
Iuri Matias bab0171120 revert versions update for now; support granular config on embark json 2018-03-31 21:06:00 -04:00
Iuri Matias 03f0b07d81 support versions on embark json config 2018-03-31 19:35:20 -04:00
Iuri Matias fffde9d4b6 tolerate lack of addCheck which means is not running in dashboard mode 2018-03-30 10:59:31 -04:00
Iuri Matias 4c82f309e0 add --simple option 2018-03-29 19:42:47 -04:00
Iuri Matias a8e22ec45c move demo and boilerplate to a templates folder 2018-03-29 19:23:24 -04:00
Iuri Matias 8b326d86db fix typo in cmd description 2018-03-29 18:12:07 -04:00
Iuri Matias 324ba904e8 usd cwd instead of pwd 2018-03-26 15:26:37 -04:00
Iuri Matias d5a21d579c fallback to shelljs if pwd is empty (windows issue) 2018-03-26 15:08:07 -04:00
Iuri Matias 4b0925d425 fallback to shelljs if pwd is empty (windows issue) 2018-03-26 14:54:47 -04:00
Richard Ramos 0326890abe Fix: Relationship was incorrect 2018-03-23 11:39:42 -04:00
Richard Ramos 58b5ea329e Styles for contract instances 2018-03-23 11:37:56 -04:00
Richard Ramos 7dcae55b8b Added events to graph and fixed problems in IDE 2018-03-23 10:02:23 -04:00
Richard Ramos 403f2daee2 Added relationships between contracts 2018-03-23 10:02:23 -04:00
Richard Ramos 01eaa0fe7f Generating basic diagram that includes methods 2018-03-23 10:02:23 -04:00
Richard Ramos d7b33a309b Changed logic of deploy manager to be able to only compile the code and not deploy it 2018-03-23 10:02:23 -04:00
Richard Ramos 9e469cc83e Initial commit for graphviz functionality 
- Added required packages
- Added command to cmd.js
- Created graph.js to contain graph logic
 2018-03-23 10:02:23 -04:00
Iuri Matias df765ed056 fix version issue causing a contract to be undefined due to a pipeline error 2018-03-22 15:36:20 -04:00
Iuri Matias 9582efbe65 fix logger call 2018-03-15 17:18:20 -04:00
Iuri Matias c1d258b819 add events to logger 2018-03-15 16:44:05 -04:00
Iuri Matias 89616537b8 refactor command handler 2018-03-15 16:38:20 -04:00
Iuri Matias cd9c3c8317 return cmd result in executeCmd callback 2018-03-15 16:34:30 -04:00
Iuri Matias 6479bf816b only deploy configured contracts in the tests 2018-03-11 08:28:03 -04:00
Iuri Matias 83227beaa1 add option to specify a logfile to output the logs 2018-03-10 13:45:56 -05:00
Iuri Matias c456c405c4 update tests 2018-03-10 12:52:37 -05:00
Iuri Matias b7b5f1b365 move services state event call to monitor itself 2018-03-10 12:46:02 -05:00
Iuri Matias 05aadc5c10 support specifying contract args as an object 2018-03-04 20:07:39 -05:00
Iuri Matias a03be15c4a display in logs contracts with address specified in the config 2018-03-04 19:23:02 -05:00
Iuri Matias 33b42dd9c1 detect invalid addresses 2018-03-04 19:18:39 -05:00
Iuri Matias ac79cef97b fix 337; support contract references in array arguments 2018-03-04 18:46:12 -05:00
Iuri Matias da7e5747f9 report error message instead of array 2018-03-02 18:01:48 -05:00
Iuri Matias 66a3388a9d fix error reporting for wrong params 2018-03-02 17:48:30 -05:00
Iuri Matias af9e27e078 fix ipfs service check 2018-03-02 17:25:59 -05:00
Iuri Matias 13e759bfee support setting protocol in config; fix getUrl 2018-03-02 16:57:55 -05:00
Iuri Matias bde067aabf support specifying ipfs protocol in the storage provider 2018-03-02 11:02:52 -05:00
Iuri Matias 59678dd1fa remove commented out lines 2018-02-28 18:23:07 -05:00
Iuri Matias 3c1156fc64 fix function identation 2018-02-28 18:14:41 -05:00
Iuri Matias 5ee99a1e5a refactor: join duplicated code 2018-02-28 18:09:10 -05:00
Iuri Matias 62d4dd456d restore pipeline plugin 2018-02-28 17:45:39 -05:00
Iuri Matias a231f11062 fix issue with repeating console input 2018-02-27 19:19:04 -05:00
Iuri Matias 531af6234b refactor console cmd exec 2018-02-27 19:19:00 -05:00
Iuri Matias eb6236da65 add command handler for console cmd 2018-02-27 19:18:52 -05:00
Iuri Matias 445133cfdf move setStatus from logger to event bus 2018-02-27 15:49:21 -05:00
Iuri Matias 66e9d6afa3 move contractsState from logger to event bus 2018-02-27 15:40:05 -05:00
Iuri Matias 96df409229 comply with linter 2018-02-24 09:26:43 -05:00
Iuri Matias 349807496a improve directory copying 2018-02-23 20:36:11 -05:00
Iuri Matias bb00987427 remove unneded msg when processing files in development 2018-02-23 19:37:42 -05:00
Iuri Matias 511b61c6c5 fix preset requires 2018-02-23 18:24:46 -05:00
Iuri Matias 8d255137d9 fix js error reporting 2018-02-23 14:04:08 -05:00
Iuri Matias 20f4e7621b fix imports issue 2018-02-22 14:56:55 -05:00
Iuri Matias 9cd8449014 fix directory copying 2018-02-22 11:45:22 -05:00
Carl Larson 11b4c9b4c4 check if document already interactive (DOMContentLoaded won't fire if already interactive) 2018-02-22 12:32:01 +00:00
Iuri Matias 41baca4b51 don't redeploy if an asset has been changed and not a contract 2018-02-21 18:43:34 -05:00
Iuri Matias ed530e8511 fix issue in which some files were not triggered change event 2018-02-21 14:04:08 -05:00
Iuri Matias 9df0ee9554 fix issue in which some files were not triggered change event 2018-02-21 13:51:48 -05:00
Iuri Matias 3b60793b25 remove old jshint directives 2018-02-07 19:49:54 -05:00
Iuri Matias a8222df1eb support ws providers 2018-02-07 19:41:11 -05:00
Iuri Matias 1c45d215ce check error severity besides the type 2018-02-07 19:40:59 -05:00
Iuri Matias 7a7330e695 update solidity module to use compileStandard and the standard json 2018-01-27 15:07:48 -05:00
Iuri Matias 5c5ef44f2f update tests 2018-01-23 19:36:02 -05:00
Heikki Hakala 6a229f2386 Revert "Add networkType rinkeby" 
This reverts commit fd70689bec.
 2018-01-23 10:00:53 +02:00
Heikki Hakala 6b664fbfa8 Add light and fast from blockchain config 2018-01-22 09:57:35 +02:00
Heikki Hakala fd70689bec Add networkType rinkeby 2018-01-22 09:53:53 +02:00
Iuri Matias 639612579b if no env present just return final object 2018-01-20 09:01:18 -05:00
Iuri Matias b19194fc6b refactor config code 2018-01-19 22:08:39 -05:00
Iuri Matias 10c4c75236 move tests related files to their own folder 2018-01-19 21:13:20 -05:00
Iuri Matias f35718b6c0 error if account index is not found 2018-01-19 20:38:28 -05:00
hodlbank 776f07dc23 [*] Fixing #319: option to use particular account for contract deployment. 2018-01-20 00:56:05 +00:00
Iuri Matias 5c0c7b45a5 remove old code 2018-01-19 13:59:39 -05:00
Iuri Matias 5300aa479b better gas estimation 2018-01-19 13:57:35 -05:00
Iuri Matias a6013b518c remove extra comment 2018-01-19 11:18:31 -05:00
Iuri Matias 992b8c19e7 fix callback name 2018-01-18 14:46:53 -05:00
Iuri Matias 70f72f494d refactor deployContract method 2018-01-18 14:41:33 -05:00
hodlbank 2a88bb8cde [*] Fixed eslint warnings. 
[+] Added proper asyncCallback for async.waterfall().
 2018-01-17 23:34:38 +00:00
hodlbank ffe9af74bb Merge branch 'beforeDeploy' into develop 2018-01-17 23:08:22 +00:00
hodlbank 07c6be968a [+] Added beforeDeploy handlers. 
[+] Plugins can call embark.registerBeforeDeploy() to register beforeDeploy handlers.
 2018-01-17 23:04:19 +00:00
Iuri Matias d09b94a5db refactor pipeline to remove duplicated code 2018-01-17 15:29:34 -05:00
Iuri Matias 80e8f6323a display error when there is a unknown compilation error 2018-01-17 15:09:19 -05:00
Iuri Matias ed8fe3a951 remove console logs 2018-01-17 14:55:22 -05:00
Iuri Matias f4d2f5346d import react bootstrap 2018-01-17 13:16:43 -05:00
Iuri Matias 7e8a594bf9 update tests 2018-01-17 11:29:30 -05:00
Iuri Matias 7b58a770d9 Merge branch 'develop' of github.com:iurimatias/embark-framework into develop 2018-01-17 11:24:26 -05:00
Iuri Matias 32d63514bf increase default gas value; add parameters 2018-01-17 11:23:32 -05:00
Iuri Matias 5985e6bea1
Merge pull request #326 from hodlbank/develop 
Fixing issue #324: add options to configure simulator's mnemonic and …
 2018-01-17 10:13:10 -05:00
Iuri Matias 4d1368f388 fix lint; update tests 2018-01-17 10:04:11 -05:00
Iuri Matias be1c5badd8 improve full support for es6 2018-01-16 19:17:52 -05:00
hodlbank 8471d8fa0f Fixing issue #324: add options to configure simulator's mnemonic and block time. 2018-01-15 21:55:28 +00:00
Iuri Matias a322d03053 support external node in tests 2018-01-15 09:51:45 -05:00
Iuri Matias ea8f3a2232 improve gas handling and errors 2018-01-13 11:38:10 -05:00
Iuri Matias ef0bc04f77 clean up; fix gas requirements 2018-01-12 18:36:29 -05:00
Iuri Matias e2aa46eac8 define default account for each contract 2018-01-12 18:06:51 -05:00
Iuri Matias 7cac969f16 default to boilerplate blockchain settings 2018-01-12 17:16:46 -05:00
Iuri Matias 4ab01744c6 update demo app 2018-01-12 16:33:16 -05:00
Iuri Matias 728aea6e04 fix imports issue 2018-01-12 14:21:36 -05:00
Iuri Matias 61c00819ec add reset cmd 2018-01-11 09:22:58 -05:00
Iuri Matias 9fd39f36ba add websocket config to blockchain config 2018-01-11 08:55:28 -05:00
Iuri Matias 82681fec8f support versioning ipfs-api 2018-01-10 11:15:32 -05:00
Iuri Matias 59642b4160 fix web3 versioning 2018-01-10 10:43:25 -05:00
Iuri Matias 7a5e5947ee cleanup 2018-01-05 15:34:31 -05:00
Iuri Matias 11ba67bb34 cleanup 2018-01-05 15:33:53 -05:00
Iuri Matias a0fca8950d cleanup 2018-01-05 15:32:32 -05:00
Iuri Matias 4fcfc6c142 update whisper check 2018-01-05 15:30:52 -05:00
Iuri Matias 59c3d82260 update web3.js 2018-01-05 15:10:47 -05:00
Iuri Matias ae28df8f8e display error & warning when choosing an unexistant file 2018-01-03 13:44:35 -05:00
Iuri Matias 569734a80d re-add npm install for embark demo 2018-01-03 12:42:38 -05:00
Iuri Matias 0e502c1537 refactor service check 2017-12-30 21:44:59 -05:00
Iuri Matias fe186a4443 move module js code to its own folder 2017-12-30 21:02:46 -05:00
Iuri Matias 37a126a6b8 move old code to a separate file 2017-12-30 20:42:52 -05:00
Iuri Matias f4e81da630 refactor whisper code; separate old version 2017-12-30 20:09:46 -05:00
Iuri Matias 7e38a239b7 fix package name listener 2017-12-30 19:34:15 -05:00
Iuri Matias 1c38f3fb89 move lib 2017-12-30 18:25:59 -05:00
Iuri Matias 2f3abc37b7 use module command to get solc version 2017-12-30 18:12:16 -05:00
Iuri Matias c7f8698e58 refactor events handler so it can handle multiple args 2017-12-30 17:51:52 -05:00
Iuri Matias 3e1f16c673 update tests 2017-12-30 17:07:13 -05:00
Iuri Matias 11af38268b refactor: get versions from module instead of config 2017-12-30 16:48:53 -05:00
Iuri Matias dee49ec5ed add createPlugin; move cmds to library managers 2017-12-30 15:52:51 -05:00
Iuri Matias 947373eafc remove unnecessary if 2017-12-29 18:35:47 -05:00
Iuri Matias 3fb02befea comply with linter 2017-12-29 18:33:11 -05:00
Iuri Matias 92de2904f1 move webserver cmds to module 2017-12-29 18:29:56 -05:00
Iuri Matias 411ed41c84 fix console cmds api 2017-12-29 18:21:36 -05:00
Iuri Matias b29e865cd6 extract to method duplicated code 2017-12-29 16:29:32 -05:00
Iuri Matias d1a207941d take into account available providers list 2017-12-29 16:11:45 -05:00
Iuri Matias cb5230f569 comply with linter 2017-12-29 08:46:01 -05:00
Iuri Matias f00fa1c4aa refactor; flatten property list 2017-12-29 08:26:31 -05:00
Iuri Matias 4c1adf258b refactor: add method to get directly property 2017-12-29 08:08:04 -05:00
Iuri Matias 8956992950 extract communication provider 2017-12-28 18:10:43 -05:00
Iuri Matias 9ca337eeb1 extract storage provider 2017-12-28 17:42:25 -05:00
Iuri Matias 9f40958e6a Merge branch 'develop' of github.com:iurimatias/embark-framework into develop 2017-12-28 13:54:22 -05:00
Iuri Matias fc24b04bf6 comply with linter 2017-12-28 13:13:30 -05:00
Iuri Matias 310712567f move whisper to a module 2017-12-28 12:40:11 -05:00
Iuri Matias e833ebd019 move ipfs embarkjs code to module 2017-12-28 12:16:50 -05:00
Iuri Matias ab5d3722b9 fix issue where contract was being deployed everytime when gas config was set; catch errors on individual onDeploy cmds 2017-12-28 08:27:20 -05:00
Iuri Matias 36d7890cfc fix cyclic error when contract is actually just referring to itself 2017-12-28 08:26:02 -05:00
Iuri Matias 1f95418504 use for to avoid multiple callback calls 2017-12-28 07:30:41 -05:00
Iuri Matias 8de81c33bd Merge branch 'develop' of github.com:iurimatias/embark-framework into develop 2017-12-28 07:00:17 -05:00
Iuri Matias 24c34fcbe3 refactor setProvider 2017-12-27 21:04:12 -05:00
Iuri Matias 17a7dcf3e6 remove unsupported whisper protocol msg 2017-12-27 20:58:14 -05:00
Iuri Matias a568835ceb separate components; extract ipfs; add register method 2017-12-27 19:10:05 -05:00
Iuri Matias 174ba8ec9b add more cmd line options to sim 2017-12-27 17:48:33 -05:00
Iuri Matias aad78cc130 fix/improve error handling 2017-12-27 13:07:13 -05:00
Iuri Matias 750eace6ce always define contract code so ondeploy cmds work 2017-12-27 11:40:21 -05:00
Iuri Matias cff999def8 Merge branch 'develop' of github.com:iurimatias/embark-framework into develop 2017-12-27 08:21:15 -05:00
Iuri Matias eaf9016c79 move ipfs service check to its module 2017-12-26 20:32:51 -05:00
Iuri Matias 50f1072372 move upload to its own module 2017-12-26 19:55:42 -05:00