ff0d24aa1f
Merge branch 'features/ipfs-process' of https://github.com/embark-framework/embark into features/ipfs-process
...
# Conflicts:
# lib/contracts/blockchain.js
2018-05-30 12:02:30 -04:00
b5d9a86680
start blockchain process at false and deploy on ready
2018-05-30 12:00:44 -04:00
138aaf39ff
fix processes on ubuntu
2018-05-30 11:03:33 -04:00
2f3a94f3a1
little fixes
2018-05-30 11:03:33 -04:00
2023689eb2
fix tests
2018-05-30 11:03:33 -04:00
4df669ab52
add more error management to ipfs
2018-05-30 11:03:33 -04:00
d06a7f43ac
fix swarm spawn
2018-05-30 11:03:33 -04:00
c86c50fb4e
boot swarm with spawn
2018-05-30 11:03:33 -04:00
8655b49a39
change ipfs to spawn too
2018-05-30 11:03:33 -04:00
73db1a6133
something en.json
2018-05-30 11:03:33 -04:00
3f671c2fb0
conflict in en.json
2018-05-30 11:03:33 -04:00
d36af9f5e1
fix blockchain start
2018-05-30 11:03:33 -04:00
4e20e82edf
conflict in blockchain
2018-05-30 11:03:33 -04:00
a88ab82261
conflict in blockchain.js
2018-05-30 11:02:01 -04:00
b0a64cc043
use right version
2018-05-30 10:57:25 -04:00
e02648dbef
add error if user uses ipfs 0.4.14 or lower
2018-05-30 10:57:25 -04:00
023d8f7f5f
fix logs
2018-05-30 10:57:25 -04:00
3c7bdbf6cf
set cors domain depending on the webserverConfig
2018-05-30 10:57:25 -04:00
ac7612136e
start storage node on run too
2018-05-30 10:57:25 -04:00
857c7d8c85
small fixes
2018-05-30 10:57:25 -04:00
f08c700151
reverse plugin.js changes
2018-05-30 10:57:25 -04:00
2b54dfd7cc
conflict in en.json
2018-05-30 10:57:25 -04:00
0f07a00791
detect swarm started signal
2018-05-30 10:57:25 -04:00
e67fafdc29
conflict in en.json
2018-05-30 10:57:25 -04:00
bc853ef899
conflict in en.json
2018-05-30 10:57:25 -04:00
70d3e6a46f
conflict en.json
2018-05-30 10:57:25 -04:00
e3a93a6d61
add storageProcessesLauncher that can work for swarm or ipfs
2018-05-30 10:57:25 -04:00
56f25ebba1
clonflict for silent
2018-05-30 10:57:25 -04:00
d969eb0065
fix processes on ubuntu
2018-05-30 10:52:15 -04:00
4d0453fede
Merge pull request #468 from embark-framework/fix_service_check
...
early return if failing to connect to node
2018-05-30 08:24:15 -04:00
302476e95e
fix simulator preferential treatment
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-29 14:19:25 -05:00
cd96aebdcd
early return if failing to connect to node
2018-05-28 17:55:59 -04:00
a7bc9755c3
little fixes
2018-05-28 16:02:44 -04:00
729c43bae1
fix tests
2018-05-28 15:56:03 -04:00
7a754ac97f
add more error management to ipfs
2018-05-28 15:43:27 -04:00
9338b6e37f
fix swarm spawn
2018-05-28 15:37:25 -04:00
52524c2f59
eliminate nasty outdated test
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-28 13:22:48 -05:00
6c921e3a85
fix typo
2018-05-28 13:58:49 -04:00
1eee68e901
fix typo; default environment to development
2018-05-28 13:53:10 -04:00
6fe3064edd
spelling correction of metamask
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-28 12:45:14 -05:00
f34bd5df4f
env check
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-28 12:28:38 -05:00
90b42bccb2
template correction to check for development environment and whether metamask is engaged and log that it is
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-28 12:27:55 -05:00
7a05a9ac79
boot swarm with spawn
2018-05-28 12:54:06 -04:00
3c32f98f71
change ipfs to spawn too
2018-05-28 12:49:44 -04:00
6fa472ae11
something en.json
2018-05-28 12:31:29 -04:00
033613d7f6
lint is king
2018-05-28 12:29:47 -04:00
45bf11ff2b
conflict in en.json
2018-05-28 11:55:16 -04:00
dd1b01a643
fix blockchain start
2018-05-28 11:54:35 -04:00
3e86e21878
conflict in blockchain
2018-05-28 11:54:31 -04:00
8d9c192e91
fix little oopsie in waterfall
2018-05-28 11:53:35 -04:00
b003675ee8
use right version
2018-05-28 11:53:35 -04:00
33e78a589e
add error if user uses ipfs 0.4.14 or lower
2018-05-28 11:53:35 -04:00
a2c7f07f3d
fix logs
2018-05-28 11:53:35 -04:00
72115bb636
set cors domain depending on the webserverConfig
2018-05-28 11:53:35 -04:00
460c2e98f1
start storage node on run too
2018-05-28 11:53:34 -04:00
fd9da44792
small fixes
2018-05-28 11:52:52 -04:00
c084803acb
reverse plugin.js changes
2018-05-28 11:52:52 -04:00
48bf7531bf
conflict in en.json
2018-05-28 11:52:49 -04:00
e43078ce90
detect swarm started signal
2018-05-28 11:51:42 -04:00
12525fb9bf
conflict in en.json
2018-05-28 11:51:38 -04:00
21a0042d00
conflict in en.json
2018-05-28 11:50:39 -04:00
04059721e6
conflict en.json
2018-05-28 11:50:01 -04:00
9e12251f2f
add storageProcessesLauncher that can work for swarm or ipfs
2018-05-28 11:49:06 -04:00
b08190242b
clonflict for silent
2018-05-28 11:48:27 -04:00
ef3bde1053
add missing code init
2018-05-28 11:42:22 -04:00
ee460e3309
add missing promise returns
2018-05-28 11:42:01 -04:00
32a9b25fe3
fix reference to ens object
2018-05-28 11:21:52 -04:00
e988bd6b4a
use import instead of require
2018-05-28 11:10:20 -04:00
3750fc297b
add missing module init
2018-05-28 11:10:09 -04:00
a25330ddec
set namesystem enable to true by default
2018-05-28 11:09:48 -04:00
8fa325a7af
Merge pull request #452 from embark-framework/DomainNameResolution
...
ENS Domain name resolution initial integration
2018-05-27 08:12:26 -04:00
2608eed19b
Merge branch 'develop' into bug_fix/change-warn-path-depth-to-length
2018-05-27 08:05:51 -04:00
605a3fe8d5
Merge pull request #457 from embark-framework/bug_fix/error-with-geth-cors
...
geth CORS updates to fix issues and add to auto blockchain process
2018-05-27 08:04:51 -04:00
2d67061fe3
put compiling message only after checking for binary
2018-05-27 08:00:18 -04:00
2ae9e7e0e7
add a warning for vyper installation
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-25 14:44:07 -05:00
8ace5653cd
fix some linting issues and add a few forgotten lines to the config function
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-25 12:52:57 -05:00
9cb10c7ce7
bring free wheeling vars into the ensEmbark namespace
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-25 12:25:28 -05:00
f5a29c7f4d
make namesystem service come from a config file for future development
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-25 12:25:02 -05:00
cfcdc0e15d
Changed path depth warning to path length
...
* Updated the path depth warning to check that the dapp path length is <= 66 characters.
* Updated the blockchain process to silent:false when loglevel == trace.
* Updated the path warning so that it would appear in the console regardless of loglevel (and silent:true)
2018-05-25 13:42:18 +10:00
5b4e829675
* Adds auto cors updates to geth command when blockchain started via run command.
...
* Fixes issues with storage/webserver configs not enabled but still having their values put in to geth cors
* Adds fixes for not including port when port == false
* Refactors of cors logic, and also now in a generic location so can be used by both `embark blockchain` and when blockchain started in separate process
2018-05-25 11:00:26 +10:00
91d3ccbc70
cringy ending of the line break
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-24 07:57:14 -05:00
16e7fe9fde
added some logic for error handling in lookup and fixed some linting issues
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-23 23:34:19 -05:00
8b07039907
should work to create the reverse lookup
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-23 16:53:39 -05:00
fe84cc8de4
last major issue
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-23 13:05:42 -05:00
793a618c12
more fixes
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-23 13:00:34 -05:00
bf40bdb93b
linting fixes and import fixes and some cleanup of the logic
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-23 12:13:06 -05:00
ea17e235f3
fix further linting issues
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-23 11:55:11 -05:00
8748084a6b
fix indentations for linting purposes
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-23 11:50:55 -05:00
5028bd90e0
flesh out the index for ENS a bit further
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-23 11:47:57 -05:00
4de830ca29
resolve appears to be done, now I just need some help wiring the module together
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-23 11:47:57 -05:00
3aa4c9fd1f
beginning of creating the ens provider
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-23 11:47:57 -05:00
99b931d230
rename method
2018-05-23 12:33:59 -04:00
fe4dd67979
warn about path depth
2018-05-23 12:33:21 -04:00
a69d12e637
pass isDev and locale to process
2018-05-23 11:52:07 -04:00
61a5ba5e0a
fix tests
2018-05-23 11:31:20 -04:00
471a4b9efb
oopsie
2018-05-23 11:19:12 -04:00
77fad169aa
add process exit
2018-05-23 11:17:03 -04:00
688a39b8bc
show message when process doesnt end with code 0
2018-05-23 11:17:03 -04:00
1bca31184e
always show process messages if error and catch geth errors
2018-05-23 11:17:03 -04:00
4815555a89
remove engine onReady
2018-05-23 11:17:02 -04:00
871c2fb228
fix tests
2018-05-23 11:17:02 -04:00
6145c0b92c
start node only when no node is present
2018-05-23 11:17:02 -04:00
29a50ea9cd
refactor assertNodeConnection to use it in watch
2018-05-23 11:17:02 -04:00
315d8c2197
fix merge
2018-05-23 11:17:02 -04:00
f935fee566
add i18n for blockchain node logs
2018-05-23 11:17:02 -04:00
0be35e87f9
remove duplicate translations
2018-05-23 11:17:02 -04:00
3759738551
fix tests
2018-05-23 11:17:02 -04:00
ece09785a7
fix testnet
2018-05-23 11:17:02 -04:00
4bdf469131
conflict in en.json
2018-05-23 11:17:02 -04:00
e69b8bab56
conflict in en.json
2018-05-23 11:17:02 -04:00
7f45b6724a
finish hiding logs
2018-05-23 11:17:01 -04:00
2062f9032c
conflict in en.json
2018-05-23 11:17:01 -04:00
c6b555af4e
use event for when engine is ready to deploy
2018-05-23 11:17:01 -04:00
47591a39dd
restart web3 service on proces launch
2018-05-23 11:17:01 -04:00
7e058e5016
set verbosity to 0 in process
2018-05-23 11:17:01 -04:00
3fcc36a7a1
launch blockchain in separate process
...
works but still cant getAccounts
2018-05-23 11:17:01 -04:00
aea270af02
detect no node using request
2018-05-23 11:17:01 -04:00
d1c3f36d02
update translations
2018-05-23 11:17:01 -04:00
201ec6c652
remove unneeded web3 object assignment
2018-05-23 11:17:01 -04:00
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
30b1975e34
use request to get contract
2018-05-23 11:15:06 -04:00
c83064adf6
use request to get contract
2018-05-23 11:15:06 -04:00
7cebbec7b6
make determine arguments async
2018-05-23 11:15:06 -04:00
c0549a6642
refactor to waterfall, in preparation to making determine arguments async
2018-05-23 11:15:06 -04:00
3fb2b6fa60
remove direct reference to contracts manager, use a request instead
2018-05-23 11:15:06 -04:00
98c5b2dd06
move contractsState emit to contracts
2018-05-23 11:15:06 -04:00
250e0b8798
adjust contracts events emission
2018-05-23 11:15:06 -04:00
a664492d1f
move onDeploy to special configs module
2018-05-23 11:15:06 -04:00
31833579a7
finish converting afterDeploy 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
21026e07ae
remove unnecessary passing of params around
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
0ec4698e6b
fix compiler tests
2018-05-23 11:15:05 -04:00
16eaacbd54
call compiler through a request
2018-05-23 11:15:05 -04:00
af8a720e90
guard against currentChain not set
2018-05-23 11:15:05 -04:00
0fcf508e17
associate address to contract
2018-05-23 11:15:05 -04:00
2ac38fb84a
if no chain set then contract is not tracked
2018-05-23 11:15:05 -04:00
ba29f0e928
move deploy tracker into a module
2018-05-23 11:15:05 -04:00
78f64945ab
remove web3 dependency from deploy tracker; use request instead to get block
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
a8e29976b7
move deploy to blockchain component
2018-05-23 11:15:05 -04:00
9b1a78cdaa
move Contract object to blockchain module
2018-05-23 11:15:05 -04:00
84dcfca254
move getBlock to blockchain module
2018-05-23 11:15:05 -04:00
1547a115a4
move getCode to blockchain
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
28ef2ed067
move web3 utils to utils module
2018-05-23 11:15:04 -04:00
ab1113fc31
Fixed bug where dist folder is created before placeholder page
...
If dist folder did not already exist, the folder is created prior to creation of the placeholder page. Without this, the dapp files are never built.
2018-05-23 13:35:18 +10:00
f10abc8da1
Merge branch 'develop' into features/show-building-placeholder
2018-05-23 09:36:11 +10:00
ab738c05f9
Moved placeholder page html to code generator and ejs template.
2018-05-23 09:33:05 +10:00
48836b3d5b
Merge pull request #446 from alaibe/fr-translation
...
Adding fr translation
2018-05-22 15:34:07 -04:00
77dbcd4424
Improve fr translation (PR feedback)
2018-05-22 20:31:28 +01:00
ceb48ebb21
Merge pull request #445 from embark-framework/features/improve-imports
...
Improve dapp imports to allow alternate syntax for importing contracts
2018-05-22 12:06:22 -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
46e040f861
Merged in merge conflicts from remote
2018-05-22 12:16:13 +10:00
85919a4f6d
Update to make the imports 'shim' more readable as requested.
2018-05-22 12:11:45 +10:00
6bcf03adc5
Merge pull request #441 from embark-framework/ipfs_object
...
make Ipfs object available in environment
2018-05-21 10:31:30 -05:00
295152de82
Merge branch 'develop' into features/improve-imports
2018-05-21 21:46:14 +10:00
d4c04bbed7
Improve dapp imports to allow alternate syntax for importing contracts
...
* Now supports alternate import statements:
* import {Token} from 'Embark/contracts';
* import * as Contracts from 'Embark/contracts';
as well as the existing syntax:
* import Token from 'Embark/contracts/Token';
* Contracts js files moved from .embark to .embark/contracts
* .embark/contracts/index.js generated on the fly which requires all contracts in .embark/contract automatically and then creates a module.exports with each of them.
2018-05-21 21:43:36 +10:00
a297407e99
Adding fr translation
2018-05-20 20:53:08 +01:00
56b20becfb
make getAccounts a simple web3 wrapper.
...
Maybe could even be like Test.prototype.getAccounts = web3.eth.getAccounts; ?
2018-05-18 20:44:14 -03:00
0ff5930427
Merge pull request #433 from natachadelarosa/develop
...
[FIX #421 ] Add Spanish Translation to embark
2018-05-18 17:45:24 -04:00
9013af29cd
Merge pull request #438 from embark-framework/features/improve-process-wrapper
...
Improve Process Launcher
2018-05-18 16:03:13 -04:00
0363c676d4
initialized ipfs object to environment
2018-05-18 15:56:36 -04:00
e2c2373249
accept hash of objects as second param for runcode
2018-05-18 15:55:34 -04:00
db6b90e77f
Merge pull request #439 from embark-framework/uv_close_fix
...
only close watcher when it's actually ready
2018-05-18 14:51:05 -04:00
c6970cfa4b
Merge pull request #435 from embark-framework/features/fund-user-in-dev
...
Fund user accounts in dev
2018-05-18 14:46:08 -04:00
b829643f61
use once in pipeline
2018-05-18 14:25:20 -04:00
a7be2cda26
convert solcw to use once
2018-05-18 14:22:58 -04:00
c5c00fc3b4
conflict in solcW
2018-05-18 14:11:29 -04:00
46c2be16de
don't unnecessary reload solc
2018-05-18 13:41:25 -04:00
6c1d9d9b39
rename startProvider to startWeb3Provider
2018-05-18 13:39:35 -04:00
4c17aa9d40
fix some PR comments
2018-05-18 13:39:35 -04:00
09cdab7e2b
fund account only in dev
2018-05-18 13:39:35 -04:00
a1e3c741a0
remove remaning of accounts config in blockchain
2018-05-18 13:39:34 -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
372266418f
too many spaces
2018-05-18 13:39:34 -04:00
50103a8c02
conflict in en.json
2018-05-18 13:39:29 -04:00
94f0d98e28
get accounts and generate script with the right address
2018-05-18 13:38:53 -04:00
c3c4518cb4
move account parsing to its own module
2018-05-18 13:38:53 -04:00
668fd3a064
add fundAccount script that keeps the user's account funded
2018-05-18 13:38:53 -04:00
c6593f6168
Merge pull request #426 from embark-framework/features/update_solc_wrapper
...
update solc wrapper
2018-05-18 13:17:01 -04:00
4439f8b601
Merge pull request #436 from embark-framework/fixConsolePluginCmdOutput
...
Fixed Returns From Plugin Modules
2018-05-18 11:45:02 -04:00
fee40c8935
remove trailing whitespace
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-18 10:43:56 -05:00
b2e45ed95c
remove unneeded code line
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-18 10:42:08 -05:00
dc0c8c5622
fix profiler and this is ready to go
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-18 10:41:23 -05:00
8411f36e06
trying this
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-18 10:18:00 -05:00
28fa906bbf
concentrate undefined logic in the plugin output
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-18 10:04:49 -05:00
bef490f5c7
get rid of console logs and try reworking the undefined handling
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-18 09:42:30 -05:00
5af4eb5b25
now profiler and other plugins will be able to benefit from undefined return output for logs only plugins
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-18 08:54:25 -05:00
14eb48fa6b
Merge pull request #434 from embark-framework/addScroller
...
should add scroller to available services
2018-05-18 09:30:37 -04:00
c2086b94ae
should add scroller to available services
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-18 08:10:59 -05:00
bc681a5b4f
[ FIX #421 ] Add Spanish Translation to embark
...
added spanish translation to Emabrk.
2018-05-17 22:21:41 -04:00
380b2258e7
Merge pull request #432 from embark-framework/addCompileOnlyFlag
...
add command for only compiling contracts in build command
2018-05-17 16:56:50 -05:00
dd9e85fa27
add command for only compiling contracts in build command
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-17 15:37:57 -05:00
c94d8e9f91
update old solc process to new process wrapper
2018-05-17 15:26:44 -04:00
Jonathan Rainville
VoR0220
Iuri Matias
Eric Mastro
Anthony Laibe
Ricardo Guilherme Schmidt
Natacha De la Rosa