Mirroristas/bigchaindb
2
0
Fork 0
mirror of https://github.com/bigchaindb/bigchaindb.git synced 2024-10-13 13:34:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to tendermint version 0.22.3 (#2380)

Browse Source 
* Update to tendermint version 0.22.3 for dev/test deployment docs and scripts

* Update version and parameters for 0.22.3

- Sync docker-compose
- Power should be a "string" not a int,uint
This commit is contained in:
Muawia Khan 2018-07-11 16:59:42 +02:00 committed by Vanshdeep Singh
parent 4d2e58416c
commit 9cfc1e6f5a
12 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose.yml
View File

@ -44,7 +44,7 @@ services:
retries: 3 retries: 3
command: '.ci/entrypoint.sh' command: '.ci/entrypoint.sh'
tendermint: tendermint:
image: tendermint/tendermint:0.22.0 image: tendermint/tendermint:0.22.3
# volumes: # volumes:
# - ./tmdata:/tendermint # - ./tmdata:/tendermint
entrypoint: '' entrypoint: ''

12
docs/contributing/source/dev-setup-coding-and-contribution-process/run-dev-network-stack.md
View File

@ -32,7 +32,7 @@ $ curl -fOL https://raw.githubusercontent.com/bigchaindb/bigchaindb/${GIT_BRANCH
## Quick Start ## Quick Start
If you run `stack.sh` out of the box i.e. without any configuration changes, you will be able to deploy a 4 node If you run `stack.sh` out of the box i.e. without any configuration changes, you will be able to deploy a 4 node
BigchainDB network with Docker containers, created from `master` branch of `bigchaindb/bigchaindb` repo and Tendermint version `0.19.9`. BigchainDB network with Docker containers, created from `master` branch of `bigchaindb/bigchaindb` repo and Tendermint version `0.22.3`.
**Note**: Run `stack.sh` with either root or non-root user with sudo enabled. **Note**: Run `stack.sh` with either root or non-root user with sudo enabled.
@ -90,7 +90,7 @@ $ bash stack.sh -h
variable. (default: master) variable. (default: master)
ENV[TM_VERSION] ENV[TM_VERSION]
(Optional) Tendermint version to use for the setup. (default: 0.19.9) (Optional) Tendermint version to use for the setup. (default: 0.22.3)
ENV[MONGO_VERSION] ENV[MONGO_VERSION]
(Optional) MongoDB version to use with the setup. (default: 3.6) (Optional) MongoDB version to use with the setup. (default: 3.6)
@ -171,8 +171,8 @@ $ export STACK_REPO=bigchaindb/bigchaindb
# Default: master # Default: master
$ export STACK_BRANCH=master $ export STACK_BRANCH=master
#Optional, since 0.19.9 is the default tendermint version. #Optional, since 0.22.3 is the default tendermint version.
$ export TM_VERSION=0.19.9 $ export TM_VERSION=0.22.3
#Optional, since 3.6 is the default MongoDB version. #Optional, since 3.6 is the default MongoDB version.
$ export MONGO_VERSION=3.6 $ export MONGO_VERSION=3.6
@ -222,8 +222,8 @@ $ export STACK_REPO=bigchaindb/bigchaindb
# Default: master # Default: master
$ export STACK_BRANCH=master $ export STACK_BRANCH=master
#Optional, since 0.19.9 is the default tendermint version #Optional, since 0.22.3 is the default tendermint version
$ export TM_VERSION=0.19.9 $ export TM_VERSION=0.22.3
#Optional, since 3.6 is the default MongoDB version. #Optional, since 3.6 is the default MongoDB version.
$ export MONGO_VERSION=3.6 $ export MONGO_VERSION=3.6

8
docs/contributing/source/dev-setup-coding-and-contribution-process/run-node-as-processes.md
View File

@ -19,13 +19,13 @@ After the installation of MongoDB is complete, run MongoDB using `sudo mongod`
### Installing a Tendermint Executable ### 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.7 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.22.3 should be replaced by the latest released version number:
```bash ```bash
$ sudo apt install -y unzip $ sudo apt install -y unzip
$ wget https://github.com/tendermint/tendermint/releases/download/v0.19.7/tendermint_0.19.7_linux_amd64.zip $ wget https://github.com/tendermint/tendermint/releases/download/v0.22.3/tendermint_0.22.3_linux_amd64.zip
$ unzip tendermint_0.19.7_linux_amd64.zip $ unzip tendermint_0.22.3_linux_amd64.zip
$ rm tendermint_0.19.7_linux_amd64.zip $ rm tendermint_0.22.3_linux_amd64.zip
$ sudo mv tendermint /usr/local/bin $ sudo mv tendermint /usr/local/bin
``` ```

2
docs/server/source/production-deployment-template/workflow.rst
View File

@ -44,7 +44,7 @@ you can do this:
.. code:: .. code::
$ mkdir $(pwd)/tmdata $ mkdir $(pwd)/tmdata
$ docker run --rm -v $(pwd)/tmdata:/tendermint/config tendermint/tendermint:0.19.9 init $ docker run --rm -v $(pwd)/tmdata:/tendermint/config tendermint/tendermint:0.22.3 init
$ cat $(pwd)/tmdata/genesis.json $ cat $(pwd)/tmdata/genesis.json
You should see something that looks like: You should see something that looks like:

8
docs/server/source/simple-network-setup.md
View File

@ -74,13 +74,13 @@ Note: The `mongodb` package is _not_ the official MongoDB package from MongoDB t
#### Install Tendermint #### Install Tendermint
Install a [recent version of Tendermint][tendermint:releases]. BigchainDB Server requires version 0.19.9 or newer. Install a [recent version of Tendermint][tendermint:releases]. BigchainDB Server requires version 0.22.3 or newer.
``` ```
sudo apt install -y unzip sudo apt install -y unzip
wget https://github.com/tendermint/tendermint/releases/download/v0.19.9/tendermint_0.19.9_linux_amd64.zip wget https://github.com/tendermint/tendermint/releases/download/v0.22.3/tendermint_0.22.3_linux_amd64.zip
unzip tendermint_0.19.9_linux_amd64.zip unzip tendermint_0.22.3_linux_amd64.zip
rm tendermint_0.19.9_linux_amd64.zip rm tendermint_0.22.3_linux_amd64.zip
sudo mv tendermint /usr/local/bin sudo mv tendermint /usr/local/bin
``` ```

2
k8s/bigchaindb/tendermint_container/Dockerfile
View File

@ -1,4 +1,4 @@
FROM tendermint/tendermint:0.19.9 FROM tendermint/tendermint:0.22.3
LABEL maintainer "dev@bigchaindb.com" LABEL maintainer "dev@bigchaindb.com"
WORKDIR / WORKDIR /
USER root USER root

2
k8s/bigchaindb/tendermint_container/tendermint_entrypoint.bash
View File

@ -99,7 +99,7 @@ for i in "${!VALS_ARR[@]}"; do
done done
set -e set -e
# add validator to genesis file along with its pub_key # add validator to genesis file along with its pub_key
curl -s "http://${VALS_ARR[$i]}:$tm_pub_key_access_port/pub_key.json" | jq ". as \$k | {pub_key: \$k, power: ${VAL_POWERS_ARR[$i]}, name: \"${VALS_ARR[$i]}\"}" > pub_validator.json curl -s "http://${VALS_ARR[$i]}:$tm_pub_key_access_port/pub_key.json" | jq ". as \$k | {pub_key: \$k, power: \"${VAL_POWERS_ARR[$i]}\", name: \"${VALS_ARR[$i]}\"}" > pub_validator.json
cat /tendermint/config/genesis.json | jq ".validators |= .+ [$(cat pub_validator.json)]" > tmpgenesis && mv tmpgenesis /tendermint/config/genesis.json cat /tendermint/config/genesis.json | jq ".validators |= .+ [$(cat pub_validator.json)]" > tmpgenesis && mv tmpgenesis /tendermint/config/genesis.json
rm pub_validator.json rm pub_validator.json
done done

2
pkg/configuration/roles/tendermint/files/Dockerfile
View File

@ -1,4 +1,4 @@
ARG tm_version=0.19.9 ARG tm_version=0.22.3
FROM tendermint/tendermint:${tm_version} FROM tendermint/tendermint:${tm_version}
LABEL maintainer "dev@bigchaindb.com" LABEL maintainer "dev@bigchaindb.com"
WORKDIR / WORKDIR /

2
pkg/configuration/roles/tendermint/tasks/start.yml
View File

