Commit 7c459d3
committed
Merge branch 'main' into alex/sims2_main
* main:
refactor(server/v2/cometbft): use only protov1 and backport #21084 (#21681)
chore(x/staking): revert proto breakage (#21666)
build(deps): bump rocksdb & core & update ci codeowners (#21652)75 files changed
Lines changed: 10216 additions & 7387 deletions
File tree
- .github
- workflows
- api/cosmos
- accounts/defaults/multisig/v1
- staking/v1beta1
- client/v2
- core
- runtime/v2
- scripts/build
- server/v2/cometbft
- client/rpc
- simapp
- v2
- tests
- x
- accounts
- defaults
- lockup
- multisig
- v1
- authz
- bank
- circuit
- consensus
- distribution
- epochs
- evidence
- feegrant
- gov
- group
- mint
- nft
- params
- protocolpool
- slashing
- staking
- keeper
- proto/cosmos/staking/v1beta1
- types
- upgrade
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
69 | 69 | | |
70 | 70 | | |
71 | 71 | | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
72 | 80 | | |
73 | 81 | | |
74 | 82 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | | - | |
17 | 16 | | |
18 | 17 | | |
19 | 18 | | |
| |||
Lines changed: 135 additions & 137 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
0 commit comments