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

304 Commits

Author SHA1 Message Date
emizzle e0fcafb8c4 linting 2018-06-27 11:10:33 +10:00
emizzle 9f33a05d82 Removed p-iteration from embark altogether. 
Replaced usage in storage module (on dapp side) with async.js `detectSeries`
 2018-06-27 10:51:53 +10:00
Iuri Matias 88132b7b6a
Merge pull request #581 from embark-framework/bug_fix/whisper-cors 
When communication is disabled in config, do not run the module in em…
 2018-06-26 16:23:06 -04:00
Iuri Matias 2250e87294
Merge pull request #582 from embark-framework/bug_fix/simple-ipfs-active-when-disabled 
Abandons all storage initialisation routines if storage is disabled i…
 2018-06-26 16:19:41 -04:00
RJ Catalano 518e96585c
Merge pull request #585 from embark-framework/gracefullyErrorENS 
small correction
 2018-06-26 15:19:02 -05:00
VoR0220 b86ae2e9f6 fixup 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-26 14:56:23 -05:00
VoR0220 93feea7c6d small correction 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-26 14:44:29 -05:00
RJ Catalano 2c6bdc3204
Merge pull request #584 from embark-framework/fixDeploymentAttempts 
make it so that FIFSRegistrar isn't attempted to be deployed on liven…
 2018-06-26 13:53:49 -05:00
VoR0220 48a6e10f9f make it so that FIFSRegistrar isn't attempted to be deployed on livenet, ropsten, etc. 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-26 13:32:53 -05:00
VoR0220 5e7cd6a88b get rid of else 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-26 13:28:28 -05:00
RJ Catalano 8bf79e704d fix line 2018-06-26 13:26:36 -05:00
VoR0220 1d7851e2ff catch errors and handle gracefully in ENS 2018-06-26 13:26:36 -05:00
Iuri Matias ac6aeaac50 make linter happy 2018-06-26 13:47:01 -04:00
Iuri Matias e2ab4c4fa3 use EmbarkJS to initialize ens contracts and set ens contract only when embark is ready 2018-06-26 13:45:23 -04:00
emizzle 6f539198da Abandons all storage initialisation routines if storage is disabled in config. 2018-06-26 14:26:54 +10:00
emizzle d32708fcde When communication is disabled in config, do not run the module in embark. 
Previous to this change, `Geth: WARN [06-25|16:46:26] origin 'embark' not allowed on WS-RPC interface` would appear in the logs when the module was run while disabled.

Updated the cors component so that when `rpcCorsDomain` and `wsOrigins` are set to `'auto'`, and all components are disabled `rpcCorsDomain` and `wsOrigins` are passed as a null parameter to geth as opposed to being passed as `'auto'`.
 2018-06-26 13:34:52 +10:00
Iuri Matias 9fb19ed78b
Merge pull request #569 from embark-framework/registration 
Registrar deployment
 2018-06-21 14:45:50 -04:00
VoR0220 e5ad90719b ensure that FIFS doesn't deploy on other test and main networks 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-21 12:57:41 -05:00
Iuri Matias 4589803003 put contracts inside the contracts field 2018-06-21 13:24:41 -04:00
VoR0220 e3bdbd520f bare bones bulk registration example spec 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>

add registrars to system

Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-21 11:24:31 -05:00
Iuri Matias 12d03d8f82
Merge pull request #565 from embark-framework/averageProfile 
convert to average
 2018-06-20 16:41:00 -04:00
Iuri Matias f16bb2c30b
Merge pull request #564 from embark-framework/features/whisper-cors 
Added cors for whisper
 2018-06-20 16:40:46 -04:00
Iuri Matias 4122bec122
Merge pull request #568 from embark-framework/next 
merge Next
 2018-06-20 16:40:23 -04:00
