diff --git a/.circleci/config.yml b/.circleci/config.yml index 21dc98dd1..c59b987c5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,7 +17,7 @@ workflows: jobs: BuildAndDeploy: machine: - docker_layer_caching: true + docker_layer_caching: false steps: - checkout - run: @@ -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: diff --git a/CHANGELOG.md b/CHANGELOG.md index e6d0a118c..38eb4dad3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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* diff --git a/docs/software/How-to-install-irishub.md b/docs/software/How-to-install-irishub.md index f4104780a..4f52382f2 100644 --- a/docs/software/How-to-install-irishub.md +++ b/docs/software/How-to-install-irishub.md @@ -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 below with v0.15.4 +Please replace below with v0.15.5 ::: ## Configure Your Server diff --git a/docs/zh/software/How-to-install-irishub.md b/docs/zh/software/How-to-install-irishub.md index a286e1663..999acf799 100644 --- a/docs/zh/software/How-to-install-irishub.md +++ b/docs/zh/software/How-to-install-irishub.md @@ -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 -请将下文中的 替换为 v0.15.4 +请将下文中的 替换为 v0.15.5 ::: ## 服务器配置要求 diff --git a/go.mod b/go.mod index f57c217cd..1a7b15570 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index 82be4c72e..cba6495cb 100644 --- a/go.sum +++ b/go.sum @@ -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= diff --git a/lite/swagger-ui/swagger.yaml b/lite/swagger-ui/swagger.yaml index bcca9cc6a..cde35edb2 100644 --- a/lite/swagger-ui/swagger.yaml +++ b/lite/swagger-ui/swagger.yaml @@ -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: diff --git a/version/version.go b/version/version.go index 9b0b37cef..9d45c21a9 100644 --- a/version/version.go +++ b/version/version.go @@ -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 = ""