fix: config.toml and app.toml overwrites #8118
Conversation
czarcas7ic
added
V:state/compatible/backport
WalkthroughThe Changes
Recent Review DetailsConfiguration used: CodeRabbit UI Files selected for processing (1)
Additional comments not posted (6)
Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (invoked as PR comments)
Additionally, you can add CodeRabbit Configration File (
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 0
Actionable comments outside the diff hunks (3)
CHANGELOG.md (3)
Line range hint
325-325: Correct the punctuation in the heading.-## [v6.4.0] +## v6.4.0
Line range hint
986-1064: Adjust heading levels to increment by one level at a time.-#### Golang API breaks +### Golang API breaks -#### Bug Fixes +### Bug Fixes -#### Features +### Features -#### SDK fork updates +### SDK fork updates -#### IAVL fork updates +### IAVL fork updates
Line range hint
588-646: Provide descriptive text for bare URLs.-https://github.com/osmosis-labs/osmosis/releases/tag/v6.4.0 +[Osmosis v6.4.0 Release](https://github.com/osmosis-labs/osmosis/releases/tag/v6.4.0) -https://github.com/osmosis-labs/osmosis/releases/tag/v6.3.1 +[Osmosis v6.3.1 Release](https://github.com/osmosis-labs/osmosis/releases/tag/v6.3.1)
|
Going to convert to draft, want to make a couple more improvements |
| recommendedAppTomlValues = []SectionKeyValue{ | ||
| { | ||
| Section: "osmosis-mempool", | ||
| Key: "arbitrage-min-gas-fee", | ||
| Value: "0.1", | ||
| }, | ||
| { | ||
| Section: "osmosis-mempool", | ||
| Key: "max-gas-wanted-per-tx", | ||
| Value: "60000000", | ||
| }} | ||
|
|
||
| recommendedConfigTomlValues = []SectionKeyValue{ | ||
| { | ||
| Section: "consensus", | ||
| Key: "timeout_commit", | ||
| Value: "2s", | ||
| }, | ||
| } |
There was a problem hiding this comment.
With this abstraction, for all future changes all we need to do is add to this var, and all the rest is taken care of!
| // Optionally allow the chain developer to overwrite the SDK's default | ||
| // server config. | ||
| srvCfg := serverconfig.DefaultConfig() | ||
| srvCfg.API.Enable = true | ||
| srvCfg.StateSync.SnapshotKeepRecent = 2 |
* fix config and app toml overwrites * changelog * more fixes * changelog name * push * push * clean up * reduce diff * comments * print propper * lint * only change the respective lines, rather than the entire file * reduce diff * abstraction * even more abstraction * add in line comments * update config * in line comments * fix overwrite bug * reduce diff (cherry picked from commit abb6ccf) # Conflicts: # CHANGELOG.md
* fix: config.toml and app.toml overwrites (#8118) * fix config and app toml overwrites * changelog * more fixes * changelog name * push * push * clean up * reduce diff * comments * print propper * lint * only change the respective lines, rather than the entire file * reduce diff * abstraction * even more abstraction * add in line comments * update config * in line comments * fix overwrite bug * reduce diff (cherry picked from commit abb6ccf) # Conflicts: # CHANGELOG.md * Update CHANGELOG.md --------- Co-authored-by: Adam Tucker <[email protected]>
Closes: #7905
What is the purpose of the change
This code is currently really odd due to being in between the previous and currently expected behavior.
Previously, we only overwrote the config/app values if the value matched a specific value. We now just overwrite regaurdless (unless a specific flag is provided to not overwrite).
This PR standardizes the logic between the two methods, specifically addressing:
Testing and Verifying
Tested the following:
Summary by CodeRabbit
Summary by CodeRabbit