Merge branch 'master' of https://github.com/cosmos/cosmos-sdk into li…

…khita/sequence-flag-ux-issue
cosmos · Aug 9, 2021 · 7ffb026 · 7ffb026
2 parents 6e60afa + 1cc93d2
commit 7ffb026
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/go.mod b/go.mod
@@ -48,7 +48,7 @@ require (
 	github.com/tendermint/tm-db v0.6.4
 	golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad
 	google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c
-	google.golang.org/grpc v1.39.0
+	google.golang.org/grpc v1.39.1
 	google.golang.org/protobuf v1.27.1
 	gopkg.in/yaml.v2 v2.4.0
 	nhooyr.io/websocket v1.8.6 // indirect

diff --git a/x/README.md b/x/README.md
@@ -1,6 +1,5 @@
 <!--
-parent:
-  order: false
+order: 0
 -->
 
 # List of Modules
@@ -14,6 +13,7 @@ Here are some production-grade modules that can be used in Cosmos SDK applicatio
 - [Crisis](crisis/spec/README.md) - Halting the blockchain under certain circumstances (e.g. if an invariant is broken).
 - [Distribution](distribution/spec/README.md) - Fee distribution, and staking token provision distribution.
 - [Evidence](evidence/spec/README.md) - Evidence handling for double signing, misbehaviour, etc.
+- [Feegrant](feegrant/spec/README.md) - Grant fee allowances for executing transactions.
 - [Governance](gov/spec/README.md) - On-chain proposals and voting.
 - [Mint](mint/spec/README.md) - Creation of new units of staking token.
 - [Params](params/spec/README.md) - Globally available parameter store.

diff --git a/x/auth/spec/04_keepers.md b/x/auth/spec/04_keepers.md
@@ -1,5 +1,5 @@
 <!--
-order: 5
+order: 4
 -->
 
 # Keepers

diff --git a/x/auth/spec/05_vesting.md b/x/auth/spec/05_vesting.md
@@ -1,5 +1,5 @@
 <!--
-order: 6
+order: 5
 -->
 
 # Vesting

diff --git a/x/auth/spec/07_params.md → x/auth/spec/06_params.md b/x/auth/spec/07_params.md → x/auth/spec/06_params.md
@@ -1,5 +1,5 @@
 <!--
-order: 7
+order: 6
 -->
 
 # Parameters

diff --git a/x/mint/spec/01_concepts.md b/x/mint/spec/01_concepts.md
@@ -1,5 +1,5 @@
 <!--
-order: 0
+order: 1
 -->
 
 # Concepts

diff --git a/x/slashing/spec/README.md b/x/slashing/spec/README.md
@@ -1,5 +1,5 @@
 <!--
-order: 20
+order: 0
 title: Slashing Overview
 parent:
   title: "slashing"

diff --git a/x/staking/spec/05_end_block.md b/x/staking/spec/05_end_block.md
@@ -1,5 +1,5 @@
 <!--
-order: 4
+order: 5
 -->
 
 # End-Block

diff --git a/x/staking/spec/06_hooks.md b/x/staking/spec/06_hooks.md
@@ -1,5 +1,5 @@
 <!--
-order: 5
+order: 6
 -->
 
 # Hooks

diff --git a/x/staking/spec/07_events.md b/x/staking/spec/07_events.md
@@ -1,5 +1,5 @@
 <!--
-order: 6
+order: 7
 -->
 
 # Events