500 Commits

Author SHA1 Message Date
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
b64a39d59a updated documentation 2016-04-18 16:00:51 +02:00
Rodolphe Marques
b8aeb228e8 documented the new transaction structure 2016-04-18 15:24:24 +02:00
Rodolphe Marques
7a75dc1700 replace inp with tx_input 2016-04-18 14:55:56 +02:00
Rodolphe Marques
35fc0b5dad remove unnecessary sorts 2016-04-18 14:50:49 +02:00
diminator
079a5296ce Merge remote-tracking branch 'remotes/origin/master' into feat/127/crypto-conditions-ilp-bigchain-integration 2016-04-18 11:31:33 +02:00
Rodolphe Marques
5439c0bdda Merge remote-tracking branch 'remotes/origin/feat/127/crypto-conditions-ilp-bigchain-integration' into feat/128/multiple-input-output 2016-04-18 11:12:26 +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
vrde
adab6d4e17
Merge remote-tracking branch 'origin/improve-contributing' 2016-04-13 12:07:08 +02:00
troymc
245cb9779d Minor docs edit 2016-04-13 11:58:10 +02:00
troymc
fd5cc287f1 Point developers to the installation instructions in CONTRIBUTING.md 2016-04-13 11:55:25 +02:00
troymc
44f6d832d7 Minor edits to CONTRIBUTING.md 2016-04-13 11:45:15 +02:00
troymc
4b4df442d5 Developer-specific notes on running unit tests 2016-04-13 11:44:36 +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
vrde
70560408cd
Add new step on how to install the package for dev 2016-04-13 11:16:17 +02:00
diminator
565fc8a1f7
fix typo 2016-04-13 11:13:04 +02:00
diminator
197954576f
threshold conditions documentation 2016-04-13 11:10:32 +02:00
vrde
59ae6a230e
Merge remote-tracking branch 'origin/minor-change-to-docs-on-running-unit-tests' 2016-04-13 10:47:03 +02:00
diminator
610715691a Merge remote-tracking branch 'remotes/origin/master' into feat/127/crypto-conditions-ilp-bigchain-integration 2016-04-13 10:45:25 +02:00
diminator
d92ad44abc Merge remote-tracking branch 'remotes/origin/feat/128/multiple-input-output' into feat/127/crypto-conditions-ilp-bigchain-integration 2016-04-13 10:37:21 +02:00
diminator
8775e7e8d7
added get_hash_data() 2016-04-13 10:36:46 +02:00
Troy McConaghy
6fc96c18f7 Merge pull request #172 from bigchaindb/aws-deployment-fabfile-tweaks
Various AWS deployment improvements
2016-04-13 10:23:51 +02:00
troymc
a4cf5500ed Fixed slice range bug in fabfile.py 2016-04-12 17:55:48 +02:00
troymc
2a1892d1f7 Docs: changed instructions for running unit tests 2016-04-12 17:38:17 +02:00
Alberto Granzotto
2d776d26d7 Merge pull request #176 from bigchaindb/feat/175/update-contributing-md
CONTRIBUTING.md: a PR should resolve an existing issue
2016-04-12 17:30:42 +02:00
vrde
6a86873b00
Merge branch 'develop' 2016-04-12 17:03:30 +02:00
Alberto Granzotto
142c833178 Merge pull request #153 from bigchaindb/improve-config
Improve configuration by using env variables correctly
2016-04-12 17:02:34 +02:00
diminator
b2fd909881 Merge branch 'feat/128/multiple-input-output' into feat/127/crypto-conditions-ilp-bigchain-integration 2016-04-12 16:38:32 +02:00
vrde
22923ee9d3
Force a config reset before every test 2016-04-12 16:23:09 +02:00
Rodolphe Marques
74a1e14183 fix failing test 2016-04-12 14:51:37 +02:00
troymc
3adf62d0f2 Fixed typo 2016-04-12 14:05:21 +02:00
diminator
923740ee6c Merge remote-tracking branch 'remotes/origin/feat/128/multiple-input-output' into feat/127/crypto-conditions-ilp-bigchain-integration 2016-04-12 13:41:26 +02:00
troymc
f8e0c41c9e CONTRIBUTING.md: a PR should resolve an existing issue 2016-04-12 13:37:45 +02:00
diminator
9912448cb0 Merge branch 'feat/127/crypto-conditions-ilp-bigchain-integration' into feat/128/multiple-input-output 2016-04-12 13:21:29 +02:00
diminator
61c0da8212
docs with code examples 2016-04-12 13:20:34 +02:00
Rodolphe Marques
66b811b2a2 merge improve-config branch 2016-04-12 12:39:49 +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
5fa12c9744 Merge remote-tracking branch 'remotes/origin/improve-config' into feat/127/crypto-conditions-ilp-bigchain-integration 2016-04-12 12:06:49 +02:00
vrde
8716711aaf
Merge branch 'move-badges-to-top' 2016-04-12 09:31:38 +02:00
troymc
e8095849bc Merge remote-tracking branch 'origin/master' into aws-deployment-fabfile-tweaks 2016-04-11 16:53:55 +02:00
vrde
e94dc71c2c
Bump to trigger travis-ci and codecov to update 2016-04-11 16:43:03 +02:00