Skip to content

Commit 5a8028b

Browse files
authored
Merge branch 'master' into aleem/8560-tm-grpc-pagination
2 parents 990a19f + cb725e1 commit 5a8028b

File tree

127 files changed

+3318
-611
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+3318
-611
lines changed

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
make build-docs LEDGER_ENABLED=false
2525
2626
- name: Deploy 🚀
27-
uses: JamesIves/github-pages-deploy-action@3.7.1
27+
uses: JamesIves/github-pages-deploy-action@4.0.0
2828
with:
2929
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3030
BRANCH: gh-pages

.github/workflows/release-sims.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: install runsim
3131
run: |
3232
export GO111MODULE="on" && go get github.com/cosmos/tools/cmd/runsim@v1.0.0
33-
- uses: actions/cache@v2.1.3
33+
- uses: actions/cache@v2.1.4
3434
with:
3535
path: ~/go/bin
3636
key: ${{ runner.os }}-go-runsim-binary
@@ -40,7 +40,7 @@ jobs:
4040
needs: [build, install-runsim]
4141
steps:
4242
- uses: actions/checkout@v2
43-
- uses: actions/cache@v2.1.3
43+
- uses: actions/cache@v2.1.4
4444
with:
4545
path: ~/go/bin
4646
key: ${{ runner.os }}-go-runsim-binary

.github/workflows/sims.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
run: go version
4040
- name: Install runsim
4141
run: export GO111MODULE="on" && go get github.com/cosmos/tools/cmd/runsim@v1.0.0
42-
- uses: actions/cache@v2.1.3
42+
- uses: actions/cache@v2.1.4
4343
with:
4444
path: ~/go/bin
4545
key: ${{ runner.os }}-go-runsim-binary
@@ -60,7 +60,7 @@ jobs:
6060
**/**.go
6161
go.mod
6262
go.sum
63-
- uses: actions/cache@v2.1.3
63+
- uses: actions/cache@v2.1.4
6464
with:
6565
path: ~/go/bin
6666
key: ${{ runner.os }}-go-runsim-binary
@@ -88,7 +88,7 @@ jobs:
8888
go.sum
8989
SET_ENV_NAME_INSERTIONS: 1
9090
SET_ENV_NAME_LINES: 1
91-
- uses: actions/cache@v2.1.3
91+
- uses: actions/cache@v2.1.4
9292
with:
9393
path: ~/go/bin
9494
key: ${{ runner.os }}-go-runsim-binary
@@ -116,7 +116,7 @@ jobs:
116116
go.sum
117117
SET_ENV_NAME_INSERTIONS: 1
118118
SET_ENV_NAME_LINES: 1
119-
- uses: actions/cache@v2.1.3
119+
- uses: actions/cache@v2.1.4
120120
with:
121121
path: ~/go/bin
122122
key: ${{ runner.os }}-go-runsim-binary
@@ -144,7 +144,7 @@ jobs:
144144
go.sum
145145
SET_ENV_NAME_INSERTIONS: 1
146146
SET_ENV_NAME_LINES: 1
147-
- uses: actions/cache@v2.1.3
147+
- uses: actions/cache@v2.1.4
148148
with:
149149
path: ~/go/bin
150150
key: ${{ runner.os }}-go-runsim-binary

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: install tparse
2727
run: |
2828
export GO111MODULE="on" && go get github.com/mfridman/tparse@v0.8.3
29-
- uses: actions/cache@v2.1.3
29+
- uses: actions/cache@v2.1.4
3030
with:
3131
path: ~/go/bin
3232
key: ${{ runner.os }}-go-tparse-binary
@@ -254,7 +254,7 @@ jobs:
254254
with:
255255
name: "${{ github.sha }}-03-race-output"
256256
if: env.GIT_DIFF
257-
- uses: actions/cache@v2.1.3
257+
- uses: actions/cache@v2.1.4
258258
with:
259259
path: ~/go/bin
260260
key: ${{ runner.os }}-go-tparse-binary

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ Ref: https://keepachangelog.com/en/1.0.0/
4848

4949
* (x/{bank,distrib,gov,slashing,staking}) [\#8363](https://github.com/cosmos/cosmos-sdk/issues/8363) Store keys have been modified to allow for variable-length addresses.
5050
* (x/ibc) [\#8266](https://github.com/cosmos/cosmos-sdk/issues/8266) Add amino JSON for IBC messages in order to support Ledger text signing.
51+
* (x/evidence) [\#8502](https://github.com/cosmos/cosmos-sdk/pull/8502) `HandleEquivocationEvidence` persists the evidence to state.
52+
* (x/gov) [\#7733](https://github.com/cosmos/cosmos-sdk/pull/7733) ADR 037 Implementation: Governance Split Votes
5153

5254
### Improvements
5355

@@ -66,6 +68,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
6668
* (client/keys) [\#8436](https://github.com/cosmos/cosmos-sdk/pull/8436) Fix key migration issue
6769
* (server) [\#8481](https://github.com/cosmos/cosmos-sdk/pull/8481) Don't create
6870
files when running `{appd} tendermint show-*` subcommands
71+
* (x/staking) [\#8546](https://github.com/cosmos/cosmos-sdk/pull/8546) Fix caching bug where concurrent calls to GetValidator could cause a node to crash
6972

7073
## [v0.40.1](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.40.1) - 2021-01-19
7174

cosmovisor/README.md

Lines changed: 0 additions & 148 deletions
This file was deleted.

cosmovisor/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../docs/run-node/cosmovisor.md

docs/architecture/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,5 @@ Read about the [PROCESS](./PROCESS.md).
7373
- [ADR 028: Public Key Addresses](./adr-028-public-key-addresses.md)
7474
- [ADR 032: Typed Events](./adr-032-typed-events.md)
7575
- [ADR 035: Rosetta API Support](./adr-035-rosetta-api-support.md)
76-
- [ADR 037: Governance Split Votes](./adr-037-gov-split-vote.md)
76+
- [ADR 037: Governance Split Votes](./adr-037-gov-split-vote.md)
77+
- [ADR 038: State Listening](./adr-038-state-listening.md)

docs/architecture/adr-037-gov-split-vote.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
## Status
88

9-
Proposed
9+
Accepted
1010

1111
## Abstract
1212

@@ -35,22 +35,22 @@ type Vote struct {
3535
}
3636
```
3737

38-
And for backwards compatibility, we introduce `MsgWeightedVote` while keeping `MsgVote`.
38+
And for backwards compatibility, we introduce `MsgVoteWeighted` while keeping `MsgVote`.
3939
```
4040
type MsgVote struct {
4141
ProposalID int64
4242
Voter sdk.Address
4343
Option Option
4444
}
4545
46-
type MsgWeightedVote struct {
46+
type MsgVoteWeighted struct {
4747
ProposalID int64
4848
Voter sdk.Address
4949
Options []WeightedVoteOption
5050
}
5151
```
5252

53-
The `ValidateBasic` of a `MsgWeightedVote` struct would require that
53+
The `ValidateBasic` of a `MsgVoteWeighted` struct would require that
5454
1. The sum of all the Rates is equal to 1.0
5555
2. No Option is repeated
5656

0 commit comments

Comments
 (0)