60 Commits

Author SHA1 Message Date
diminator
c3c71c6d9e Merge remote-tracking branch 'origin/master' into feat/201/escrow 2016-05-26 10:54:31 +02:00
diminator
37c698529f
WIP: docs and tutorial 2016-05-25 16:40:47 +02:00
ryan
53b1c2aab5 block num 2016-05-25 16:18:07 +02:00
ryan
56da36e271 block num 2016-05-25 16:15:47 +02:00
diminator
9875cab3b3
cc-based escrow 2016-05-24 17:55:43 +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
635a416305 test get_transaction on invalid block 2016-05-19 13:54:47 +02:00
diminator
76eb18329e Merge remote-tracking branch 'remotes/origin/master' into fix/260/add-output-condition-to-fulfillment-message 2016-05-12 16:03:19 +02:00
diminator
7630ec7fc6
refactor input_condition and get_fulfillment_message
test malleability
2016-05-12 15:30:58 +02:00
diminator
0c9777686d
output_condition from fid instead of cid 2016-05-11 19:18:56 +02:00
diminator
c623ca56d0
fulfillment_message with output_condition
added tests
2016-05-11 19:02:37 +02:00
Rodolphe Marques
4c64b6642b Change the block process to use all the cpus instead of only one cpu per
task
2016-05-11 14:45:10 +02:00
diminator
ca34b58629
rename verify_signature to validate_fulfillments 2016-05-10 17:12:38 +02:00
Dimitri De Jonghe
4f28e873dc Merge pull request #233 from bigchaindb/bug/229/check-block-signature-and-pub-key
validate_block now checks if a federation node created the block.
2016-05-03 11:24:39 +02:00
Rodolphe Marques
1813c26879 validate_block now checks if a federation node created the block.
It checks to see if node_pubkey is a federation node and if the
signature is correct.

Created tests
2016-04-28 13:54:50 +02:00
diminator
6d99427bc7
hashlocked conditions + tests + docs 2016-04-21 18:59:48 +02:00
diminator
37ef8deb5b
docs: MIMO code and explanation 2016-04-19 11:25:29 +02:00
diminator
d5923d5c67 Merge remote-tracking branch 'remotes/origin/feat/128/multiple-input-output' into feat/127/crypto-conditions-ilp-bigchain-integration 2016-04-18 17:19:02 +02:00
diminator
2fdbb5bef8
updated multiple owner docs and cryptoconditions example 2016-04-18 17:18:10 +02:00
Rodolphe Marques
35fc0b5dad remove unnecessary sorts 2016-04-18 14:50:49 +02:00
diminator
85353f7002
updated cryptoconditions
replaced get_subcondition_from_vk
2016-04-15 16:32:27 +02:00
Rodolphe Marques
7576dc3937 Merge remote-tracking branch 'remotes/origin/feat/127/crypto-conditions-ilp-bigchain-integration' into feat/128/multiple-input-output 2016-04-15 11:43:25 +02:00
Rodolphe Marques
8bc8229c0d Added more tests 2016-04-15 11:33:43 +02:00
Rodolphe Marques
4af6a2037d Added tests for the default threshold signatures. 2016-04-14 17:35:09 +02:00
Rodolphe Marques
a4bbffa544 Refactor sign_tx. Fix tests
The implicit condition of create transactions is now handled by
`get_fulfillment_message` instead of `sign_tx`
2016-04-14 16:13:57 +02:00
Rodolphe Marques
cbb9a55de8 Added tests for get_spent with multi outputs txs 2016-04-14 14:21:07 +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
Rodolphe Marques
4c4cae8f81 create_tx and sign_tx create threshold conditions by default if there
are multiple current owners.
Created tests
2016-04-13 17:44:25 +02:00
diminator
87592ee004
docs for get_hash_data and get_fulfillment_message
added serialized=False arg to get_fulfillment_message
2016-04-13 11:34:01 +02:00
diminator
8775e7e8d7
added get_hash_data() 2016-04-13 10:36:46 +02:00
Rodolphe Marques
43a88142f7 Merge remote-tracking branch 'remotes/origin/feat/127/crypto-conditions-ilp-bigchain-integration' into feat/128/multiple-input-output 2016-04-12 12:21:17 +02:00
Rodolphe Marques
28656e9544 updated some tests 2016-04-12 12:18:36 +02:00
diminator
32ca586bc8
Added condition/fulfillment tests
isolated get_fulfillment_message(...)
2016-04-11 15:15:47 +02:00
diminator
7d99bcba7b
merge + fixed tests for get_owned_ids
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-08 16:08:33 +02:00
diminator
8dc0c48681
fixed tests 2016-04-08 15:56:51 +02:00
diminator
8b7478365e
fixing tests WIP 2016-04-08 14:43:11 +02:00
diminator
f082f22aaa
Merge remote-tracking branch 'remotes/origin/feat/128/multiple-input-output' into feat/127/crypto-conditions-ilp-bigchain-integration
Conflicts:
	tests/db/test_bigchain_api.py
	tests/test_util.py
2016-04-08 14:00:20 +02:00
diminator
cc0c56c150
sign/verify with fulfillments for CREATE/GENESIS 2016-04-08 10:56:45 +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
Rodolphe Marques
caf7c0dfc4 Added argument validation to create_transaction.
Fixed some tests
2016-04-07 17:38:16 +02:00
diminator
b76bd72ea0
tx with conditions 2016-04-07 15:41:06 +02:00
diminator
ec08bca3d0
fulfillment preparations 2016-04-06 16:21:35 +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
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
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
vrde
fc33cf850a Update skipped test 2016-03-03 01:52:38 +01:00