Skip to content

Commit 2539f2a

Browse files
authored
Merge branch 'main' into release/v0.50.x
2 parents e143149 + fc3ca2f commit 2539f2a

5 files changed

Lines changed: 6 additions & 29 deletions

File tree

.github/workflows/staticmajor.yml

Lines changed: 0 additions & 23 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ Members must:
344344
* Be active contributors to the Cosmos SDK, and furthermore should be continuously making substantial contributions
345345
to the project's codebase, review process, documentation and ADRs
346346
* Have stake in the Cosmos SDK project, represented by:
347-
* Being a client / user of the Comsos SDK
347+
* Being a client / user of the Cosmos SDK
348348
* "[giving back](https://www.debian.org/social_contract)" to the software
349349
* Delegate representation in case of vacation or absence
350350

client/flags/flags.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ func AddTxFlagsToCmd(cmd *cobra.Command) {
126126
f.Uint64P(FlagSequence, "s", 0, "The sequence number of the signing account (offline mode only)")
127127
f.String(FlagNote, "", "Note to add a description to the transaction (previously --memo)")
128128
f.String(FlagFees, "", "Fees to pay along with transaction; eg: 10uatom")
129-
f.String(FlagGasPrices, "", "Gas prices in decimal format to determine the transaction fee (e.g. 0.1uatom)")
129+
f.String(FlagGasPrices, "", "Determine the transaction fee by multiplying max gas units by gas prices (e.g. 0.1uatom), rounding up to nearest denom unit")
130130
f.String(FlagNode, "tcp://localhost:26657", "<host>:<port> to CometBFT rpc interface for this chain")
131131
f.Bool(FlagUseLedger, false, "Use a connected Ledger device")
132132
f.Float64(FlagGasAdjustment, DefaultGasAdjustment, "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored ")

client/v2/autocli/testdata/help-echo-msg.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Flags:
1515
--from string Name or address of private key with which to sign
1616
--gas string gas limit to set per-transaction; set to "auto" to calculate sufficient gas automatically. Note: "auto" option doesn't always report accurate results. Set a valid coin value to adjust the result. Can be used instead of "fees". (default 200000)
1717
--gas-adjustment float adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored (default 1)
18-
--gas-prices string Gas prices in decimal format to determine the transaction fee (e.g. 0.1uatom)
18+
--gas-prices string Determine the transaction fee by multiplying max gas units by gas prices (e.g. 0.1uatom), rounding up to nearest denom unit
1919
--generate-only Build an unsigned transaction and write it to STDOUT (when enabled, the local Keybase only accessed when providing a key name)
2020
-h, --help help for send
2121
--keyring-backend string Select keyring's backend (os|file|kwallet|pass|test|memory) (default "os")

simapp/upgrades.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ func (app SimApp) RegisterUpgradeHandlers() {
3636
if upgradeInfo.Name == UpgradeName && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
3737
storeUpgrades := storetypes.StoreUpgrades{
3838
Added: []string{
39-
accounts.ModuleName,
40-
protocolpooltypes.ModuleName,
39+
accounts.StoreKey,
40+
protocolpooltypes.StoreKey,
4141
},
4242
Deleted: []string{
43-
crisistypes.ModuleName, // The SDK discontinued the crisis module in v0.51.0
43+
crisistypes.StoreKey, // The SDK discontinued the crisis module in v0.51.0
4444
},
4545
}
4646

0 commit comments

Comments
 (0)