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 |
|
vrde
|
8215576497
|
Remove exception stacktrace when starting without keypair
|
2016-04-08 15:56:10 +02:00 |
|
vrde
|
c92d285fa8
|
Merge branch 'improve-config' of github.com:bigchaindb/bigchaindb into improve-config
|
2016-04-08 15:16:20 +02:00 |
|
vrde
|
f90254c3c9
|
Update documentation
|
2016-04-08 15:14:14 +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 |
|
Rodolphe Marques
|
d2b44890f2
|
changed bigchaindb-benchmark to use the new configuration loader
|
2016-04-08 14:04:17 +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 |
|
vrde
|
32e08b7c63
|
Remove useless func
|
2016-04-08 10:14:14 +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
|
1ddfa2becb
|
Add explicit tests for update_types
|
2016-04-07 18:06:04 +02:00 |
|
vrde
|
820a14baa7
|
Merge branch 'develop' into improve-config
|
2016-04-07 18:05:42 +02:00 |
|
vrde
|
c9cd842151
|
Avoid loading the config located in the home of the current user
|
2016-04-07 17:54:36 +02:00 |
|
Rodolphe Marques
|
caf7c0dfc4
|
Added argument validation to create_transaction.
Fixed some tests
|
2016-04-07 17:38:16 +02:00 |
|
Troy McConaghy
|
f554490e4d
|
Merge branch 'develop' into add-release_eips-script
|
2016-04-07 17:28:13 +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
|
ae641d6a96
|
Fix tests
|
2016-04-07 14:31:34 +02:00 |
|
vrde
|
0692fe04d0
|
Print config using json
|
2016-04-07 14:16:01 +02:00 |
|
vrde
|
06f45f1dc7
|
Change server port to 9984
|
2016-04-07 14:15:29 +02:00 |
|
vrde
|
ac3ce3b6fa
|
Merge branch 'develop' into improve-config
|
2016-04-07 11:25:12 +02:00 |
|
troymc
|
0a428442de
|
Added script to release allocated-but-unassociated elastic IPs on AWS
|
2016-04-07 11:22:44 +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 |
|
vrde
|
959320cdb9
|
Remove CONFIGURED from tests as well 😓
|
2016-04-06 17:39:44 +02:00 |
|
vrde
|
3c31a8684f
|
Remove CONFIGURED key from show-config
|
2016-04-06 16:50:34 +02:00 |
|
vrde
|
a56aa992fa
|
Do not hide empty privkeys
|
2016-04-06 16:36:12 +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 |
|
vrde
|
2a0598e9f1
|
Merge branch 'develop' into improve-config
|
2016-04-06 16:26:50 +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 |
|
vrde
|
c5cefd6ad5
|
Remove useless import
|
2016-04-06 16:15:38 +02:00 |
|
vrde
|
4b32e8e01a
|
Use autoconfigure on every command
|
2016-04-06 16:15:17 +02:00 |
|
vrde
|
aec3b3db6c
|
Hide private key when showing configuration
|
2016-04-06 16:14:43 +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 |
|