315 Commits

Author SHA1 Message Date
diminator
bb88279b64 fix: use _bitmask for seriallizing thresholdconditions 2016-03-21 10:49:39 +01:00
diminator
892ab74acc fix: resolved merge 2016-03-21 09:55:37 +01:00
diminator
2cc5c41c86 Merge remote-tracking branch 'remotes/origin/develop' into feat/127/crypto-conditions-ilp-sha256-fulfillments
Conflicts:
	bigchaindb/core.py
2016-03-21 09:54:54 +01:00
diminator
c47d6b258c fixed tests by providing abstract methods to ecdsa.py 2016-03-19 18:29:20 +01:00
diminator
a852f5f66d - Ed25519: get_verifying_key and to_ascii
- documentation
2016-03-19 18:23:29 +01:00
Troy McConaghy
9da2a3c943 Merge pull request #143 from bigchaindb/feat/140/add-section-about-running-tests-in-docs
Move info on running all unit tests into the Sphinx docs
2016-03-19 10:49:10 +01:00
Troy McConaghy
60e926f7a5 Merge branch 'develop' into feat/140/add-section-about-running-tests-in-docs 2016-03-19 10:37:39 +01:00
Troy McConaghy
63fc86227b Merge pull request #141 from bigchaindb/update-roadmap-md
Updated ROADMAP.md based on March 16 meeting
2016-03-19 10:22:51 +01:00
Troy McConaghy
4556cc01f0 Merge branch 'develop' into feat/140/add-section-about-running-tests-in-docs 2016-03-19 10:13:55 +01:00
Troy McConaghy
c75fbb8c24 Merge branch 'develop' into update-roadmap-md 2016-03-19 10:13:39 +01:00
Alberto Granzotto
adae753e2a Merge pull request #99 from GemHQ/modular-consensus-rules
Modular consensus rules
2016-03-19 04:26:07 +01:00
Matt Smith
2aa003578c Typos 2016-03-18 16:50:21 -07:00
diminator
4b3e7249ca Merge remote-tracking branch 'remotes/origin/develop' into feat/127/crypto-conditions-ilp-sha256-fulfillments 2016-03-18 22:28:22 +01:00
diminator
f273e48c11 - Ed25519 inheritance
- Renamed Private/PublicKey to Signing/VerifyingKey
2016-03-18 22:23:32 +01:00
diminator
bdc2475bdd cleanup 2016-03-18 20:20:18 +01:00
diminator
9bd1e9ff8b sha256 fulfillment
tests
2016-03-18 20:01:47 +01:00
diminator
821ca9f8e6 threshold fulfillment
tests
2016-03-18 18:46:22 +01:00
Matt Smith
9c9378cf60 Merge branch 'develop' into modular-consensus-rules 2016-03-18 10:44:12 -07:00
Troy McConaghy
fcfd114644 Merge branch 'develop' into feat/140/add-section-about-running-tests-in-docs 2016-03-18 13:39:14 +01:00
Troy McConaghy
f27da1e39d Merge branch 'develop' into update-roadmap-md 2016-03-18 11:56:53 +01:00
troymc
cb5c14f9f1 Public Testnet --> Public Sandbox Testnet 2016-03-18 11:55:20 +01:00
Troy McConaghy
55ad60097d Fixed minor errors in Introduction (in docs) 2016-03-18 11:40:30 +01:00
diminator
46cd3323e8 ILP conditions and fulfillment basis
ed25519 fulfillment
tests
2016-03-18 09:58:54 +01:00
troymc
785ee388fe Move info on running all unit tests into the Sphinx docs 2016-03-17 16:20:11 +01:00
Troy McConaghy
678cd2dd29 Updated ROADMAP.md based on March 16 meeting 2016-03-17 11:05:15 +01:00
diminator
8425214c2a reverted bigchaindb/util 2016-03-16 16:46:09 +01:00
diminator
828ed4e98b updated tests 2016-03-16 16:44:11 +01:00
diminator
fad392a00b Merge branch 'feat/127/crypto-conditions-ilp' of github.com:bigchaindb/bigchaindb into feat/127/crypto-conditions-ilp 2016-03-16 16:41:47 +01:00
diminator
4255c1780b renamed crypto.core to crypto.asymmetric 2016-03-16 16:40:45 +01:00
Dimitri De Jonghe
6764701ced Merge branch 'develop' into feat/127/crypto-conditions-ilp 2016-03-16 16:36:39 +01:00
diminator
9dc767318e - abstracted crypto scheme
- added ED25519
- added tests
2016-03-16 16:27:40 +01:00
Matt Smith
3d50459b84 Corrected plugin group name in comments 2016-03-14 20:02:18 -07:00
Matt Smith
a7b3898b6f Merge remote-tracking branch 'upstream/develop' into modular-consensus-rules 2016-03-14 13:29:17 -07:00
Matt Smith
ad535c7895 Tests for loading consensus plugins 2016-03-14 13:27:17 -07:00
Troy McConaghy
fdd1f297a6 Merge pull request #133 from bigchaindb/clarify-timestamps-in-docs
Clarify the meaning of some timestamps in the docs
2016-03-14 17:21:30 +01:00
troymc
645430d24d Clarify meaning of transaction id in docs 2016-03-14 17:13:04 +01:00
troymc
ae97f4b8e1 Clarify the meaning of some timestamps in the docs 2016-03-14 16:54:23 +01:00
Troy McConaghy
2e07fb7c65 Merge pull request #130 from bigchaindb/mention-milestones-in-roadmap-etc
Mention milesones etc. in ROADMAP.md
2016-03-14 13:11:27 +01:00
troymc
ef9a574bb5 Mention milesones etc. in ROADMAP.md 2016-03-14 10:06:42 +01:00
Matt Smith
7253e96796 Fleshed out consensus plugin docs 2016-03-13 23:41:57 -07:00
Matt Smith
037b5110fe Modified Client module and web views to use plublic consensus methods
for creating/signing/verifying instead of the functions in utils.py --
those are now only called by the the BaseConsensusRules class in
consensus.py.
2016-03-13 22:26:35 -07:00
Troy McConaghy
73cfc9b9e5 Merge pull request #121 from bigchaindb/feat/119/distinguish-server-client-and-apis-in-docs
Feat/119/distinguish server client and apis in docs
2016-03-12 19:37:17 +01:00
Troy McConaghy
14275baa5f Merge branch 'develop' into feat/119/distinguish-server-client-and-apis-in-docs 2016-03-09 09:47:12 +01:00
Matt Smith
5c4529f120 Merge remote-tracking branch 'upstream/develop' into modular-consensus-rules
Conflicts:
	setup.py
2016-03-08 18:43:48 -08:00
Matt Smith
79a66bdf9b Added consensus doc stub 2016-03-08 18:42:26 -08: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
14b71537d6 Made AbstractConsensusRules use python's abc and enforcing that ConsensusRules plugins subclass it 2016-03-08 18:32:25 -08:00
Matt Smith
01d706ac56 Moved consensus package files into single consensus.py module 2016-03-08 18:24:21 -08:00
Troy McConaghy
533d792e97 Merge pull request #117 from bigchaindb/feat/51/add-changelog-md-file
Feat/51/add CHANGELOG.md file
2016-03-08 16:27:10 +01:00
Troy McConaghy
7519901245 Merge branch 'develop' into feat/51/add-changelog-md-file 2016-03-08 14:42:00 +01:00