From 02ee8a9ac10a3864bf740e854773241044f1047b Mon Sep 17 00:00:00 2001 From: Troy McConaghy Date: Fri, 1 Jun 2018 13:29:58 +0200 Subject: [PATCH 1/2] Upgrade Tendermint to 0.19.7, except for Docker image still at 0.19.2 (#2327) * Fixed 2 PEP257 compliance errors * Upgrade Tendermint to 0.19.7 except for Docker image, which is still at 0.19.2 --- bigchaindb/tendermint/utils.py | 5 ++--- .../run-node-as-processes.md | 8 ++++---- docs/server/source/simple-network-setup.md | 6 +++--- pkg/configuration/roles/tendermint/files/Dockerfile | 2 +- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/bigchaindb/tendermint/utils.py b/bigchaindb/tendermint/utils.py index 75ad045c..e6efb463 100644 --- a/bigchaindb/tendermint/utils.py +++ b/bigchaindb/tendermint/utils.py @@ -39,8 +39,7 @@ def calculate_hash(key_list): def merkleroot(hashes): - """ - Computes the merkle root for a given list. + """Computes the merkle root for a given list. Args: hashes (:obj:`list` of :obj:`bytes`): The leaves of the tree. @@ -69,7 +68,7 @@ def merkleroot(hashes): def public_key64_to_address(base64_public_key): - """Note this only compatibile with Tendermint 0.19.0 """ + """Note this only compatible with Tendermint 0.19.x""" ed25519_public_key = public_key_from_base64(base64_public_key) encoded_public_key = amino_encoded_public_key(ed25519_public_key) return hashlib.new('ripemd160', encoded_public_key).hexdigest().upper() diff --git a/docs/contributing/source/dev-setup-coding-and-contribution-process/run-node-as-processes.md b/docs/contributing/source/dev-setup-coding-and-contribution-process/run-node-as-processes.md index 43e66da1..822ef569 100644 --- a/docs/contributing/source/dev-setup-coding-and-contribution-process/run-node-as-processes.md +++ b/docs/contributing/source/dev-setup-coding-and-contribution-process/run-node-as-processes.md @@ -19,13 +19,13 @@ After the installation of MongoDB is complete, run MongoDB using `sudo mongod` ### Installing a Tendermint Executable -Find [the version number of the latest Tendermint release](https://github.com/tendermint/tendermint/releases) and install it using the following, where 0.19.3 should be replaced by the latest released version number: +Find [the version number of the latest Tendermint release](https://github.com/tendermint/tendermint/releases) and install it using the following, where 0.19.7 should be replaced by the latest released version number: ```bash $ sudo apt install -y unzip -$ wget https://github.com/tendermint/tendermint/releases/download/v0.19.3/tendermint_0.19.3_linux_amd64.zip -$ unzip tendermint_0.19.3_linux_amd64.zip -$ rm tendermint_0.19.3_linux_amd64.zip +$ wget https://github.com/tendermint/tendermint/releases/download/v0.19.7/tendermint_0.19.7_linux_amd64.zip +$ unzip tendermint_0.19.7_linux_amd64.zip +$ rm tendermint_0.19.7_linux_amd64.zip $ sudo mv tendermint /usr/local/bin ``` diff --git a/docs/server/source/simple-network-setup.md b/docs/server/source/simple-network-setup.md index 2dbe657d..39e5e62f 100644 --- a/docs/server/source/simple-network-setup.md +++ b/docs/server/source/simple-network-setup.md @@ -61,9 +61,9 @@ Install a [recent version of Tendermint][tendermint:releases]. BigchainDB Server ``` sudo apt install -y unzip -wget https://github.com/tendermint/tendermint/releases/download/v0.19.3/tendermint_0.19.3_linux_amd64.zip -unzip tendermint_0.19.3_linux_amd64.zip -rm tendermint_0.19.3_linux_amd64.zip +wget https://github.com/tendermint/tendermint/releases/download/v0.19.7/tendermint_0.19.7_linux_amd64.zip +unzip tendermint_0.19.7_linux_amd64.zip +rm tendermint_0.19.7_linux_amd64.zip sudo mv tendermint /usr/local/bin ``` diff --git a/pkg/configuration/roles/tendermint/files/Dockerfile b/pkg/configuration/roles/tendermint/files/Dockerfile index 70a0a8ee..81ca6b06 100644 --- a/pkg/configuration/roles/tendermint/files/Dockerfile +++ b/pkg/configuration/roles/tendermint/files/Dockerfile @@ -1,4 +1,4 @@ -ARG tm_version=0.19.3 +ARG tm_version=0.19.2 FROM tendermint/tendermint:${tm_version} LABEL maintainer "dev@bigchaindb.com" WORKDIR / From 6b0f22aeb807f6b06bad41510100f52fedf46257 Mon Sep 17 00:00:00 2001 From: Troy McConaghy Date: Fri, 1 Jun 2018 13:49:23 +0200 Subject: [PATCH 2/2] Last PR before 2.0 beta 1 (#2328) * Update CHANGELOG.md for 2.0 Beta 1 release * Changed 2.0.0b1 release date to 2018-06-01 * k8s: Updated bigchaindb docker image tag to 2.0.0-beta1 * Updated version.py for the 2.0 Beta 1 release * Updated dev status to '4 - Beta' in setup.py for the 2.0 Beta 1 release --- CHANGELOG.md | 21 +++++++++++++++++++++ bigchaindb/version.py | 4 ++-- k8s/bigchaindb/bigchaindb-ss.yaml | 2 +- k8s/dev-setup/bigchaindb.yaml | 2 +- setup.py | 2 +- 5 files changed, 26 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 46450000..ae78e9fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,8 +15,29 @@ For reference, the possible headings are: * **Fixed** for any bug fixes. * **Security** to invite users to upgrade in case of vulnerabilities. * **External Contributors** to list contributors outside of BigchainDB GmbH. +* **Known Issues** * **Notes** +## [2.0 Beta 1] - 2018-06-01 + +Tag name: v2.0.0b1 + +### Fixed + +* Fixed a bug that arose with some code that treated transactions-waiting-for-block-inclusion as if they were already stored in MongoDB (i.e. already in a block). [Pull request #2318](https://github.com/bigchaindb/bigchaindb/pull/2318) +* If a user asked for a block and it happened to be an empty block, BigchainDB returned 404 Not Found, as if the block did not exist. Now it returns a 200 OK with a block containing no transactions, i.e. an empty block. [Pull request #2321](https://github.com/bigchaindb/bigchaindb/pull/2321) + +### Known Issues + +* An issue was found with the `bigchaindb upsert-validator` command. A solution was proposed in [BEP-19](https://github.com/bigchaindb/BEPs/pull/45) and is being implemented in [pull request #2314](https://github.com/bigchaindb/bigchaindb/pull/2314) +* Some users are reporting that they sometimes lose the ability to post new transactions, but they can still retrieve existing transactions; see [issue #2322](https://github.com/bigchaindb/bigchaindb/pull/2322). It seems the issue may be with Tendermint; see [tendermint/tendermint#1642](https://github.com/tendermint/tendermint/issues/1642) + +### Notes + +* There's a [new docs page](https://docs.bigchaindb.com/projects/server/en/v2.0.0b1/simple-network-setup.html) about how to set up a network where each node uses a single virtual machine. +* We checked, and BigchainDB 2.0 Beta 1 works with MongoDB 3.6 (and 3.4). +* Support for RethinkDB is completely gone. + ## [2.0 Alpha 6] - 2018-05-17 Tag name: v2.0.0a6 diff --git a/bigchaindb/version.py b/bigchaindb/version.py index c6e729e3..174d8004 100644 --- a/bigchaindb/version.py +++ b/bigchaindb/version.py @@ -1,2 +1,2 @@ -__version__ = '2.0.0a6' -__short_version__ = '2.0a6' +__version__ = '2.0.0b1' +__short_version__ = '2.0b1' diff --git a/k8s/bigchaindb/bigchaindb-ss.yaml b/k8s/bigchaindb/bigchaindb-ss.yaml index 1980cbfe..f1abd887 100644 --- a/k8s/bigchaindb/bigchaindb-ss.yaml +++ b/k8s/bigchaindb/bigchaindb-ss.yaml @@ -154,7 +154,7 @@ spec: timeoutSeconds: 15 # BigchainDB container - name: bigchaindb - image: bigchaindb/bigchaindb:2.0.0-alpha6 + image: bigchaindb/bigchaindb:2.0.0-beta1 imagePullPolicy: Always args: - start diff --git a/k8s/dev-setup/bigchaindb.yaml b/k8s/dev-setup/bigchaindb.yaml index 7a1b2766..1ccd5af1 100644 --- a/k8s/dev-setup/bigchaindb.yaml +++ b/k8s/dev-setup/bigchaindb.yaml @@ -34,7 +34,7 @@ spec: terminationGracePeriodSeconds: 10 containers: - name: bigchaindb - image: bigchaindb/bigchaindb:2.0.0-alpha6 + image: bigchaindb/bigchaindb:2.0.0-beta1 imagePullPolicy: Always args: - start diff --git a/setup.py b/setup.py index a7ad8c78..07f97d1d 100644 --- a/setup.py +++ b/setup.py @@ -111,7 +111,7 @@ setup( zip_safe=False, python_requires='>=3.6', classifiers=[ - 'Development Status :: 3 - Alpha', + 'Development Status :: 4 - Beta', 'Intended Audience :: Developers', 'Topic :: Database', 'Topic :: Database :: Database Engines/Servers',