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

248 Commits

Author SHA1 Message Date
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
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