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

2116 Commits

Author SHA1 Message Date
Iuri Matias 7b9de1b259 make ethersim optional 2016-05-23 16:00:54 -04:00
Iuri Matias fe02278179 update web3 to latest version 2016-05-23 09:20:11 -04:00
Iuri Matias faf626be93 make embark blockchain compatible with latest geth 2016-05-22 11:23:04 -04:00
Iuri Matias c168d103cb remove no longer supported log file option when calling geth 2016-05-20 23:26:17 -04:00
Iuri Matias 2eaa5fc0a4 Merge pull request #146 from iurimatias/upcoming 
Upcoming
 2016-02-29 10:03:48 -05:00
Iuri Matias 32ef27212b update specs; remove unused env config 2016-02-29 09:59:34 -05:00
Iuri Matias f032256552 remove exit - for now - when getting an error deploying 2016-02-29 09:50:17 -05:00
Iuri Matias 676c598b4a Merge pull request #142 from SafeMarket/console-log-deploy-errors 
Console log deploy errors
 2016-02-28 12:58:03 -05:00
Iuri Matias 0fda113db3 Merge pull request #143 from SafeMarket/extension-fix 
Extension fix
 2016-02-28 12:57:52 -05:00
Iuri Matias 30fd0a9489 Merge pull request #144 from SafeMarket/deploy_synchronously 
Deploy synchronously
 2016-02-28 12:57:05 -05:00
Aakil Fernandes c1195b4e03 remove extra quotes 2016-02-25 15:56:40 -05:00
Aakil Fernandes 07ec906766 add blockchain config to abi 2016-02-25 15:23:11 -05:00
Aakil Fernandes 8af4282ed7 deployed_contracts_count fix 2016-02-25 15:23:11 -05:00
Aakil Fernandes 8ea13b4da5 sync->synchronously 2016-02-25 15:23:11 -05:00
Aakil Fernandes 7dac3c0832 deploy_synchronously 2016-02-25 15:23:11 -05:00
Iuri Matias bd76193ac8 add bignumber to dependencies so BigNumber can be used in onDeploy 2016-02-25 15:21:45 -05:00
Aakil Fernandes 171fefbda1 expose runtimeBytecode 2016-02-25 15:20:47 -05:00
Aakil Fernandes 83520affa3 add contractdb 2016-02-25 15:20:47 -05:00
Aakil Fernandes cb0ac1e3ca use last part of contract file rather than 1st 2016-02-25 14:08:24 -05:00
Aakil Fernandes c2ae0c5b4f rebase 2016-02-25 13:40:09 -05:00
Iuri Matias 9f21e35607 Merge pull request #136 from area/develop 
Add support for other paths for ipfs binary
 2016-02-09 16:19:31 -05:00
