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

1562 Commits

Author SHA1 Message Date
Jonathan Rainville dd1c10fe85 remove useless waterfall 2018-04-16 13:11:55 -04:00
Iuri Matias 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
Jonathan Rainville 891a4e0a0f fix versions with spaces and add warning 2018-04-16 11:38:46 -04:00
Iuri Matias 39c7e3c625
Merge pull request #364 from embark-framework/bug_fix/build-before-upload-fixed 
Bug fix/build before upload fixed
 2018-04-16 11:13:09 -04:00
Eric Mastro 8bdf79b19a Handling for error during build. 2018-04-15 20:31:26 +10:00
Eric Mastro 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
Eric Mastro c1c61de2d5 Passed in success messaging to async callback. 2018-04-15 20:31:08 +10:00
Eric Mastro 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
Eric Mastro 6b7af4b647 #156326148 Build contracts and dapp before upload. 2018-04-15 20:30:52 +10:00
Iuri Matias f9b7f5c034 Merge branch 'develop' of github.com:iurimatias/embark-framework into develop 2018-04-13 16:56:10 -04:00
Iuri Matias 1d80f80823 remove unnnecessary chains files 2018-04-13 16:55:55 -04:00
Iuri Matias 1bd0b9931c
Merge pull request #363 from embark-framework/features/vyper-plugin 
Add Vyper contract support
 2018-04-13 16:25:53 -04:00
Jonathan Rainville d3e9dc75ec update readme to include Vyper doc 2018-04-13 16:06:56 -04:00
Jonathan Rainville 99c04b405f fix clas name and bytecode 2018-04-13 15:48:19 -04:00
Jonathan Rainville 17e1c71506 submit contract for deployment, not working yet 2018-04-13 14:59:01 -04:00
Jonathan Rainville dc9e6c168b start vyper implementation 2018-04-13 14:59:01 -04:00
Jonathan Rainville 7d8c7b119c add warning after compile for files without a compatible compiler 2018-04-13 14:59:01 -04:00
Jonathan Rainville 6647c31d38 hotfix: callback with wrong parameter order 2018-04-13 14:54:46 -04:00
Iuri Matias 82726e07e1
Merge pull request #361 from embark-framework/graphviz-contracts 
Graphviz contracts
 2018-04-13 11:29:23 -04:00
Iuri Matias b56f20db8a
Merge pull request #359 from embark-framework/node_module_import 
better mappings
 2018-04-12 20:41:52 -04:00
Iuri Matias 5ed1e787b2 print error if contract file is not found 2018-04-12 20:30:20 -04:00
Iuri Matias 7243c6ea8b revert to lower versions of solc 2018-04-12 18:52:13 -04:00
Iuri Matias 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
Iuri Matias e0ab9cbde4 refactor findImports 2018-04-12 17:57:55 -04:00
Iuri Matias db61e355c1 look for contract import in dapp dir and node_modules 2018-04-12 17:55:57 -04:00
Iuri Matias e3fde1ad22 support mapping contract file in contracts config 2018-04-12 17:54:08 -04:00
Iuri Matias c219aafd6a
Merge pull request #358 from embark-framework/bug_fix/annoying-object-in-log 
Removed annoying [Object object] from the log that was appearing duri…
 2018-04-12 17:03:59 -04:00
emizzle 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
Iuri Matias 17b960e803
Merge pull request #357 from embark-framework/appveyor 
add appveyor
 2018-04-11 11:31:29 -04:00
Iuri Matias dbb6b69649 add badge for appveyor 2018-04-11 11:25:53 -04:00
Iuri Matias 34b378cd5d fix typo... 2018-04-11 11:14:01 -04:00
Iuri Matias 8c43ba2772 npm5 windows issues workaround 2018-04-11 11:01:58 -04:00
Iuri Matias a46bdfd71e update npm version to fix recursive npm install bug 2018-04-11 10:41:03 -04:00
Iuri Matias 2ce86f8591 use node cmd so it works on windows 2018-04-11 09:17:43 -04:00
Iuri Matias 67bdcbb1c3 put cmds between "s so it works on windows 2018-04-11 09:12:24 -04:00
Iuri Matias 6e235f7e1c complete appveyor.yml 2018-04-11 09:00:08 -04:00
Iuri Matias 12466c4ec5 add appveyor config file 2018-04-11 08:51:54 -04:00
Iuri Matias 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
Iuri Matias 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
Jonathan Rainville 6e87085cb5
Merge pull request #354 from embark-framework/bug_fix/embark-upload-windows 
Fix upload on Windows
 2018-04-10 16:40:47 -04:00
Jonathan Rainville e90cead578 fix tests breaking because of line-endings 2018-04-10 16:38:49 -04:00
Jonathan Rainville 6905698bcc fix swarm upload too 2018-04-10 16:02:59 -04:00
Iuri Matias 9d261472f9 extract node name and version (so it displays just like in 2.6.0) 2018-04-10 15:14:00 -04:00
Iuri Matias 044759ef52 get node name and version 2018-04-10 15:08:08 -04:00
Jonathan Rainville e731495109 fix upload on windows 2018-04-10 14:17:59 -04:00
Iuri Matias 8f95dd0939
Merge pull request #353 from embark-framework/bug_fix/arrows-ipfs-get-windows 
Fix weird characters in IPFS get by using ipfsConnection.get
 2018-04-10 13:57:51 -04:00
Jonathan Rainville 2907510b6e fix arrows in ipfs get by using ipfsConnection.get 2018-04-10 13:33:13 -04:00
RJ Catalano 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
Iuri Matias 62352d0772
Merge pull request #351 from embark-framework/fix/rainvij/fix-windows 
Fix Windows Build due to PWD not existing
 2018-04-09 17:01:07 -04:00
Jonathan Rainville 3ecb195b38 move import list out of loop to accelerate build process 2018-04-09 16:29:49 -04:00