61a518f569
remove initCOnfig in tests because useless
2018-06-01 13:44:54 -04:00
f3d55f6742
patch weird event max listeners bug
2018-06-01 13:44:54 -04:00
73fca42ce1
fix error messages for non deployed contracts
2018-06-01 13:44:54 -04:00
d76ab75c4a
remove initTest
2018-06-01 13:44:54 -04:00
88889a1a9d
update test_app tests
2018-06-01 13:44:53 -04:00
2d1a37d63b
conflict in pakcgae lock
2018-06-01 13:44:49 -04:00
33bd52e9ec
add id to solc process to avoid multiple callback calls
2018-06-01 13:44:35 -04:00
dbb2352928
fix contracts that are instances of
2018-06-01 13:44:14 -04:00
6712fc294c
change another storage test
2018-06-01 13:44:14 -04:00
beb0df8985
make running config() without callback work
2018-06-01 13:44:14 -04:00
ab92457319
fix missing default from
2018-06-01 13:43:48 -04:00
4040c1eec9
use object assign to assign new values to contract
2018-06-01 13:43:48 -04:00
8664570d7c
conflict in test
2018-06-01 13:43:43 -04:00
d0a289a450
conflict in deployManager
2018-06-01 13:42:05 -04:00
b97c85d5f4
conflict in tests
2018-06-01 13:41:12 -04:00
3555575ff9
change another storage test
2018-06-01 13:35:58 -04:00
049af73294
make running config() without callback work
2018-06-01 13:35:58 -04:00
491ff47cf8
conflict in en.json
2018-06-01 13:35:52 -04:00
d647ea791e
fix missing default from
2018-06-01 13:35:18 -04:00
72da3b4a35
use object assign to assign new values to contract
2018-06-01 13:35:18 -04:00
a1d32e72e7
conflict in deployManager
2018-06-01 13:35:15 -04:00
9dcb64bde3
conflict in deployManager
2018-06-01 13:34:23 -04:00
c234655acd
resolve conflict in test.js
2018-06-01 13:33:11 -04:00
723a4ae805
reformat run_test
2018-06-01 13:32:23 -04:00
ed1a2c4ddb
remove timer
2018-06-01 13:31:22 -04:00
10f55910d2
remove initCOnfig in tests because useless
2018-06-01 13:30:08 -04:00
7cab30f4df
patch weird event max listeners bug
2018-06-01 13:29:51 -04:00
9a1eefc838
Merge branch 'develop' into features/improve-storage-config
2018-06-01 12:01:51 -04:00
e5ec461f78
fix error messages for non deployed contracts
2018-06-01 11:30:02 -04:00
eeb88010d5
remove initTest
2018-06-01 11:06:07 -04:00
55df42979f
update test_app tests
2018-06-01 10:48:29 -04:00
f3e7d03204
remove orbit
2018-06-01 10:15:41 -04:00
a112f18d93
always deploy contracts when in tests and make all test work
2018-06-01 10:05:43 -04:00
421f9a4096
Merge in remote
2018-06-01 14:10:54 +10:00
74d5ee3984
small fixes
2018-06-01 14:06:02 +10:00
446f28ed6f
de-dupe en.json
2018-06-01 13:39:00 +10:00
a11047c681
Further fixes for starting dappConnection processes automatically
...
moved storage process launching to storage module
refactored all cases of storage url building to util methods
updated cors so that a processes will not include itself in cors list
changed child process command console output to trace, so it's visible when --logLevel == trace
2018-06-01 13:36:46 +10:00
927f562a41
Fixed issue with CORS domains for auto-started geth, swarm, and ipfs processes.
...
Fixes after rebase:
* De-duped i18n en.json
* Re-built package-lock.json
Current WIP is auto-starting storage processes defined in dappConnection config.
2018-06-01 13:35:25 +10:00
7aa44c7fe3
Added improvements to storage config
2018-06-01 13:35:11 +10:00
85117cf55c
Dynamic selection of storage provider now working based on improved storage config.
...
swarm plugin now re-initialises the bzz object when it's availability is checked. this creates a much more stable swarm implementation on the dapp side.
surrounded the storage provider init code block with embark env ready
added alternate swarm gateway url
can now upload dapp to ipfs and run swarm storage and vice versa
2018-06-01 13:35:11 +10:00
6ac8672a31
Added a global storage module that inits ipfs or swarm depending on dappConnection options. WIP.
2018-06-01 13:34:49 +10:00
942a57aa3a
Storage config improvements start. Adjusted the config and have started to support those improvements through the codebase.
...
Currently stuck on starting multiple storage servcies at once. Might need a change in storage config spec.
WIP.
2018-06-01 13:33:44 +10:00
0cb79d84a0
Dynamic selection of storage provider now working based on improved storage config.
...
swarm plugin now re-initialises the bzz object when it's availability is checked. this creates a much more stable swarm implementation on the dapp side.
surrounded the storage provider init code block with embark env ready
added alternate swarm gateway url
can now upload dapp to ipfs and run swarm storage and vice versa
2018-06-01 13:30:01 +10:00
ec15823dbc
Added a global storage module that inits ipfs or swarm depending on dappConnection options. WIP.
2018-06-01 13:28:28 +10:00
f6667b6948
Storage config improvements start. Adjusted the config and have started to support those improvements through the codebase.
...
Currently stuck on starting multiple storage servcies at once. Might need a change in storage config spec.
WIP.
2018-06-01 13:28:05 +10:00
0ab151500d
add id to solc process to avoid multiple callback calls
2018-05-31 13:32:02 -04:00
ac69f2f9fd
Merge branch 'develop' of https://github.com/embark-framework/embark into develop
2018-05-31 10:38:09 -04:00
75c91992e3
Merge pull request #469 from embark-framework/refactor_contracts_part2
...
Refactor contracts part2
2018-05-31 10:37:43 -04:00
30c6555649
hotfix tag for github urls
2018-05-31 10:37:40 -04:00
9929415da8
remove unneded passing of contracts manager
2018-05-31 10:09:26 -04:00
20d7496980
take into account errors when determining arguments
2018-05-31 10:02:57 -04:00
a0cfe525a9
fix contracts that are instances of
2018-05-31 09:52:37 -04:00
4b4ae66c93
change another storage test
2018-05-31 08:38:25 -04:00
827a3b309f
make running config() without callback work
2018-05-31 08:38:25 -04:00
756d77a9b1
conflict en.json
2018-05-31 08:38:20 -04:00
622f54bda9
fix missing default from
2018-05-31 08:37:21 -04:00
641a77c2dc
use object assign to assign new values to contract
2018-05-31 08:37:21 -04:00
1176a2e8be
make require and test work
2018-05-31 08:37:21 -04:00
093bd13c6a
build only once
2018-05-31 08:37:21 -04:00
41aaa5c20d
conflict package json
2018-05-31 08:37:17 -04:00
68fb70f788
reformat run_test
2018-05-31 08:37:00 -04:00
0aa96aa504
Fixed issue with CORS domains for auto-started geth, swarm, and ipfs processes.
...
Fixes after rebase:
* De-duped i18n en.json
* Re-built package-lock.json
Current WIP is auto-starting storage processes defined in dappConnection config.
2018-05-31 20:18:25 +10:00
6d77aae6de
Added improvements to storage config
2018-05-31 15:19:09 +10:00
30f0f4dc72
Dynamic selection of storage provider now working based on improved storage config.
...
swarm plugin now re-initialises the bzz object when it's availability is checked. this creates a much more stable swarm implementation on the dapp side.
surrounded the storage provider init code block with embark env ready
added alternate swarm gateway url
can now upload dapp to ipfs and run swarm storage and vice versa
2018-05-31 15:18:58 +10:00
0a331e9352
Added a global storage module that inits ipfs or swarm depending on dappConnection options. WIP.
2018-05-31 15:18:10 +10:00
d0d73320aa
Storage config improvements start. Adjusted the config and have started to support those improvements through the codebase.
...
Currently stuck on starting multiple storage servcies at once. Might need a change in storage config spec.
WIP.
2018-05-31 15:18:10 +10:00
7ee62adb24
remove unused assignment
2018-05-30 17:30:51 -04:00
b3173c1ff3
register ipfs cmd correctly
2018-05-30 17:22:12 -04:00
b43a766de7
cleanup module call
2018-05-30 13:38:08 -04:00
7d795fa180
remove unused var
2018-05-30 13:38:08 -04:00
4f20d31b4c
add emitAndRunActionsForEvent
2018-05-30 13:38:08 -04:00
45f7767313
remove contracts manager dependency from deploy manager
2018-05-30 13:38:08 -04:00
1d782c0e53
emit contractsDeployed event only
2018-05-30 13:38:08 -04:00
68e6782f49
remove unneded assignment
2018-05-30 13:38:08 -04:00
9b368bc1b3
remove unneeded assignment
2018-05-30 13:38:08 -04:00
1912981d7d
move contract deploy code to contract deployer; move it to events
2018-05-30 13:38:08 -04:00
70f38d863e
fix code generator event
2018-05-30 13:35:36 -04:00
f1cb7d1187
lint is king
2018-05-30 13:35:36 -04:00
69e5af2308
replace beforeAction plugin api with event action api
2018-05-30 13:35:36 -04:00
8458acd207
filter for plugins that have defined properties
2018-05-30 13:35:36 -04:00
3f20f400dd
certify pluginTypes are uniques, to avoid issue with a plugin call being called twice or more
2018-05-30 13:35:36 -04:00
71cd523f30
remove old methods
2018-05-30 13:35:36 -04:00
16653d491b
move onDeploy to new api
2018-05-30 13:35:36 -04:00
93e5003c64
cleanup
2018-05-30 13:35:36 -04:00
4f45b4fa13
add new plugin method for generalized event actions
2018-05-30 13:35:36 -04:00
f08bb56337
simplify determine args method
2018-05-30 13:35:36 -04:00
cf13f098ac
refactor deploy method
2018-05-30 13:35:36 -04:00
f4010bd66e
remove unnecessary determin params call
2018-05-30 13:35:36 -04:00
8cc86e0b0f
remove legacy events
2018-05-30 13:35:36 -04:00
742632eccf
remove contractsManager dependency
2018-05-30 13:35:36 -04:00
3f9c55131b
use requests instead of contractsManager directly
2018-05-30 13:35:36 -04:00
5f64376c84
refactor generateContractsJson
2018-05-30 13:35:36 -04:00
cf999ce997
refactor runcode to use events instead; remove dependencies
2018-05-30 13:35:36 -04:00
fc92b69211
use self
2018-05-30 13:35:03 -04:00
e35474f726
early return
2018-05-30 13:23:18 -04:00
4db2d40ef5
fix swarm
2018-05-30 12:58:32 -04:00
b5e96beb81
little oopsie
2018-05-30 12:07:48 -04:00
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
f2e52d1dbc
create processLauncher that launches and subscribes to process
2018-05-17 15:26:44 -04:00
c1de9defcd
Merge pull request #424 from embark-framework/features/remove-upload-option
...
Removed `platform` from the upload command line option as it is being specified in the storage.json config.
2018-05-17 15:20:47 -04:00
a967b304e3
Merge pull request #422 from 3esmit/patch-1
...
Initialize web3 provider before deployAll
2018-05-17 15:08:29 -04:00
8e2af920b8
early callback in compiler
2018-05-17 10:02:53 -04:00
bcb7c80758
Early return if no sol files
2018-05-17 09:49:50 -04:00
dd78aef3db
fix vyper .vy
2018-05-17 09:40:38 -04:00
f828e9d87e
add missing comma
2018-05-17 08:58:26 -04:00
627bf0c939
Removed `platform` from the upload command line option as it is being specified in the storage.json config.
...
Removed duplicates from en.json.
Fixed upload error message bug showing encoded interpolated string
2018-05-17 17:38:17 +10:00
bc57ca62e3
add missing semicol
2018-05-17 03:00:23 -03:00
25e95c1002
add EmbarkSpec.getAccounts(cb)
2018-05-16 20:24:08 -03:00
bfcf72b09a
Initialize web3 provider before deployAll
...
This makes possible to load accounts before deploying the contracts.
2018-05-16 19:40:24 -03:00
01ae387c74
Merge pull request #418 from embark-framework/refactor_pipeline
...
Refactor pipeline
2018-05-16 18:15:51 -04:00
b1fab3e77c
remove console logs
2018-05-16 18:15:23 -04:00
965c34d3ed
replace the es file with one that contains all the existing keys
2018-05-16 18:11:39 -04:00
c1f72061e3
add tests for processLauncher
2018-05-16 16:41:25 -04:00
441063dd10
add docs for eventWrapper
2018-05-16 16:41:25 -04:00
80c382557f
add jsdoc to processWrapper
2018-05-16 16:41:25 -04:00
d17256dc40
add JS Doc for processLauncher
2018-05-16 16:41:25 -04:00
1ffc9ffe08
enable events calling for request and on
2018-05-16 16:41:25 -04:00
953ce6659e
reorg subscribe to message method
2018-05-16 16:41:25 -04:00
1c125a019c
conflict in en.json
2018-05-16 16:41:15 -04:00
3c0fda5a40
add eventWrapper not tested
2018-05-16 16:40:17 -04:00
36850895cf
add process wrapper to handle logs
2018-05-16 16:40:17 -04:00
18e23ae334
Merge pull request #419 from embark-framework/bug_fix/max-listeners-warning
...
set max listeners to 50
2018-05-16 16:02:04 -04:00
52c9e51deb
add keys for es
2018-05-16 15:28:17 -04:00
e651884473
set to 200 per Iuri's request
2018-05-16 15:27:38 -04:00
597d40e824
add missing keys
2018-05-16 15:26:57 -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
8ae6c6a646
simplify buildContracts and buildWeb3JS methodsgst
2018-05-16 15:07:47 -04:00
4dcd644b7c
remove listeners for command handlers
2018-05-16 13:57:27 -04:00
44d6cc32df
remove old remove listener; fix callback
2018-05-16 13:56:23 -04:00
ce781ab96e
remove previous listener (for now)
2018-05-16 13:11:44 -04:00
b7fc3f9054
refactor write contracts
2018-05-16 12:48:17 -04:00
d8a1894803
remove extra method
2018-05-16 10:09:46 -04:00
da84cfa769
add missing require
2018-05-16 10:03:05 -04:00
6544c2a999
move contracts generation from pipeline to code generator module
2018-05-16 10:00:56 -04:00
7271b00cf4
make file changes in the pipelins
2018-05-15 18:21:00 -04:00
1f6e386d9b
build web3js generation from pipeline to code_generator
2018-05-15 18:05:44 -04:00
256276c884
Merge pull request #415 from embark-framework/features/cargo
...
Add a cargo to not run file write for each file
2018-05-15 18:01:25 -04:00
760bd984d8
only close watcher when it's actually ready
2018-05-15 17:20:43 -04:00
38cf7a4aa8
throttle contracts too
2018-05-15 15:41:24 -04:00
6bff25f3b6
hotfix hide logs of hard-source
2018-05-15 15:01:38 -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
24c4c51232
add locales
2018-05-14 12:14:05 -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
a03757a5e6
Merge pull request #412 from embark-framework/js_config
...
support for js configs
2018-05-12 13:13:15 -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
7d8dd02db1
silence bluebird warning
2018-05-11 16:18:53 -04:00
26187cfa1d
add missing default from
2018-05-11 16:18:44 -04:00
3a62f6a121
update default dev networkid to be the same as --dev option chainId
2018-05-11 10:23:52 -04:00
7686ad561f
detect web3 version and get accounts correctly
2018-05-11 08:20:03 -04:00
4236f56147
add missing option
2018-05-10 15:36:24 -04:00
2e324484d4
add missing option
2018-05-10 15:26:09 -04:00
854fa0deb0
add locale option to most cmds
2018-05-10 15:02:03 -04:00
517a3bf234
move i18n and locales to its own folder; abstract it a bit; detect at initialization; add cmd line option
2018-05-10 15:01:34 -04:00
0b70f32bb9
initial work for i18n
2018-05-10 15:01:34 -04:00
1bb808a767
Merge pull request #404 from embark-framework/chore/webpack-optimization
...
Add a plugin that caches to increase file processing speed
2018-05-10 14:46:52 -04:00
59c61d6be1
hode messages from plugin
2018-05-10 14:45:35 -04:00
fbd36b58e5
ignore tmp files
2018-05-10 13:42:02 -04:00
a3f8c809a0
add queue for changes to do only one file build at the time
2018-05-10 13:28:12 -04:00
986ef520fc
add plugin that caches
2018-05-10 12:22:58 -04:00
a35ce6f73e
pass normalizeInput
2018-05-10 11:14:25 -04:00
83f97407e8
touch ups
2018-05-10 10:48:06 -04:00
31e82e31d0
do a process for each file
2018-05-10 10:43:10 -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
8cc485ac94
add isDev blockchain option
2018-05-09 15:16:46 -04:00
2913617a81
fix command (reset)
2018-05-09 15:16:46 -04:00
92c8d70dd5
change warning to tell about --reset
2018-05-09 15:16:46 -04:00
46e1ccd81b
use --dev when in development
2018-05-09 15:16:46 -04:00
edbc77afca
hotfix console
2018-05-08 14:51:51 -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
a03777dc65
async buildContractJs
2018-05-08 09:41:19 -04:00
4ec7fbb9db
async buildContracts
2018-05-08 09:36:50 -04:00
2dd9e8f2ea
async contract write
2018-05-08 09:25:37 -04:00
af38383e0f
lint
2018-05-08 09:04:53 -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
3f8450f060
Extra functionality for deciding which elements to include in a graph
2018-05-04 16:17:12 -04:00
b1a499cf0e
update template message
2018-05-03 17:32:10 -04:00
be7723e077
Merge pull request #392 from embark-framework/bug_fix/whisper-demo
...
Fix Whisper demo
2018-05-02 16:12:33 -04:00
3266f20a0f
fix glob in windows
2018-05-02 15:48:06 -04:00
41b2741ba5
add optionnal callback
2018-05-02 12:10:11 -04:00
0cffff067a
Merge pull request #390 from embark-framework/features/add-swarm-to-embarkjs
...
Added swarm support in embarkjs, isAvailable for messages/storage, swarm/ipfs checks
2018-05-01 18:52:22 -04:00
3bf5093f1b
more linting and add condition in case of no hash
2018-05-01 10:20:27 -04:00
2ad852667e
add early returns and lint
2018-05-01 09:38:13 -04:00
67c932c77d
fix contracts in dashboard by removing the double evaluation
2018-05-01 09:20:19 -04:00
b93b3b4e47
Merge branches 'features/add-swarm-to-embarkjs' and 'features/add-swarm-to-embarkjs' of https://github.com/embark-framework/embark into features/add-swarm-to-embarkjs
2018-05-01 00:06:26 +10: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
72cce7d4d2
Fixes to make lint and tests happy
2018-04-30 22:07:37 +10: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
5aa05c8094
Merge pull request #387 from embark-framework/bug_fix/new-contract-in-empty-dapp
...
Fix adding a contract
2018-04-27 14:08:02 -04:00
2827deb418
fix on contract add
2018-04-27 13:50:57 -04:00
4a9ff1fe9d
check if testrpc is installed and warn if not
2018-04-27 09:16:29 -04:00
1cfe46db55
intercept logs in the app itself - stopgap fix
2018-04-26 17:19:45 -04:00
17c33ad075
Merge pull request #384 from embark-framework/chores/test-allpligin-apis
...
Small fixes for plugin APIs
2018-04-26 17:06:05 -04:00
6a3add8e04
Merge pull request #383 from embark-framework/no_contracts
...
don't error if it's an empty dapp with no contracts yet
2018-04-26 14:56:13 -04:00
3b736f56a7
don't error if it's an empty dapp with no contracts yet
2018-04-26 14:15:43 -04:00
d046feb83d
fix a bug where upload cmd used plugin name
2018-04-26 14:00:41 -04:00
e4566f9f81
add more registers but generation one fails in run
2018-04-26 09:40:41 -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
ef0bcbf405
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.
2018-04-26 21:37:00 +10: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
52d0c5a8dd
stop tests when deploy fails
2018-04-24 10:19:01 -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
ade2ad1a67
comply with linter
2018-04-20 19:59:47 -04:00
a63aa2ea0f
remove commented line; use beta 34
2018-04-20 19:58:16 -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
1b6d747dbd
fixing package management test
2018-04-20 17:17:49 -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
c05915b0e9
swarm deploy refactored to use web3.bzz instead of command line
...
* `Embark.upload()` refactored to build own `Engine` and services so `web3` could be passed to `Swarm` module
* `Swarm.deploy()` modified to use `web3.bzz.upload()`
* needs detection of running swarm node
2018-04-20 17:39:45 +10: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
09ca551a22
Add --loglevel validation for `run` and `build`
2018-04-19 14:43:41 +10: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
5925124978
fix unit tests and add test_appp test for http contracts
2018-04-18 14:56:18 -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
e5ae6bc86e
Merge pull request #367 from embark-framework/refactor/vyper-utils
...
Refactor Vyper compiler
2018-04-17 11:35:38 -04:00
6f119eeb1b
move vyper contract compile to static util function
2018-04-17 11:25:46 -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
a3d2cc9a2c
Moved console "ready" message to write after outputDone event is emitted
2018-04-17 14:11:22 +10:00
dd1c10fe85
remove useless waterfall
2018-04-16 13:11:55 -04:00
ad136802da
Merge pull request #365 from embark-framework/bug_fix/fix-versions-with-spaces
...
Fix versions with spaces and add warning
2018-04-16 12:07:02 -04:00
891a4e0a0f
fix versions with spaces and add warning
2018-04-16 11:38:46 -04:00
8bdf79b19a
Handling for error during build.
2018-04-15 20:31:26 +10:00
8fc978eb50
* Removed duplicated code to build and deploy contracts and replaced with a call to the build function.
...
* Updated upload functions to use async `exec` and removed returns from the callbacks.
2018-04-15 20:31:16 +10:00
c1c61de2d5
Passed in success messaging to async callback.
2018-04-15 20:31:08 +10:00
31a2a27e9a
#156326148 Updates to build and upload process and fixes for test_app/test.html
...
* Updated build to include deployment of contracts
* updated the plugin uploadCmd to be a Promise for better bubbling of errors and messaging.
* updated test.js imports so functionality works correctly.
2018-04-15 20:30:59 +10:00
6b7af4b647
#156326148 Build contracts and dapp before upload.
2018-04-15 20:30:52 +10:00
99c04b405f
fix clas name and bytecode
2018-04-13 15:48:19 -04:00
17e1c71506
submit contract for deployment, not working yet
2018-04-13 14:59:01 -04:00
dc9e6c168b
start vyper implementation
2018-04-13 14:59:01 -04:00
7d8c7b119c
add warning after compile for files without a compatible compiler
2018-04-13 14:59:01 -04:00
6647c31d38
hotfix: callback with wrong parameter order
2018-04-13 14:54:46 -04:00
82726e07e1
Merge pull request #361 from embark-framework/graphviz-contracts
...
Graphviz contracts
2018-04-13 11:29:23 -04:00
b56f20db8a
Merge pull request #359 from embark-framework/node_module_import
...
better mappings
2018-04-12 20:41:52 -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
e0ab9cbde4
refactor findImports
2018-04-12 17:57:55 -04:00
db61e355c1
look for contract import in dapp dir and node_modules
2018-04-12 17:55:57 -04:00
e3fde1ad22
support mapping contract file in contracts config
2018-04-12 17:54:08 -04:00
4a9b52e5df
Removed annoying [Object object] from the log that was appearing during contract compilation.
...
The warnings in object that were attempted to be logged were already being logged in a previous loop, so this was simply removed.
2018-04-12 13:47:34 +10: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
282067649c
Merge pull request #356 from embark-framework/bug_fix/fix-tests-in-windows
...
Fix tests breaking because of line-endings
2018-04-10 17:08:27 -04:00
e90cead578
fix tests breaking because of line-endings
2018-04-10 16:38:49 -04:00
6905698bcc
fix swarm upload too
2018-04-10 16:02:59 -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
e731495109
fix upload on windows
2018-04-10 14:17:59 -04:00
2907510b6e
fix arrows in ipfs get by using ipfsConnection.get
2018-04-10 13:33:13 -04:00
586ecd00c8
Merge pull request #352 from embark-framework/bug_fix/async_log_fix
...
Fix console.dir messing up the console
2018-04-09 16:22:02 -05:00
3ecb195b38
move import list out of loop to accelerate build process
2018-04-09 16:29:49 -04:00
f37b09a371
fix build process on windows
2018-04-09 16:14:07 -04:00
3a89b3f951
intercept dir and pass it to the logger
2018-04-09 15:24:01 -04:00
f56b42d91f
Linting
2018-04-05 11:41:28 -04:00
d038ed414d
Merge branch 'develop' of https://github.com/embark-framework/embark into graphviz-contracts
2018-04-05 11:35:19 -04:00
5a91b2d44a
remove unneeded require
2018-04-02 15:32:09 -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
Jonathan Rainville
Iuri Matias
Eric Mastro
VoR0220
Anthony Laibe
Ricardo Guilherme Schmidt
Natacha De la Rosa
Richard Ramos
emizzle