From e2d69681a64f26fd584e34f24b31cf80d577aa1e Mon Sep 17 00:00:00 2001 From: chengwenxi Date: Thu, 9 Apr 2020 23:22:18 +0800 Subject: [PATCH 1/3] upgrade tendermint to v0.32.2 --- CHANGELOG.md | 8 ++++++++ go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 33ea108de..ab0137737 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## 0.16.2 + +*Apr 9th, 2020* + +### Tendermint + +* [\#110](https://github.com/irisnet/tendermint/pull/110) Defend against DoS attacks + ## 0.16.1 *Jan 9th, 2020* diff --git a/go.mod b/go.mod index 180077b7e..85ead505e 100644 --- a/go.mod +++ b/go.mod @@ -33,7 +33,7 @@ require ( replace ( github.com/tendermint/iavl => github.com/irisnet/iavl v0.12.3 - github.com/tendermint/tendermint => github.com/irisnet/tendermint v0.32.1 + github.com/tendermint/tendermint => github.com/irisnet/tendermint v0.32.2 golang.org/x/crypto => github.com/tendermint/crypto v0.0.0-20180820045704-3764759f34a5 ) diff --git a/go.sum b/go.sum index 479b810d2..cf8864eaf 100644 --- a/go.sum +++ b/go.sum @@ -77,8 +77,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.3 h1:AYqI1q/EVAOCWznYx4FtEZIq8x9yPBs9ZA/Rk3zsTDo= github.com/irisnet/iavl v0.12.3/go.mod h1:qofGh9236iFgVez+gPk7bC+ef5wCw7aIMvAVBK3lT84= -github.com/irisnet/tendermint v0.32.1 h1:INUYX36ZDUozg22WdAhtrjsWAqUqVVM4Q3nCRRBd1NM= -github.com/irisnet/tendermint v0.32.1/go.mod h1:36RAXv6V/Ar3H6ofEtmtxU2u80tYRdQh1z51gxoG9Nk= +github.com/irisnet/tendermint v0.32.2 h1:tAvtIb1ts2AAv3NQIBnRaZrY0OCCasf6nzWLZcF0/54= +github.com/irisnet/tendermint v0.32.2/go.mod h1:36RAXv6V/Ar3H6ofEtmtxU2u80tYRdQh1z51gxoG9Nk= github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jmhodges/levigo v1.0.0 h1:q5EC36kV79HWeTBWsod3mG11EgStG3qArTKcvlksN1U= github.com/jmhodges/levigo v1.0.0/go.mod h1:Q6Qx+uH3RAqyK4rFQroq9RL7mdkABMcfhEI+nNuzMJQ= From aa55fd703e3a418e9f2d47c12f8e444e916ee0cd Mon Sep 17 00:00:00 2001 From: chengwenxi Date: Thu, 9 Apr 2020 23:27:11 +0800 Subject: [PATCH 2/3] update version --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 389c905e5..28e9c09c6 100644 --- a/version/version.go +++ b/version/version.go @@ -11,7 +11,7 @@ import ( // Version - Iris Version const ProtocolVersion = 2 -const Version = "0.16.1" +const Version = "0.16.2" // GitCommit set by build flags var GitCommit = "" From 67efc28d7069e297039e1218cb05fb63c911cc14 Mon Sep 17 00:00:00 2001 From: chengwenxi Date: Thu, 9 Apr 2020 23:30:09 +0800 Subject: [PATCH 3/3] update version --- docs/get-started/install.md | 4 ++-- docs/zh/get-started/install.md | 4 ++-- lite/swagger-ui/swagger.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/get-started/install.md b/docs/get-started/install.md index 5a86629c2..5ad63ae63 100644 --- a/docs/get-started/install.md +++ b/docs/get-started/install.md @@ -6,7 +6,7 @@ order: 2 ## Latest Version -The Latest IRIShub version for Mainnet is [v0.16.1](https://github.com/irisnet/irishub/releases/latest) +The Latest IRIShub version for Mainnet is [v0.16.2](https://github.com/irisnet/irishub/releases/latest) ## Install `go` @@ -39,7 +39,7 @@ After setting up `go` correctly, you should be able to compile and run `iris`. Make sure that your server can access to google.com because our project depends on some libraries provided by google. (If you are not able to access google.com, you can also try to add a proxy: `export GOPROXY=https://goproxy.io`) ```bash -git clone --branch v0.16.1 https://github.com/irisnet/irishub +git clone --branch v0.16.2 https://github.com/irisnet/irishub cd irishub # source scripts/setTestEnv.sh # to build or install the testnet version make get_tools install diff --git a/docs/zh/get-started/install.md b/docs/zh/get-started/install.md index d8cb598a2..5d8c15e4e 100644 --- a/docs/zh/get-started/install.md +++ b/docs/zh/get-started/install.md @@ -6,7 +6,7 @@ order: 2 ## 最新版本 -IRIShub 主网的最新版本是[v0.16.1](https://github.com/irisnet/irishub/releases/latest) +IRIShub 主网的最新版本是[v0.16.2](https://github.com/irisnet/irishub/releases/latest) ## 安装`go` @@ -39,7 +39,7 @@ go version 请确保您的服务器可以访问 google.com，因为我们的项目依赖于google提供的某些库（如果您无法访问google.com，也可以尝试添加代理：`export GOPROXY=https://goproxy.io`） ```bash -git clone --branch v0.16.1 https://github.com/irisnet/irishub +git clone --branch v0.16.2 https://github.com/irisnet/irishub cd irishub # source scripts/setTestEnv.sh # to build or install the testnet version make get_tools install diff --git a/lite/swagger-ui/swagger.yaml b/lite/swagger-ui/swagger.yaml index dcb82d73f..bca741485 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.16.1" + version: "0.16.2" title: IRISLCD Swagger-UI termsOfService: 'https://www.irisnet.org' contact: