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
fe186a4443
move module js code to its own folder
2017-12-30 21:02:46 -05:00
37a126a6b8
move old code to a separate file
2017-12-30 20:42:52 -05:00
f4e81da630
refactor whisper code; separate old version
2017-12-30 20:09:46 -05:00
7e38a239b7
fix package name listener
2017-12-30 19:34:15 -05:00
1c38f3fb89
move lib
2017-12-30 18:25:59 -05:00
2f3abc37b7
use module command to get solc version
2017-12-30 18:12:16 -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
947373eafc
remove unnecessary if
2017-12-29 18:35:47 -05:00
3fb02befea
comply with linter
2017-12-29 18:33:11 -05:00
92de2904f1
move webserver cmds to module
2017-12-29 18:29:56 -05:00
411ed41c84
fix console cmds api
2017-12-29 18:21:36 -05:00
b29e865cd6
extract to method duplicated code
2017-12-29 16:29:32 -05:00
d1a207941d
take into account available providers list
2017-12-29 16:11:45 -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
8956992950
extract communication provider
2017-12-28 18:10:43 -05:00
9ca337eeb1
extract storage provider
2017-12-28 17:42:25 -05:00
9f40958e6a
Merge branch 'develop' of github.com:iurimatias/embark-framework into develop
2017-12-28 13:54:22 -05:00
fc24b04bf6
comply with linter
2017-12-28 13:13:30 -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
ab5d3722b9
fix issue where contract was being deployed everytime when gas config was set; catch errors on individual onDeploy cmds
2017-12-28 08:27:20 -05:00
36d7890cfc
fix cyclic error when contract is actually just referring to itself
2017-12-28 08:26:02 -05:00
1f95418504
use for to avoid multiple callback calls
2017-12-28 07:30:41 -05:00
8de81c33bd
Merge branch 'develop' of github.com:iurimatias/embark-framework into develop
2017-12-28 07:00:17 -05:00
24c34fcbe3
refactor setProvider
2017-12-27 21:04:12 -05:00
17a7dcf3e6
remove unsupported whisper protocol msg
2017-12-27 20:58:14 -05:00
a568835ceb
separate components; extract ipfs; add register method
2017-12-27 19:10:05 -05:00
174ba8ec9b
add more cmd line options to sim
2017-12-27 17:48:33 -05:00
aad78cc130
fix/improve error handling
2017-12-27 13:07:13 -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
49d693dc1a
use givenProvider instead of currentProvider
2017-12-26 09:07:57 -05:00
cd0fd94386
updatests; include options
2017-12-22 13:07:43 -05:00
16afb4e405
implemet afterDeploy cmds
2017-12-21 11:21:36 -05:00
7cdba7e4e3
throw exception when finding CyclingDependencyError
2017-12-20 14:58:59 -05:00
52953a1d0d
warn about cycling dependencies
2017-12-20 14:54:47 -05:00
eb43fa2526
add onDeploy cmds to contract depedencies
2017-12-20 14:30:01 -05:00
281ebc643d
update & fix onDeploy
2017-12-20 14:09:35 -05:00
d005d3f668
fix on deploy
2017-12-20 11:32:11 -05:00
d2ccfa3145
suggest parent name instead of same contract
2017-12-20 09:41:12 -05:00
25d99bcf2f
fix linting error
2017-12-19 15:48:56 -05:00
02634d0bda
warn is terminal window is too small
2017-12-19 15:14:09 -05:00
535340794b
warn of contract typos
2017-12-19 14:07:48 -05:00
c63c9b8728
warn user of typos
2017-12-19 13:29:48 -05:00
bc34e00268
better errors when parsing invalid json
2017-12-19 12:57:03 -05:00
9404bfb2cc
don't attempt to link contract if it's not in the code
2017-12-19 11:13:27 -05:00
a99ee73ef8
add version command
2017-12-19 10:20:05 -05:00
6a27559de4
update linter rule
2017-12-19 09:54:39 -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
8360295ed0
warn if server is already running or not
2017-12-17 19:18:35 -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
9efd29ec9e
add to help exit cmd
2017-12-16 18:16:53 -05:00
81f06bc984
include ipfs version in versions cmd
2017-12-16 18:15:44 -05:00
65ae827350
Merge branch 'mds' into develop
2017-12-16 17:55:38 -05:00
8999d619c5
update tests
2017-12-16 17:55:27 -05:00
158fb1414a
re-use same package if already downloaded
2017-12-16 17:36:52 -05:00
67dd4a22cb
update tests
2017-12-16 17:10:11 -05:00
ce6c570634
use utils joinPath instead of path.join
2017-12-16 17:10:11 -05:00
ce4f75ddc4
extract solc to its own module
2017-12-16 17:08:18 -05:00
f90321a23e
warn user if attempting to download package without internet connection
2017-12-16 17:05:37 -05:00
b764ecf4d6
fix logger call
2017-12-16 12:48:59 -05:00
9d78f995e8
refactor download
2017-12-16 12:44:52 -05:00
a216aa980f
extract tar extraction code
2017-12-16 12:23:02 -05:00
8e62a1f2e9
clean up
2017-12-16 12:01:45 -05:00
130b37f6fd
minor refactor
2017-12-16 11:48:20 -05:00
7e1493c039
clean up
2017-12-16 11:45:29 -05:00
26b070b27f
minor refactor: simplify options setting
2017-12-16 11:11:29 -05:00
fb8d3c4c0a
refactor availableServices
2017-12-16 10:54:17 -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
e093ff5b30
refactor utils http get
2017-12-15 22:15:24 -05:00
301ba94ef6
refactor httpGet
2017-12-15 22:11:55 -05:00
e88b51bdfd
add err arg
2017-12-15 22:06:33 -05:00
510bc2c542
refactor httpsGet
2017-12-15 22:05:38 -05:00
bee4d0e1f2
extract file download
2017-12-15 21:53:11 -05:00
c4e13f9ea8
minor refactor on setprovider code
2017-12-15 18:02:50 -05:00
d42a34b342
comply with eslint
2017-12-15 17:30:29 -05:00
1666be1158
fix contract directories config
2017-12-15 17:14:00 -05:00
68886d7095
add error for reference issues
2017-12-15 16:39:13 -05:00
cfaccb307b
throw error when target lib is not found
2017-12-15 16:18:19 -05:00
7c33720c98
fix onDeploy cmds
2017-12-15 15:50:42 -05:00
0a4a757af8
fix deploy intention so interfaces can be detected automatically
2017-12-14 16:16:51 -05:00
34cec58f32
cleanup
2017-12-14 15:27:19 -05:00
1cb6581fde
better display error contract deployment errors in the dashbord
2017-12-14 15:03:08 -05:00
c55b011675
fix eslint issues
2017-12-13 20:15:57 -05:00
2c8f049f4a
remove unused import
2017-12-13 19:51:34 -05:00
bed7e7afc6
clean up
2017-12-13 19:49:59 -05:00
9211279f8e
fix eslint issues
2017-12-13 19:49:05 -05:00
6098d3cca6
add alias for exit cmd
2017-12-13 19:31:16 -05:00
ccb77051f8
import bootstrap in test_app
2017-12-13 19:24:20 -05:00
4106531bd7
warn user when IPFS comes back online
2017-12-13 18:15:59 -05:00
d32d5f50bd
check if geth command exists and warn user if not
2017-12-13 17:58:07 -05:00
19d061e5f3
remove commented out line
2017-12-13 17:25:29 -05:00
e2dcad07ce
update tests
2017-12-13 16:28:23 -05:00
0b00f99f09
include ipfs lib in embarkjs
2017-12-13 15:53:29 -05:00
3ddd492e83
refactor building web3 obj
2017-12-13 15:53:29 -05:00
c160ac616f
refactor building web3 obj
2017-12-13 15:53:29 -05:00
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
Iuri Matias
Antonio Tenorio Fornés
Todd Baur
Carl Mönnig
Nathan Hernandez
roo2
ramiro