From 5c68ebec12299557a6ed502788def31b4be4f0c8 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 27 Sep 2023 07:24:34 -0500
Subject: [PATCH 1/3] chore: bump celestia-core to v1.28.0-tm-v0.34.29
(backport #2581) (#2582)
This is an automatic backport of pull request #2581 done by
[Mergify](https://mergify.com).
---
Mergify commands and options
More conditions and actions can be found in the
[documentation](https://docs.mergify.com/).
You can also trigger Mergify actions by commenting on this pull request:
- `@Mergifyio refresh` will re-evaluate the rules
- `@Mergifyio rebase` will rebase this PR on its base branch
- `@Mergifyio update` will merge the base branch into this PR
- `@Mergifyio backport ` will backport this PR on
`` branch
Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you
can:
- look at your merge queues
- generate the Mergify configuration with the config editor.
Finally, you can contact us on https://mergify.com
Co-authored-by: Evan Forbes <42654277+evan-forbes@users.noreply.github.com>
---
go.mod | 2 +-
go.sum | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/go.mod b/go.mod
index e71147ab7b..cf6f0cb3ef 100644
--- a/go.mod
+++ b/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
)
diff --git a/go.sum b/go.sum
index 8111deb593..f8b4b14a85 100644
--- a/go.sum
+++ b/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=
From decaa36dfbb7c09c09bdfec5e2c7ff241ffd4f69 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 27 Sep 2023 12:36:20 +0000
Subject: [PATCH 2/3] docs: add one more mint param to params.md (backport
#2554) (#2562)
This is an automatic backport of pull request #2554 done by
[Mergify](https://mergify.com).
---
Mergify commands and options
More conditions and actions can be found in the
[documentation](https://docs.mergify.com/).
You can also trigger Mergify actions by commenting on this pull request:
- `@Mergifyio refresh` will re-evaluate the rules
- `@Mergifyio rebase` will rebase this PR on its base branch
- `@Mergifyio update` will merge the base branch into this PR
- `@Mergifyio backport ` will backport this PR on
`` branch
Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you
can:
- look at your merge queues
- generate the Mergify configuration with the config editor.
Finally, you can contact us on https://mergify.com
Co-authored-by: Rootul P
---
specs/src/specs/params.md | 5 +++--
x/mint/README.md | 2 +-
x/mint/types/constants.go | 4 +++-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/specs/src/specs/params.md b/specs/src/specs/params.md
index 098ef93957..71fc28d0ea 100644
--- a/specs/src/specs/params.md
+++ b/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 |
diff --git a/x/mint/README.md b/x/mint/README.md
index cd9f2750d6..97b9db6b3f 100644
--- a/x/mint/README.md
+++ b/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
diff --git a/x/mint/types/constants.go b/x/mint/types/constants.go
index 69d319a4ea..06a7cffbd3 100644
--- a/x/mint/types/constants.go
+++ b/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.
From 0b76b2cafb1d2b439c87c8b951aebfdc2d274efb Mon Sep 17 00:00:00 2001
From: Callum Waters
Date: Thu, 28 Sep 2023 10:25:22 +0200
Subject: [PATCH 3/3] chore: use the DefaultConsensusConfig() for initializing
a node (#2576)
This is something that wasn't backported as part of #2188
Note that this changes the default indexer to `null`
---
cmd/celestia-appd/cmd/root.go | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/cmd/celestia-appd/cmd/root.go b/cmd/celestia-appd/cmd/root.go
index 7ae7f151dd..d8fbd1231c 100644
--- a/cmd/celestia-appd/cmd/root.go
+++ b/cmd/celestia-appd/cmd/root.go
@@ -5,7 +5,6 @@ import (
"io"
"os"
"path/filepath"
- "time"
"github.com/celestiaorg/celestia-app/pkg/appconsts"
qgbcmd "github.com/celestiaorg/celestia-app/x/qgb/client"
@@ -37,7 +36,6 @@ import (
genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli"
"github.com/spf13/cast"
"github.com/spf13/cobra"
- tmcfg "github.com/tendermint/tendermint/config"
tmcli "github.com/tendermint/tendermint/libs/cli"
"github.com/tendermint/tendermint/libs/log"
dbm "github.com/tendermint/tm-db"
@@ -84,19 +82,7 @@ func NewRootCmd() *cobra.Command {
}
// Override the default tendermint config for celestia-app
- tmCfg := tmcfg.DefaultConfig()
-
- // Set broadcast timeout to be 50 seconds in order to avoid timeouts for long block times
- // TODO: make TimeoutBroadcastTx configurable per https://github.com/celestiaorg/celestia-app/issues/1034
- tmCfg.RPC.TimeoutBroadcastTxCommit = 50 * time.Second
- tmCfg.RPC.MaxBodyBytes = int64(8388608) // 8 MiB
- tmCfg.Mempool.TTLNumBlocks = 10
- tmCfg.Mempool.MaxTxBytes = 2 * 1024 * 1024 // 2 MiB
- tmCfg.Mempool.Version = "v1" // prioritized mempool
- tmCfg.Consensus.TimeoutPropose = appconsts.TimeoutPropose
- tmCfg.Consensus.TimeoutCommit = appconsts.TimeoutCommit
- tmCfg.Consensus.SkipTimeoutCommit = false
-
+ tmCfg := app.DefaultConsensusConfig()
customAppTemplate, customAppConfig := initAppConfig()
err = server.InterceptConfigsPreRunHandler(cmd, customAppTemplate, customAppConfig, tmCfg)