a174b94702
move basic import so it's always available
2017-12-13 15:53:29 -05:00
99a66a05ef
import web3 object on contract import
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
aa0f774f1d
Merge branch 'release/2.6.0' into develop
2017-12-13 12:17:29 -05:00
daba3b9319
remove extra character in template causing issues with the console
2017-12-13 11:38:36 -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
8c1b9b56cf
update bundle; don't double add shh option
2017-10-21 08:42:29 -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
c5a7db2da0
cleanup
2017-10-14 06:12:54 -04:00
704a1ff517
cleanup
2017-10-14 06:06:09 -04:00
f450bf2e6a
fix lint; add eslint
2017-10-14 05:24:39 -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
2f25876722
fix jshint issues
2017-10-09 09:11:37 -04:00
09db4eaa53
re-add support for whisper 5
2017-10-09 08:59:02 -04:00
69fa1b24c3
adapt test app to work with 1.0
2017-10-07 21:02:05 -04:00
ef98346963
fix issues with the console
2017-10-07 19:53:57 -04:00
3d88138804
fix loading order
2017-10-07 16:51:56 -04:00
a9e63069fb
fix connecting to correct provider
2017-10-07 15:20:51 -04:00
e5aab5e2ea
download target file instead of tarball
2017-10-06 16:17:13 -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
29c343463b
add support for whisper v5; make get url ipfs get configurable
2017-07-24 07:27:52 -04:00
2bf91b6d9a
make storage getUrl configurable
2017-07-23 08:15:40 -04:00
fbfb5269b0
update compiler spec
2017-07-16 14:40:06 -04:00
fd5eca6856
replace all instances of matched lib
2017-07-16 13:38:12 -04:00
c02e3e7ab8
treat library as dependencies for contract deployment
2017-07-16 13:31:40 -04:00
48f9c54d9d
detect and replace library references with address
2017-07-16 12:10:17 -04:00
b56b51cf6e
don't stop when getting a compiler warning but print it as a warning
2017-07-15 11:35:29 -04:00
aa5efab6f9
update tests
2017-07-08 12:39:53 -04:00
094334fee7
code lint fix
2017-07-07 20:46:06 +09:00
414c875082
add versions command
2017-07-06 19:50:36 -04:00
232f6fc88b
support list of fallbacks for dapp web3 connection, support separate connection config for deployment
2017-07-06 18:48:20 -04:00
f882b3486b
use deployment config from contracts.json instead of blockchain.json
2017-07-05 20:24:28 -04:00
408090a643
make linter happy
2017-07-05 19:38:53 -04:00
2ed4eee831
display loading message when new libs are being installed
2017-07-05 18:26:44 -04:00
5a2cdb19bf
use existing version of lib if versions match
2017-07-05 09:12:11 -04:00
f45ce963b4
add file type so files are loaded when needed; support to configure web3 and solc versions
2017-07-05 08:35:51 -04:00
0991a87b73
add support for embark_js directive
2017-07-03 18:54:31 -04:00
0e904bba33
support contract as an alias
2017-07-03 18:15:43 -04:00
8e349cc6ed
support directive
2017-07-02 18:03:14 -04:00
61e44b31e9
support specifying web3.js separetly
2017-07-02 14:55:35 -04:00
31ecaf0837
support to download specified versions of web3
2017-07-02 13:33:11 -04:00
263fdb6d8b
support specifying file or folder when running tests
2017-07-02 11:32:16 -04:00
ec6fc4d967
get rid of npm install
2017-07-02 00:30:09 -04:00
ec9293af60
get rid of mocha requirement
2017-07-02 00:27:14 -04:00
ccf78b4ff2
exit process after each mocha run
2017-07-01 23:22:01 -04:00
9a8a8d7da2
first step at getting rid of mocha/embark on package.json
2017-07-01 23:11:42 -04:00
88c1a16453
fix contract address and make module exports compatible
2017-07-01 22:04:29 -04:00
0eb462a89c
generate contract js file
2017-07-01 12:55:46 -04:00
4f90e62790
include specific contract config given contract name
2017-07-01 12:55:46 -04:00
b473d68a1e
include specific contract config given contract name
2017-07-01 12:55:46 -04:00
cdc75c91e1
fix contract extension file matching
2017-06-29 07:39:12 -04:00
ffbf6a70c5
include whisper version in the dashboard
2017-06-27 17:05:35 -04:00
cbf6f6ec5c
default to embarkDApp as the new dapp
2017-06-27 15:45:30 -04:00
590dfe8925
fix template generator
2017-06-26 16:48:05 -04:00
5b60c3effa
fix issue with orbit config
2017-06-26 15:25:22 -04:00
1bbacd1c5d
make linter happy
2017-06-26 09:02:58 -04:00
2a2a5820fc
fix testing functionality in develop
2017-06-26 09:01:54 -04:00
84f7149aaf
fix contracts loading; add warning for whisper version; update web3.js
2017-06-25 12:56:14 -04:00
a6c8e83d40
fix conflicts
2017-06-24 22:35:27 -04:00
6f93d7e824
use npm dependencies management for ipfs, web3 and orbit, and remove them from js/ folder.
2017-06-21 18:58:15 +02:00
46e18e34c5
remove duplicate dependency
2017-06-21 18:57:25 +02:00
4bb7f18155
Merge branch 'develop' of github.com:iurimatias/embark-framework into develop
2017-06-19 06:33:07 -04:00
f38b9bc1d6
fix for no accounts on init with warning messages
2017-06-18 13:16:11 +02:00
4202d5e832
Update solc to 0.4.11
...
The solidity compiler was at 0.4.8, 3 patches behind. At some point the
output of the compiler changed, `compiler.js` reflects those changes.
I'm not sure if other properties changed.
2017-06-02 21:20:27 -04:00
5232f0e74d
fix crash in logger if message is null or undefined
2017-04-09 14:55:24 +10:00
47f313b12c
generate json files
2017-04-04 06:37:50 -04:00
3c1ca7f457
remove unneded require
2017-04-02 14:54:34 -04:00
dd7984bcda
use version from constructor parameter
2017-04-02 14:49:19 -04:00
86335e0c74
move http request to utils
2017-04-02 14:40:10 -04:00
2373d14d6b
add options to runCommand
2017-04-02 14:30:00 -04:00
9ce25d7651
refactor services check to use on/off and let monitor decide colors
2017-04-01 23:22:43 -04:00
f4dbeb4b7e
revert some of the recent changes
2017-03-31 07:39:33 -04:00
faf0e1ff48
revert some of the recent changes
2017-03-31 07:34:43 -04:00
780fc197f3
remove static since we want these exposed
2017-03-30 22:31:23 +09:00
613e4e6abe
integration testing fixes
2017-03-30 22:16:46 +09:00
8a5604eec6
var -> let
2017-03-30 20:52:49 +09:00
7599f43a3b
fixed problem with double this.client in blockchain.js
2017-03-30 20:48:22 +09:00
fbe3f302b2
cleanup code from linter feedback
2017-03-30 20:38:14 +09:00
65f6827b05
merge develop branch
2017-03-30 20:29:55 +09:00
648b27920c
merge develop branch
2017-03-30 20:26:03 +09:00
36633bf60c
the lint is mother the lint is father
2017-03-30 07:16:15 -04:00
67f325f5a0
migrate all the code to ES6
2017-03-30 20:12:39 +09:00
c2ca2563bc
revert change that was refering to a relative path for embark.json
2017-03-30 07:04:13 -04:00
504e68d5fc
Merge pull request #259 from Exartu/develop
...
readme documentation update
2017-03-30 07:02:52 -04:00
8dc87b7cbc
Merge pull request #258 from toadkicker/use_path_in_tmpl_gen
...
this fixes problems where concatenating the path string would fail
2017-03-30 07:01:11 -04:00
7bdc934e40
revert test change to previous state
2017-03-30 06:58:24 -04:00
fc36bccee5
Merge pull request #257 from aletheia-foundation/develop
...
Show error message if unable to deploy contracts. Include ethereumjs-testrpc
2017-03-30 06:57:04 -04:00
604635f3e3
added async simulator
2017-03-29 17:47:04 -03:00
a66f002a18
swap path -> util.joinPath
2017-03-30 03:13:48 +09:00
5bf1475ea4
swap more var -> let
2017-03-30 02:50:05 +09:00
e3b9c01205
fix linter complaints
2017-03-30 02:18:00 +09:00
4ae5757bae
add back in missing load commands
2017-03-30 02:04:35 +09:00
2f5c647c39
this changes Embark to an EventEmitter and adds more event handling for loading and fetching plugins. It introduces a dependency on underscore and underscore string. It adds defenses against null/invalid options objects.
2017-03-30 00:37:30 +09:00
20baf5ee9f
call path.join once and store in fspath var
2017-03-22 21:46:59 +09:00
37a7259999
this fixes problems where concatenating the path string would fail, e.g. non-unix systems.
2017-03-22 20:32:16 +09:00
b186bf966c
fixed merge conflicts
2017-03-22 14:13:58 +09:00
1a8e5a5abd
fixes async on blockchains
2017-03-21 16:26:45 -03:00
af4cacf496
fixes async on blockchains
2017-03-21 15:28:36 -03:00
3e0e1fda0c
fixes for runing on meteor
2017-03-21 14:52:02 -03:00
3637b2e06e
update the initTests method of embark to reflect the new structure of test.js
2017-03-21 18:55:15 +10:00
2a39290158
start the web3 service for the build task so that contracts can be deployed
2017-03-21 18:22:16 +10:00
5fa32754fb
show error message if unable to deploy contracts due to web3 client being unavailable
2017-03-21 17:47:26 +10:00
447f967061
add service check functionality to plugin api
2017-03-16 07:31:52 -04:00
e8c8a85713
fix broken js generation on asset change: (temporarily) revert change to not deploy on asset change and force redeploy of everything
2017-03-12 21:32:06 -04:00
124177c8fc
speed up testing
2017-03-13 00:21:19 +09:00
383b3c31a5
speed up test class - unstable
2017-03-12 12:23:30 +09:00
f64474b861
dont require () at end of requires
2017-03-12 11:59:13 +09:00
9eb4887d37
add backwards compatbility for tests with a deprecation message
2017-03-11 21:49:12 -05:00
1534bf6207
Merge pull request #242 from toadkicker/make_cli_faster
...
this is a quick attempt at speeding up the init of CLI…
2017-03-11 21:18:20 -05:00
54420b327e
detect when ethereum node comes back online and redeploy
2017-03-11 12:27:10 -05:00
8d8ff671f7
if monitor is already running then init service
2017-03-11 11:48:12 -05:00
5cf287a747
implement stopCheck
2017-03-11 11:23:42 -05:00
2dec088a9b
add service check error
2017-03-11 11:17:52 -05:00
c514765d0b
move misc utils modules to their own folder
2017-03-11 11:03:20 -05:00
92f9df4117
remove async extension to a module
2017-03-11 10:52:02 -05:00
c2c41549c1
cleanup; remove unneded requires
2017-03-11 10:38:05 -05:00
ea70d09e8c
move ethereum and whisper checks; refactor web3 connection
2017-03-11 10:29:45 -05:00
4bf31328e2
use eachObject to avoid async issues; support non-recurrent checks
2017-03-11 07:32:16 -05:00
173c571147
remove old services monitor; add new services monitor to engine; move previous checks to their modules inits
2017-03-10 22:00:30 -05:00
b25a0ecbc7
Merge branch 'develop' of github.com:iurimatias/embark-framework into make_cli_faster
2017-03-11 10:59:52 +09:00
b590312e20
cleanup empty lines after function
2017-03-11 00:13:59 +09:00
dc9084b8a6
Dropped 'this' in Cmd and set internal var Embar to self execute
2017-03-11 00:07:08 +09:00
835899cf6e
this is a quick attempt at speeding up the init of CLI by changing Embark.js to a reveal module pattern and moving the requires into the functions that need them. It removes the circular reference between Cmd and Embark, which is the biggest hit to speed. It also changes how the binary starts by importing Cmd instead of Embark.
2017-03-10 23:43:52 +09:00
a4369ecd4e
implement (previously empty) stopMonitor method
2017-03-10 06:44:17 -05:00
02cb5b7f1f
Merge pull request #237 from nogueian/develop
...
Fixed issue with logic to detect if IPFS node is online
2017-03-08 20:34:20 -05:00
2de9292bd6
Merge branch 'develop' of github.com:iurimatias/embark-framework into one_version
2017-03-08 23:54:17 +09:00
83f3e1c5ee
dot notation preferred
2017-03-08 23:52:17 +09:00
f5aafa4242
Setting host and port parameters back according to develop branch
2017-03-08 09:51:58 -05:00
c1d2bd170e
Merge pull request #230 from toadkicker/add_mocha_timeouts
...
add this.timeout(15000) to tests to allow the solc enough space to work
2017-03-08 09:47:08 -05:00
82042c01c6
Fixed issue with logic to detect if IPFS node is online. If the IPFS node is not running and there's another service in the computer running on port 5001 it could cause an exception.
2017-03-08 09:46:15 -05:00
026909aa91
fix other timeout issues in tests outside of core framework code
2017-03-08 23:41:16 +09:00
486fbec108
read version in from package.json instead of strings
2017-03-08 23:20:23 +09:00
70868de81b
changes undefined process.exit(code) to process.exit(9)
2017-03-08 19:29:19 +09:00
71121cdc4b
update to 2.4.0
2017-03-07 06:39:56 -05:00
b42031de6b
fix cmd line webserver host override
2017-03-06 22:08:43 -05:00
96d1361dd8
support defaults when new config files are not found, for backwards compatibility
2017-03-05 21:27:33 -05:00
007be84f23
add config to the plugin api (temporary)
2017-03-05 20:25:09 -05:00
8325943bd7
add new events for output generation and first deployment
2017-03-05 11:00:47 -05:00
a797f8fcf6
fix account selection when it isn't configured; improve error message on tests
2017-03-04 21:51:28 -05:00
fd6af8af2e
refactor condition
2017-03-04 20:35:15 -05:00
a527573796
separate the different functions in deployContracts
2017-03-04 20:14:47 -05:00
16275f13e5
if any account is configured in blockchain.json then use it as the default account for deploying contracts
2017-03-04 19:17:39 -05:00
85659987d9
add support for website config file; reflect real web server config in the dashboard
2017-03-04 14:20:28 -05:00
269552aee0
add events to plugin api
2017-03-04 12:42:24 -05:00
3db27c14cb
add exception to dealWithConfigsMethods; it's simple enough
2017-03-03 21:51:23 -05:00
617d263341
reduce complexity of engine main metod
2017-03-03 21:48:32 -05:00
383d69c194
handle cmd error
2017-03-03 21:11:53 -05:00
94cca83670
simplify test constructor
2017-03-03 21:06:44 -05:00
6799e1d8a5
remove comment
2017-03-03 01:25:14 -05:00
cd45a2be77
refactor, move calls to engine; fix tests
2017-03-03 01:22:12 -05:00
6784fa662c
pass path when listening to file change event
2017-03-02 21:31:07 -05:00
d5ebd7d748
fix for current refactor: on an asset change don't redeploy
2017-03-02 20:23:03 -05:00
fe30f4b040
make cmd call async
2017-03-02 08:15:35 -05:00
4c5cb95209
refactor: extract method for cmd interpreter
2017-03-02 07:44:24 -05:00
11eca918a1
add cc rule
2017-03-01 21:28:27 -05:00
d4f7eca2c5
make cc happy; use join path
2017-03-01 21:15:02 -05:00
09fbd66417
put callback call at the end
2017-03-01 21:09:55 -05:00
c0bcc15023
simplify condition; return callback
2017-03-01 21:08:28 -05:00
dbb0b0b171
track deployed contracts taking into account swarm hash inserted by solc
2017-03-01 20:52:58 -05:00
b7cd296716
make abi generation independent of deployment
2017-02-28 23:29:16 -05:00
1674adee4a
add config to specify available providers for each component
2017-02-28 21:43:03 -05:00
09e58977e4
generate final embarkjs file depending on components enabled
2017-02-28 21:26:15 -05:00
e61f0f102d
generate storage and communication abi; disable deployment if config is disabled
2017-02-28 20:42:03 -05:00
c500bb4988
fix error display with refactored compilation module
2017-02-28 08:03:03 -05:00
5477b7f11c
fix options varible; make cc happy
2017-02-27 07:49:25 -05:00
e806a14af6
Merge branch 'develop' of github.com:iurimatias/embark-framework into develop
2017-02-27 06:57:30 -05:00
60a617a28e
don't intercept console error in plugins, causes too much issues; need to research a better way
2017-02-26 18:47:52 -05:00
2642325868
Fix scoping
2017-02-26 14:33:58 -08:00
5cf9048099
Add more options to testing setup
...
Ability to retrieve the logger from contract deployment, as well as
override the default `embark.json`
2017-02-26 14:33:14 -08:00
0060dbe53f
don't exit if blockchain is not available
2017-02-26 14:56:43 -05:00
a153859caf
herge branch 'refactor_e' into develop
2017-02-25 23:32:08 -05:00
0dc21abd3c
fix compiler argument
2017-02-25 23:20:57 -05:00
562efc6f14
test fixes
2017-02-25 22:57:22 -05:00
5fc2d97609
fix so child process doesn't hang some cmds
2017-02-25 22:39:40 -05:00
85519e95d8
add new deploy manager to build cmd
2017-02-25 20:45:40 -05:00
289ece9df6
Updates to boilerplate and template creation
...
Update `test` command to run `embark test`
Update `name` in `package.json` to be something more easily replaceable.
Use `sed` to replace above flag with DApp name
2017-02-25 14:34:45 -08:00
e9ce9dc6f1
add redeploy; don't reload compiler if it's already loaded
2017-02-25 15:47:35 -05:00
d73eb802ea
refactor deployment
2017-02-24 22:49:34 -05:00
4b119fffde
add solc wrapper
2017-02-24 19:27:27 -05:00
a2a27bb0c2
start refactoring deployment steps
2017-02-24 08:20:03 -05:00
Iuri Matias
Antonio Tenorio Fornés
Todd Baur
Carl Mönnig
Nathan Hernandez
roo2
ramiro
Andy Nogueira
DeviateFish