bigchaindb · diminator · Mar 29, 2017 · Mar 30, 2017 · Mar 31, 2017 · Mar 31, 2017
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,15 @@
 [submodule "bigchaindb-server"]
 	path = bigchaindb-server
 	url = https://github.com/bigchaindb/bigchaindb/
+[submodule "plugins/bigchaindb-consensus-composition"]
+	path = plugins/bigchaindb-consensus-composition
+	url = https://github.com/ascribe/bigchaindb-consensus-composition/
+[submodule "plugins/bigchaindb-consensus-policy"]
+	path = plugins/bigchaindb-consensus-policy
+	url = https://github.com/ascribe/bigchaindb-consensus-policy/
+[submodule "examples/client/asset_composition"]
+	path = examples/client/asset_composition
+	url = [email protected]:ascribe/sicpa-client.git
+[submodule "plugins/bigchaindb-smart-assets"]
+	path = plugins/bigchaindb-smart-assets
+	url = [email protected]:ascribe/bigchaindb-smart-assets.git
diff --git a/bigchaindb-server b/bigchaindb-server
diff --git a/compose/bdb-server-plugins/Dockerfile b/compose/bdb-server-plugins/Dockerfile
@@ -0,0 +1,19 @@
+FROM python:3.5
+
+RUN apt-get update && apt-get install -y python3.4 vim
+
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+
+RUN pip install --upgrade pip
+
+COPY bigchaindb-server /usr/src/app/
+COPY plugins/bigchaindb-consensus-composition /usr/src/app/plugins/bigchaindb-consensus-composition
+
+RUN pip install --no-cache-dir -e .[dev]
+RUN bigchaindb -y configure rethinkdb
+
+WORKDIR /usr/src/app/plugins/bigchaindb-consensus-composition
+
+RUN pip install --no-cache-dir -e .[dev]
+
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -41,6 +41,30 @@ services:
       BIGCHAINDB_SERVER_BIND: 0.0.0.0:9984
       BIGCHAINDB_KEYPAIR_PUBLIC: GW1nrdZm4mbVC8ePeiGWz6DqHexqewqy5teURVHi3RG4
       BIGCHAINDB_KEYPAIR_PRIVATE: 2kQgBtQnHoauw8QchKM7xYvEBW1QDoHzhBsCL9Vi1AzB
+      BIGCHAINDB_CONSENSUS_PLUGIN: default
+    ports:
+      - "49984:9984"
+    command: bigchaindb start
+
+  bdb-server-plugins:
+    build:
+      context: .
+      dockerfile:  ./compose/bdb-server-plugins/Dockerfile
+    volumes:
+      - ./bigchaindb-server/bigchaindb:/usr/src/app/bigchaindb
+      - ./bigchaindb-server/tests:/usr/src/app/tests
+      - ./bigchaindb-server/docs:/usr/src/app/docs
+      - ./bigchaindb-server/setup.py:/usr/src/app/setup.py
+      - ./bigchaindb-server/setup.cfg:/usr/src/app/setup.cfg
+      - ./bigchaindb-server/pytest.ini:/usr/src/app/pytest.ini
+      - ./bigchaindb-server/tox.ini:/usr/src/app/tox.ini
+      - ./bigchaindb-server/Makefile:/usr/src/app/Makefile
+    environment:
+      BIGCHAINDB_DATABASE_HOST: rdb
+      BIGCHAINDB_SERVER_BIND: 0.0.0.0:9984
+      BIGCHAINDB_KEYPAIR_PUBLIC: GW1nrdZm4mbVC8ePeiGWz6DqHexqewqy5teURVHi3RG4
+      BIGCHAINDB_KEYPAIR_PRIVATE: 2kQgBtQnHoauw8QchKM7xYvEBW1QDoHzhBsCL9Vi1AzB
+      BIGCHAINDB_CONSENSUS_PLUGIN: consensus_asset_composition
     ports:
       - "49984:9984"
     command: bigchaindb start

diff --git a/examples/client/asset_composition b/examples/client/asset_composition
diff --git a/examples/client/css/scss/bigchaindb.scss b/examples/client/css/scss/bigchaindb.scss
@@ -0,0 +1,10 @@
+$brand-main-green: #39BA91;
+
+$brand-main-gray: #445261;
+$brand-main-gray-light: #CAD2DA;
+$brand-main-gray-lighter: #E8EBEF;
+
+$brand-main-blue-dark: #101A25;
+$brand-main-blue: #074354;
+$brand-main-blue-light: #BFE6EC;
+
+0 −1		bigchaindb/__init__.py
+3 −29		bigchaindb/backend/mongodb/query.py
+0 −28		bigchaindb/backend/query.py
+4 −31		bigchaindb/backend/rethinkdb/query.py
+3 −45		bigchaindb/common/crypto.py
+7 −21		bigchaindb/common/transaction.py
+1 −21		bigchaindb/config_utils.py
+1 −20		bigchaindb/consensus.py
+54 −13		bigchaindb/core.py
+0 −62		bigchaindb/fastquery.py
+22 −34		bigchaindb/models.py
+1 −1		docs/root/source/bft.md
+21 −14		docs/server/source/websocket-event-stream-api.rst
+1 −1		k8s/nginx/container/Dockerfile
+9 −0		k8s/nginx/container/README.md
+20 −0		k8s/nginx/container/nginx.conf.template
+6 −0		k8s/nginx/container/nginx_entrypoint.bash
+1 −1		tests/assets/test_digital_assets.py
+2 −2		tests/assets/test_divisible_assets.py
+3 −53		tests/backend/mongodb/test_queries.py
+0 −2		tests/backend/test_generics.py
+0 −13		tests/common/test_crypto.py
+0 −9		tests/conftest.py
+6 −6		tests/db/test_bigchain_api.py
+0 −1		tests/test_config_utils.py
+0 −86		tests/test_fastquery.py