embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
2,454 Commits 171 Branches 184 Tags 104 MiB
Commit Graph

1490 Commits

Author SHA1 Message Date
Jonathan Rainville 4b4ae66c93 change another storage test 2018-05-31 08:38:25 -04:00
Jonathan Rainville 827a3b309f make running config() without callback work 2018-05-31 08:38:25 -04:00
Jonathan Rainville 756d77a9b1 conflict en.json 2018-05-31 08:38:20 -04:00
Jonathan Rainville 622f54bda9 fix missing default from 2018-05-31 08:37:21 -04:00
Jonathan Rainville 641a77c2dc use object assign to assign new values to contract 2018-05-31 08:37:21 -04:00
Jonathan Rainville 1176a2e8be make require and test work 2018-05-31 08:37:21 -04:00
Jonathan Rainville 093bd13c6a build only once 2018-05-31 08:37:21 -04:00
Jonathan Rainville 41aaa5c20d conflict package json 2018-05-31 08:37:17 -04:00
Jonathan Rainville 68fb70f788 reformat run_test 2018-05-31 08:37:00 -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 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
Iuri Matias 16653d491b move onDeploy to new api 2018-05-30 13:35:36 -04:00
Iuri Matias 93e5003c64 cleanup 2018-05-30 13:35:36 -04:00
Iuri Matias 4f45b4fa13 add new plugin method for generalized event actions 2018-05-30 13:35:36 -04:00
Iuri Matias f08bb56337 simplify determine args method 2018-05-30 13:35:36 -04:00
Iuri Matias cf13f098ac refactor deploy method 2018-05-30 13:35:36 -04:00
Iuri Matias f4010bd66e remove unnecessary determin params call 2018-05-30 13:35:36 -04:00
Iuri Matias 8cc86e0b0f remove legacy events 2018-05-30 13:35:36 -04:00
Iuri Matias 742632eccf remove contractsManager dependency 2018-05-30 13:35:36 -04:00
Iuri Matias 3f9c55131b use requests instead of contractsManager directly 2018-05-30 13:35:36 -04:00
Iuri Matias 5f64376c84 refactor generateContractsJson 2018-05-30 13:35:36 -04:00
Iuri Matias cf999ce997 refactor runcode to use events instead; remove dependencies 2018-05-30 13:35:36 -04:00
Iuri Matias fc92b69211 use self 2018-05-30 13:35:03 -04:00
Jonathan Rainville e35474f726 early return 2018-05-30 13:23:18 -04:00
Jonathan Rainville 4db2d40ef5 fix swarm 2018-05-30 12:58:32 -04:00
Jonathan Rainville b5e96beb81 little oopsie 2018-05-30 12:07:48 -04:00
Jonathan Rainville 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
Jonathan Rainville b5d9a86680 start blockchain process at false and deploy on ready 2018-05-30 12:00:44 -04:00
Jonathan Rainville 138aaf39ff fix processes on ubuntu 2018-05-30 11:03:33 -04:00
Jonathan Rainville 2f3a94f3a1 little fixes 2018-05-30 11:03:33 -04:00
Jonathan Rainville 2023689eb2 fix tests 2018-05-30 11:03:33 -04:00
Jonathan Rainville 4df669ab52 add more error management to ipfs 2018-05-30 11:03:33 -04:00
Jonathan Rainville d06a7f43ac fix swarm spawn 2018-05-30 11:03:33 -04:00
Jonathan Rainville c86c50fb4e boot swarm with spawn 2018-05-30 11:03:33 -04:00
Jonathan Rainville 8655b49a39 change ipfs to spawn too 2018-05-30 11:03:33 -04:00
Jonathan Rainville 73db1a6133 something en.json 2018-05-30 11:03:33 -04:00
Jonathan Rainville 3f671c2fb0 conflict in en.json 2018-05-30 11:03:33 -04:00
Jonathan Rainville d36af9f5e1 fix blockchain start 2018-05-30 11:03:33 -04:00
Jonathan Rainville 4e20e82edf conflict in blockchain 2018-05-30 11:03:33 -04:00
Jonathan Rainville a88ab82261 conflict in blockchain.js 2018-05-30 11:02:01 -04:00
Jonathan Rainville b0a64cc043 use right version 2018-05-30 10:57:25 -04:00
Jonathan Rainville e02648dbef add error if user uses ipfs 0.4.14 or lower 2018-05-30 10:57:25 -04:00
Jonathan Rainville 023d8f7f5f fix logs 2018-05-30 10:57:25 -04:00
Jonathan Rainville 3c7bdbf6cf set cors domain depending on the webserverConfig 2018-05-30 10:57:25 -04:00
Jonathan Rainville ac7612136e start storage node on run too 2018-05-30 10:57:25 -04:00
Jonathan Rainville 857c7d8c85 small fixes 2018-05-30 10:57:25 -04:00
Jonathan Rainville f08c700151 reverse plugin.js changes 2018-05-30 10:57:25 -04:00
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
Jonathan Rainville a7be2cda26 convert solcw to use once 2018-05-18 14:22:58 -04:00
Jonathan Rainville c5c00fc3b4 conflict in solcW 2018-05-18 14:11:29 -04:00
Iuri Matias 46c2be16de don't unnecessary reload solc 2018-05-18 13:41:25 -04:00
Jonathan Rainville 6c1d9d9b39 rename startProvider to startWeb3Provider 2018-05-18 13:39:35 -04:00
Jonathan Rainville 4c17aa9d40 fix some PR comments 2018-05-18 13:39:35 -04:00
Jonathan Rainville 09cdab7e2b fund account only in dev 2018-05-18 13:39:35 -04:00
Jonathan Rainville a1e3c741a0 remove remaning of accounts config in blockchain 2018-05-18 13:39:34 -04:00
Jonathan Rainville 6c8653ef09 move code to front end. funds on provider start 2018-05-18 13:39:34 -04:00
Jonathan Rainville 418c55851b remove warning when dev 2018-05-18 13:39:34 -04:00
Jonathan Rainville 372266418f too many spaces 2018-05-18 13:39:34 -04:00
Jonathan Rainville 50103a8c02 conflict in en.json 2018-05-18 13:39:29 -04:00
Jonathan Rainville 94f0d98e28 get accounts and generate script with the right address 2018-05-18 13:38:53 -04:00
Jonathan Rainville c3c4518cb4 move account parsing to its own module 2018-05-18 13:38:53 -04:00
Jonathan Rainville 668fd3a064 add fundAccount script that keeps the user's account funded 2018-05-18 13:38:53 -04:00
Iuri Matias c6593f6168
Merge pull request #426 from embark-framework/features/update_solc_wrapper 
update solc wrapper
 2018-05-18 13:17:01 -04:00
