934 Commits

Author SHA1 Message Date
diminator
a9d081176c
remove duplicate validations 2016-05-26 17:47:25 +02:00
troymc
207d537ef9 Made edits to models.md suggested by @diminator 2016-05-26 16:53:40 +02:00
diminator
0a9c0963ef
update cc image 2016-05-26 15:57:11 +02:00
diminator
b21e06d9fe
minor tweaks 2016-05-26 15:32:46 +02:00
diminator
32c6ba3406
minor tweaks 2016-05-26 15:24:24 +02:00
diminator
7602e3550c
timeout caveat 2016-05-26 15:02:28 +02:00
troymc
570e76f587 Added note about escrow to CHANGELOG.md 2016-05-26 14:43:08 +02:00
diminator
09615955fc
img edits 2016-05-26 11:04:07 +02:00
diminator
c3c71c6d9e Merge remote-tracking branch 'origin/master' into feat/201/escrow 2016-05-26 10:54:31 +02:00
diminator
649b1d4697
tutorial escrow doublespend 2016-05-26 10:41:28 +02:00
diminator
19d266df79
escrow tutorial 2016-05-26 10:33:27 +02:00
diminator
e0c4827eb3
doc images 2016-05-26 09:49:12 +02:00
troymc
734564c991 Added notes on PR #324 to CHANGELOG 2016-05-25 18:05:27 +02:00
vrde
f4286fb025
Merge remote-tracking branch 'origin/core/192/ignore-invalid-blocks' 2016-05-25 17:13:39 +02:00
vrde
fd10e39305
Merge remote-tracking branch 'origin/core/192/ignore-invalid-blocks' 2016-05-25 17:12:19 +02:00
diminator
37c698529f
WIP: docs and tutorial 2016-05-25 16:40:47 +02:00
vrde
3133978d05
Merge branch 'core/192/ignore-invalid-blocks' 2016-05-25 16:18:18 +02:00
ryan
53b1c2aab5 block num 2016-05-25 16:18:07 +02:00
ryan
d8b51f904f Merge branch 'core/191/ignore-invalid-blocks' of github.com:bigchaindb/bigchaindb into core/192/ignore-invalid-blocks 2016-05-25 16:16:22 +02:00
ryan
56da36e271 block num 2016-05-25 16:15:47 +02:00
vrde
ab43b30353
Use constants instead of strings 2016-05-25 15:50:10 +02:00
ryan
0de838c40f simplify query 2016-05-25 14:41:01 +02:00
diminator
9875cab3b3
cc-based escrow 2016-05-24 17:55:43 +02:00
troymc
56efe3ff02 Docs: edited the tx, block and vote models section 2016-05-24 17:38:35 +02:00
troymc
51a84d3e93 Omitted mention of PR #266 2016-05-23 11:14:17 +02:00
troymc
5e809a963a Added PR #271 and PR #279 to CHANGELOG.md 2016-05-23 11:10:56 +02:00
ryan
003d4b8310 imperative phrasing 2016-05-23 10:27:22 +02:00
troymc
30551e5906 Updated CHANGELOG.md in prep for next version release 2016-05-23 10:23:46 +02:00
ryan
1b10d11a2c Revert "get_tx_by_payload_hash checks block status (no tests)"
This reverts commit bb0bb9a1b4f686e2cb042427de1aeb06a002fc14.
2016-05-23 10:20:33 +02:00
ryan
5bc66a28c1 Revert "revert get_tx_by_payload_hash"
This reverts commit fb2cd532a9462ae4fc3c50056f01b37467816848.
2016-05-23 10:17:12 +02:00
vrde
3daa153878
Merge remote-tracking branch 'origin/update-roadmap' 2016-05-20 15:43:28 +02:00
vrde
c76e831f15
Merge remote-tracking branch 'origin/better-newrelic-support' 2016-05-20 15:42:32 +02:00
troymc
046f39f715 Use import sys rather than from sys etc. 2016-05-20 13:38:17 +02:00
vrde
48325cccb4
Merge branch 'sbellem-docker-dev' 2016-05-20 11:07:09 +02:00
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