Skip to content

Commit

Permalink
Merge pull request #2047 from irisnet/yelong/security-patch
Browse files Browse the repository at this point in the history
R4R: Bump tendermint version
  • Loading branch information
zhangyelong authored Oct 30, 2019
2 parents 3937de2 + 5ffe243 commit 54cc5be
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ workflows:
jobs:
BuildAndDeploy:
machine:
docker_layer_caching: true
docker_layer_caching: false
steps:
- checkout
- run:
Expand Down Expand Up @@ -46,7 +46,7 @@ jobs:
command: docker push irisnet/irishub:testnet-$TAG
UnitTest:
machine:
docker_layer_caching: true
docker_layer_caching: false
steps:
- checkout
- run:
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## 0.15.5

*Oct 30th, 2019*

### Tendermint

Bump Tendermint version to irisnet/tendermint [v0.31.3](https://github.com/irisnet/tendermint/releases/tag/v0.31.3) to fix the consensus security bug.

## 0.15.4

*Oct 14th, 2019*
Expand Down
4 changes: 2 additions & 2 deletions docs/software/How-to-install-irishub.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

## Latest Version

The Latest version of IRIShub is [v0.15.4](https://github.com/irisnet/irishub/releases/latest)
The Latest version of IRIShub is [v0.15.5](https://github.com/irisnet/irishub/releases/latest)

::: tip
Please replace <latest_iris_version> below with v0.15.4
Please replace <latest_iris_version> below with v0.15.5
:::

## Configure Your Server
Expand Down
4 changes: 2 additions & 2 deletions docs/zh/software/How-to-install-irishub.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

## 最新版本

当前IRIShub最新版本为 [v0.15.4](https://github.com/irisnet/irishub/releases/latest)
当前IRIShub最新版本为 [v0.15.5](https://github.com/irisnet/irishub/releases/latest)

::: tip
请将下文中的 <latest_iris_version> 替换为 v0.15.4
请将下文中的 <latest_iris_version> 替换为 v0.15.5
:::

## 服务器配置要求
Expand Down
4 changes: 3 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ require (

replace (
github.com/tendermint/iavl => github.com/irisnet/iavl v0.12.2
github.com/tendermint/tendermint => github.com/irisnet/tendermint v0.31.2
github.com/tendermint/tendermint => github.com/irisnet/tendermint v0.31.3
golang.org/x/crypto => github.com/tendermint/crypto v0.0.0-20180820045704-3764759f34a5
)

go 1.13
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/irisnet/iavl v0.12.2 h1:M7Y0FwWNRGTq3j+DLbEHAKjTsBaxoovc/A1RaKhdKhY=
github.com/irisnet/iavl v0.12.2/go.mod h1:JRGfj9mLdUSdoBSpYjo14FRe/qyKv3YKHwHnhuxzKaQ=
github.com/irisnet/tendermint v0.31.2 h1:bpxmRMDx5k7S0xTYuOyagaPnlhw+/Mx5O7q7fQUh3Sc=
github.com/irisnet/tendermint v0.31.2/go.mod h1:cLvoTnSF/1xKjgwfUwqE+frnDCrHCWInffCVfR3eo50=
github.com/irisnet/tendermint v0.31.3 h1:a80IlKLrBC9a41f+ECYlBZKZQ5VKWXtlHbAlny8d/fQ=
github.com/irisnet/tendermint v0.31.3/go.mod h1:cLvoTnSF/1xKjgwfUwqE+frnDCrHCWInffCVfR3eo50=
github.com/jmhodges/levigo v0.0.0-20161115193449-c42d9e0ca023 h1:y5P5G9cANJZt3MXlMrgELo5mNLZPXH8aGFFFG7IzPU0=
github.com/jmhodges/levigo v0.0.0-20161115193449-c42d9e0ca023/go.mod h1:Q6Qx+uH3RAqyK4rFQroq9RL7mdkABMcfhEI+nNuzMJQ=
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY=
Expand Down
2 changes: 1 addition & 1 deletion lite/swagger-ui/swagger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ info:
description: >-
A REST interface for state queries, transaction generation and
broadcast.
version: "0.15.4"
version: "0.15.5"
title: IRISLCD Swagger-UI
termsOfService: 'https://www.irisnet.org'
contact:
Expand Down
2 changes: 1 addition & 1 deletion version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

// Version - Iris Version
const ProtocolVersion = 1
const Version = "0.15.4"
const Version = "0.15.5"

// GitCommit set by build flags
var GitCommit = ""
Expand Down

0 comments on commit 54cc5be

Please sign in to comment.