1554 Commits

Author SHA1 Message Date
vrde
2948ccdb2a
Merge branch 'docker-dev' of git://github.com/sbellem/bigchaindb into sbellem-docker-dev 2016-05-20 11:06:50 +02:00
vrde
95fe5a77aa
Merge remote-tracking branch 'origin/feat/317/switch-to-rapidjson' 2016-05-20 10:59:56 +02:00
vrde
40d5d90b6c
Merge remote-tracking branch 'origin/use-pip3-for-setuptools-upgrade' 2016-05-20 10:55:52 +02:00
troymc
1c44d669e0 Updated the links to ROADMAP.md in the docs 2016-05-19 19:21:19 +02:00
troymc
fd4ac0d8e7 Changed ROADMAP.md to link to the new roadmap location 2016-05-19 19:20:48 +02:00
ryan
fb2cd532a9 revert get_tx_by_payload_hash 2016-05-19 16:43:04 +02:00
ryan
61bae88cdb Merge branch 'master' into core/192/ignore-invalid-blocks 2016-05-19 16:32:46 +02:00
ryan
1eaa0ff913 test get_owned on invalid block 2016-05-19 16:27:04 +02:00
ryan
9fdc4fc9c2 test for query on spent in invalid block 2016-05-19 15:42:27 +02:00
ryan
8d3faec6a7 fix unspent query 2016-05-19 15:42:05 +02:00
Ryan Henderson
9f03b2b771 add election class, process starts (#221)
* add election class, process starts

* remove else clause

* resolve splitvote

* move quorum check to core

* remove comments

* fixed vote counting

* add test

* poison pill

* queue test

* generalize election status

* get correct part of block

* clean shut down

* test block liquidation

* add vote signature checking

* add tests

* user_public_key to user_vk

* python3 style floordivs

* correct verdict for odd number of voters, and tests

* remove whitespace

* simplify verify_vote_signature

* election checks pubkey is in block voters

* tests for elector pubkey

* count invalid votes as votes for invalid block

* test update

* test mismatched vote, block sigs

* variable name change

* comments on voting logic

* comments on voting logic

* remove unused queue

* correct block model

* imperative docstring

* election status class constants

* election tests use constants
2016-05-19 14:03:52 +02:00
ryan
635a416305 test get_transaction on invalid block 2016-05-19 13:54:47 +02:00
Rodolphe Marques
07df25ffaf fix typo after merge 2016-05-19 12:36:42 +02:00
Rodolphe Marques
925c15e80e Merge remote-tracking branch 'remotes/origin/master' into feat/317/switch-to-rapidjson 2016-05-19 12:01:26 +02:00
Rodolphe Marques
b420b86d69 fix typo 2016-05-19 11:50:43 +02:00
troymc
b1a8741c57 Use pip3 instead of pip to upgrade pip, wheel & setuptools 2016-05-19 11:48:11 +02:00
vrde
b1101747c0
Merge branch 'more-explicit-error-reporting-for-pkg_resources' 2016-05-19 11:42:03 +02:00
vrde
dbbdb2f017
Fix help message 2016-05-19 11:30:58 +02:00
Rodolphe Marques
6d4bb7928b updated documentation 2016-05-19 11:28:34 +02:00
vrde
248f21d8cd
Bump to wake up some CI stuff 2016-05-19 11:23:46 +02:00
vrde
491dc29b41
Use more generic and compatible Exception 2016-05-19 11:08:26 +02:00
ryan
814d8a1663 wait for indexes 2016-05-18 17:09:26 +02:00
Dimitri De Jonghe
ed0b1965bf Merge pull request #281 from bigchaindb/fix/260/add-output-condition-to-fulfillment-message
Fix #260 transaction malleability
2016-05-18 16:45:19 +02:00
ryan
ce86be7747 Merge branch 'master' into core/192/ignore-invalid-blocks 2016-05-18 16:27:59 +02:00
ryan
5e3358f278 Merge branch 'core/193/invalid-block-backlog' into core/192/ignore-invalid-blocks 2016-05-18 16:27:15 +02:00
Rodolphe Marques
50da984626 replaced json with rapidjson 2016-05-18 15:43:47 +02:00
troymc
87275b966c Changed where newrelic_license_key gets set 2016-05-18 14:56:49 +02:00
troymc
12567e7f1e Add documentation on how to use New Relic Server Monitoring 2016-05-18 14:32:24 +02:00
troymc
937e1a7d65 Tested & improved New Relic installation 2016-05-18 14:31:42 +02:00
Troy McConaghy
8138a4b1c2 Merge pull request #315 from bigchaindb/codecov-yml-changes-suggested-by-stevepeak
codecov.yml changes suggested by stevepeak & more
2016-05-18 10:53:14 +02:00
troymc
7ed2de43ef Ignore benchmarking-tests & speed-tests in codecov.yml 2016-05-18 10:44:30 +02:00
troymc
b38330d0aa codecov.yml changes suggested by stevepeak 2016-05-18 10:43:40 +02:00
Sylvain Bellemare
7f5ae6b4c0 Add docs to run unit tests with docker-compose 2016-05-17 15:23:09 +02:00
diminator
3aba164bfd
logical and rather than bitwise 2016-05-17 15:23:00 +02:00
diminator
3dad488344
condition.serialize_uri => condition_uri 2016-05-17 15:12:20 +02:00
Sylvain Bellemare
d45fb3568a Simplify the service names 2016-05-17 14:53:46 +02:00
Troy McConaghy
71489ac00f Merge pull request #278 from bigchaindb/feat/277/add-gitattributes-file
Resolve Feat/277/add gitattributes file
2016-05-17 14:48:48 +02:00
Troy McConaghy
801e077519 Merge pull request #276 from bigchaindb/suggest-updating-pip-etc-in-install-docs
Install docs: Suggest upgrading pip wheel & setuptools
2016-05-17 14:44:13 +02:00
ryan
4dd6c78441 election tests use constants 2016-05-17 13:31:13 +02:00
Troy McConaghy
bf6298cf17 Merge pull request #291 from bigchaindb/feat/280/deploy_conf_file_for_aws_deployment_config
Feat/280/deploy conf file for aws deployment config
2016-05-17 12:58:25 +02:00
troymc
8b52b81e58 Merge branch 'master' into feat/280/deploy_conf_file_for_aws_deployment_config 2016-05-17 11:26:36 +02:00
troymc
f168e97880 Changed settings validation code in launch_ec2_nodes.py 2016-05-17 11:26:09 +02:00
troymc
8839440fd7 In awsdeploy.sh, check if NUM_NODES set 2016-05-17 11:23:15 +02:00
troymc
ebd1b927aa No default AWS deployment config file 2016-05-17 09:29:49 +02:00
troymc
1a2f0e749d Make config filename the 1st arg of awsdeploy.sh 2016-05-16 16:58:37 +02:00
Troy McConaghy
e5e243b116 Merge pull request #309 from sbellem/status-badge
Add badge for development status
2016-05-13 17:08:47 +02:00
Sylvain Bellemare
f5e52a7257 Add badge for development status 2016-05-13 17:03:17 +02:00
Sylvain Bellemare
93d3b55770 Re-work docker-compose file
use version 2 & dedicated dev dockerfile
2016-05-13 16:22:40 +02:00
Sylvain Bellemare
a05c688682 Parameterize db host config via env var 2016-05-13 16:21:33 +02:00
Alberto Granzotto
9bd0ad6d01 Merge pull request #308 from bigchaindb/update-roadmap-add-table
Update ROADMAP: add table
2016-05-13 16:04:03 +02:00