Skip to content

Commit

Permalink
fix(x/auth/tx): avoid panic from intoAnyV2 when v1.PublicKey is optio…
Browse files Browse the repository at this point in the history
…nal (#23148)
  • Loading branch information
mmsqe authored Jan 3, 2025
1 parent f29d7f7 commit 07d5168
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ Every module contains its own CHANGELOG.md. Please refer to the module you are i
### Bug Fixes

* (query) [23002](https://github.com/cosmos/cosmos-sdk/pull/23002) Fix collection filtered pagination.
* (x/auth/tx) [#23148](https://github.com/cosmos/cosmos-sdk/pull/23148) Avoid panic from intoAnyV2 when v1.PublicKey is optional.

### API Breaking Changes

Expand Down
8 changes: 5 additions & 3 deletions x/auth/tx/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -293,9 +293,11 @@ func intoV2SignerInfo(v1s []*tx.SignerInfo) []*txv1beta1.SignerInfo {
modeInfoV2 := new(txv1beta1.ModeInfo)
intoV2ModeInfo(v1.ModeInfo, modeInfoV2)
v2 := &txv1beta1.SignerInfo{
PublicKey: intoAnyV2([]*codectypes.Any{v1.PublicKey})[0],
ModeInfo: modeInfoV2,
Sequence: v1.Sequence,
ModeInfo: modeInfoV2,
Sequence: v1.Sequence,
}
if v1.PublicKey != nil {
v2.PublicKey = intoAnyV2([]*codectypes.Any{v1.PublicKey})[0]
}
v2s[i] = v2
}
Expand Down
15 changes: 15 additions & 0 deletions x/auth/tx/builder_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package tx

import (
"testing"

any "github.com/cosmos/gogoproto/types/any"
"github.com/stretchr/testify/require"

"github.com/cosmos/cosmos-sdk/types/tx"
)

func TestIntoV2SignerInfo(t *testing.T) {
require.NotNil(t, intoV2SignerInfo([]*tx.SignerInfo{{}}))
require.NotNil(t, intoV2SignerInfo([]*tx.SignerInfo{{PublicKey: &any.Any{}}}))
}

0 comments on commit 07d5168

Please sign in to comment.