Iuri Matias 4439f8b601
Merge pull request #436 from embark-framework/fixConsolePluginCmdOutput 
Fixed Returns From Plugin Modules
 2018-05-18 11:45:02 -04:00
VoR0220 fee40c8935 remove trailing whitespace 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-18 10:43:56 -05:00
VoR0220 b2e45ed95c remove unneeded code line 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-18 10:42:08 -05:00
VoR0220 dc0c8c5622 fix profiler and this is ready to go 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-18 10:41:23 -05:00
VoR0220 8411f36e06 trying this 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-18 10:18:00 -05:00
VoR0220 28fa906bbf concentrate undefined logic in the plugin output 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-18 10:04:49 -05:00
VoR0220 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
VoR0220 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
Iuri Matias 14eb48fa6b
Merge pull request #434 from embark-framework/addScroller 
should add scroller to available services
 2018-05-18 09:30:37 -04:00
VoR0220 c2086b94ae should add scroller to available services 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-18 08:10:59 -05:00
Natacha De la Rosa bc681a5b4f [FIX #421] Add Spanish Translation to embark 
added spanish translation to Emabrk.
 2018-05-17 22:21:41 -04:00
RJ Catalano 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
VoR0220 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
Iuri Matias c94d8e9f91 update old solc process to new process wrapper 2018-05-17 15:26:44 -04:00
Jonathan Rainville f2e52d1dbc create processLauncher that launches and subscribes to process 2018-05-17 15:26:44 -04:00
Iuri Matias 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
Iuri Matias a967b304e3
Merge pull request #422 from 3esmit/patch-1 
Initialize web3 provider before deployAll
 2018-05-17 15:08:29 -04:00
Jonathan Rainville 8e2af920b8 early callback in compiler 2018-05-17 10:02:53 -04:00
Jonathan Rainville bcb7c80758 Early return if no sol files 2018-05-17 09:49:50 -04:00
Jonathan Rainville dd78aef3db fix vyper .vy 2018-05-17 09:40:38 -04:00
Iuri Matias f828e9d87e add missing comma 2018-05-17 08:58:26 -04:00
emizzle 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
Ricardo Guilherme Schmidt bc57ca62e3 add missing semicol 2018-05-17 03:00:23 -03:00
Ricardo Guilherme Schmidt 25e95c1002 add EmbarkSpec.getAccounts(cb) 2018-05-16 20:24:08 -03:00
Ricardo Guilherme Schmidt bfcf72b09a
Initialize web3 provider before deployAll 
This makes possible to load accounts before deploying the contracts.
 2018-05-16 19:40:24 -03:00
Iuri Matias 01ae387c74
Merge pull request #418 from embark-framework/refactor_pipeline 
Refactor pipeline
 2018-05-16 18:15:51 -04:00
Iuri Matias b1fab3e77c remove console logs 2018-05-16 18:15:23 -04:00
Iuri Matias 965c34d3ed replace the es file with one that contains all the existing keys 2018-05-16 18:11:39 -04:00
Jonathan Rainville c1f72061e3 add tests for processLauncher 2018-05-16 16:41:25 -04:00
Jonathan Rainville 441063dd10 add docs for eventWrapper 2018-05-16 16:41:25 -04:00
Jonathan Rainville 80c382557f add jsdoc to processWrapper 2018-05-16 16:41:25 -04:00
Jonathan Rainville d17256dc40 add JS Doc for processLauncher 2018-05-16 16:41:25 -04:00
Jonathan Rainville 1ffc9ffe08 enable events calling for request and on 2018-05-16 16:41:25 -04:00
Jonathan Rainville 953ce6659e reorg subscribe to message method 2018-05-16 16:41:25 -04:00
Jonathan Rainville 1c125a019c conflict in en.json 2018-05-16 16:41:15 -04:00
Jonathan Rainville 3c0fda5a40 add eventWrapper not tested 2018-05-16 16:40:17 -04:00
Jonathan Rainville 36850895cf add process wrapper to handle logs 2018-05-16 16:40:17 -04:00
Iuri Matias 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
Iuri Matias 52c9e51deb add keys for es 2018-05-16 15:28:17 -04:00
Jonathan Rainville e651884473 set to 200 per Iuri's request 2018-05-16 15:27:38 -04:00
Iuri Matias 597d40e824 add missing keys 2018-05-16 15:26:57 -04:00
Iuri Matias 00e3af9012 lint is king 2018-05-16 15:18:12 -04:00
Jonathan Rainville 0611fee841 set max listeners to 50 2018-05-16 15:08:22 -04:00
Iuri Matias 8ae6c6a646 simplify buildContracts and buildWeb3JS methodsgst 2018-05-16 15:07:47 -04:00
Iuri Matias 4dcd644b7c remove listeners for command handlers 2018-05-16 13:57:27 -04:00
Iuri Matias 44d6cc32df remove old remove listener; fix callback 2018-05-16 13:56:23 -04:00
Iuri Matias ce781ab96e remove previous listener (for now) 2018-05-16 13:11:44 -04:00
Iuri Matias b7fc3f9054 refactor write contracts 2018-05-16 12:48:17 -04:00
Iuri Matias d8a1894803 remove extra method 2018-05-16 10:09:46 -04:00
Iuri Matias da84cfa769 add missing require 2018-05-16 10:03:05 -04:00
Iuri Matias 6544c2a999 move contracts generation from pipeline to code generator module 2018-05-16 10:00:56 -04:00
Iuri Matias 7271b00cf4 make file changes in the pipelins 2018-05-15 18:21:00 -04:00
Iuri Matias 1f6e386d9b build web3js generation from pipeline to code_generator 2018-05-15 18:05:44 -04:00
Iuri Matias 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
Iuri Matias 760bd984d8 only close watcher when it's actually ready 2018-05-15 17:20:43 -04:00
Jonathan Rainville 38cf7a4aa8 throttle contracts too 2018-05-15 15:41:24 -04:00
Jonathan Rainville 6bff25f3b6 hotfix hide logs of hard-source 2018-05-15 15:01:38 -04:00
Jonathan Rainville 8cee44cbd7 conflict in package lock 2018-05-15 14:42:06 -04:00
Jonathan Rainville 38dffb9eed move provider to contracts 2018-05-15 12:45:38 -04:00
Jonathan Rainville fdf8791c1c fix mnemonic accounts 2018-05-15 11:33:19 -04:00
Jonathan Rainville c5f80c72b9 add 0x if private key doesn't have it 2018-05-14 16:38:15 -04:00
Jonathan Rainville 7b1a219b51 pass isDev to engine so that it can show a warning 2018-05-14 14:32:19 -04:00
Jonathan Rainville 3f09d5d3f0 add tests for getContract 2018-05-14 14:04:26 -04:00
Jonathan Rainville e470a63905 enable comma separated keys in file 2018-05-14 13:30:13 -04:00
Jonathan Rainville 24c4c51232 add locales 2018-05-14 12:14:05 -04:00
Jonathan Rainville 890faf260d remove sync methods as they are now unsupported 2018-05-14 12:12:14 -04:00
Jonathan Rainville 37ca90ad9b add wallet and clean up 2018-05-14 12:08:03 -04:00
Jonathan Rainville 00bc3050ba intercept get accounts 2018-05-14 11:18:48 -04:00
Jonathan Rainville b7908a3797 conflict in package lock 2018-05-14 11:18:48 -04:00