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
|
32ca586bc8
|
Added condition/fulfillment tests
isolated get_fulfillment_message(...)
|
2016-04-11 15:15:47 +02:00 |
|
Rodolphe Marques
|
4936ce6ff4
|
Merge remote-tracking branch 'remotes/origin/feat/127/crypto-conditions-ilp-bigchain-integration' into feat/128/multiple-input-output
|
2016-04-08 16:19:38 +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 |
|
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
|
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 |
|
Dimitri De Jonghe
|
3a057755f5
|
Merge pull request #152 from bigchaindb/feat/137/crypto-ed25519-compatible-signing-scheme
Switch to ED25519 signing scheme
|
2016-04-07 17:10:50 +02:00 |
|
diminator
|
12ce460400
|
removed ECDSA support in tests config
|
2016-04-07 17:05:57 +02:00 |
|
Dimitri De Jonghe
|
56a1bb5e1d
|
Merge branch 'develop' into feat/137/crypto-ed25519-compatible-signing-scheme
|
2016-04-07 16:11:20 +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 |
|
vrde
|
aebe179840
|
Merge branch 'feat/116/more-solid-webserver' into develop
|
2016-04-07 11:04:49 +02:00 |
|
vrde
|
b11cbce5cd
|
Merge branch 'develop' into feat/116/more-solid-webserver
|
2016-04-07 11:00:47 +02:00 |
|
vrde
|
b988b3f6f7
|
Pin major version for gunicorn
|
2016-04-07 10:58:29 +02:00 |
|
diminator
|
e1191a8c38
|
updated documentation
|
2016-04-07 09:54:25 +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
|
eea3cc015a
|
small fix in the retrieval of the condition in verifying and signing transactions
|
2016-04-06 16:26:24 +02:00 |
|
diminator
|
ec08bca3d0
|
fulfillment preparations
|
2016-04-06 16:21:35 +02:00 |
|
Rodolphe Marques
|
784350a5c8
|
updated validate transaction. Fixed genesis block
|
2016-04-06 16:20:36 +02:00 |
|
Rodolphe Marques
|
662f32fccb
|
updated verify_signature to check fulfillments
|
2016-04-06 15:26:42 +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 |
|
Rodolphe Marques
|
aa626a768d
|
fixed payload handling
|
2016-04-06 11:50:46 +02:00 |
|
diminator
|
e1d9336803
|
Merge remote-tracking branch 'remotes/origin/develop' into feat/137/crypto-ed25519-compatible-signing-scheme
Conflicts:
setup.py
|
2016-04-06 10:52:49 +02:00 |
|
Troy McConaghy
|
ebb6e1a882
|
Merge pull request #164 from bigchaindb/how-to-handle-pull-requests-md
Added HOW_TO_HANDLE_PULL_REQUESTS.md
|
2016-04-05 17:55:06 +02:00 |
|
Troy McConaghy
|
1f677fb4a0
|
Merge branch 'develop' into how-to-handle-pull-requests-md
|
2016-04-05 17:43:36 +02:00 |
|
Troy McConaghy
|
cb0944aede
|
Merge pull request #160 from bigchaindb/feat/151/deploy-cluster-on-AWS
Feat/151/deploy cluster on aws
|
2016-04-05 17:42:29 +02:00 |
|
troymc
|
d6f471af5c
|
Docs now say more about how to check on AWS instances
|
2016-04-05 17:35:50 +02:00 |
|
troymc
|
1c399486e3
|
Ensure newly-launched AWS instances don't have same tag as existing instances
|
2016-04-05 17:00:01 +02:00 |
|
troymc
|
2debba73c4
|
Add another 'Known Deployment Issue' to AWS deployment docs
|
2016-04-05 16:59:04 +02:00 |
|
troymc
|
569b6ef761
|
Comment-out 2 cmds before apt-get update in fabfile
|
2016-04-05 16:51:24 +02:00 |
|
troymc
|
838ed80770
|
Docs: Remove ugly red text from headings
|
2016-04-05 16:50:23 +02:00 |
|
troymc
|
efd6514a04
|
Fixed apt-get update problem in AWS deployment fabfile
|
2016-04-05 15:23:26 +02:00 |
|
troymc
|
3f491e5bd1
|
Ensure Python 2.5-2.7 when using AWS deploy scripts
|
2016-04-05 15:21:24 +02:00 |
|
Rodolphe Marques
|
dd3bc54c62
|
changed structure of transactions
|
2016-04-05 14:36:23 +02:00 |
|
troymc
|
5170676c64
|
Merge remote-tracking branch 'origin/develop' into feat/151/deploy-cluster-on-AWS
|
2016-04-05 14:07:16 +02:00 |
|
Troy McConaghy
|
98bd615d57
|
Merge branch 'develop' into how-to-handle-pull-requests-md
|
2016-04-05 13:46:49 +02:00 |
|
Troy McConaghy
|
d313bbc321
|
Merge pull request #161 from bigchaindb/feat/159/add-codecov-yml-file
Added a codecov.yml configuration file
|
2016-04-05 13:28:28 +02:00 |
|
Troy McConaghy
|
c57148b0f7
|
Merge branch 'develop' into feat/159/add-codecov-yml-file
|
2016-04-05 13:14:39 +02:00 |
|
troymc
|
b100e2820c
|
Moved AWS credentials & configs to standard ~/.aws files
|
2016-04-05 11:09:57 +02:00 |
|
troymc
|
8bcecc38ff
|
Remove fabric check in startup.sh
|
2016-04-05 11:07:04 +02:00 |
|
troymc
|
acc22fd0b2
|
one line: pip install fabric fabtools requests boto3
|
2016-04-04 14:46:11 +02:00 |
|