Iuri Matias 648382bd15 fix blockchain config specs 2016-02-09 15:45:48 -05:00
Iuri Matias a74e0aaa8c update compiler spec 2016-02-09 15:25:23 -05:00
Iuri Matias ef94b9ad96 remove extra minethreads config 2016-02-09 15:05:04 -05:00
Iuri Matias 3ec1fdb6d9 add filename to compiler hash 2016-02-09 14:44:40 -05:00
Iuri Matias 991abb2c7d remove extra { 2016-02-08 22:07:30 -05:00
VoR0220 1bd6c89f0c small corrections 2016-02-08 21:59:44 -05:00
VoR0220 8d2d4f8df4 Throw errors for solidity compiler 2016-02-08 21:59:44 -05:00
VoR0220 a221b1b6b9 fixed interface issues, stubs work again 2016-02-08 21:59:44 -05:00
VoR0220 078e3240db Update compiler.js 2016-02-08 21:59:44 -05:00
VoR0220 f864bb6098 compiling correctly and moved wall of code 
is_a_token I think is no longer necessary methinks...because now you can just draw up your coin as is. At the very least the function needs to be rewritten. In addition I moved the wall of code that you had a TODO to move on...and I put it in its own separate function configureContractsParameters. Let me know what we should do with is_a_token.
 2016-02-08 21:59:44 -05:00
VoR0220 b7c03ac06b Update compiler.js 2016-02-08 21:59:44 -05:00
VoR0220 f5595adb43 Update compiler.js 2016-02-08 21:59:44 -05:00
VoR0220 867b7a16fc Update compiler.js 2016-02-08 21:59:44 -05:00
VoR0220 f2e4333d1e couple of forgotten things needed to be fixed up 2016-02-08 21:59:44 -05:00
VoR0220 ce7693eca2 Update compiler.js 2016-02-08 21:59:44 -05:00
VoR0220 a734eb2b7c Update blockchain.js 2016-02-08 21:59:44 -05:00
VoR0220 4b451f0290 Update contracts.js 2016-02-08 21:58:00 -05:00
VoR0220 9e8ebe9cb3 Update compiler.js 2016-02-08 21:57:59 -05:00
RJ Catalano d8881dd674 changes to bootpeers and ending console toggle 2016-02-08 21:56:44 -05:00
VoR0220 2c1804d01f Update blockchain.js 2016-02-08 21:54:34 -05:00
VoR0220 1228a639e7 update config 2016-02-08 21:54:34 -05:00
VoR0220 ac268c0cd7 add NAT options 2016-02-08 21:54:34 -05:00
VoR0220 94276e8407 changes to rpc_api 2016-02-08 21:54:34 -05:00
VoR0220 482a630294 changes to bootnodes, kill console toggle option 2016-02-08 21:54:34 -05:00
VoR0220 76ec8442ee Update blockchain.js 2016-02-08 21:54:34 -05:00
VoR0220 4625fd6b5a Update blockchain.js 2016-02-08 21:54:34 -05:00
VoR0220 ce36265c39 Update blockchain.js 2016-02-08 21:53:14 -05:00
VoR0220 916437fd4c Update compiler.js 2016-02-08 21:53:14 -05:00
RJ Catalano e0d9931a74 change back to original version of solc 2016-02-08 21:53:13 -05:00
RJ Catalano 2a1ec1b2d7 change back to old compiler 2016-02-08 21:53:13 -05:00
Iuri Matias 0c6ced4dc9 instantiate web3 object 2016-02-08 21:50:01 -05:00
Iuri Matias 84191a241c update specs 2016-02-08 21:12:09 -05:00
area 3512de6ba2 Add support for other paths for ipfs binary 
Use `which` to locate `ipfs` rather than guessing.
 2016-01-11 14:54:02 +00:00
Iuri Matias b9a9de0a32 don't print primary address 2015-12-06 16:01:37 -05:00
Iuri Matias 47a63844fd add better defaults to blockchain config 2015-12-06 16:01:17 -05:00
Iuri Matias 58b2cb84ae Merge pull request #120 from SafeMarket/testnet 
Testnet
 2015-11-23 08:25:19 -05:00
Aakil Fernandes af25780866 add testnet to config 2015-11-20 11:57:51 -05:00
Aakil Fernandes b5fc0f5b9a add testnet option 2015-11-20 11:18:32 -05:00
Aakil Fernandes 81fd274786 throw error when solc fails 2015-10-14 15:53:57 -04:00
Iuri Matias 82b9af2a14 get test config files from embark config 2015-10-12 17:49:54 -04:00
Iuri Matias d45f76beec read embark config file to get contract files for testing 2015-10-12 12:25:43 -04:00
Iuri Matias d33d986f36 update specs 2015-10-12 10:50:52 -04:00
Iuri Matias 38445c9e7f fix deployment 2015-10-09 13:20:35 -04:00
Iuri Matias a7da9bc3c5 remove sync-me dependency 2015-10-09 11:09:26 -04:00
Iuri Matias 2be2a80c31 remove method missing dependency 2015-10-09 11:05:43 -04:00
Iuri Matias 0e867c2a03 remove jasmine dependency 2015-10-09 11:03:02 -04:00
Iuri Matias fb2fbca8f7 remove hashmerge dependency 2015-10-09 11:01:55 -04:00
Iuri Matias b4d659a3d1 move spec code to lib 2015-10-09 10:57:30 -04:00
Iuri Matias c550b688d3 add flag to include provider in abi; update spec 2015-10-09 10:18:18 -04:00
Iuri Matias 95823a8e54 make deployment async 2015-10-08 15:30:47 -04:00
Iuri Matias 32ac41a9cb compile using js solc 2015-10-01 23:04:15 -04:00
Iuri Matias 02a52f718f change enodes config to boot 2015-10-01 22:37:47 -04:00
Iuri Matias 6fcc9c7481 Merge pull request #95 from VoR0220/develop 
Ability to boot enodes from a list in blockchain.yml, support for solc 1.0
 2015-10-01 22:36:17 -04:00
Iuri Matias e78554b02f Merge pull request #93 from SafeMarket/minefix 
only mine if config.mine is true
 2015-10-01 22:33:06 -04:00
Iuri Matias 0c233d968d Merge pull request #89 from FinclusionSystems/develop 
show grunt stacktrace
 2015-10-01 22:32:41 -04:00
VoR0220 b3cec8287b added ability to boot nodes via a list 2015-10-01 08:23:41 -05:00
Aakil Fernandes 03c7f25219 config.address -> config.account.address 2015-09-27 15:14:07 -04:00
Aakil Fernandes 2526ba47fd use account if expliciitly set in config 2015-09-27 15:13:57 -04:00
Aakil Fernandes f818faf680 only mine if config.mine is true 2015-09-27 15:11:36 -04:00
VoR0220 1a147ab01a Merge branch 'develop' of https://github.com/iurimatias/embark-framework into develop 2015-09-26 01:51:22 -05:00
Frederic Heem 6b7b88d58a don-'t call web3.eth.getBlock twice 2015-09-25 08:55:35 +01:00
Frederic Heem 8f96834596 add geth_extra_opts options, can be used to set --vmdebug to geth 2015-09-25 08:47:51 +01:00
Frederic Heem 3c17582bd5 throw error when block cannot be found 2015-09-25 08:44:37 +01:00
VoR0220 1a4bcd168b support solc version 1.0 2015-09-16 15:25:50 -05:00
Iuri Matias 92ca694d35 fix embarassing typo 2015-09-15 09:02:43 -04:00
Iuri Matias 052c2de4b9 get correct compiled code 2015-09-14 21:35:44 -04:00
VoR0220 bc96708d13 correcting some changes I made in error 2015-09-14 20:06:36 -05:00
Iuri Matias fd46b0217d support for both solc 0.1.1 and 0.1.2 2015-09-14 21:01:42 -04:00
VoR0220 6f808cfeb0 ability to create multiple contracts with a single password for testing purposes 2015-09-14 19:58:52 -05:00
Iuri Matias 775b043209 Merge pull request #79 from RCasatta/develop 
Support for solc 0.1.2
 2015-09-14 08:00:24 -04:00
Joris Bontje 1d54018d2e configurable deploy timeout per environment. fixes #63 2015-09-08 11:52:39 +02:00
Riccardo Casatta a64dc60bab Support for solc 0.1.2 2015-09-07 11:32:57 +02:00
Iuri Matias 7c4f3ef1d9 Merge pull request #78 from gerbrand/develop 
Allowing to define chains file per environment/chain
 2015-09-05 06:48:49 -04:00
Gerbrand van DIeijen 98054a2cbb Allowing to define chains file per environment/chain 2015-09-04 10:55:19 +02:00
Chris Hitchcott 95a1c5a550 make `copyMinerJavascriptToTemp` step public 2015-09-03 18:45:06 +08:00
Iuri Matias 3d2a14e28b check if contract exists 2015-08-31 21:14:12 -04:00
Iuri Matias e1ae6dae0c implement deploy field 2015-08-31 20:53:17 -04:00
Iuri Matias 2d82f6e480 Merge branch 'develop' of github.com:iurimatias/embark-framework into develop 2015-08-31 20:17:41 -04:00
Chris Hitchcott b3b1b13795 implement `getStartBlockchainCommand` to return geth CLI string 2015-08-31 21:11:21 +08:00
Iuri Matias f8ba2acf71 workaround for abi issues 2015-08-31 08:24:09 -04:00
Iuri Matias 59d42104b0 add supprot for serpent 2015-08-30 22:10:45 -04:00
Iuri Matias 467713fe87 support solc compiler; display syntax errors 2015-08-30 21:35:34 -04:00
Ryan Casey 274524e456 Sometimes it's nice to get beneath the framework and work with web3 directly. 2015-08-21 12:34:02 -07:00
Gerbrand van DIeijen 92173c9907 Add option to run geth with any command 2015-08-18 12:05:20 +02:00
Iuri Matias 4609a21643 add support to enable whisper 2015-08-09 16:41:42 -04:00
Iuri Matias 4260122238 don't track contract if there was an error deploying it 2015-08-08 11:53:57 -04:00
Iuri Matias 14560913b6 take into account when no cmds are specified 2015-08-08 11:36:00 -04:00
Iuri Matias 39840bbd7a take into account contract args and classname when recording contract 2015-08-05 22:19:21 -04:00
Iuri Matias d5d4cb81e3 Merge pull request #51 from jorisbontje/47-default-chains-json 
default to empty set when chains.json is missing
 2015-08-05 21:06:30 -04:00
Iuri Matias c667d8ad66 fix contact address 2015-08-05 10:11:32 -04:00
Iuri Matias efdf24c49b if contract already deployed record it and generate api; also re-run ondeploy 2015-08-05 10:01:44 -04:00
Joris Bontje 01260b889d default to empty set when chains.json is missing 2015-08-05 14:35:39 +02:00
Iuri Matias 8544756684 manage chain when deploying contracts 2015-08-04 08:18:04 -04:00
Iuri Matias f8db3c2920 save chain; add chain manager to deployment 2015-08-03 21:54:39 -04:00
Iuri Matias 56e59d814b get contract 2015-08-03 21:01:15 -04:00
Iuri Matias fab0df5c8b add contract to chain 2015-08-03 08:44:16 -04:00
Iuri Matias ea54f7524d initialize chain 2015-08-03 08:03:55 -04:00
Iuri Matias c0420d74a8 support deploy commands specifying contract 2015-08-02 20:50:12 -04:00
Iuri Matias 3757e41ea0 support deploy commands on contracts config 2015-08-02 19:43:37 -04:00
Iuri Matias 159d68dcd2 Merge branch 'develop' of github.com:iurimatias/embark-framework into develop 2015-08-02 06:58:47 -04:00
Tim Watts a4e4dee48c Allow blockchain rpchost to be configurable 2015-08-02 09:02:09 +00:00
Iuri Matias 90a1f8cd65 warn user if there was issues deploying a contract 2015-08-01 19:34:26 -04:00
Iuri Matias 3a1828f1f6 fix contract deployment; timeout & retry 2015-08-01 18:04:22 -04:00
Iuri Matias dec7ae8a94 fix blockchain environment 2015-08-01 11:19:21 -04:00
Iuri Matias e9fab5451f support for stubs 2015-07-31 22:50:51 -04:00
Iuri Matias 6ff72432d6 make maxpeers configurable 2015-07-29 21:40:49 -04:00
Iuri Matias 29d25e3621 Merge pull request #43 from jorisbontje/41-genesis-block-not-found 
make genesis block configurable
 2015-07-29 10:10:46 -04:00
Joris Bontje f1a02711bd make genesis block configurable. fixes #41 2015-07-29 15:49:02 +02:00
Joris Bontje fb8eb8e34c ensure datadir exists, bypassing the interactive liabilities prompt 2015-07-29 14:54:39 +02:00
linagee 634a7bfe1e Keep looping if address is null 
This made embark-framework work for me. (More often than not.)
 2015-07-24 18:06:02 -06:00
Iuri Matias 335eab8e57 remove unneded packages 2015-07-22 18:59:46 -04:00
Iuri Matias 60b39cd159 fix issue where tmp folder would get deleted 2015-07-22 08:30:04 -04:00
Iuri Matias 88866f1357 add meteor build and ipfs support 2015-07-12 22:11:59 -04:00
Iuri Matias ea16259f34 support embark blockchain without node modules 2015-07-12 21:33:36 -04:00
Iuri Matias 505ca5d14f wait & set contract addresses on deployment 2015-07-09 08:23:04 -04:00
Iuri Matias b9c0b8f9e5 use correct variable when determing output from cmd 2015-07-09 07:43:53 -04:00
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
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
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
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 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 27c45ba62d remove log 2015-06-15 06:12:53 -04:00
Iuri Matias dca33e02fc add spec to boilerplate 2015-06-15 05:46:18 -04:00
Iuri Matias 1e5d704061 support constructor arguments in specs 2015-06-14 21:38:00 -04:00
Iuri Matias 55cdf4c878 compile contracts and request correct contract to proxy 2015-06-13 16:57:44 -04:00
Iuri Matias bda4267fa2 request needed class 2015-06-13 09:21:29 -04:00
Iuri Matias 7695c1616f move test code into module 2015-06-13 09:02:19 -04:00