Skip to content

Commit

Permalink
Merge pull request #2560 from irisnet/vincent-v1.0.0-rc2
Browse files Browse the repository at this point in the history
Release v1.0.0-rc2
  • Loading branch information
Haifeng Xi authored Feb 7, 2021
2 parents 661849a + 32db68a commit 3ef73cd
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 3 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,14 @@

## Unreleased

## 1.0.0-rc2

*February 7th, 2021*

### Application

* [\#2560](https://github.com/irisnet/irishub/pull/2560) Bump irismod version to [v1.3.0](https://github.com/irisnet/irismod/releases/tag/v1.3.0)
* [\#2551](https://github.com/irisnet/irishub/pull/2551) Disable repeated service invocation
* [\#2542](https://github.com/irisnet/irishub/pull/2542) Migrate withdraw infos

## 1.0.0-rc1
Expand Down
3 changes: 2 additions & 1 deletion app/ante.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ import (
"github.com/cosmos/cosmos-sdk/x/auth/signing"
bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"

guardiankeeper "github.com/irisnet/irishub/modules/guardian/keeper"
oraclekeeper "github.com/irisnet/irismod/modules/oracle/keeper"
tokenkeeper "github.com/irisnet/irismod/modules/token/keeper"

guardiankeeper "github.com/irisnet/irishub/modules/guardian/keeper"
)

// NewAnteHandler returns an AnteHandler that checks and increments sequence
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/golang/protobuf v1.4.3
github.com/gorilla/mux v1.8.0
github.com/grpc-ecosystem/grpc-gateway v1.16.0
github.com/irisnet/irismod v1.2.2-0.20210207103135-e2dd25c3e96b
github.com/irisnet/irismod v1.3.0
github.com/olebedev/config v0.0.0-20190528211619-364964f3a8e4
github.com/pkg/errors v0.9.1
github.com/rakyll/statik v0.1.7
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,8 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
github.com/irisnet/irismod v1.2.2-0.20210207103135-e2dd25c3e96b h1:fK5IGSguZzI7QlSirbIT+OEmLerFOb3luLHPwJk0wNE=
github.com/irisnet/irismod v1.2.2-0.20210207103135-e2dd25c3e96b/go.mod h1:5Ye17WorhxHwrGDZvSkmrfiFq5PXi3roINw1JcB4IB0=
github.com/irisnet/irismod v1.3.0 h1:yu6dJp+010LawbOoQsnDjufEKH9HQLiZK1ZZqH+jKqY=
github.com/irisnet/irismod v1.3.0/go.mod h1:5Ye17WorhxHwrGDZvSkmrfiFq5PXi3roINw1JcB4IB0=
github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
Expand Down
2 changes: 1 addition & 1 deletion scripts/protoc-swagger-gen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -eo pipefail

SDK_VERSION=v0.41.0
IRISMOD_VERSION=v1.2.2-0.20210207103135-e2dd25c3e96b
IRISMOD_VERSION=v1.3.0

chmod -R 755 ${GOPATH}/pkg/mod/github.com/cosmos/cosmos-sdk@${SDK_VERSION}/proto
chmod -R 755 ${GOPATH}/pkg/mod/github.com/cosmos/cosmos-sdk@${SDK_VERSION}/third_party/proto
Expand Down

0 comments on commit 3ef73cd

Please sign in to comment.