diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 060bfac..3732beb 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -81,7 +81,7 @@ jobs: run: sudo apt-get update && sudo apt-get install -y git zsh curl tarantool-common vim build-essential cmake - name: Get Tendermint - run: wget https://github.com/tendermint/tendermint/releases/download/v0.34.15/tendermint_0.34.15_linux_amd64.tar.gz && tar zxf tendermint_0.34.15_linux_amd64.tar.gz + run: wget https://github.com/tendermint/tendermint/releases/download/v0.34.24/tendermint_0.34.24_linux_amd64.tar.gz && tar zxf tendermint_0.34.24_linux_amd64.tar.gz - name: Setup poetry uses: Gr1N/setup-poetry@v8 diff --git a/Dockerfile-all-in-one b/Dockerfile-all-in-one index aa633a7..1189bf9 100644 --- a/Dockerfile-all-in-one +++ b/Dockerfile-all-in-one @@ -1,7 +1,7 @@ FROM python:3.9-slim LABEL maintainer "contact@ipdb.global" -ARG TM_VERSION=0.34.15 +ARG TM_VERSION=0.34.24 RUN mkdir -p /usr/src/app ENV HOME /root COPY . /usr/src/app/ diff --git a/config/test_config_utils.py b/config/test_config_utils.py index c72fce6..5168038 100644 --- a/config/test_config_utils.py +++ b/config/test_config_utils.py @@ -207,7 +207,7 @@ def test_autoconfigure_read_both_from_file_and_env(monkeypatch, request): "advertised_port": WSSERVER_ADVERTISED_PORT, }, "database": database_mongodb, - "tendermint": {"host": "localhost", "port": 26657, "version": "v0.34.15"}, + "tendermint": {"host": "localhost", "port": 26657, "version": "v0.34.24"}, "log": { "file": LOG_FILE, "level_console": "debug", diff --git a/docker-compose.yml b/docker-compose.yml index 525e031..2339adb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -65,7 +65,7 @@ services: restart: always tendermint: - image: tendermint/tendermint:v0.34.15 + image: tendermint/tendermint:v0.34.24 # volumes: # - ./tmdata:/tendermint entrypoint: '' diff --git a/docs/root/source/contributing/dev-setup-coding-and-contribution-process/run-node-as-processes.md b/docs/root/source/contributing/dev-setup-coding-and-contribution-process/run-node-as-processes.md index ba60915..5addcf6 100644 --- a/docs/root/source/contributing/dev-setup-coding-and-contribution-process/run-node-as-processes.md +++ b/docs/root/source/contributing/dev-setup-coding-and-contribution-process/run-node-as-processes.md @@ -30,9 +30,9 @@ The version of Planetmint Server described in these docs only works well with Te ```bash $ sudo apt install -y unzip -$ wget https://github.com/tendermint/tendermint/releases/download/v0.34.15/tendermint_v0.34.15_linux_amd64.zip -$ unzip tendermint_v0.34.15_linux_amd64.zip -$ rm tendermint_v0.34.15_linux_amd64.zip +$ wget https://github.com/tendermint/tendermint/releases/download/v0.34.24/tendermint_v0.34.24_linux_amd64.zip +$ unzip tendermint_v0.34.24_linux_amd64.zip +$ rm tendermint_v0.34.24_linux_amd64.zip $ sudo mv tendermint /usr/local/bin ``` diff --git a/docs/root/source/network-setup/k8s-deployment-template/workflow.rst b/docs/root/source/network-setup/k8s-deployment-template/workflow.rst index 1d0148f..e2a7dc0 100644 --- a/docs/root/source/network-setup/k8s-deployment-template/workflow.rst +++ b/docs/root/source/network-setup/k8s-deployment-template/workflow.rst @@ -60,7 +60,7 @@ you can do this: .. code:: $ mkdir $(pwd)/tmdata - $ docker run --rm -v $(pwd)/tmdata:/tendermint/config tendermint/tendermint:v0.34.15 init + $ docker run --rm -v $(pwd)/tmdata:/tendermint/config tendermint/tendermint:v0.34.24 init $ cat $(pwd)/tmdata/genesis.json You should see something that looks like: diff --git a/k8s/planetmint/tendermint_container/Dockerfile b/k8s/planetmint/tendermint_container/Dockerfile index 91230fc..378d38a 100644 --- a/k8s/planetmint/tendermint_container/Dockerfile +++ b/k8s/planetmint/tendermint_container/Dockerfile @@ -1,4 +1,4 @@ -FROM tendermint/tendermint:v0.34.15 +FROM tendermint/tendermint:v0.34.24 LABEL maintainer "contact@ipdb.global" WORKDIR / USER root diff --git a/pkg/configuration/roles/tendermint/files/Dockerfile b/pkg/configuration/roles/tendermint/files/Dockerfile index b33d0f9..72425ac 100644 --- a/pkg/configuration/roles/tendermint/files/Dockerfile +++ b/pkg/configuration/roles/tendermint/files/Dockerfile @@ -1,4 +1,4 @@ -ARG tm_version=v0.31.5 +ARG tm_version=v0.34.24 FROM tendermint/tendermint:${tm_version} LABEL maintainer "contact@ipdb.global" WORKDIR / diff --git a/pkg/scripts/stack.sh b/pkg/scripts/stack.sh index ea774a0..4295435 100755 --- a/pkg/scripts/stack.sh +++ b/pkg/scripts/stack.sh @@ -17,7 +17,7 @@ stack_size=${STACK_SIZE:=4} stack_type=${STACK_TYPE:="docker"} stack_type_provider=${STACK_TYPE_PROVIDER:=""} # NOTE versions prior v0.28.0 have different priv_validator format! -tm_version=${TM_VERSION:="v0.34.15"} +tm_version=${TM_VERSION:="v0.34.24"} mongo_version=${MONGO_VERSION:="3.6"} stack_vm_memory=${STACK_VM_MEMORY:=2048} stack_vm_cpus=${STACK_VM_CPUS:=2} diff --git a/pkg/scripts/unstack.sh b/pkg/scripts/unstack.sh index 9a285ac..cf12dbc 100755 --- a/pkg/scripts/unstack.sh +++ b/pkg/scripts/unstack.sh @@ -16,7 +16,7 @@ stack_repo=${STACK_REPO:="planetmint/planetmint"} stack_size=${STACK_SIZE:=4} stack_type=${STACK_TYPE:="docker"} stack_type_provider=${STACK_TYPE_PROVIDER:=""} -tm_version=${TM_VERSION:="0.31.5"} +tm_version=${TM_VERSION:="0.34.24"} mongo_version=${MONGO_VERSION:="3.6"} stack_vm_memory=${STACK_VM_MEMORY:=2048} stack_vm_cpus=${STACK_VM_CPUS:=2} diff --git a/planetmint/config.py b/planetmint/config.py index c938e58..3f1fb3c 100644 --- a/planetmint/config.py +++ b/planetmint/config.py @@ -86,7 +86,7 @@ class Config(metaclass=Singleton): "tendermint": { "host": "localhost", "port": 26657, - "version": "v0.34.15", # look for __tm_supported_versions__ + "version": "v0.34.24", # look for __tm_supported_versions__ }, "database": self.__private_database_map, "log": { diff --git a/planetmint/version.py b/planetmint/version.py index c3bf372..ec58cb0 100644 --- a/planetmint/version.py +++ b/planetmint/version.py @@ -3,8 +3,8 @@ # SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) # Code is Apache-2.0 and docs are CC-BY-4.0 -__version__ = "2.4.7" -__short_version__ = "2.4" +__version__ = "2.5.0" +__short_version__ = "2.5" # Supported Tendermint versions -__tm_supported_versions__ = ["0.34.15"] +__tm_supported_versions__ = ["0.34.24"]