Commit Graph

1184 Commits

Author SHA1 Message Date
Iuri Matias 3d7c1c629c fix merge errors 2015-07-09 07:31:37 -04:00
Iuri Matias 0655957e0f Merge branch 'develop' of github.com:iurimatias/embark-framework into develop 2015-07-09 07:24:21 -04:00
Iuri Matias 19eb84ef91 Merge pull request #25 from debris/fixed_contract_address
Fixed contract address
2015-07-09 07:07:52 -04:00
Iuri Matias e2b5e03bf7 Merge pull request #22 from debris/deploy_fix
fixed error on embark deploy when deploying contracts from new boilerplate
2015-07-09 07:07:13 -04:00
Iuri Matias f6883e9896 Merge pull request #21 from debris/patch-1
readme update - debugging embark
2015-07-09 07:05:16 -04:00
Marek Kotewicz 37fd6e1e13 fixed typos 2015-07-09 11:03:06 +02:00
Marek Kotewicz ddcbe657af reverted bolerplate/package.json 2015-07-09 10:59:03 +02:00
Marek Kotewicz 13e33dd192 web3.js 0.8.1, fixed obtaining contract addresses 2015-07-09 10:49:04 +02:00
Marek Kotewicz b6d22f1a3f fixed error on embark deploy when deploying contracts from new boilerplate 2015-07-09 09:21:18 +02:00
Marek Kotewicz 2ffe63a31d readme update - debugging embark 2015-07-09 08:55:45 +02:00
Iuri Matias df0e4d51ce force exit at end of cmd 2015-07-08 06:17:05 -04:00
Iuri Matias 1f03a4e962 support both meteor and grunt config files 2015-07-07 07:17:13 -04:00
Iuri Matias 9a4e62072f comment out config yml optiosn in boilerplate 2015-07-07 06:58:30 -04:00
Iuri Matias ce681de06b add support for main config file 2015-07-07 06:51:03 -04:00
Iuri Matias 4492db4603 define contracts type with address defined as static 2015-07-06 08:33:26 -04:00
Iuri Matias fe8b8e805e support specifying a contract address 2015-07-06 08:19:25 -04:00
Iuri Matias ea2a162d4b fix contract creation defaults; add test for contract instances 2015-07-04 18:59:57 -04:00
Iuri Matias 5d9f7f32da fix deployment script 2015-07-04 17:02:01 -04:00
Iuri Matias 4481938ccd implement contract instances 2015-07-04 16:52:05 -04:00
Iuri Matias c2416389fc abstract compiler into its own module 2015-07-03 23:23:21 -04:00
Iuri Matias 3f86244fbd cleanup 2015-07-03 22:41:39 -04:00
Iuri Matias b7bdd841c9 refactor modules; update grunt tasks 2015-07-03 22:27:17 -04:00
Iuri Matias e43c0a38d6 refactor blockchain lib + tests 2015-07-03 08:53:42 -04:00
Iuri Matias 1a5ddea9a8 restructure lib initialization 2015-07-03 07:59:35 -04:00
Iuri Matias ad071bc1b2 refactor deploy script + tests 2015-07-03 04:59:33 -04:00
Iuri Matias de9dff3397 refactor: determine contract dependencies + add specs 2015-07-02 08:50:32 -04:00
Iuri Matias 4499fc6c13 restructure; move code from tasks into libs 2015-07-02 08:34:39 -04:00
Iuri Matias 4593ad7e76 update requirements; add warning for 0.9.34 2015-07-02 07:43:44 -04:00
linagee 872d9364ab No reason for peers with test
This made mine start to mine. (Would not start without it.)
2015-07-02 07:43:43 -04:00
Iuri Matias eac991971a refactor: start moving contracts code to its own file + specs 2015-07-02 07:43:43 -04:00
Iuri Matias e9c34168a2 rename config as config.blockchain 2015-07-02 07:43:01 -04:00
Iuri Matias 676b28c35b move blockchain config to its own file 2015-07-02 07:43:00 -04:00
Iuri Matias 3b5c45a29f refactor blockchain config 2015-07-02 07:43:00 -04:00
Iuri Matias 12f84bf403 restructure; move code from tasks into libs 2015-07-02 07:43:00 -04:00
Iuri Matias 416530dbbf update to 0.4.3 2015-07-02 07:41:51 -04:00
Iuri Matias f4ba7dc817 update mining script to take to work with 0.9.35 2015-07-02 07:39:24 -04:00
linagee 961dac4645 web3.eth.pendingTransactions is not a function
See https://github.com/iurimatias/embark-framework/issues/15
Also, minimalAmount was set too low for demo contract to launch.
2015-07-01 19:55:24 -04:00
Iuri Matias e01a339756 update to 0.4.2 2015-06-26 20:23:15 -04:00
Iuri Matias bc1af4ec25 fix issue with deploying multiple indepedent contracts 2015-06-26 20:18:05 -04:00
Iuri Matias 77b1e333ed update to 0.4.1 2015-06-24 07:23:12 -04:00
Iuri Matias 949ca2da1c fix mining script to work with both geth 0.9.33 and older versions 2015-06-24 07:22:10 -04:00
Iuri Matias 18dd35f1a5 update readme 2015-06-22 07:54:22 -04:00
Iuri Matias b212a69ce0 update readme 2015-06-22 06:18:11 -04:00
Iuri Matias 93d8f50d33 update readme 2015-06-22 06:13:04 -04:00
Iuri Matias e897263bc3 update readme 2015-06-22 06:07:46 -04:00
Iuri Matias 21617e3bf6 update to 0.4.0 2015-06-21 22:49:07 -04:00
Iuri Matias c0b4f62aa9 add some info to default html page 2015-06-21 22:43:15 -04:00
Iuri Matias 4988e30154 update readme 2015-06-21 22:14:22 -04:00
Iuri Matias a1a3aab6e5 support receiving contract as argument; automatically determine correct deployment order 2015-06-20 13:47:38 -04:00
Iuri Matias 9abd93ff7f update demo contract and spec 2015-06-20 08:36:40 -04:00