Commit Graph

434 Commits

Author SHA1 Message Date
ed0wolf 668e0be0c3 Setting web3 on Embark Test constructor so it can be used before deploying contracts 2016-11-08 09:31:02 +00:00
Iuri Matias 0a26fa98ce define version in the main object 2016-10-30 22:37:06 -04:00
Iuri Matias 59f9d9fdf0 handle errors 2016-10-30 22:04:25 -04:00
Iuri Matias c7bd478dde handle error if no accounts are found 2016-10-30 21:56:19 -04:00
Iuri Matias b01f18916e return callback 2016-10-30 21:52:58 -04:00
Iuri Matias eb7c89045e log any error with the services 2016-10-30 21:47:21 -04:00
Iuri Matias c893c34fd2 add errors in test 2016-10-30 21:35:08 -04:00
Iuri Matias 52244cca8e move gas adjust to its own method 2016-10-30 21:31:29 -04:00
Iuri Matias 99c528c230 simplify method dealing with instanceOf 2016-10-30 20:48:16 -04:00
Iuri Matias 5c283b5232 support maxpeers option 2016-10-30 20:35:11 -04:00
Iuri Matias 6920ae9481 refactor to use commonOptions method 2016-10-30 20:21:28 -04:00
Iuri Matias a5bc17f0de use config port when calling geth 2016-10-30 20:15:57 -04:00
Iuri Matias e58671e742 refactor common geth command options into the a common method 2016-10-30 20:08:45 -04:00
Iuri Matias 0a2a26fd29 fix network config type 2016-10-30 20:01:25 -04:00
Iuri Matias 5c05b7f8d9 simplify whisper config condition 2016-10-30 19:53:23 -04:00
Iuri Matias 88bdd662de refactor determining method arguments 2016-10-30 19:38:40 -04:00
Iuri Matias df7ff3916f handle error on deploy all 2016-10-30 19:28:45 -04:00
Iuri Matias e44bd3a22e handle error on contract deplyoment 2016-10-30 19:22:09 -04:00
Iuri Matias ac67c80576 return callbacks 2016-10-30 19:17:31 -04:00
Iuri Matias c30a289945 handle error if no accounts are found 2016-10-30 19:14:38 -04:00
Iuri Matias 67074ee60f update to 2.1.3 2016-10-30 08:57:44 -04:00
Iuri Matias 0524b17309 update to 2.1.3 2016-10-30 08:56:13 -04:00
Iuri Matias a9fbd5f6a5 make --no-color option available 2016-10-29 22:35:22 -04:00
Iuri Matias 7bccb73f01 support --dashboard option 2016-10-29 22:30:41 -04:00
Iuri Matias 655f56f893 support --noserver option 2016-10-29 22:00:54 -04:00
Iuri Matias 60285ea1c0 support specifying web server hostname through -b option 2016-10-29 21:41:50 -04:00
Iuri Matias caaf3acde5 use path join 2016-10-29 14:13:06 -04:00
Iuri Matias 41273a4517 remove trailing commas 2016-10-29 14:07:42 -04:00
Iuri Matias 06879ccdd6 return callback 2016-10-29 13:55:06 -04:00
Iuri Matias 549e33317b use path join 2016-10-29 13:50:54 -04:00
Iuri Matias 60f487da38 use path join 2016-10-29 12:35:16 -04:00
Iuri Matias bd3b05bb00 refactor condition to avoid checking for void 0 2016-10-29 12:24:13 -04:00
Iuri Matias 814c2bc4a4 return callbacks 2016-10-29 12:15:50 -04:00
Iuri Matias 9a09e206ae refactor contract build method 2016-10-29 12:02:07 -04:00
Iuri Matias 215a823c35 update to 2.1.2 2016-10-29 11:16:43 -04:00
Iuri Matias 00dd8ecf91 display compilation and/or deployment error in the logs and status instead of crashing 2016-10-29 11:08:10 -04:00
Iuri Matias 816e67370a refactor duplicated build & deploy process 2016-10-29 10:33:54 -04:00
Iuri Matias c9a52c11b0 update to 2.1.1 2016-10-25 19:44:12 -04:00
Iuri Matias 19735884c0 add support for -p option in embark run to specify web server port 2016-10-25 19:33:24 -04:00
Iuri Matias a6397b3fe9 update to 2.1.0 2016-10-24 06:14:35 -04:00
Iuri Matias 3ea6e53218 get contract from contract list, not compiled contracts 2016-10-23 11:15:35 -04:00
Iuri Matias 42fd369cf4 remove trailing commas 2016-10-22 20:16:00 -04:00
Iuri Matias 9de3d20ee9 remove trailing commas 2016-10-22 20:10:25 -04:00
Iuri Matias 4b1a16b100 add jshint exceptions and TODO 2016-10-22 17:29:06 -04:00
Aleš Katona 835047c755 fix lint errors 2016-10-22 13:29:41 -06:00
Iuri Matias 4989876135 display ethereum node name and embark version in available services 2016-10-22 12:11:47 -04:00
Iuri Matias f337ffd418 clarify web3 error msg 2016-10-22 11:57:36 -04:00
Iuri Matias bcdba3f8bc clarify gas amount msg 2016-10-22 11:48:47 -04:00
Iuri Matias ae3bcb1060 fix gas settings; add information of gas used with deployment 2016-10-22 09:42:52 -04:00
Iuri Matias d05cf90b5b display error in contract status 2016-10-21 07:16:15 -04:00
Iuri Matias 907a358e5b add some tabs to adjust status message 2016-10-20 23:34:31 -04:00
Iuri Matias f747c757c5 if the contract is set to not deploy, display information correctly on the dashboard 2016-10-20 23:31:42 -04:00
Iuri Matias 727e2d0923 set the default limit if the contract deploy option is false 2016-10-20 23:22:31 -04:00
Iuri Matias bf509e8b27 don't return a contract from the chains.json if it has no address 2016-10-20 23:21:32 -04:00
Iuri Matias f9dbbd9243 update to 2.0.1 2016-10-19 07:38:32 -04:00
Iuri Matias fa17170878 add version number to cmd 2016-10-16 12:41:28 -04:00
Iuri Matias 23a7f03cc4 add more tests; fix issue with selecting selecting non-default environment contract configuration 2016-10-15 15:54:19 -04:00
Iuri Matias 5a6a9e8b94 join serpent and solidity contracts 2016-10-15 08:22:18 -04:00
Iuri Matias 969e4015cb add test for abi and blockchain config; fix whisper config 2016-10-14 07:01:54 -04:00
Iuri Matias ab42ae92d5 support nodiscover option; add warnings to cors settings 2016-10-07 07:15:29 -04:00
Iuri Matias 47736b6eed add check for ipfs 2016-10-06 07:40:24 -04:00
Iuri Matias a19a690d3d fix relative paths to js files 2016-10-06 07:40:24 -04:00
Iuri Matias 8a1fd3a165 jshint it 2016-10-06 07:40:24 -04:00
Iuri Matias 8711b75462 add support for more simulators 2016-10-06 07:40:24 -04:00
Iuri Matias 9d6e7b79bd implement onDeploy 2016-10-06 07:40:24 -04:00
Iuri Matias fcc808b9f4 add ipfs and tests cmd 2016-10-06 07:40:24 -04:00
Iuri Matias b0458c6fab fix logging in test 2016-10-06 07:40:23 -04:00
Iuri Matias 5ae091ffb5 refactor ipfs module 2016-10-06 07:40:23 -04:00
Iuri Matias fb41ce8a66 remove old files 2016-10-06 07:40:23 -04:00
Iuri Matias ed6b1fd5c2 implement test functionality 2016-10-06 07:40:23 -04:00
Iuri Matias 97954ead32 refactor contract builder 2016-10-06 07:40:23 -04:00
Iuri Matias 4b4b15f405 add support for static addresses in contracts config 2016-10-06 07:40:23 -04:00
Iuri Matias 2b6e5e834a support instanceOf config 2016-10-06 07:40:23 -04:00
Iuri Matias 2a8f0635b9 implement contract dependencies 2016-10-06 07:40:23 -04:00
Iuri Matias d21f385fc0 fix rpccorsdomain; deployment to livenet and testnet 2016-10-06 07:40:23 -04:00
Iuri Matias 2e79299f14 cleanup; add todo to add other items to chains file 2016-10-06 07:40:23 -04:00
Iuri Matias 3d672a0f63 make sure code exists when tracking it 2016-10-06 07:40:23 -04:00
Iuri Matias 4af36ce1e4 refactor blockchain module; support more options 2016-10-06 07:40:23 -04:00
Iuri Matias 2eef8b46ae make address green in dashboard 2016-10-06 07:40:22 -04:00
Iuri Matias 7f31566684 adjust log levels of watcher 2016-10-06 07:40:22 -04:00
Iuri Matias 4c1f3fb8f6 refactor watch module 2016-10-06 07:40:22 -04:00
Iuri Matias 656ac157d3 refactor watch module 2016-10-06 07:40:22 -04:00
Iuri Matias 3a5891810a jshint it 2016-10-06 07:40:22 -04:00
Iuri Matias 03f81c47d7 implement contract tracking 2016-10-06 07:40:22 -04:00
Iuri Matias c3beb51327 fix contract arguments 2016-10-06 07:40:22 -04:00
Iuri Matias df508e4e8d watch for config file changes and redeploy 2016-10-06 07:40:22 -04:00
Iuri Matias 89c0001dcb make contract gas calculation automatic 2016-10-06 07:40:22 -04:00
Iuri Matias f004a1a7e1 fix pipeline and watching of contracts and assets 2016-10-06 07:40:22 -04:00
Iuri Matias 432bc5a5b1 clear cmd line on ctrl-w 2016-10-06 07:40:22 -04:00
Iuri Matias 556c799869 add command line history and navigation to the console 2016-10-06 07:40:22 -04:00
Iuri Matias 9e61009942 watch contract files 2016-10-06 07:40:22 -04:00
Iuri Matias a1bedff7e1 add error message if attemping to start without node already running 2016-10-06 07:40:21 -04:00
Iuri Matias 2f9c0a2996 add more support for the console 2016-10-06 07:40:21 -04:00
Iuri Matias 70c9a1d9c5 add more functionality to the logs and update the dashboard 2016-10-06 07:40:21 -04:00
Iuri Matias 26e178f91c adjust monitor and improve error msgs 2016-10-06 07:40:21 -04:00
Iuri Matias ea0ea6599e exit from monitor on ctrl+c 2016-10-06 07:40:21 -04:00
Iuri Matias 7b45f8d6ea basic monitor 2016-10-06 07:40:21 -04:00
Iuri Matias f38d0e886c use blockchain config to determine rpc host and port 2016-10-06 07:40:21 -04:00
Iuri Matias e9e71da81a support IPFS 2016-10-06 07:40:21 -04:00
Iuri Matias b9c93fe97d refactor config into its own module 2016-10-06 07:40:21 -04:00
Iuri Matias 95615d14a7 some progress with new tests 2016-10-06 07:40:21 -04:00
Iuri Matias 0f14c247b0 refactor run and build functions 2016-10-06 07:40:20 -04:00
Iuri Matias f6c8b7a301 refactor watch 2016-10-06 07:40:20 -04:00
Iuri Matias eb95ae7fd6 refactor server 2016-10-06 07:40:20 -04:00
Iuri Matias 6f5c5fae36 implement templates, build, and blockchain 2016-10-06 07:40:20 -04:00
Iuri Matias d1dae1bade initial embarkjs implementation with support for client side deploys 2016-10-06 07:40:20 -04:00
Iuri Matias 88381bdda1 working run 2016-10-06 07:40:20 -04:00
Iuri Matias 421a0af41e implement watch functionality 2016-10-06 07:40:20 -04:00
Iuri Matias 00a7dbe2f1 add server functionality 2016-10-06 07:40:20 -04:00
Iuri Matias dfb365d07e implement simple pipeline system 2016-10-06 07:40:20 -04:00
Iuri Matias 2064b72ac6 redone deployment system 2016-10-06 07:40:20 -04:00
Iuri Matias 22f7e6d6d4 move some of the old code 2016-10-06 07:39:33 -04:00
Iuri Matias 0faa649c2f add single deploy support 2016-08-10 07:58:11 -04:00
Iuri Matias 60d860f27a support deploying a single contract with custom arguments in the tests 2016-08-09 21:59:49 -04:00
Iuri Matias cf3cfe51ca generate an abi file compatible with mist and metamask 2016-08-09 20:50:12 -04:00
Iuri Matias da92171818 fix testnet support 2016-05-31 22:10:46 -04:00
Iuri Matias 00543f3830 fix deployment for tests 2016-05-29 20:14:27 -04:00
Iuri Matias b78b742ab4 fix solc input 2016-05-29 15:09:57 -04:00
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