VoR0220 b41d6b312c small fix 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-20 14:17:05 -05:00
VoR0220 a050a97a62 convert to average 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-20 09:38:51 -05:00
emizzle 51eb5a1f65 Added cors for whisper 2018-06-20 16:19:25 +10:00
Iuri Matias 9beaaa2a29 remove extra logs 2018-06-19 15:46:55 -04:00
VoR0220 7eac4df38d missing semicolon 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-18 15:07:42 -05:00
VoR0220 a9a460f10e back to promisification 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-18 14:57:43 -05:00
VoR0220 ca5a60b5f0 callback fixes and get rid of resolver interface 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-18 14:31:22 -05:00
VoR0220 800269d97b more unnecessary contracts gotten rid of, and fixes made to Embarkjs file 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-18 13:54:37 -05:00
VoR0220 77001ee8f8 get rid of unnecessary contracts for this iteration 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-18 13:15:54 -05:00
VoR0220 220800fcc3 get rid of global web3 in ens 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-18 12:52:02 -05:00
VoR0220 f6fccd4588 get rid of register for now 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-18 12:45:21 -05:00
VoR0220 c568b36977 finish it all up 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-18 12:43:52 -05:00
VoR0220 4b8fd88ebc finish the deployment stage 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-18 10:58:42 -05:00
VoR0220 417b5145a4 add in new api for ens 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-18 10:45:34 -05:00
VoR0220 1979d48bb9 temp commit 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-18 10:45:34 -05:00
VoR0220 6de3274fa6 starting to create registration and some changes to the deployment 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-18 10:45:34 -05:00
VoR0220 dc71b1725a lint is lyfe 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-18 10:45:34 -05:00
VoR0220 e8d55bdb0d attempt at deploying on dev net 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-18 10:45:34 -05:00
VoR0220 42fe72392b add ens contracts 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-18 10:45:34 -05:00
Iuri Matias 5c6e6e50f9 use contractAddress instead of address 2018-06-18 10:22:04 -04:00
Iuri Matias 7706e276bf
Merge pull request #533 from embark-framework/bug_fix/ipfs-service-check-error 
Storage provider initialisation fixes and improvements.
 2018-06-15 18:09:30 -04:00
Iuri Matias 5614998f89
Merge pull request #525 from embark-framework/bug_fix/solc-loading-issue 
Fix for solc loading issue
 2018-06-15 17:28:53 -04:00
Iuri Matias 6845c7124b fix eqls 2018-06-15 17:24:19 -04:00
emizzle a100dd4260 Requested PR fixes 
Added catch to live-plugin-manager install promise running in child process

Removed some `else`'s ;)

Only showing solc downloading spinner when `--nodashboard` option is used.

When installing package in main process and simultaneous downloads fail, all callbacks called with error.

Updated logging in npmTimer.
 2018-06-15 17:06:59 -04:00
emizzle 5e20f27c99 Solc loading issue now fully resolved 
Added better error checking for solidity compilation errors

Extracted timer functionality for downloading packages so it works across the main process and child processes.

Npm class is instantiated only once and reused for event commands.

Npm class can handle concurrent requests for the same package and callback the installation result for each request.
 2018-06-15 17:06:59 -04:00
emizzle b96df79c59 Finally fixed the solc loading issue. 
Moved the instantiation of the live-plugin-manager in to the child solc process. This allowed us to use the live-plugin-manager to require the installed solc file.

If the module is the same version as used by embark, the module is still loading using the normal require (from node_modules), as before.
 2018-06-15 17:06:59 -04:00
emizzle eedcdc77a7 Solc loading issue now fully resolved 
Added better error checking for solidity compilation errors

Extracted timer functionality for downloading packages so it works across the main process and child processes.

Npm class is instantiated only once and reused for event commands.

Npm class can handle concurrent requests for the same package and callback the installation result for each request.
 2018-06-15 17:02:53 -04:00
emizzle 62f3b85bc4 Finally fixed the solc loading issue. 
Moved the instantiation of the live-plugin-manager in to the child solc process. This allowed us to use the live-plugin-manager to require the installed solc file.

If the module is the same version as used by embark, the module is still loading using the normal require (from node_modules), as before.
 2018-06-15 16:54:08 -04:00
VoR0220 ad6a6cf328 small fixes to ensure something of a better experience for error reporting on the profiler side 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-15 15:22:27 -05:00
Jonathan Rainville 6991215b40 catch error and warn if no provider 2018-06-15 10:04:19 -04:00
emizzle 24e1ed36f7 Fixed issue with IPFS not starting when swarm failed. 
Added logging when starting of all storage providers has completed, and whether or not there were errors during starting of one of the providers.

Added parallel processing for starting dappConnection storage providers.

Removed irrelevant IPFS error from trace logs when IPFS not available.
 2018-06-15 16:35:05 +10:00
Jonathan Rainville a62a74d162 callback error from runCode and use that in onDeploy codes 2018-06-14 11:10:31 -04:00
Iuri Matias e6ed016cc0
Merge pull request #510 from embark-framework/gastimation 
Gastimation
 2018-06-12 14:11:28 -04:00
