259 Commits

Author SHA1 Message Date
ryan
eb444c0771 generalize election status 2016-04-29 10:50:27 +02:00
ryan
1f7e1893f9 fixed vote counting 2016-04-28 15:33:08 +02:00
diminator
e3774bae82
Merge remote-tracking branch 'remotes/origin/master' into feat/128/multiple-input-output
Conflicts:
	bigchaindb/crypto.py
	bigchaindb/util.py
	docs/source/python-server-api-examples.md
	setup.py
2016-04-26 17:45:26 +02:00
Rodolphe Marques
131acb8cb7 better coments for the get_owned_ids method 2016-04-26 14:58:36 +02:00
Rodolphe Marques
665fea7107 replaced generic exception 2016-04-26 14:50:04 +02:00
ryan
3cd256a797 move quorum check to core 2016-04-26 13:33:10 +02:00
Rodolphe Marques
dcce6d9504 returns empty list. not None 2016-04-25 13:39:28 +02:00
diminator
a6dd9dc1fd
update to cryptoconditions 0.1.6: removes the need of the cryptography dependency 2016-04-22 12:23:51 +02:00
diminator
5cea537143
Merge remote-tracking branch 'remotes/origin/master' into feat/128/multiple-input-output
Conflicts:
	bigchaindb/core.py
2016-04-21 19:07:05 +02:00
Rodolphe Marques
7a75dc1700 replace inp with tx_input 2016-04-18 14:55:56 +02:00
Rodolphe Marques
1c1fd47c80 Fix get_owned_ids to work with multiple outputs
Created more tests
2016-04-14 12:22:26 +02:00
vrde
891289ed66
Move monitoring code from the main class to processes 2016-04-13 16:47:18 +02:00
Rodolphe Marques
66b811b2a2 merge improve-config branch 2016-04-12 12:39:49 +02:00
Rodolphe Marques
ab8e808ef3 Merge remote-tracking branch 'remotes/origin/feat/127/crypto-conditions-ilp-bigchain-integration' into feat/128/multiple-input-output 2016-04-08 15:12:08 +02:00
diminator
8b7478365e
fixing tests WIP 2016-04-08 14:43:11 +02:00
Rodolphe Marques
bf2cc89991 Updated get owned ids to also return the cid. 2016-04-08 14:41:20 +02:00
diminator
66e3c9e8a9
sign/validate fulfillment (single owner)
Merge remote-tracking branch 'remotes/origin/develop' into feat/127/crypto-conditions-ilp-bigchain-integration

Conflicts:
	tests/conftest.py
2016-04-07 18:21:13 +02:00
vrde
820a14baa7
Merge branch 'develop' into improve-config 2016-04-07 18:05:42 +02:00
diminator
a7ca11a593
Merge remote-tracking branch 'remotes/origin/feat/128/multiple-input-output' into feat/127/crypto-conditions-ilp-bigchain-integration
Conflicts:
	bigchaindb/core.py
2016-04-07 15:43:35 +02:00
diminator
b76bd72ea0
tx with conditions 2016-04-07 15:41:06 +02:00
Rodolphe Marques
ade6bfb1c0 Updated validate_transaction to work with crypto conditions.
Updated get_spent to work with multiple inputs
2016-04-07 15:38:38 +02:00
diminator
ce945e3409
Merge remote-tracking branch 'remotes/origin/feat/128/multiple-input-output' into feat/127/crypto-conditions-ilp-bigchain-integration
Conflicts:
	bigchaindb/consensus.py
	bigchaindb/util.py
2016-04-06 16:27:56 +02:00
Rodolphe Marques
784350a5c8 updated validate transaction. Fixed genesis block 2016-04-06 16:20:36 +02:00
vrde
c5cefd6ad5
Remove useless import 2016-04-06 16:15:38 +02:00
diminator
dd20737bb9 Merge remote-tracking branch 'remotes/origin/feat/128/multiple-input-output' into feat/127/crypto-conditions-ilp-bigchain-integration
Conflicts:
	bigchaindb/util.py
2016-04-06 12:41:56 +02:00
diminator
9067582bdd updated docs 2016-03-31 18:05:52 +02:00
diminator
4138842eed import keys from cryptoconditions
set ed25519 as default
2016-03-23 19:14:59 +01:00
Rodolphe Marques
194bf8c6bd initial implementation of multi input support 2016-03-22 19:30:53 +01:00
Matt Smith
a5243e43f6 This large (sorry) commit
1. switches from a composable plugin model to a single-plugin model
2. switches class methods to static methods in the BaseConsensusRules class
3. adds create_transaction, sign_transaction, and verify_transaction to
the plugin API

TODO: If we adopt this model, all references in e.g. client.py to util
methods like `sign_tx` need to be routed through the plugin methods, and
possibly need to be added to the plugin interface.
2016-03-08 18:33:31 -08:00
Matt Smith
9644df07f7 Merge remote-tracking branch 'upstream/develop' into
modular-consensus-rules
Resolves conflicts from module reorg in PR #102

Conflicts:
	bigchaindb/__init__.py
	bigchaindb/core.py
2016-03-04 18:07:23 -08:00
vrde
1fa47d4b5f Move last methods to util 2016-03-03 03:09:54 +01:00
vrde
1475a3cbb1 Move hash_data to the crypto module 2016-03-03 02:02:17 +01:00
Matt Smith
ee4720d1a5 Pulled validate_transaction and validate_block out into a base ConsensusRules plugin class 2016-02-29 18:39:23 -08:00
Matt Smith
8a9030e5c0 Added a simple plugin system for consensus rules using setuputils entry_points 2016-02-29 18:38:33 -08:00
vrde
70692a851c Add client code to create/transfer txs 2016-02-26 16:23:50 +01:00
vrde
054c17d38c Merge remote-tracking branch 'origin/develop' into feat/17/provide-a-restful-api 2016-02-24 14:15:08 +01:00
Alberto Granzotto
712a55d4ed Merge pull request #72 from rhsimplex/statsd
Monitoring for BigchainDB
2016-02-24 14:07:21 +01:00
vrde
3bfb6bc4c4 Merge remote-tracking branch 'origin/develop' into feat/17/provide-a-restful-api 2016-02-24 12:02:54 +01:00
ryan
667c9a2223 readability refactor 2016-02-24 11:51:17 +01:00
vrde
aeede79846 Add asset create and transfer 2016-02-24 02:38:30 +01:00
vrde
445bacce0d Move some other code to the util module 2016-02-23 18:14:52 +01:00
Greg McMullen
a466cfbd6c Bigchain -> BigchainDB in only one place and not other places. 2016-02-23 16:40:26 +01:00
Rodolphe Marques
6c75a5bb6d removed exception print 2016-02-23 13:54:54 +01:00
Rodolphe Marques
4326c863ac Fixed how validate_transaction handles double spends.
Create tests.
Fixed some flake8 warnings
2016-02-23 13:48:31 +01:00
Rodolphe Marques
0d9de54976 get_spent also returns the block id containing the
the transaction that used txid as an input
2016-02-23 10:42:42 +01:00
vrde
0f3a15ba6e Fix docstring formatting 2016-02-23 02:02:41 +01:00
vrde
cdf63ef151 Move other common code to the util module 2016-02-23 01:59:33 +01:00
vrde
b3b54e7529 Move common code to util module 2016-02-22 23:46:32 +01:00
Rodolphe Marques
024817a4ac Initial implementation of the fix 2016-02-22 19:45:55 +01:00
ryan
131d7fad14 setup changes 2016-02-22 10:17:16 +01:00