Jonathan Rainville
c234655acd
resolve conflict in test.js
2018-06-01 13:33:11 -04:00
Jonathan Rainville
723a4ae805
reformat run_test
2018-06-01 13:32:23 -04:00
Iuri Matias
4669922090
Merge pull request #471 from embark-framework/features/improve-storage-config
...
Improve storage config
2018-06-01 12:07:30 -04:00
Iuri Matias
9a1eefc838
Merge branch 'develop' into features/improve-storage-config
2018-06-01 12:01:51 -04:00
Iuri Matias
d2b41be908
Merge pull request #472 from embark-framework/remove_orbit
...
remove orbit
2018-06-01 12:00:07 -04:00
Iuri Matias
f3e7d03204
remove orbit
2018-06-01 10:15:41 -04:00
Eric Mastro
421f9a4096
Merge in remote
2018-06-01 14:10:54 +10:00
emizzle
74d5ee3984
small fixes
2018-06-01 14:06:02 +10:00
emizzle
446f28ed6f
de-dupe en.json
2018-06-01 13:39:00 +10:00
emizzle
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
emizzle
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
emizzle
7aa44c7fe3
Added improvements to storage config
2018-06-01 13:35:11 +10:00
emizzle
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
emizzle
6ac8672a31
Added a global storage module that inits ipfs or swarm depending on dappConnection options. WIP.
2018-06-01 13:34:49 +10:00
emizzle
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
emizzle
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
emizzle
ec15823dbc
Added a global storage module that inits ipfs or swarm depending on dappConnection options. WIP.
2018-06-01 13:28:28 +10:00
emizzle
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
Eric Mastro
d29b033a8a
merge in changes from remote
2018-06-01 08:33:01 +10:00
Jonathan Rainville
ac69f2f9fd
Merge branch 'develop' of https://github.com/embark-framework/embark into develop
2018-05-31 10:38:09 -04:00
Iuri Matias
75c91992e3
Merge pull request #469 from embark-framework/refactor_contracts_part2
...
Refactor contracts part2
2018-05-31 10:37:43 -04:00
Jonathan Rainville
30c6555649
hotfix tag for github urls
2018-05-31 10:37:40 -04:00
Iuri Matias
9929415da8
remove unneded passing of contracts manager
2018-05-31 10:09:26 -04:00
Iuri Matias
20d7496980
take into account errors when determining arguments
2018-05-31 10:02:57 -04:00
Iuri Matias
7d28cdfd01
Merge pull request #470 from embark-framework/ipfs_cmd_fix
...
register ipfs cmd correctly
2018-05-31 09:46:36 -04:00
emizzle
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
emizzle
6d77aae6de
Added improvements to storage config
2018-05-31 15:19:09 +10:00
emizzle
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
emizzle
0a331e9352
Added a global storage module that inits ipfs or swarm depending on dappConnection options. WIP.
2018-05-31 15:18:10 +10:00
emizzle
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
Iuri Matias
7ee62adb24
remove unused assignment
2018-05-30 17:30:51 -04:00
Iuri Matias
b3173c1ff3
register ipfs cmd correctly
2018-05-30 17:22:12 -04:00
Iuri Matias
01fc78059e
Merge pull request #466 from embark-framework/abiFixes
...
alias to the abi property in an object
2018-05-30 15:37:42 -04:00
VoR0220
2d98938f18
eliminate space
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-30 14:35:07 -05:00
VoR0220
21b530fad2
fix for the fix
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-30 14:34:36 -05:00
VoR0220
4d65ccec7a
fixed this up
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-30 14:33:29 -05:00
Iuri Matias
b43a766de7
cleanup module call
2018-05-30 13:38:08 -04:00
Iuri Matias
7d795fa180
remove unused var
2018-05-30 13:38:08 -04:00
Iuri Matias
4f20d31b4c
add emitAndRunActionsForEvent
2018-05-30 13:38:08 -04:00
Iuri Matias
45f7767313
remove contracts manager dependency from deploy manager
2018-05-30 13:38:08 -04:00
Iuri Matias
1d782c0e53
emit contractsDeployed event only
2018-05-30 13:38:08 -04:00
Iuri Matias
68e6782f49
remove unneded assignment
2018-05-30 13:38:08 -04:00
Iuri Matias
9b368bc1b3
remove unneeded assignment
2018-05-30 13:38:08 -04:00
Iuri Matias
1912981d7d
move contract deploy code to contract deployer; move it to events
2018-05-30 13:38:08 -04:00
Iuri Matias
70f38d863e
fix code generator event
2018-05-30 13:35:36 -04:00
Iuri Matias
f1cb7d1187
lint is king
2018-05-30 13:35:36 -04:00
Iuri Matias
69e5af2308
replace beforeAction plugin api with event action api
2018-05-30 13:35:36 -04:00
Iuri Matias
8458acd207
filter for plugins that have defined properties
2018-05-30 13:35:36 -04:00
Iuri Matias
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
Iuri Matias
71cd523f30
remove old methods
2018-05-30 13:35:36 -04:00