Commit Graph

75 Commits

Author SHA1 Message Date
Iuri Matias 6243d7c453
add missing self 2018-10-23 10:26:14 +02:00
Jonathan Rainville 0b6cb01a80
fix errors and add swarm 2018-10-23 10:25:43 +02:00
emizzle 178115de18
Removed `mineWhenNeeded` condition
Removed a condition that detects if `mineWhenNeeded === true`. While reaslistically, the `defaultAccount` will only be populated when `mineWhenNeeded` is set, there is no need to check for this when falling back to the blockchain account.
2018-10-22 19:54:50 +02:00
emizzle 294e14446f
Auto set swarm account to account controlled by the node
When there is no account/password specified for swarm, there was an error shown in the logs (asking for address/password), and the swarm process would quit.

This PR changes the behaviour so that if a swarm address/password are not specified in the config, it attempts to use the blockchain address/password specified in `config/blockchain > account`. If `config/blockchain > account > address` doesn’t exist, the first account controlled by the node is used (provided by `web3.eth.getAccounts`, along with the password from `config/blockchain > account > password`.
2018-10-22 19:54:50 +02:00
emizzle 2d19d12e39
Support for embark-status plugin
Added request to update cors from a plugin (affects blockchain client and storage client).
2018-10-22 19:54:48 +02:00
Moksh Jain 51b2cce0ea
adds dashboard logging for: geth, ipfs, swarm 2018-10-22 19:39:25 +02:00
emizzle 9aa3217331
After upload message regarding CORS and public gateways 2018-10-22 19:30:13 +02:00
Iuri Matias 9b2fa9402b
Merge pull request #822 from embark-framework/bugfix/circular-json
Fix circular JSON and swarm api require
2018-09-14 18:11:34 -04:00
Anthony Laibe 8ffc9b89e2 Swarm use local data dir 2018-09-13 13:37:44 +01:00
Anthony Laibe 583318169a Fix loading swarm-api in node or browser 2018-09-13 12:29:44 +01:00
Anthony Laibe c22901ab95 Fix circular JSON and swarm api require 2018-09-13 11:21:17 +01:00
emizzle 680db4d575 Change over to published swarm-api library 2018-09-12 12:43:10 +10:00
emizzle 1d03f01531 Update warnings in embark after upload
warn user that they need to run a blockchain node and swarm for the dapp to work correctly.
2018-09-10 22:47:31 +10:00
emizzle b759e9eed7 Add ‘defaultpath’ for upload
Hardcode to ‘index.html’
2018-09-10 22:42:10 +10:00
emizzle 9d39fa39ac Swarm updates for embark
Change __embarkSwarm to use new SwarmJS and change over from promises.

Add note after upload that blockchain nodes needs to be running to access the swarm uploaded dapp.

Fix typo with swarm “on” available.

Linting / cleanup
2018-09-10 22:42:10 +10:00
emizzle e44b62d550 SwarmJS browser support 2018-09-10 22:42:10 +10:00
emizzle 3f5fe21b90 change to ‘uploadDirectory’ 2018-09-10 22:42:10 +10:00
emizzle 2dc8d8c276 Fix issue with swarm isAvailable 2018-09-10 22:42:10 +10:00
emizzle fcb75dee11 Move to swarmjs and await geth ready
Move to swarmjs library (in embark-framework).

Wait for geth to start before start of swarm check.
2018-09-10 22:42:10 +10:00
emizzle b5e8546ebd Converted upload procedure to local SwarmGW lib
# Conflicts:
#	package-lock.json
2018-09-10 22:42:00 +10:00
Michael Bradley, Jr 08fc21c890 gateway URLs: http -> https 2018-08-28 15:44:50 -05:00
Anthony Laibe 39b9d6e1d8 PR feedback 2018-08-23 09:59:02 +01:00
Anthony Laibe 60c6bc3e48 Lint 2018-08-22 10:58:01 +01:00
Anthony Laibe b0e0989359 Move ipns function to ipfs 2018-08-22 10:48:45 +01:00
Jonathan Rainville 5179eea56f revert trace 2018-08-21 16:05:58 -04:00
Jonathan Rainville ef9fbb5b6e remove comment 2018-08-21 16:05:58 -04:00
Jonathan Rainville 0204eb6d46 swarm adjustements 2018-08-21 16:05:58 -04:00
Jonathan Rainville 212eb79754 fix small oopsies and make it work 2018-08-21 16:05:58 -04:00
Iuri Matias 29b0d01f22 move processes into core 2018-08-21 16:04:22 -04:00
Iuri Matias d7340b4f5a move storage processes to their own modules 2018-08-21 16:02:18 -04:00
Anthony Laibe df8ca76e28 Fix scope of the callback 2018-08-21 15:54:45 -04:00
Iuri Matias f9f25f33c8 fix swarm upload cmd registration 2018-08-21 15:31:55 -04:00
Iuri Matias 2baa6ed792 make linter happy 2018-08-21 15:30:11 -04:00
Iuri Matias fd9be8ac84 remove unused param 2018-08-21 15:30:11 -04:00
Iuri Matias aaf127fd1d move storage config check to the constructor 2018-08-21 15:30:11 -04:00
Iuri Matias 97be8b7463 refactor storage config check 2018-08-21 15:30:11 -04:00
Iuri Matias 46a6d391cd simplify use of callback 2018-08-21 15:30:11 -04:00
Iuri Matias df97a6ac00 re-add register upload cmd api; refactor storage module initialization 2018-08-21 15:30:11 -04:00
Iuri Matias e07d06fa4c make linter happy 2018-08-21 15:30:11 -04:00
Iuri Matias 2780b4eb2f fix upload callback 2018-08-21 15:30:11 -04:00
Iuri Matias 7a612ea5df check swarm connection before attempting to connect 2018-08-21 15:30:10 -04:00
Iuri Matias 651ef31bb5 fix start process 2018-08-21 15:30:10 -04:00
Iuri Matias 14710e06d8 use commands to request upload; let storage component figure out which one to call 2018-08-21 15:30:10 -04:00
emizzle 86ba7e3803 linting 2018-08-21 15:12:07 -04:00
emizzle efe649e4e6 Removed p-iteration from embark altogether.
Replaced usage in storage module (on dapp side) with async.js `detectSeries`
2018-08-21 15:12:07 -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 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
Eric Mastro c45fdb12df Improve storage logging (during --loglevel trace)
Includes IPFS command run 
Includes response from IPFS/Swarm service checks
Includes url being checked during IPFS/Swarm service checks.
2018-06-05 11:39:28 +10:00
Iuri Matias 37d54e22db refactor services monitor to use events instead of passing addCheck around 2018-06-01 19:32:14 -04:00
Eric Mastro 421f9a4096 Merge in remote 2018-06-01 14:10:54 +10:00