@ -27,7 +27,7 @@
for i in $( seq {{ stack_size }} );do for i in $( seq {{ stack_size }} );do
tendermint gen_validator > /tendermint/config/priv_validator$i.json; tendermint gen_validator > /tendermint/config/priv_validator$i.json;
tendermint gen_node_key > /tendermint/config/node_id$i; mv /tendermint/config/node_key.json /tendermint/config/node_key$i.json; tendermint gen_node_key > /tendermint/config/node_id$i; mv /tendermint/config/node_key.json /tendermint/config/node_key$i.json;
cat tendermint/config/priv_validator$i.json | jq ".pub_key" | jq ". as \$k | {pub_key: \$k, power: 10, cat tendermint/config/priv_validator$i.json | jq ".pub_key" | jq ". as \$k | {pub_key: \$k, power: \"10\",
name: \"{{ tendermint_docker_name }}$i\"}" > pub_validator$i.json; name: \"{{ tendermint_docker_name }}$i\"}" > pub_validator$i.json;
cat /tendermint/config/genesis.json | jq ".validators |= .+ [$(cat pub_validator$i.json)]" > tmpgenesis; cat /tendermint/config/genesis.json | jq ".validators |= .+ [$(cat pub_validator$i.json)]" > tmpgenesis;
mv tmpgenesis /tendermint/config/genesis.json; mv tmpgenesis /tendermint/config/genesis.json;

2
pkg/configuration/roles/tendermint/templates/start_tendermint.j2
View File

@ -65,7 +65,7 @@ for i in "${!VALS_ARR[@]}"; do
done done
set -e set -e
# add validator to genesis file along with its pub_key # add validator to genesis file along with its pub_key
curl -s "http://${VALS_ARR[$i]}:$tm_pub_key_access_port/pub_key.json" | jq ". as \$k | {pub_key: \$k, power: ${VAL_POWERS_ARR[$i]}, name: \"${VALS_ARR[$i]}\"}" > pub_validator.json curl -s "http://${VALS_ARR[$i]}:$tm_pub_key_access_port/pub_key.json" | jq ". as \$k | {pub_key: \$k, power: \"${VAL_POWERS_ARR[$i]}\", name: \"${VALS_ARR[$i]}\"}" > pub_validator.json
cat /tendermint/config/genesis.json | jq ".validators |= .+ [$(cat pub_validator.json)]" > tmpgenesis && mv tmpgenesis /tendermint/config/genesis.json cat /tendermint/config/genesis.json | jq ".validators |= .+ [$(cat pub_validator.json)]" > tmpgenesis && mv tmpgenesis /tendermint/config/genesis.json
rm pub_validator.json rm pub_validator.json
done done

2
pkg/scripts/stack.sh
View File

@ -11,7 +11,7 @@ stack_repo=${STACK_REPO:="bigchaindb/bigchaindb"}
stack_size=${STACK_SIZE:=4} stack_size=${STACK_SIZE:=4}
stack_type=${STACK_TYPE:="docker"} stack_type=${STACK_TYPE:="docker"}
stack_type_provider=${STACK_TYPE_PROVIDER:=""} stack_type_provider=${STACK_TYPE_PROVIDER:=""}
tm_version=${TM_VERSION:="0.19.9"} tm_version=${TM_VERSION:="0.22.3"}
mongo_version=${MONGO_VERSION:="3.6"} mongo_version=${MONGO_VERSION:="3.6"}
stack_vm_memory=${STACK_VM_MEMORY:=2048} stack_vm_memory=${STACK_VM_MEMORY:=2048}
stack_vm_cpus=${STACK_VM_CPUS:=2} stack_vm_cpus=${STACK_VM_CPUS:=2}

2
pkg/scripts/unstack.sh
View File

@ -11,7 +11,7 @@ stack_repo=${STACK_REPO:="bigchaindb/bigchaindb"}
stack_size=${STACK_SIZE:=4} stack_size=${STACK_SIZE:=4}
stack_type=${STACK_TYPE:="docker"} stack_type=${STACK_TYPE:="docker"}
stack_type_provider=${STACK_TYPE_PROVIDER:=""} stack_type_provider=${STACK_TYPE_PROVIDER:=""}
tm_version=${TM_VERSION:="0.19.9"} tm_version=${TM_VERSION:="0.22.3"}
mongo_version=${MONGO_VERSION:="3.6"} mongo_version=${MONGO_VERSION:="3.6"}
stack_vm_memory=${STACK_VM_MEMORY:=2048} stack_vm_memory=${STACK_VM_MEMORY:=2048}
stack_vm_cpus=${STACK_VM_CPUS:=2} stack_vm_cpus=${STACK_VM_CPUS:=2}