2bb977df76
WIP to merge in other swarm changes
...
Adding swarm to embarkjs. WIP.
Add 'auto' setting for geth CORS and websockets origin
* 'auto' now supported for `rpcCorsDomain` and `wsOrigins` in the blockchain config.
* 'auto' set to the default value in blockchain config for test and demo apps.
test add config and contract and add test
addFileToPipeline test and registerBeforeDeploy with new arg
add more registers but generation one fails in run
WIP commit
Undo changes to test config.
Merge pull request #381 from embark-framework/features/cors-auto
Add 'auto' setting for geth CORS and websockets origin
fix a bug where upload cmd used plugin name
don't error if it's an empty dapp with no contracts yet
Merge pull request #383 from embark-framework/no_contracts
don't error if it's an empty dapp with no contracts yet
remove duplicated entry
force zepplein version for travis
Merge pull request #384 from embark-framework/chores/test-allpligin-apis
Small fixes for plugin APIs
intercept logs in the app itself - stopgap fix
Merge pull request #385 from embark-framework/console_logs_fix
intercept logs in the app itself - stopgap fix
* removed unneeded provider property.
* add 'swarm' as a provider in the storage.config
* update method for swarm service check
Merge branch 'develop' into features/add-swarm-to-embarkjs
More work to add swarm to embarkjs
* added eth-lib to parse result of swarm text
* changed "currentStorage" and "currentMessages" to "currentProvider" for consistency.
* added protocol to storage config
* selectively starts storage service depending on which one is configured in the storage config
* run service check for ipfs/swarm prior to uploaded
* added swarm methods for embarkjs
Updated code based on code review
check if testrpc is installed and warn if not
Merge pull request #386 from embark-framework/bug_fix/test-rpc-not-installed
check if testrpc is installed and warn if not
Removed timeout
Removed spacer
Merge pull request #382 from embark-framework/react-demo
Updating embark demo to use react instead of jquery
fix on contract add
Merge pull request #387 from embark-framework/bug_fix/new-contract-in-empty-dapp
Fix adding a contract
redeploy with right config on config change
fix tests
reset watchers after build to make sure files remain watch
Merge pull request #389 from embark-framework/bug_fix/file-changes-not-watched
Fix files not being watched
Merge pull request #388 from embark-framework/bug_fix/changing-contract-config
Redeploy with right config on config change
Added swarm support in embarkjs and isAvailable for messages/storage
* reverted currentProvider back to currentStorage and currentMessages
* added `EmbarkJS.Storage.isAvailable` and `EmbarkJS.Messages.isAvailable()` and underlying provider functions for Whisper, Orbit, IPFS, and Swarm
* Finished swarm implementation in embarkjs plus cleanup
* updated test app storage config to swarm to show swarm config option
Merge branch 'develop' into features/add-swarm-to-embarkjs
2018-04-30 15:56:43 +10:00
0dd2938abe
reset watchers after build to make sure files remain watch
2018-04-27 16:34:13 -04:00
94c493e854
redeploy with right config on config change
2018-04-27 15:10:24 -04:00
5aa05c8094
Merge pull request #387 from embark-framework/bug_fix/new-contract-in-empty-dapp
...
Fix adding a contract
2018-04-27 14:08:02 -04:00
2827deb418
fix on contract add
2018-04-27 13:50:57 -04:00
4a9ff1fe9d
check if testrpc is installed and warn if not
2018-04-27 09:16:29 -04:00
1cfe46db55
intercept logs in the app itself - stopgap fix
2018-04-26 17:19:45 -04:00
17c33ad075
Merge pull request #384 from embark-framework/chores/test-allpligin-apis
...
Small fixes for plugin APIs
2018-04-26 17:06:05 -04:00
6a3add8e04
Merge pull request #383 from embark-framework/no_contracts
...
don't error if it's an empty dapp with no contracts yet
2018-04-26 14:56:13 -04:00
3b736f56a7
don't error if it's an empty dapp with no contracts yet
2018-04-26 14:15:43 -04:00
d046feb83d
fix a bug where upload cmd used plugin name
2018-04-26 14:00:41 -04:00
e4566f9f81
add more registers but generation one fails in run
2018-04-26 09:40:41 -04:00
61be2c7bd7
addFileToPipeline test and registerBeforeDeploy with new arg
2018-04-26 09:40:32 -04:00
c818326f2e
test add config and contract and add test
2018-04-26 09:40:26 -04:00
ef0bcbf405
Add 'auto' setting for geth CORS and websockets origin
...
* 'auto' now supported for `rpcCorsDomain` and `wsOrigins` in the blockchain config.
* 'auto' set to the default value in blockchain config for test and demo apps.
2018-04-26 21:37:00 +10:00
4c39a3f589
Merge branch 'develop' into bug_fix/upload-to-swarm
2018-04-26 19:05:56 +10:00
f59a187bce
Removed unused host/port options passed in to the swarm service.
2018-04-26 12:59:57 +10:00
fba491592d
add function to check if context has specified context
2018-04-25 10:57:23 -04:00
f39acbdd42
get context from cmd ran and use arrays of contexts
2018-04-25 10:34:17 -04:00
97e91d4c44
only log loaded plugins in list plugins and warn when plugin is not right
2018-04-24 15:53:19 -04:00
51c2c8f880
check context and on changing context, load plugins that work
2018-04-24 14:42:56 -04:00
52d0c5a8dd
stop tests when deploy fails
2018-04-24 10:19:01 -04:00
cc30ff390e
Implemented PR review changes
...
* Removed config init from `cmd.js` for upload.
* refactored `upload()` to use engine services instead of loading and using plugins directly.
* now passing web3 directly to the `Swarm` constructor
2018-04-24 10:27:11 +10:00
16909c7f1a
if version name doesn't have /, then just use the full name
2018-04-23 12:14:48 -04:00
782044ef7c
Merge pull request #375 from embark-framework/fix_package_management
...
Fix package management
2018-04-20 20:10:38 -04:00
ade2ad1a67
comply with linter
2018-04-20 19:59:47 -04:00
a63aa2ea0f
remove commented line; use beta 34
2018-04-20 19:58:16 -04:00
41f04234d0
clean up
2018-04-20 19:52:51 -04:00
cf02a10656
use web3 naming instead of web3.js; check if package already exists
2018-04-20 19:45:57 -04:00
1b6d747dbd
fixing package management test
2018-04-20 17:17:49 -04:00
c212a9b90c
make sure all file names are using forward slashes
2018-04-20 13:40:41 -04:00
d48c971471
improve url regexes
2018-04-20 12:04:27 -04:00
c1bed28c00
code and test importing the http contract
2018-04-20 11:39:17 -04:00
9bf06aebce
refacotr how we handle files already parsed
2018-04-20 10:03:03 -04:00
abc89b2015
add code to parse all files to check for http imports
2018-04-20 09:52:13 -04:00
c05915b0e9
swarm deploy refactored to use web3.bzz instead of command line
...
* `Embark.upload()` refactored to build own `Engine` and services so `web3` could be passed to `Swarm` module
* `Swarm.deploy()` modified to use `web3.bzz.upload()`
* needs detection of running swarm node
2018-04-20 17:39:45 +10:00
9cdcc4f6d4
add code to import in solcP
2018-04-19 15:25:26 -04:00
60fb6b14d4
downlaod import files
2018-04-19 15:25:26 -04:00
05b1f61c9b
download files in full path of url
2018-04-19 15:25:26 -04:00
6c5415b27f
base code for import parse
2018-04-19 15:25:26 -04:00
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
09ca551a22
Add --loglevel validation for `run` and `build`
2018-04-19 14:43:41 +10:00
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
df226919c0
change file creation with using File.types
2018-04-18 15:02:50 -04:00
5925124978
fix unit tests and add test_appp test for http contracts
2018-04-18 14:56:18 -04:00
b931efcf7d
fix dir in contractsDirectory
2018-04-18 12:59:58 -04:00
9faf644c31
add loading in file.js but includes a patch to fix
2018-04-18 12:09:42 -04:00
ce34d40fe7
integrate downloadCOntract function in contract get function
2018-04-18 09:07:39 -04:00
2568ec1aec
implement the download function
2018-04-17 16:34:37 -04:00
cf14b3784f
add getUrl function for external contracts + tests
2018-04-17 15:07:00 -04:00
e5ae6bc86e
Merge pull request #367 from embark-framework/refactor/vyper-utils
...
Refactor Vyper compiler
2018-04-17 11:35:38 -04:00
6f119eeb1b
move vyper contract compile to static util function
2018-04-17 11:25:46 -04:00
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
a3d2cc9a2c
Moved console "ready" message to write after outputDone event is emitted
2018-04-17 14:11:22 +10:00
dd1c10fe85
remove useless waterfall
2018-04-16 13:11:55 -04:00
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
891a4e0a0f
fix versions with spaces and add warning
2018-04-16 11:38:46 -04:00
8bdf79b19a
Handling for error during build.
2018-04-15 20:31:26 +10:00
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
c1c61de2d5
Passed in success messaging to async callback.
2018-04-15 20:31:08 +10:00
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
6b7af4b647
#156326148 Build contracts and dapp before upload.
2018-04-15 20:30:52 +10:00
99c04b405f
fix clas name and bytecode
2018-04-13 15:48:19 -04:00
17e1c71506
submit contract for deployment, not working yet
2018-04-13 14:59:01 -04:00
dc9e6c168b
start vyper implementation
2018-04-13 14:59:01 -04:00
7d8c7b119c
add warning after compile for files without a compatible compiler
2018-04-13 14:59:01 -04:00
6647c31d38
hotfix: callback with wrong parameter order
2018-04-13 14:54:46 -04:00
82726e07e1
Merge pull request #361 from embark-framework/graphviz-contracts
...
Graphviz contracts
2018-04-13 11:29:23 -04:00
b56f20db8a
Merge pull request #359 from embark-framework/node_module_import
...
better mappings
2018-04-12 20:41:52 -04:00
5ed1e787b2
print error if contract file is not found
2018-04-12 20:30:20 -04:00
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
e0ab9cbde4
refactor findImports
2018-04-12 17:57:55 -04:00
db61e355c1
look for contract import in dapp dir and node_modules
2018-04-12 17:55:57 -04:00
e3fde1ad22
support mapping contract file in contracts config
2018-04-12 17:54:08 -04:00
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
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
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
e90cead578
fix tests breaking because of line-endings
2018-04-10 16:38:49 -04:00
6905698bcc
fix swarm upload too
2018-04-10 16:02:59 -04:00
9d261472f9
extract node name and version (so it displays just like in 2.6.0)
2018-04-10 15:14:00 -04:00
044759ef52
get node name and version
2018-04-10 15:08:08 -04:00
e731495109
fix upload on windows
2018-04-10 14:17:59 -04:00
2907510b6e
fix arrows in ipfs get by using ipfsConnection.get
2018-04-10 13:33:13 -04:00
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
3ecb195b38
move import list out of loop to accelerate build process
2018-04-09 16:29:49 -04:00
f37b09a371
fix build process on windows
2018-04-09 16:14:07 -04:00
3a89b3f951
intercept dir and pass it to the logger
2018-04-09 15:24:01 -04:00
f56b42d91f
Linting
2018-04-05 11:41:28 -04:00
d038ed414d
Merge branch 'develop' of https://github.com/embark-framework/embark into graphviz-contracts
2018-04-05 11:35:19 -04:00
5a91b2d44a
remove unneeded require
2018-04-02 15:32:09 -04:00
2ec7589f90
refactor to use dappPath
2018-04-02 15:30:16 -04:00
e0db5ed61a
refactor to use dappPath
2018-04-02 15:06:56 -04:00
10f7d21f81
fix tests, enable blockchain component by default
2018-04-02 14:44:55 -04:00
d3b0787895
eslint is king
2018-03-31 21:15:53 -04:00
02e407f90b
completly disable opted-out components
2018-03-31 21:08:25 -04:00
bab0171120
revert versions update for now; support granular config on embark json
2018-03-31 21:06:00 -04:00
03f0b07d81
support versions on embark json config
2018-03-31 19:35:20 -04:00
fffde9d4b6
tolerate lack of addCheck which means is not running in dashboard mode
2018-03-30 10:59:31 -04:00
4c82f309e0
add --simple option
2018-03-29 19:42:47 -04:00
a8e22ec45c
move demo and boilerplate to a templates folder
2018-03-29 19:23:24 -04:00
8b326d86db
fix typo in cmd description
2018-03-29 18:12:07 -04:00
324ba904e8
usd cwd instead of pwd
2018-03-26 15:26:37 -04:00
d5a21d579c
fallback to shelljs if pwd is empty (windows issue)
2018-03-26 15:08:07 -04:00
4b0925d425
fallback to shelljs if pwd is empty (windows issue)
2018-03-26 14:54:47 -04:00
0326890abe
Fix: Relationship was incorrect
2018-03-23 11:39:42 -04:00
58b5ea329e
Styles for contract instances
2018-03-23 11:37:56 -04:00
7dcae55b8b
Added events to graph and fixed problems in IDE
2018-03-23 10:02:23 -04:00
403f2daee2
Added relationships between contracts
2018-03-23 10:02:23 -04:00
01eaa0fe7f
Generating basic diagram that includes methods
2018-03-23 10:02:23 -04:00
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
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
df765ed056
fix version issue causing a contract to be undefined due to a pipeline error
2018-03-22 15:36:20 -04:00
9582efbe65
fix logger call
2018-03-15 17:18:20 -04:00
c1d258b819
add events to logger
2018-03-15 16:44:05 -04:00
89616537b8
refactor command handler
2018-03-15 16:38:20 -04:00
cd9c3c8317
return cmd result in executeCmd callback
2018-03-15 16:34:30 -04:00
6479bf816b
only deploy configured contracts in the tests
2018-03-11 08:28:03 -04:00
83227beaa1
add option to specify a logfile to output the logs
2018-03-10 13:45:56 -05:00
c456c405c4
update tests
2018-03-10 12:52:37 -05:00
b7b5f1b365
move services state event call to monitor itself
2018-03-10 12:46:02 -05:00
05aadc5c10
support specifying contract args as an object
2018-03-04 20:07:39 -05:00
a03be15c4a
display in logs contracts with address specified in the config
2018-03-04 19:23:02 -05:00
33b42dd9c1
detect invalid addresses
2018-03-04 19:18:39 -05:00
ac79cef97b
fix 337; support contract references in array arguments
2018-03-04 18:46:12 -05:00
da7e5747f9
report error message instead of array
2018-03-02 18:01:48 -05:00
66a3388a9d
fix error reporting for wrong params
2018-03-02 17:48:30 -05:00
af9e27e078
fix ipfs service check
2018-03-02 17:25:59 -05:00
13e759bfee
support setting protocol in config; fix getUrl
2018-03-02 16:57:55 -05:00
bde067aabf
support specifying ipfs protocol in the storage provider
2018-03-02 11:02:52 -05:00
59678dd1fa
remove commented out lines
2018-02-28 18:23:07 -05:00
3c1156fc64
fix function identation
2018-02-28 18:14:41 -05:00
5ee99a1e5a
refactor: join duplicated code
2018-02-28 18:09:10 -05:00
62d4dd456d
restore pipeline plugin
2018-02-28 17:45:39 -05:00
a231f11062
fix issue with repeating console input
2018-02-27 19:19:04 -05:00
531af6234b
refactor console cmd exec
2018-02-27 19:19:00 -05:00
eb6236da65
add command handler for console cmd
2018-02-27 19:18:52 -05:00
445133cfdf
move setStatus from logger to event bus
2018-02-27 15:49:21 -05:00
66e9d6afa3
move contractsState from logger to event bus
2018-02-27 15:40:05 -05:00
96df409229
comply with linter
2018-02-24 09:26:43 -05:00
349807496a
improve directory copying
2018-02-23 20:36:11 -05:00
bb00987427
remove unneded msg when processing files in development
2018-02-23 19:37:42 -05:00
511b61c6c5
fix preset requires
2018-02-23 18:24:46 -05:00
8d255137d9
fix js error reporting
2018-02-23 14:04:08 -05:00
20f4e7621b
fix imports issue
2018-02-22 14:56:55 -05:00
9cd8449014
fix directory copying
2018-02-22 11:45:22 -05:00
11b4c9b4c4
check if document already interactive (DOMContentLoaded won't fire if already interactive)
2018-02-22 12:32:01 +00:00
41baca4b51
don't redeploy if an asset has been changed and not a contract
2018-02-21 18:43:34 -05:00
ed530e8511
fix issue in which some files were not triggered change event
2018-02-21 14:04:08 -05:00
9df0ee9554
fix issue in which some files were not triggered change event
2018-02-21 13:51:48 -05:00
3b60793b25
remove old jshint directives
2018-02-07 19:49:54 -05:00
a8222df1eb
support ws providers
2018-02-07 19:41:11 -05:00
1c45d215ce
check error severity besides the type
2018-02-07 19:40:59 -05:00
7a7330e695
update solidity module to use compileStandard and the standard json
2018-01-27 15:07:48 -05:00
5c5ef44f2f
update tests
2018-01-23 19:36:02 -05:00
6a229f2386
Revert "Add networkType rinkeby"
...
This reverts commit fd70689bec
2018-01-23 10:00:53 +02:00
6b664fbfa8
Add light and fast from blockchain config
2018-01-22 09:57:35 +02:00
fd70689bec
Add networkType rinkeby
2018-01-22 09:53:53 +02:00
639612579b
if no env present just return final object
2018-01-20 09:01:18 -05:00
b19194fc6b
refactor config code
2018-01-19 22:08:39 -05:00
10c4c75236
move tests related files to their own folder
2018-01-19 21:13:20 -05:00
f35718b6c0
error if account index is not found
2018-01-19 20:38:28 -05:00
776f07dc23
[*] Fixing #319 : option to use particular account for contract deployment.
2018-01-20 00:56:05 +00:00
5c0c7b45a5
remove old code
2018-01-19 13:59:39 -05:00
5300aa479b
better gas estimation
2018-01-19 13:57:35 -05:00
a6013b518c
remove extra comment
2018-01-19 11:18:31 -05:00
992b8c19e7
fix callback name
2018-01-18 14:46:53 -05:00
70f72f494d
refactor deployContract method
2018-01-18 14:41:33 -05:00
2a88bb8cde
[*] Fixed eslint warnings.
...
[+] Added proper asyncCallback for async.waterfall().
2018-01-17 23:34:38 +00:00
ffe9af74bb
Merge branch 'beforeDeploy' into develop
2018-01-17 23:08:22 +00:00
07c6be968a
[+] Added beforeDeploy handlers.
...
[+] Plugins can call embark.registerBeforeDeploy() to register beforeDeploy handlers.
2018-01-17 23:04:19 +00:00
d09b94a5db
refactor pipeline to remove duplicated code
2018-01-17 15:29:34 -05:00
80e8f6323a
display error when there is a unknown compilation error
2018-01-17 15:09:19 -05:00
ed8fe3a951
remove console logs
2018-01-17 14:55:22 -05:00
f4d2f5346d
import react bootstrap
2018-01-17 13:16:43 -05:00
7e8a594bf9
update tests
2018-01-17 11:29:30 -05:00
7b58a770d9
Merge branch 'develop' of github.com:iurimatias/embark-framework into develop
2018-01-17 11:24:26 -05:00
32d63514bf
increase default gas value; add parameters
2018-01-17 11:23:32 -05:00
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
4d1368f388
fix lint; update tests
2018-01-17 10:04:11 -05:00
be1c5badd8
improve full support for es6
2018-01-16 19:17:52 -05:00
8471d8fa0f
Fixing issue #324 : add options to configure simulator's mnemonic and block time.
2018-01-15 21:55:28 +00:00
a322d03053
support external node in tests
2018-01-15 09:51:45 -05:00
ea8f3a2232
improve gas handling and errors
2018-01-13 11:38:10 -05:00
ef0bc04f77
clean up; fix gas requirements
2018-01-12 18:36:29 -05:00
e2aa46eac8
define default account for each contract
2018-01-12 18:06:51 -05:00
7cac969f16
default to boilerplate blockchain settings
2018-01-12 17:16:46 -05:00
4ab01744c6
update demo app
2018-01-12 16:33:16 -05:00
728aea6e04
fix imports issue
2018-01-12 14:21:36 -05:00
61c00819ec
add reset cmd
2018-01-11 09:22:58 -05:00
9fd39f36ba
add websocket config to blockchain config
2018-01-11 08:55:28 -05:00
82681fec8f
support versioning ipfs-api
2018-01-10 11:15:32 -05:00
59642b4160
fix web3 versioning
2018-01-10 10:43:25 -05:00
7a5e5947ee
cleanup
2018-01-05 15:34:31 -05:00
11ba67bb34
cleanup
2018-01-05 15:33:53 -05:00
a0fca8950d
cleanup
2018-01-05 15:32:32 -05:00
4fcfc6c142
update whisper check
2018-01-05 15:30:52 -05:00
59c3d82260
update web3.js
2018-01-05 15:10:47 -05:00
ae28df8f8e
display error & warning when choosing an unexistant file
2018-01-03 13:44:35 -05:00
569734a80d
re-add npm install for embark demo
2018-01-03 12:42:38 -05:00
0e502c1537
refactor service check
2017-12-30 21:44:59 -05:00
Eric Mastro
Jonathan Rainville
Iuri Matias
emizzle
RJ Catalano
Richard Ramos
Carl Larson
Heikki Hakala
hodlbank