status-im
/
embark-area-51
mirror of https://github.com/status-im/embark-area-51.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,978 Commits 54 Branches 96 Tags 20 MiB
Commit Graph

1134 Commits

Author SHA1 Message Date
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