5f3361d030
conflict in en.json
2018-05-23 11:16:56 -04:00
3e9376138b
move runCode
2018-05-23 11:16:17 -04:00
592b4ed4fd
conflict in code_generator
2018-05-23 11:16:13 -04:00
a664492d1f
move onDeploy to special configs module
2018-05-23 11:15:06 -04:00
c800598e9b
move afterDeploy code into a special configs module
2018-05-23 11:15:06 -04:00
000d7beb27
move code to assert connection to blockchain module
2018-05-23 11:15:06 -04:00
16eaacbd54
call compiler through a request
2018-05-23 11:15:05 -04:00
ba29f0e928
move deploy tracker into a module
2018-05-23 11:15:05 -04:00
68c277cad1
remove unneded references to web3 objects; leave clarifying notes
2018-05-23 11:15:05 -04:00
ac45b7a19b
remove unneded assigment; add clarification/TODO
2018-05-23 11:15:05 -04:00
ae93d78cc2
move accounts to web3 module
2018-05-23 11:15:04 -04:00
4d0ebc03ad
move web3 init to its own module
2018-05-23 11:15:04 -04:00
db9fbef140
Add loading placeholder page while embark is building asset files.
...
We could extend this further to launch the webserver with the placeholder page before building the contracts as well.
2018-05-22 15:15:34 +10:00
e2c2373249
accept hash of objects as second param for runcode
2018-05-18 15:55:34 -04:00
6c1d9d9b39
rename startProvider to startWeb3Provider
2018-05-18 13:39:35 -04:00
09cdab7e2b
fund account only in dev
2018-05-18 13:39:35 -04:00
6c8653ef09
move code to front end. funds on provider start
2018-05-18 13:39:34 -04:00
418c55851b
remove warning when dev
2018-05-18 13:39:34 -04:00
01ae387c74
Merge pull request #418 from embark-framework/refactor_pipeline
...
Refactor pipeline
2018-05-16 18:15:51 -04:00
e651884473
set to 200 per Iuri's request
2018-05-16 15:27:38 -04:00
00e3af9012
lint is king
2018-05-16 15:18:12 -04:00
0611fee841
set max listeners to 50
2018-05-16 15:08:22 -04:00
4dcd644b7c
remove listeners for command handlers
2018-05-16 13:57:27 -04:00
38cf7a4aa8
throttle contracts too
2018-05-15 15:41:24 -04:00
8cee44cbd7
conflict in package lock
2018-05-15 14:42:06 -04:00
38dffb9eed
move provider to contracts
2018-05-15 12:45:38 -04:00
fdf8791c1c
fix mnemonic accounts
2018-05-15 11:33:19 -04:00
c5f80c72b9
add 0x if private key doesn't have it
2018-05-14 16:38:15 -04:00
7b1a219b51
pass isDev to engine so that it can show a warning
2018-05-14 14:32:19 -04:00
3f09d5d3f0
add tests for getContract
2018-05-14 14:04:26 -04:00
e470a63905
enable comma separated keys in file
2018-05-14 13:30:13 -04:00
890faf260d
remove sync methods as they are now unsupported
2018-05-14 12:12:14 -04:00
37ca90ad9b
add wallet and clean up
2018-05-14 12:08:03 -04:00
00bc3050ba
intercept get accounts
2018-05-14 11:18:48 -04:00
b7908a3797
conflict in package lock
2018-05-14 11:18:48 -04:00
a32c04c751
fix conflict in engine
2018-05-14 11:18:48 -04:00
e8210607b7
fix for when config is specified in embark.json
2018-05-11 19:09:38 -04:00
b804f51de5
fix getting .json config file
2018-05-11 18:22:03 -04:00
8b22305833
support js files besides json files
2018-05-11 18:10:48 -04:00
0b70f32bb9
initial work for i18n
2018-05-10 15:01:34 -04:00
a3f8c809a0
add queue for changes to do only one file build at the time
2018-05-10 13:28:12 -04:00
a35ce6f73e
pass normalizeInput
2018-05-10 11:14:25 -04:00
ed1d0ce67c
make only webpack in a separate process
2018-05-10 10:10:09 -04:00
911efe4e84
Merge pull request #400 from embark-framework/features/write-files-process
...
Write files in a different process
2018-05-09 16:57:43 -04:00
cdf46f2b30
fix linting errors and clean up ze code
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-08 10:53:34 -05:00
ab53bfba0c
fix linting errors
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-08 10:41:38 -05:00
dc7a002c1e
improve logging
2018-05-08 11:31:47 -04:00
819dec1bc3
profile me officer, here's a new module
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-08 10:30:46 -05:00
7d64b705a3
touch ups
2018-05-08 09:52:06 -04:00
4ec7fbb9db
async buildContracts
2018-05-08 09:36:50 -04:00
1fe6f4ee2c
more async
2018-05-08 09:02:46 -04:00
1d5f015aaa
async some functions
2018-05-08 08:54:10 -04:00
e85d8b1ae5
fix file writing, now working
2018-05-07 16:33:30 -04:00
d2d29be334
fix getting web3 location and provider code
2018-05-07 15:48:01 -04:00
148a74f3d6
make pipeline js in a different process (still doesnt work)
2018-05-07 14:30:30 -04:00
6ef78ff770
include fix for bug
2018-05-01 00:03:31 +10:00
0d20d422ce
hotfix for watch not defined
2018-04-30 09:29:31 -04:00
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
2827deb418
fix on contract add
2018-04-27 13:50:57 -04:00
1cfe46db55
intercept logs in the app itself - stopgap fix
2018-04-26 17:19:45 -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
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
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
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
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
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
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
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
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
dc9e6c168b
start vyper implementation
2018-04-13 14:59:01 -04:00
82726e07e1
Merge pull request #361 from embark-framework/graphviz-contracts
...
Graphviz contracts
2018-04-13 11:29:23 -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
e3fde1ad22
support mapping contract file in contracts config
2018-04-12 17:54:08 -04: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
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
3a89b3f951
intercept dir and pass it to the logger
2018-04-09 15:24:01 -04:00
d038ed414d
Merge branch 'develop' of https://github.com/embark-framework/embark into graphviz-contracts
2018-04-05 11:35:19 -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
d5a21d579c
fallback to shelljs if pwd is empty (windows issue)
2018-03-26 15:08:07 -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
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
83227beaa1
add option to specify a logfile to output the logs
2018-03-10 13:45:56 -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
41baca4b51
don't redeploy if an asset has been changed and not a contract
2018-02-21 18:43:34 -05:00
3b60793b25
remove old jshint directives
2018-02-07 19:49:54 -05: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
07c6be968a
[+] Added beforeDeploy handlers.
...
[+] Plugins can call embark.registerBeforeDeploy() to register beforeDeploy handlers.
2018-01-17 23:04:19 +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
61c00819ec
add reset cmd
2018-01-11 09:22:58 -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
4fcfc6c142
update whisper check
2018-01-05 15:30:52 -05:00
59c3d82260
update web3.js
2018-01-05 15:10:47 -05:00
c7f8698e58
refactor events handler so it can handle multiple args
2017-12-30 17:51:52 -05:00
3e1f16c673
update tests
2017-12-30 17:07:13 -05:00
11af38268b
refactor: get versions from module instead of config
2017-12-30 16:48:53 -05:00
dee49ec5ed
add createPlugin; move cmds to library managers
2017-12-30 15:52:51 -05:00
411ed41c84
fix console cmds api
2017-12-29 18:21:36 -05:00
cb5230f569
comply with linter
2017-12-29 08:46:01 -05:00
f00fa1c4aa
refactor; flatten property list
2017-12-29 08:26:31 -05:00
4c1adf258b
refactor: add method to get directly property
2017-12-29 08:08:04 -05:00
9ca337eeb1
extract storage provider
2017-12-28 17:42:25 -05:00
310712567f
move whisper to a module
2017-12-28 12:40:11 -05:00
e833ebd019
move ipfs embarkjs code to module
2017-12-28 12:16:50 -05:00
8de81c33bd
Merge branch 'develop' of github.com:iurimatias/embark-framework into develop
2017-12-28 07:00:17 -05:00
17a7dcf3e6
remove unsupported whisper protocol msg
2017-12-27 20:58:14 -05:00
750eace6ce
always define contract code so ondeploy cmds work
2017-12-27 11:40:21 -05:00
cff999def8
Merge branch 'develop' of github.com:iurimatias/embark-framework into develop
2017-12-27 08:21:15 -05:00
eaf9016c79
move ipfs service check to its module
2017-12-26 20:32:51 -05:00
50f1072372
move upload to its own module
2017-12-26 19:55:42 -05:00
cd0fd94386
updatests; include options
2017-12-22 13:07:43 -05:00
52953a1d0d
warn about cycling dependencies
2017-12-20 14:54:47 -05:00
bc34e00268
better errors when parsing invalid json
2017-12-19 12:57:03 -05:00
799da089af
refactor webserver code
2017-12-19 09:50:29 -05:00
76be683ed2
refactor webserver
2017-12-18 09:37:16 -05:00
14d330a729
fix webserver service check
2017-12-17 18:58:55 -05:00
113bb25142
add webserver start/stop cmd
2017-12-17 18:34:41 -05:00
8999d619c5
update tests
2017-12-16 17:55:27 -05:00
67dd4a22cb
update tests
2017-12-16 17:10:11 -05:00
ce4f75ddc4
extract solc to its own module
2017-12-16 17:08:18 -05:00
130b37f6fd
minor refactor
2017-12-16 11:48:20 -05:00
7e1493c039
clean up
2017-12-16 11:45:29 -05:00
a76dbb69b9
tolerate lack of blockchain config file
2017-12-16 08:48:37 -05:00
747237de76
fix defaults when contracts config file is not present
2017-12-16 08:12:38 -05:00
301ba94ef6
refactor httpGet
2017-12-15 22:11:55 -05:00
1666be1158
fix contract directories config
2017-12-15 17:14:00 -05:00
c55b011675
fix eslint issues
2017-12-13 20:15:57 -05:00
9211279f8e
fix eslint issues
2017-12-13 19:49:05 -05:00
4106531bd7
warn user when IPFS comes back online
2017-12-13 18:15:59 -05:00
0b00f99f09
include ipfs lib in embarkjs
2017-12-13 15:53:29 -05:00
b7b5fae2c8
imports with shared web3 object
2017-12-13 15:53:29 -05:00
92e22ea519
support special imports
2017-12-13 15:53:29 -05:00
038f57e7d2
fix new index example
2017-12-13 15:53:29 -05:00
3d36aaaeb3
support both old system and imports in the pipeline
2017-12-13 15:53:29 -05:00
33711c8db2
support imports
2017-12-13 15:53:29 -05:00
58cf9ca78d
take into account config in ipfs service check
2017-12-07 10:26:17 -05:00
be64d2ff6b
fix IPFS dependency
2017-12-06 11:37:44 -05:00
e2cbc2a488
fix linting issues
2017-12-05 18:14:46 -05:00
4bb77ae8d5
Merge branch 'develop' into buildFixes
2017-10-24 20:56:57 +02:00
2690ada62d
Merge branch 'next' into develop
2017-10-22 09:47:11 -04:00
05ebefff9a
downgrade to 0.4.17
2017-10-22 09:44:32 -04:00
f3a8e68c60
Merge branch 'next' into develop
2017-10-22 08:37:24 -04:00
38b1cf480e
update solc version
2017-10-21 15:17:54 -04:00
398aff3af7
fix multiple issues with multiple file writes
2017-10-21 14:21:18 -04:00
a18fb65e53
Merge branch 'next' into develop
2017-10-19 19:16:18 -04:00
e23e4bc417
add blockchain ws config support; fix whisper provider setting
2017-10-19 18:55:49 -04:00
dd8135445d
Merge branch 'next' into develop
2017-10-17 07:03:54 -04:00
460f78cc55
update events name for code generation
2017-10-17 07:03:13 -04:00
6157968c5e
update default solc version; update spec; fix issue with compiler warnings
2017-10-17 06:51:52 -04:00
0e9b90b4ee
comply with linter
2017-10-14 10:13:30 -04:00
d1762a0fb4
refactor code generation
2017-10-13 20:01:35 -04:00
322fabab3d
update tests; fix test module
2017-10-13 05:56:42 -04:00
ef98346963
fix issues with the console
2017-10-07 19:53:57 -04:00
a9e63069fb
fix connecting to correct provider
2017-10-07 15:20:51 -04:00
a78d8b00bf
fix support for 1.0 versions of web3
2017-10-06 07:30:34 -04:00
f41702634f
add deprecated warning for deprecated events
2017-08-03 20:03:17 -04:00
2dc1941e48
rename ABIGenerator (very old legacy reasons) to more apropriate CodeGenerator
2017-08-03 19:29:09 -04:00
2bf91b6d9a
make storage getUrl configurable
2017-07-23 08:15:40 -04:00
414c875082
add versions command
2017-07-06 19:50:36 -04:00
Jonathan Rainville
Iuri Matias
emizzle
VoR0220
Richard Ramos
hodlbank
Antonio Tenorio Fornés