Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(x/auth): Add fees on batch sign #18564

Merged
merged 12 commits into from
Nov 29, 2023
Merged

fix(x/auth): Add fees on batch sign #18564

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
11e8e3a
Add fees on batch sign
raynaudoe Nov 27, 2023
e15e946
Update changelog
raynaudoe Nov 27, 2023
c5e60e4
Merge branch 'main' into eze/fix-fee-batch-sign
raynaudoe Nov 27, 2023
0b4a990
Minor fixes
raynaudoe Nov 27, 2023
6c3fb70
Fix changelog
raynaudoe Nov 28, 2023
108f677
Minor fixes
raynaudoe Nov 28, 2023
e31cf13
Merge branch 'main' into eze/fix-fee-batch-sign
raynaudoe Nov 28, 2023
f98caf6
Add batch sign test
raynaudoe Nov 29, 2023
9b064ad
Split comment
raynaudoe Nov 29, 2023
e1cc0f8
Fix changelog
raynaudoe Nov 29, 2023
2d1bf6f
Merge branch 'main' into eze/fix-fee-batch-sign
raynaudoe Nov 29, 2023
395a72f
Fix suite tests
raynaudoe Nov 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions x/auth/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,5 @@ Ref: https://keepachangelog.com/en/1.0.0/
### API Breaking Changes

### Bug Fixes

* (client/cli) [#18564](https://github.com/cosmos/cosmos-sdk/pull/18564) Fix total fees when batch signing
raynaudoe marked this conversation as resolved.
Show resolved Hide resolved
11 changes: 10 additions & 1 deletion x/auth/client/cli/tx_sign.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ func makeSignBatchCmd() func(cmd *cobra.Command, args []string) error {
appendMessagesToSingleTx, _ := cmd.Flags().GetBool(flagAppend)
// Combines all tx msgs and create single signed transaction
if appendMessagesToSingleTx {
var totalFees sdk.Coins
txBuilder := txCfg.NewTxBuilder()
msgs := make([]sdk.Msg, 0)
newGasLimit := uint64(0)
Expand All @@ -129,6 +130,12 @@ func makeSignBatchCmd() func(cmd *cobra.Command, args []string) error {
}
// increment the gas
newGasLimit += fe.GetTx().GetGas()
// Individual fee values from each transaction need to be aggregated to calculate the total fee for the batch of transactions.
raynaudoe marked this conversation as resolved.
Show resolved Hide resolved
// https://github.com/cosmos/cosmos-sdk/issues/18064
unmergedFees := fe.GetTx().GetFee()
for _, fee := range unmergedFees {
totalFees = totalFees.Add(fee)
}
// append messages
msgs = append(msgs, unsignedStdTx.GetMsgs()...)
}
Expand All @@ -140,13 +147,15 @@ func makeSignBatchCmd() func(cmd *cobra.Command, args []string) error {

// set the memo,fees,feeGranter,feePayer from cmd flags
txBuilder.SetMemo(txFactory.Memo())
txBuilder.SetFeeAmount(txFactory.Fees())
txBuilder.SetFeeGranter(clientCtx.FeeGranter)
txBuilder.SetFeePayer(clientCtx.FeePayer)

// set the gasLimit
txBuilder.SetGasLimit(newGasLimit)

// set the feeAmount
txBuilder.SetFeeAmount(totalFees)

// sign the txs
from, _ := cmd.Flags().GetString(flags.FlagFrom)
err := sigTxOrMultisig(clientCtx, txBuilder, txFactory, from, multisigKey)
Expand Down
Loading