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

203 Commits

Author SHA1 Message Date
Jonathan Rainville 8cc485ac94 add isDev blockchain option 2018-05-09 15:16:46 -04:00
emizzle 799769d19c Update test to match abi generated with 0.4.23 2018-05-04 11:01:42 -04:00
emizzle bdfe61ad75 fix test failing with old solc version 2018-05-03 23:30:59 -04:00
emizzle 72cce7d4d2 Fixes to make lint and tests happy 2018-04-30 22:07:37 +10:00
Eric Mastro 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
Iuri Matias 782044ef7c
Merge pull request #375 from embark-framework/fix_package_management 
Fix package management
 2018-04-20 20:10:38 -04:00
Iuri Matias b4129e975b update tests 2018-04-20 20:01:11 -04:00
Jonathan Rainville d48c971471 improve url regexes 2018-04-20 12:04:27 -04:00
Jonathan Rainville c1bed28c00 code and test importing the http contract 2018-04-20 11:39:17 -04:00
Jonathan Rainville 9bf06aebce refacotr how we handle files already parsed 2018-04-20 10:03:03 -04:00
Jonathan Rainville abc89b2015 add code to parse all files to check for http imports 2018-04-20 09:52:13 -04:00
Jonathan Rainville df5b647ecb fix and add tests 2018-04-19 15:25:27 -04:00
Jonathan Rainville 60fb6b14d4 downlaod import files 2018-04-19 15:25:26 -04:00
Jonathan Rainville 05b1f61c9b download files in full path of url 2018-04-19 15:25:26 -04:00
Jonathan Rainville 6c5415b27f base code for import parse 2018-04-19 15:25:26 -04:00
Jonathan Rainville df226919c0 change file creation with using File.types 2018-04-18 15:02:50 -04:00
Jonathan Rainville 5925124978 fix unit tests and add test_appp test for http contracts 2018-04-18 14:56:18 -04:00
Jonathan Rainville 9faf644c31 add loading in file.js but includes a patch to fix 2018-04-18 12:09:42 -04:00
Jonathan Rainville ce34d40fe7 integrate downloadCOntract function in contract get function 2018-04-18 09:07:39 -04:00
Jonathan Rainville 2568ec1aec implement the download function 2018-04-17 16:34:37 -04:00
Jonathan Rainville cf14b3784f add getUrl function for external contracts + tests 2018-04-17 15:07:00 -04:00
Jonathan Rainville e90cead578 fix tests breaking because of line-endings 2018-04-10 16:38:49 -04:00
Iuri Matias 290eec857d update tests 2018-02-22 10:27:30 -05:00
Iuri Matias a8222df1eb support ws providers 2018-02-07 19:41:11 -05:00
Iuri Matias c2c894cfb1 update compiler tests 2018-01-27 15:07:55 -05:00
Iuri Matias 5c5ef44f2f update tests 2018-01-23 19:36:02 -05:00
Iuri Matias 10c4c75236 move tests related files to their own folder 2018-01-19 21:13:20 -05:00
Iuri Matias 46d192bec0 update tests 2018-01-19 14:18:50 -05:00
Iuri Matias 7e8a594bf9 update tests 2018-01-17 11:29:30 -05:00
Iuri Matias 4d1368f388 fix lint; update tests 2018-01-17 10:04:11 -05:00
Iuri Matias 11dc74043b update tests 2018-01-12 18:15:05 -05:00
Iuri Matias d9ac76a0b7 update tests 2018-01-12 14:21:46 -05:00
Iuri Matias 59c3d82260 update web3.js 2018-01-05 15:10:47 -05:00
Iuri Matias 2f3abc37b7 use module command to get solc version 2017-12-30 18:12:16 -05:00
Iuri Matias 3e1f16c673 update tests 2017-12-30 17:07:13 -05:00
Iuri Matias 6f3345ae33 updated tests 2017-12-26 10:17:41 -05:00
Iuri Matias 6d077b1412 fix module name in tests 2017-12-17 19:30:22 -05:00
Iuri Matias 8999d619c5 update tests 2017-12-16 17:55:27 -05:00
Iuri Matias 67dd4a22cb update tests 2017-12-16 17:10:11 -05:00
Iuri Matias 747237de76 fix defaults when contracts config file is not present 2017-12-16 08:12:38 -05:00
Iuri Matias e8ebb0fb37 update tests 2017-12-15 17:38:02 -05:00
Iuri Matias e2dcad07ce update tests 2017-12-13 16:28:23 -05:00
Iuri Matias c68c1b2d74 update test config 2017-12-07 09:41:19 -05:00
Iuri Matias 9bd1880479 update test config 2017-12-07 09:25:06 -05:00
Iuri Matias cd72a66c2b update blockchain config tests 2017-10-19 19:16:08 -04:00
Iuri Matias a1076ff079 update tests 2017-10-13 20:16:39 -04:00
Iuri Matias d1762a0fb4 refactor code generation 2017-10-13 20:01:35 -04:00
Iuri Matias 322fabab3d update tests; fix test module 2017-10-13 05:56:42 -04:00
Iuri Matias 2dc1941e48 rename ABIGenerator (very old legacy reasons) to more apropriate CodeGenerator 2017-08-03 19:29:09 -04:00
Iuri Matias 29c343463b add support for whisper v5; make get url ipfs get configurable 2017-07-24 07:27:52 -04:00
Iuri Matias fbfb5269b0 update compiler spec 2017-07-16 14:40:06 -04:00
Iuri Matias aa5efab6f9 update tests 2017-07-08 12:39:53 -04:00
Iuri Matias ad9b18133a update tests 2017-06-25 12:59:19 -04:00
Iuri Matias a6c8e83d40 fix conflicts 2017-06-24 22:35:27 -04:00
Nathan Hernandez ed0da0d292 Merge pull request #1 from jonjonsonjr/develop 
fix expected token in compiler test
 2017-06-02 22:22:04 -04:00
