Merge branch 'v1.x' into cal/ttl-duration

go.mod

@@ -221,5 +221,5 @@ replace (
 	github.com/cosmos/cosmos-sdk => github.com/celestiaorg/cosmos-sdk v1.18.0-sdk-v0.46.14
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 	github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
-	github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.27.0-tm-v0.34.28
+	github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.28.0-tm-v0.34.29
 )

go.sum

@@ -176,8 +176,8 @@ github.com/bufbuild/protocompile v0.1.0/go.mod h1:ix/MMMdsT3fzxfw91dvbfzKW3fRRnu
 github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
 github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34=
 github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
-github.com/celestiaorg/celestia-core v1.27.0-tm-v0.34.28 h1:BE7JFZ1SYpwM9OfL9cPcjlO5xjIbDPgdFkJNouyl6jA=
-github.com/celestiaorg/celestia-core v1.27.0-tm-v0.34.28/go.mod h1:1GT0RfdNqOXvyR3Hq4ROcNBknQNz9E6K5l3Cla9eFFk=
+github.com/celestiaorg/celestia-core v1.28.0-tm-v0.34.29 h1:6zayAAkDu2Kz3SZceHauYgw2vvV7K9D8tkehY3MlzlM=
+github.com/celestiaorg/celestia-core v1.28.0-tm-v0.34.29/go.mod h1:xrICN0PBhp3AdTaZ8q4wS5Jvi32V02HNjaC2EsWiEKk=
 github.com/celestiaorg/cosmos-sdk v1.18.0-sdk-v0.46.14 h1:dDfoQJOlVNj4HufJ1lBLTo2k3/L/255MIiKmEQziDmw=
 github.com/celestiaorg/cosmos-sdk v1.18.0-sdk-v0.46.14/go.mod h1:kkdiHo/zG6ar80730+bG1owdMAQXrGp4utFu7mbfADo=
 github.com/celestiaorg/merkletree v0.0.0-20210714075610-a84dc3ddbbe4 h1:CJdIpo8n5MFP2MwK0gSRcOVlDlFdQJO1p+FqdxYzmvc=

specs/src/specs/params.md

@@ -53,6 +53,7 @@ are blocked by the `x/paramfilter` module.
 | staking.BondDenom | utia | Bondable coin denomination. | False |
 | staking.MinCommissionRate | 0.05 (5%) | Minimum commission rate used by all validators. | True |
 | mint.BondDenom | utia | Denomination that is inflated and sent to the distribution module account. | False |
-| mint.InflationRateChange | 0.10 (10%) | The rate at which the annual provisions decrease each year. | False |
-| mint.InflationRate | 0.08 (8%) | Initial annual inflation rate used to calculate the annual provisions. | False |
+| mint.InitialInflationRate | 0.08 (8%) | The inflation rate the network starts at. | False |
+| mint.DisinflationRate | 0.10 (10%) | The rate at which the inflation rate decreases each year. | False |
+| mint.TargetInflationRate | 0.015 (1.5%) | The inflation rate that the network aims to stabalize at. | False |
 | qgb.DataCommitmentWindow | 400 | Number of blocks that are included in a signed batch (DataCommitment). | True |

x/mint/README.md

@@ -80,7 +80,7 @@ The genesis state is defined in [./types/genesis.go](./types/genesis.go).
 
 ## Params
 
-All params have been removed from this module because they should not be modifiable via governance.
+All params have been removed from this module because they should not be modifiable via governance. The constants used in this module are defined in [./types/constants.go](./types/constants.go) and they are subject to change via hardforks.
 
 ## Tests
 

x/mint/types/constants.go

@@ -14,8 +14,10 @@ const (
 	SecondsPerYear     = int64(SecondsPerMinute * MinutesPerHour * HoursPerDay * DaysPerYear) // 31,556,952
 	NanosecondsPerYear = int64(NanosecondsPerSecond * SecondsPerYear)                         // 31,556,952,000,000,000
 
+	// InitialInflationRate is the inflation rate that the network starts at.
 	InitialInflationRate = 0.08
-	DisinflationRate     = 0.1
+	// DisinflationRate is the rate at which the inflation rate decreases each year.
+	DisinflationRate = 0.1
 	// TargetInflationRate is the inflation rate that the network aims to
 	// stabalize at. In practice, TargetInflationRate acts as a minimum so that
 	// the inflation rate doesn't decrease after reaching it.