Jonathan Rainville
2b54dfd7cc
conflict in en.json
2018-05-30 10:57:25 -04:00
Jonathan Rainville
0f07a00791
detect swarm started signal
2018-05-30 10:57:25 -04:00
Jonathan Rainville
e67fafdc29
conflict in en.json
2018-05-30 10:57:25 -04:00
Jonathan Rainville
bc853ef899
conflict in en.json
2018-05-30 10:57:25 -04:00
Jonathan Rainville
70d3e6a46f
conflict en.json
2018-05-30 10:57:25 -04:00
Jonathan Rainville
e3a93a6d61
add storageProcessesLauncher that can work for swarm or ipfs
2018-05-30 10:57:25 -04:00
Jonathan Rainville
56f25ebba1
clonflict for silent
2018-05-30 10:57:25 -04:00
Jonathan Rainville
d969eb0065
fix processes on ubuntu
2018-05-30 10:52:15 -04:00
Jonathan Rainville
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
VoR0220
302476e95e
fix simulator preferential treatment
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-29 14:19:25 -05:00
Iuri Matias
cd96aebdcd
early return if failing to connect to node
2018-05-28 17:55:59 -04:00
Jonathan Rainville
a7bc9755c3
little fixes
2018-05-28 16:02:44 -04:00
Jonathan Rainville
729c43bae1
fix tests
2018-05-28 15:56:03 -04:00
Jonathan Rainville
7a754ac97f
add more error management to ipfs
2018-05-28 15:43:27 -04:00
Jonathan Rainville
9338b6e37f
fix swarm spawn
2018-05-28 15:37:25 -04:00
VoR0220
52524c2f59
eliminate nasty outdated test
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-28 13:22:48 -05:00
Iuri Matias
6c921e3a85
fix typo
2018-05-28 13:58:49 -04:00
Iuri Matias
1eee68e901
fix typo; default environment to development
2018-05-28 13:53:10 -04:00
VoR0220
6fe3064edd
spelling correction of metamask
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-28 12:45:14 -05:00
VoR0220
f34bd5df4f
env check
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-28 12:28:38 -05:00
VoR0220
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
Jonathan Rainville
7a05a9ac79
boot swarm with spawn
2018-05-28 12:54:06 -04:00
Jonathan Rainville
3c32f98f71
change ipfs to spawn too
2018-05-28 12:49:44 -04:00
Jonathan Rainville
6fa472ae11
something en.json
2018-05-28 12:31:29 -04:00
Iuri Matias
033613d7f6
lint is king
2018-05-28 12:29:47 -04:00
Jonathan Rainville
45bf11ff2b
conflict in en.json
2018-05-28 11:55:16 -04:00
Jonathan Rainville
dd1b01a643
fix blockchain start
2018-05-28 11:54:35 -04:00
Jonathan Rainville
3e86e21878
conflict in blockchain
2018-05-28 11:54:31 -04:00
Jonathan Rainville
8d9c192e91
fix little oopsie in waterfall
2018-05-28 11:53:35 -04:00
Jonathan Rainville
b003675ee8
use right version
2018-05-28 11:53:35 -04:00
Jonathan Rainville
33e78a589e
add error if user uses ipfs 0.4.14 or lower
2018-05-28 11:53:35 -04:00
Jonathan Rainville
a2c7f07f3d
fix logs
2018-05-28 11:53:35 -04:00
Jonathan Rainville
72115bb636
set cors domain depending on the webserverConfig
2018-05-28 11:53:35 -04:00
Jonathan Rainville
460c2e98f1
start storage node on run too
2018-05-28 11:53:34 -04:00
Jonathan Rainville
fd9da44792
small fixes
2018-05-28 11:52:52 -04:00
Jonathan Rainville
c084803acb
reverse plugin.js changes
2018-05-28 11:52:52 -04:00
Jonathan Rainville
48bf7531bf
conflict in en.json
2018-05-28 11:52:49 -04:00
Jonathan Rainville
e43078ce90
detect swarm started signal
2018-05-28 11:51:42 -04:00
Jonathan Rainville
12525fb9bf
conflict in en.json
2018-05-28 11:51:38 -04:00
Jonathan Rainville
21a0042d00
conflict in en.json
2018-05-28 11:50:39 -04:00
Jonathan Rainville
04059721e6
conflict en.json
2018-05-28 11:50:01 -04:00
Jonathan Rainville
9e12251f2f
add storageProcessesLauncher that can work for swarm or ipfs
2018-05-28 11:49:06 -04:00
Jonathan Rainville
b08190242b
clonflict for silent
2018-05-28 11:48:27 -04:00
Iuri Matias
ef3bde1053
add missing code init
2018-05-28 11:42:22 -04:00
Iuri Matias
ee460e3309
add missing promise returns
2018-05-28 11:42:01 -04:00
Iuri Matias
32a9b25fe3
fix reference to ens object
2018-05-28 11:21:52 -04:00
Iuri Matias
e988bd6b4a
use import instead of require
2018-05-28 11:10:20 -04:00
Iuri Matias
3750fc297b
add missing module init
2018-05-28 11:10:09 -04:00
Iuri Matias
a25330ddec
set namesystem enable to true by default
2018-05-28 11:09:48 -04:00
Iuri Matias
8fa325a7af
Merge pull request #452 from embark-framework/DomainNameResolution
...
ENS Domain name resolution initial integration
2018-05-27 08:12:26 -04:00
Iuri Matias
2608eed19b
Merge branch 'develop' into bug_fix/change-warn-path-depth-to-length
2018-05-27 08:05:51 -04:00
Iuri Matias
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
Iuri Matias
2d67061fe3
put compiling message only after checking for binary
2018-05-27 08:00:18 -04:00
VoR0220
2ae9e7e0e7
add a warning for vyper installation
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-25 14:44:07 -05:00
VoR0220
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
VoR0220
9cb10c7ce7
bring free wheeling vars into the ensEmbark namespace
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-25 12:25:28 -05:00
VoR0220
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
Eric Mastro
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
emizzle
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
VoR0220
91d3ccbc70
cringy ending of the line break
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-24 07:57:14 -05:00
VoR0220
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
VoR0220
8b07039907
should work to create the reverse lookup
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-23 16:53:39 -05:00
VoR0220
fe84cc8de4
last major issue
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-23 13:05:42 -05:00
VoR0220
793a618c12
more fixes
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-23 13:00:34 -05:00
VoR0220
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
VoR0220
ea17e235f3
fix further linting issues
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-23 11:55:11 -05:00
VoR0220
8748084a6b
fix indentations for linting purposes
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-23 11:50:55 -05:00
VoR0220
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
VoR0220
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
VoR0220
3aa4c9fd1f
beginning of creating the ens provider
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-23 11:47:57 -05:00
Iuri Matias
99b931d230
rename method
2018-05-23 12:33:59 -04:00
Iuri Matias
fe4dd67979
warn about path depth
2018-05-23 12:33:21 -04:00
Jonathan Rainville
a69d12e637
pass isDev and locale to process
2018-05-23 11:52:07 -04:00
Jonathan Rainville
61a5ba5e0a
fix tests
2018-05-23 11:31:20 -04:00
Jonathan Rainville
471a4b9efb
oopsie
2018-05-23 11:19:12 -04:00
Jonathan Rainville
77fad169aa
add process exit
2018-05-23 11:17:03 -04:00
Jonathan Rainville
688a39b8bc
show message when process doesnt end with code 0
2018-05-23 11:17:03 -04:00
Jonathan Rainville
1bca31184e
always show process messages if error and catch geth errors
2018-05-23 11:17:03 -04:00
Jonathan Rainville
4815555a89
remove engine onReady
2018-05-23 11:17:02 -04:00
Jonathan Rainville
871c2fb228
fix tests
2018-05-23 11:17:02 -04:00
Jonathan Rainville
6145c0b92c
start node only when no node is present
2018-05-23 11:17:02 -04:00
Jonathan Rainville
29a50ea9cd
refactor assertNodeConnection to use it in watch
2018-05-23 11:17:02 -04:00
Iuri Matias
315d8c2197
fix merge
2018-05-23 11:17:02 -04:00
Jonathan Rainville
f935fee566
add i18n for blockchain node logs
2018-05-23 11:17:02 -04:00
Jonathan Rainville
0be35e87f9
remove duplicate translations
2018-05-23 11:17:02 -04:00
Jonathan Rainville
3759738551
fix tests
2018-05-23 11:17:02 -04:00
Jonathan Rainville
ece09785a7
fix testnet
2018-05-23 11:17:02 -04:00
Jonathan Rainville
4bdf469131
conflict in en.json
2018-05-23 11:17:02 -04:00
Jonathan Rainville
e69b8bab56
conflict in en.json
2018-05-23 11:17:02 -04:00
Jonathan Rainville
7f45b6724a
finish hiding logs
2018-05-23 11:17:01 -04:00
Jonathan Rainville
2062f9032c
conflict in en.json
2018-05-23 11:17:01 -04:00
Jonathan Rainville
c6b555af4e
use event for when engine is ready to deploy
2018-05-23 11:17:01 -04:00
Jonathan Rainville
47591a39dd
restart web3 service on proces launch
2018-05-23 11:17:01 -04:00
Jonathan Rainville
7e058e5016
set verbosity to 0 in process
2018-05-23 11:17:01 -04:00
Jonathan Rainville
3fcc36a7a1
launch blockchain in separate process
...
works but still cant getAccounts
2018-05-23 11:17:01 -04:00
Jonathan Rainville
aea270af02
detect no node using request
2018-05-23 11:17:01 -04:00
Iuri Matias
d1c3f36d02
update translations
2018-05-23 11:17:01 -04:00
Iuri Matias
201ec6c652
remove unneeded web3 object assignment
2018-05-23 11:17:01 -04:00
Jonathan Rainville
5f3361d030
conflict in en.json
2018-05-23 11:16:56 -04:00
Iuri Matias
3e9376138b
move runCode
2018-05-23 11:16:17 -04:00
Jonathan Rainville
592b4ed4fd
conflict in code_generator
2018-05-23 11:16:13 -04:00
Iuri Matias
30b1975e34
use request to get contract
2018-05-23 11:15:06 -04:00
Iuri Matias
c83064adf6
use request to get contract
2018-05-23 11:15:06 -04:00
Iuri Matias
7cebbec7b6
make determine arguments async
2018-05-23 11:15:06 -04:00
Iuri Matias
c0549a6642
refactor to waterfall, in preparation to making determine arguments async
2018-05-23 11:15:06 -04:00
Iuri Matias
3fb2b6fa60
remove direct reference to contracts manager, use a request instead
2018-05-23 11:15:06 -04:00
Iuri Matias
98c5b2dd06
move contractsState emit to contracts
2018-05-23 11:15:06 -04:00
Iuri Matias
250e0b8798
adjust contracts events emission
2018-05-23 11:15:06 -04:00
Iuri Matias
a664492d1f
move onDeploy to special configs module
2018-05-23 11:15:06 -04:00
Iuri Matias
31833579a7
finish converting afterDeploy module
2018-05-23 11:15:06 -04:00
Iuri Matias
c800598e9b
move afterDeploy code into a special configs module
2018-05-23 11:15:06 -04:00
Iuri Matias
21026e07ae
remove unnecessary passing of params around
2018-05-23 11:15:06 -04:00
Iuri Matias
000d7beb27
move code to assert connection to blockchain module
2018-05-23 11:15:06 -04:00
Iuri Matias
0ec4698e6b
fix compiler tests
2018-05-23 11:15:05 -04:00
Iuri Matias
16eaacbd54
call compiler through a request
2018-05-23 11:15:05 -04:00
Iuri Matias
af8a720e90
guard against currentChain not set
2018-05-23 11:15:05 -04:00
Iuri Matias
0fcf508e17
associate address to contract
2018-05-23 11:15:05 -04:00
Iuri Matias
2ac38fb84a
if no chain set then contract is not tracked
2018-05-23 11:15:05 -04:00
Iuri Matias
ba29f0e928
move deploy tracker into a module
2018-05-23 11:15:05 -04:00
Iuri Matias
78f64945ab
remove web3 dependency from deploy tracker; use request instead to get block
2018-05-23 11:15:05 -04:00
Iuri Matias
68c277cad1
remove unneded references to web3 objects; leave clarifying notes
2018-05-23 11:15:05 -04:00
Iuri Matias
ac45b7a19b
remove unneded assigment; add clarification/TODO
2018-05-23 11:15:05 -04:00
Iuri Matias
a8e29976b7
move deploy to blockchain component
2018-05-23 11:15:05 -04:00
Iuri Matias
9b1a78cdaa
move Contract object to blockchain module
2018-05-23 11:15:05 -04:00
Iuri Matias
84dcfca254
move getBlock to blockchain module
2018-05-23 11:15:05 -04:00
Iuri Matias
1547a115a4
move getCode to blockchain
2018-05-23 11:15:05 -04:00
Iuri Matias
ae93d78cc2
move accounts to web3 module
2018-05-23 11:15:04 -04:00
Iuri Matias
4d0ebc03ad
move web3 init to its own module
2018-05-23 11:15:04 -04:00
Iuri Matias
28ef2ed067
move web3 utils to utils module
2018-05-23 11:15:04 -04:00
Eric Mastro
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
Eric Mastro
f10abc8da1
Merge branch 'develop' into features/show-building-placeholder
2018-05-23 09:36:11 +10:00
emizzle
ab738c05f9
Moved placeholder page html to code generator and ejs template.
2018-05-23 09:33:05 +10:00
Jonathan Rainville
48836b3d5b
Merge pull request #446 from alaibe/fr-translation
...
Adding fr translation
2018-05-22 15:34:07 -04:00
Anthony Laibe
77dbcd4424
Improve fr translation (PR feedback)
2018-05-22 20:31:28 +01:00
Iuri Matias
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
emizzle
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
emizzle
46e040f861
Merged in merge conflicts from remote
2018-05-22 12:16:13 +10:00
emizzle
85919a4f6d
Update to make the imports 'shim' more readable as requested.
2018-05-22 12:11:45 +10:00
RJ Catalano
6bcf03adc5
Merge pull request #441 from embark-framework/ipfs_object
...
make Ipfs object available in environment
2018-05-21 10:31:30 -05:00
Eric Mastro
295152de82
Merge branch 'develop' into features/improve-imports
2018-05-21 21:46:14 +10:00
Eric Mastro
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
Anthony Laibe
a297407e99
Adding fr translation
2018-05-20 20:53:08 +01:00
Ricardo Guilherme Schmidt
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
Iuri Matias
0ff5930427
Merge pull request #433 from natachadelarosa/develop
...
[FIX #421 ] Add Spanish Translation to embark
2018-05-18 17:45:24 -04:00
Iuri Matias
9013af29cd
Merge pull request #438 from embark-framework/features/improve-process-wrapper
...
Improve Process Launcher
2018-05-18 16:03:13 -04:00
Iuri Matias
0363c676d4
initialized ipfs object to environment
2018-05-18 15:56:36 -04:00
Iuri Matias
e2c2373249
accept hash of objects as second param for runcode
2018-05-18 15:55:34 -04:00
Iuri Matias
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
Iuri Matias
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
Jonathan Rainville
b829643f61
use once in pipeline
2018-05-18 14:25:20 -04:00