VoR0220 41f77793f4 more patchy mcpatchface 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-12 12:54:41 -05:00
VoR0220 3ede75ce50 Merge branch 'gastimation' of github.com:embark-framework/embark into gastimation 2018-06-12 12:52:36 -05:00
VoR0220 258d9b3fe0 patchy mcpatchface 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-12 12:52:23 -05:00
Iuri Matias a88513f58d Merge branch 'gastimation' of github.com:embark-framework/embark into gastimation 2018-06-12 13:24:30 -04:00
Iuri Matias 1dcd30b3a8 don't crash and instead inform user if contract cannot be profiled 2018-06-12 13:24:21 -04:00
VoR0220 acf67071c8 fix name 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-12 12:21:31 -05:00
VoR0220 cd67500dd1 minor cleanup 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-12 12:16:19 -05:00
VoR0220 539c035aa6 unnecessary declaration 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-12 12:14:02 -05:00
VoR0220 a601541bb0 get rid of one more line and get rid of unused cb 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-12 12:12:37 -05:00
VoR0220 43c8525d48 fix callbacks in gas estimator, add more fallback support and clean up console logs to better display potential errors 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-12 12:10:35 -05:00
VoR0220 e0470b8ef4 clean up junk and fix logger formatting 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-12 10:44:21 -05:00
VoR0220 335670f2ca package lock update and linting errors fixed 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-12 10:39:45 -05:00
VoR0220 57f098239d add support for null inputs and fallback and constructor types 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-12 10:36:41 -05:00
VoR0220 0ff39f48b3 fix the callback schema for async and pretty it up a bit 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-12 10:36:41 -05:00
VoR0220 90f342b65a redo logic so that it uses the async library 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-12 10:36:41 -05:00
VoR0220 5c7e9f0054 changes to the logic around gas estimator and profiler 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-12 10:36:41 -05:00
VoR0220 311ec7d9cb switch the keys around and make a few logical changes to the way things are structured. Currently stuck at method calling 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-12 10:36:41 -05:00
VoR0220 fedbe0d2bc first attempt at gas estimation using a 3 round fuzzer and linking it into the profiler 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-12 10:36:41 -05:00
Richard Ramos a9065b1eae Websocket handling 2018-06-12 08:50:49 -04:00
Richard Ramos 03483052ea Adding error messages 2018-06-11 16:43:26 -04:00
Richard Ramos 48a3f2afdc Fixing conflicts 2018-06-11 16:43:08 -04:00
Iuri Matias e46f6aa5b7 color output 2018-06-11 16:40:59 -04:00
Richard Ramos 80052fc5e1 Displays json as a string in the console 2018-06-11 16:40:59 -04:00
Richard Ramos f467fc5a31 Launching ipc connection depending on role 2018-06-11 16:40:59 -04:00
Richard Ramos 09c11662aa Removing unused variables 2018-06-11 16:40:59 -04:00
Richard Ramos c9a2014ac7 Formatting input parameters 2018-06-11 16:40:59 -04:00
Richard Ramos 39d510cef4 Displaying status, gas and block number 2018-06-11 16:40:59 -04:00
Richard Ramos 8ef2dc124f Extracted console logging to its own file 2018-06-11 16:40:59 -04:00
Richard Ramos bf25381fa6 Rebasing changes from develop 2018-06-11 16:40:14 -04:00
Jonathan Rainville eecd719515 put message if swarm or ipfs is not installed 2018-06-08 10:40:01 -04:00
Jonathan Rainville 3d70028cc5 fixing small stuff 2018-06-07 13:01:12 -04:00
Iuri Matias 805091aa66
Merge pull request #482 from embark-framework/fuzzer 
Fuzzer
 2018-06-06 10:54:28 -04:00
Iuri Matias f44ed981b5
Merge pull request #481 from embark-framework/ipc 
add socket support
 2018-06-05 16:42:44 -04:00
Iuri Matias a41cf99be0 reverse condition 2018-06-05 16:13:17 -04:00
VoR0220 e42cbb4ade one last change 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-05 15:07:41 -05:00
VoR0220 95a06e0bf9 formatting fixes 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>

one more

Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-05 14:44:05 -05:00
VoR0220 773f5a7921 convert console logs to embark logger and this baby is ready to rock 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-05 14:16:38 -05:00
VoR0220 a7629d2ac0 fix linting 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-05 13:54:43 -05:00
VoR0220 ffe26d052a some changes to the way randomness is calculated and getting rid of unnecessary garbage and added logging 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-05 13:39:18 -05:00
VoR0220 28d1d585fe checkpoint 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-05 13:39:18 -05:00
VoR0220 4858f8a19f convert to BN instead of number 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-05 13:39:18 -05:00
VoR0220 a0d0d9692b flesh it out further and add a console command and fix annoying bugs 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-05 13:39:18 -05:00
VoR0220 7812951164 wip 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-05 13:39:18 -05:00
VoR0220 f4bca2710f gas estimator and fuzzer 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-05 13:39:18 -05:00