Nathan Hernandez 97d113b334 Update compiler tests 2017-06-02 22:17:21 -04:00
Jon Johnson 3049acbdee fix expected token in compiler test 2017-06-02 19:14:04 -07:00
Todd Baur 613e4e6abe integration testing fixes 2017-03-30 22:16:46 +09:00
Todd Baur 7599f43a3b fixed problem with double this.client in blockchain.js 2017-03-30 20:48:22 +09:00
Todd Baur 67f325f5a0 migrate all the code to ES6 2017-03-30 20:12:39 +09:00
Todd Baur 26b87b4b05 swap test var -> let 2017-03-30 02:57:22 +09:00
Todd Baur 2f5c647c39 this changes Embark to an EventEmitter and adds more event handling for loading and fetching plugins. It introduces a dependency on underscore and underscore string. It adds defenses against null/invalid options objects. 2017-03-30 00:37:30 +09:00
Todd Baur b186bf966c fixed merge conflicts 2017-03-22 14:13:58 +09:00
Todd Baur 383b3c31a5 speed up test class - unstable 2017-03-12 12:23:30 +09:00
Todd Baur f4ef1af4a1 fixed failing timeouts in abi tests 2017-03-08 23:56:00 +09:00
Todd Baur 2de9292bd6 Merge branch 'develop' of github.com:iurimatias/embark-framework into one_version 2017-03-08 23:54:17 +09:00
Todd Baur 83f3e1c5ee dot notation preferred 2017-03-08 23:52:17 +09:00
Todd Baur b003a30b3b add version from package.json in test for contracts 2017-03-08 23:49:43 +09:00
Iuri Matias c1d2bd170e Merge pull request #230 from toadkicker/add_mocha_timeouts 
add this.timeout(15000) to tests to allow the solc enough space to work
 2017-03-08 09:47:08 -05:00
Todd Baur ac2a75791c grunt-config-mocha does not accept 0 as an option for timeout, so we set the value in the test itself 2017-03-08 23:38:40 +09:00
Todd Baur 7a930d95a8 switch config to grunt vs declaring in test 2017-03-08 23:28:10 +09:00
Todd Baur 6f5abfe07c swap let -> var 2017-03-08 22:56:27 +09:00
Todd Baur 895b2477cd added unit test for Embark.Cmd 2017-03-08 22:52:26 +09:00
Todd Baur 5525e1e9d4 add this.timeout(15000) to tests to allow the solc enough space to work 2017-03-08 22:49:42 +09:00
Iuri Matias dbb0b0b171 track deployed contracts taking into account swarm hash inserted by solc 2017-03-01 20:52:58 -05:00
Iuri Matias 3525754cde add new enable field to config test 2017-02-28 23:40:40 -05:00
Iuri Matias 0bdfda78ab update test to take error into account 2017-02-28 08:07:07 -05:00
Iuri Matias dac6ca9fe6 fix contract tests 2017-02-25 23:27:45 -05:00
Iuri Matias 0dc21abd3c fix compiler argument 2017-02-25 23:20:57 -05:00
Iuri Matias 562efc6f14 test fixes 2017-02-25 22:57:22 -05:00
Iuri Matias 1868788342 reorgnize code structure 2017-02-19 12:51:32 -05:00
Iuri Matias 655114b394 add config to specify geth command 2017-02-18 08:55:33 -05:00
Iuri Matias 03a6b6c48d option added 2017-02-18 08:41:18 -05:00
Iuri Matias eb36af87b0 add support for the bootnodes config 2017-02-18 08:24:23 -05:00
Iuri Matias c339732cd6 make compiler module async 2017-02-17 07:14:44 -05:00
Iuri Matias d14943e95d update test 2017-02-15 21:13:45 -05:00
Iuri Matias f37bc46f8e fix specs; clarify production enviroment (livenet not production); exec testrpc directly 2017-02-08 06:31:57 -05:00
Iuri Matias 91dd7731d1 update tests 2017-02-06 20:25:51 -05:00
Iuri Matias f1fefff128 update test 2017-02-06 19:36:40 -05:00
Iuri Matias 1cdcaee7d9 fix specs 2017-02-06 06:51:27 -05:00
Iuri Matias ccdfaf61f2 implement plugin support: implement support for client-side web3 providers and contracts plugins 2017-02-06 06:51:26 -05:00
Iuri Matias c554e90b57 update solc and spec 2017-01-14 07:05:36 -05:00
Iuri Matias 087578c8e6 add spec for contracs config; fix contracts arguments when it's an instanceOf 2017-01-12 20:42:33 -05:00
Iuri Matias 59c63b98e1 add small test for console 2017-01-08 15:47:15 -05:00
Iuri Matias 6d369cd452 update solc + specs 2017-01-06 21:48:38 -05:00
Iuri Matias 4002856f89 update to solc 0.4.6 2016-12-02 07:06:04 -05:00
Iuri Matias 5c283b5232 support maxpeers option 2016-10-30 20:35:11 -04:00
Iuri Matias 1140ebf075 update compiler test to be compatible with solc 0.4.0 2016-10-25 19:31:10 -04:00
Iuri Matias 824bc33e20 update compiler test 2016-10-22 18:20:52 -04:00
Iuri Matias 9e06656710 add solidity pragma to demo and test contracts 2016-10-22 18:04:45 -04:00