Skip to content

Commit be2c190

Browse files
aljo242aljo242
authored
Merge branch 'main' into ziscky/22393-sim-finalize-block-fix
2 parents 19b92a9 + 39b0244 commit be2c190

File tree

138 files changed

+1294
-1276
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+1294
-1276
lines changed

‎.github/workflows/md-link-checker.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
steps:
1010
- uses: actions/checkout@v4
1111
- run: cd docs && sh ./pre.sh
12-
- uses: gaurav-nelson/[email protected].15
12+
- uses: gaurav-nelson/[email protected].16
1313
with:
1414
folder-path: "docs"
1515
- run: cd docs && sh ./post.sh

‎CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@ Every module contains its own CHANGELOG.md. Please refer to the module you are i
4747

4848
### Improvements
4949

50+
* [#23470](https://github.com/cosmos/cosmos-sdk/pull/23470) Converge to use of one single sign mode type and signer data:
51+
* Use api's signmode throughout the SDK to align with `cosmossdk.io/tx`. This allows developer not to juggle between sign mode types
52+
* Deprecate `authsigning.SignerData` in favor of txsigning.SignerData and replace its usage
53+
* Remove `APISignModeToInternal` from `x/auth` as no conversion is necessary by the user anymore
54+
5055
### Bug Fixes
5156

5257
* (x/simulation) [#23382](https://github.com/cosmos/cosmos-sdk/pull/23382) Finalize block after queued operations.

‎api/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module cosmossdk.io/api
33
go 1.23
44

55
require (
6-
buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.2-20241120201313-68e42a58b301.1
6+
buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.3-20241120201313-68e42a58b301.1
77
github.com/cosmos/cosmos-proto v1.0.0-beta.5
88
github.com/cosmos/gogoproto v1.7.0
99
google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53
@@ -12,7 +12,7 @@ require (
1212
)
1313

1414
require (
15-
buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.2-20240130113600-88ef6483f90f.1 // indirect
15+
buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.3-20240130113600-88ef6483f90f.1 // indirect
1616
github.com/google/go-cmp v0.6.0 // indirect
1717
golang.org/x/net v0.34.0 // indirect
1818
golang.org/x/sys v0.29.0 // indirect

‎api/go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.2-20241120201313-68e42a58b301.1 h1:72N6FvGkvIAHJFuW6BFXCThbTS2qo/PlzQuw7wSjUi8=
2-
buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.2-20241120201313-68e42a58b301.1/go.mod h1:UJ1nx2WHcWAvKiaem512kYlHektAZJ/eNU032Pdar70=
3-
buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.2-20240130113600-88ef6483f90f.1 h1:LFgdGZ+BzNqHWsndyRvvFE1450BBZ2nFtyNEGZ9NOSg=
4-
buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.2-20240130113600-88ef6483f90f.1/go.mod h1:cuOHNO5SRU1J25UoI8VvPyi8dq9BpZb4gKa01Umx57Y=
1+
buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.3-20241120201313-68e42a58b301.1 h1:ka493q+UHMpnJHmWS5EqsvVnOQIKrCdO/2Jpzht4drc=
2+
buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.3-20241120201313-68e42a58b301.1/go.mod h1:mvIvtXjrqo1Rmpf+OUuHIVQpA6f9bezvxtZ1c1uo3a8=
3+
buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.3-20240130113600-88ef6483f90f.1 h1:t5a3Rfm5y1+U3gqSq9fd728bj7kL9Rq1oBBXgx2iaaE=
4+
buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.3-20240130113600-88ef6483f90f.1/go.mod h1:tUkfiDbobvvm/uysw5gXCf0I+2eFtlo7pBTy+OTnzZc=
55
github.com/cosmos/cosmos-proto v1.0.0-beta.5 h1:eNcayDLpip+zVLRLYafhzLvQlSmyab+RC5W7ZfmxJLA=
66
github.com/cosmos/cosmos-proto v1.0.0-beta.5/go.mod h1:hQGLpiIUloJBMdQMMWb/4wRApmI9hjHH05nefC0Ojec=
77
github.com/cosmos/gogoproto v1.7.0 h1:79USr0oyXAbxg3rspGh/m4SWNyoz/GLaAh0QlCe2fro=

‎baseapp/msg_service_router_test.go

+12-8
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,19 @@ import (
66

77
abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
88
"github.com/stretchr/testify/require"
9+
"google.golang.org/protobuf/types/known/anypb"
910

1011
coretesting "cosmossdk.io/core/testing"
1112
"cosmossdk.io/depinject"
1213
"cosmossdk.io/log"
14+
txsigning "cosmossdk.io/x/tx/signing"
1315

1416
"github.com/cosmos/cosmos-sdk/client/tx"
1517
"github.com/cosmos/cosmos-sdk/codec"
1618
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
1719
"github.com/cosmos/cosmos-sdk/runtime"
1820
"github.com/cosmos/cosmos-sdk/testutil/testdata"
1921
"github.com/cosmos/cosmos-sdk/types/tx/signing"
20-
authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
2122
authtx "github.com/cosmos/cosmos-sdk/x/auth/tx"
2223
)
2324

@@ -143,9 +144,6 @@ func TestMsgService(t *testing.T) {
143144
// set the TxDecoder in the BaseApp for minimal tx simulations
144145
app.SetTxDecoder(txConfig.TxDecoder())
145146

146-
defaultSignMode, err := authsigning.APISignModeToInternal(txConfig.SignModeHandler().DefaultMode())
147-
require.NoError(t, err)
148-
149147
testdata.RegisterInterfaces(interfaceRegistry)
150148
testdata.RegisterMsgServer(
151149
app.MsgServiceRouter(),
@@ -173,7 +171,7 @@ func TestMsgService(t *testing.T) {
173171
sigV2 := signing.SignatureV2{
174172
PubKey: priv.PubKey(),
175173
Data: &signing.SingleSignatureData{
176-
SignMode: defaultSignMode,
174+
SignMode: txConfig.SignModeHandler().DefaultMode(),
177175
Signature: nil,
178176
},
179177
Sequence: 0,
@@ -183,14 +181,20 @@ func TestMsgService(t *testing.T) {
183181
require.NoError(t, err)
184182

185183
// Second round: all signer infos are set, so each signer can sign.
186-
signerData := authsigning.SignerData{
184+
anyPk, err := codectypes.NewAnyWithValue(priv.PubKey())
185+
require.NoError(t, err)
186+
187+
signerData := txsigning.SignerData{
187188
ChainID: "test",
188189
AccountNumber: 0,
189190
Sequence: 0,
190-
PubKey: priv.PubKey(),
191+
PubKey: &anypb.Any{
192+
TypeUrl: anyPk.TypeUrl,
193+
Value: anyPk.Value,
194+
},
191195
}
192196
sigV2, err = tx.SignWithPrivKey(
193-
context.TODO(), defaultSignMode, signerData,
197+
context.TODO(), txConfig.SignModeHandler().DefaultMode(), signerData,
194198
txBuilder, priv, txConfig, 0)
195199
require.NoError(t, err)
196200
err = txBuilder.SetSignatures(sigV2)

‎client/tx/aux_builder.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"google.golang.org/protobuf/types/known/anypb"
99
"google.golang.org/protobuf/types/known/timestamppb"
1010

11+
apisigning "cosmossdk.io/api/cosmos/tx/signing/v1beta1"
1112
txv1beta1 "cosmossdk.io/api/cosmos/tx/v1beta1"
1213
txsigning "cosmossdk.io/x/tx/signing"
1314
"cosmossdk.io/x/tx/signing/aminojson"
@@ -127,15 +128,15 @@ func (b *AuxTxBuilder) SetPubKey(pk cryptotypes.PubKey) error {
127128

128129
// SetSignMode sets the aux signer's sign mode. Allowed sign modes are
129130
// DIRECT_AUX and LEGACY_AMINO_JSON.
130-
func (b *AuxTxBuilder) SetSignMode(mode signing.SignMode) error {
131+
func (b *AuxTxBuilder) SetSignMode(mode apisigning.SignMode) error {
131132
switch mode {
132-
case signing.SignMode_SIGN_MODE_DIRECT_AUX, signing.SignMode_SIGN_MODE_LEGACY_AMINO_JSON:
133+
case apisigning.SignMode_SIGN_MODE_DIRECT_AUX, apisigning.SignMode_SIGN_MODE_LEGACY_AMINO_JSON:
133134
default:
134135
return sdkerrors.ErrInvalidRequest.Wrapf("AuxTxBuilder can only sign with %s or %s",
135-
signing.SignMode_SIGN_MODE_DIRECT_AUX, signing.SignMode_SIGN_MODE_LEGACY_AMINO_JSON)
136+
apisigning.SignMode_SIGN_MODE_DIRECT_AUX, apisigning.SignMode_SIGN_MODE_LEGACY_AMINO_JSON)
136137
}
137138

138-
b.auxSignerData.Mode = mode
139+
b.auxSignerData.Mode = signing.SignMode(mode)
139140
return nil
140141
}
141142

‎client/tx/aux_builder_test.go

+13-12
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import (
55

66
"github.com/stretchr/testify/require"
77

8+
apisigning "cosmossdk.io/api/cosmos/tx/signing/v1beta1"
9+
810
"github.com/cosmos/cosmos-sdk/client/tx"
911
"github.com/cosmos/cosmos-sdk/codec"
1012
"github.com/cosmos/cosmos-sdk/codec/testutil"
@@ -16,7 +18,6 @@ import (
1618
sdk "github.com/cosmos/cosmos-sdk/types"
1719
moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil"
1820
typestx "github.com/cosmos/cosmos-sdk/types/tx"
19-
"github.com/cosmos/cosmos-sdk/types/tx/signing"
2021
)
2122

2223
const (
@@ -53,7 +54,7 @@ func TestAuxTxBuilder(t *testing.T) {
5354
{
5455
"cannot set SIGN_MODE_DIRECT",
5556
func() error {
56-
return b.SetSignMode(signing.SignMode_SIGN_MODE_DIRECT)
57+
return b.SetSignMode(apisigning.SignMode_SIGN_MODE_DIRECT)
5758
},
5859
true, "AuxTxBuilder can only sign with SIGN_MODE_DIRECT_AUX or SIGN_MODE_LEGACY_AMINO_JSON",
5960
},
@@ -105,7 +106,7 @@ func TestAuxTxBuilder(t *testing.T) {
105106
func() error {
106107
require.NoError(t, b.SetMsgs(msg1))
107108
require.NoError(t, b.SetPubKey(pub1))
108-
require.NoError(t, b.SetSignMode(signing.SignMode_SIGN_MODE_DIRECT_AUX))
109+
require.NoError(t, b.SetSignMode(apisigning.SignMode_SIGN_MODE_DIRECT_AUX))
109110

110111
_, err := b.GetSignBytes()
111112
return err
@@ -117,7 +118,7 @@ func TestAuxTxBuilder(t *testing.T) {
117118
func() error {
118119
require.NoError(t, b.SetMsgs(msg1))
119120
require.NoError(t, b.SetPubKey(pub1))
120-
require.NoError(t, b.SetSignMode(signing.SignMode_SIGN_MODE_DIRECT_AUX))
121+
require.NoError(t, b.SetSignMode(apisigning.SignMode_SIGN_MODE_DIRECT_AUX))
121122

122123
_, err := b.GetSignBytes()
123124
require.NoError(t, err)
@@ -133,7 +134,7 @@ func TestAuxTxBuilder(t *testing.T) {
133134
require.NoError(t, b.SetMsgs(msg1))
134135
require.NoError(t, b.SetPubKey(pub1))
135136
b.SetAddress(addr1Str)
136-
require.NoError(t, b.SetSignMode(signing.SignMode_SIGN_MODE_DIRECT_AUX))
137+
require.NoError(t, b.SetSignMode(apisigning.SignMode_SIGN_MODE_DIRECT_AUX))
137138

138139
_, err := b.GetSignBytes()
139140
require.NoError(t, err)
@@ -154,7 +155,7 @@ func TestAuxTxBuilder(t *testing.T) {
154155
require.NoError(t, b.SetMsgs(msg1))
155156
require.NoError(t, b.SetPubKey(pub1))
156157
b.SetAddress(addr1Str)
157-
err := b.SetSignMode(signing.SignMode_SIGN_MODE_DIRECT_AUX)
158+
err := b.SetSignMode(apisigning.SignMode_SIGN_MODE_DIRECT_AUX)
158159
require.NoError(t, err)
159160

160161
_, err = b.GetSignBytes()
@@ -164,7 +165,7 @@ func TestAuxTxBuilder(t *testing.T) {
164165
auxSignerData, err := b.GetAuxSignerData()
165166

166167
// Make sure auxSignerData is correctly populated
167-
checkCorrectData(t, cdc, auxSignerData, signing.SignMode_SIGN_MODE_DIRECT_AUX)
168+
checkCorrectData(t, cdc, auxSignerData, apisigning.SignMode_SIGN_MODE_DIRECT_AUX)
168169

169170
return err
170171
},
@@ -176,7 +177,7 @@ func TestAuxTxBuilder(t *testing.T) {
176177
require.NoError(t, b.SetMsgs(msg1))
177178
require.NoError(t, b.SetPubKey(pub1))
178179
b.SetAddress(addr1Str)
179-
err := b.SetSignMode(signing.SignMode_SIGN_MODE_LEGACY_AMINO_JSON)
180+
err := b.SetSignMode(apisigning.SignMode_SIGN_MODE_LEGACY_AMINO_JSON)
180181
require.NoError(t, err)
181182

182183
_, err = b.GetSignBytes()
@@ -195,7 +196,7 @@ func TestAuxTxBuilder(t *testing.T) {
195196
require.NoError(t, b.SetMsgs(msg1))
196197
require.NoError(t, b.SetPubKey(pub1))
197198
b.SetAddress(addr1Str)
198-
err := b.SetSignMode(signing.SignMode_SIGN_MODE_LEGACY_AMINO_JSON)
199+
err := b.SetSignMode(apisigning.SignMode_SIGN_MODE_LEGACY_AMINO_JSON)
199200
require.NoError(t, err)
200201

201202
_, err = b.GetSignBytes()
@@ -205,7 +206,7 @@ func TestAuxTxBuilder(t *testing.T) {
205206
auxSignerData, err := b.GetAuxSignerData()
206207

207208
// Make sure auxSignerData is correctly populated
208-
checkCorrectData(t, cdc, auxSignerData, signing.SignMode_SIGN_MODE_LEGACY_AMINO_JSON)
209+
checkCorrectData(t, cdc, auxSignerData, apisigning.SignMode_SIGN_MODE_LEGACY_AMINO_JSON)
209210

210211
return err
211212
},
@@ -229,7 +230,7 @@ func TestAuxTxBuilder(t *testing.T) {
229230
}
230231

231232
// checkCorrectData that the auxSignerData's content matches the inputs we gave.
232-
func checkCorrectData(t *testing.T, cdc codec.Codec, auxSignerData typestx.AuxSignerData, signMode signing.SignMode) {
233+
func checkCorrectData(t *testing.T, cdc codec.Codec, auxSignerData typestx.AuxSignerData, signMode apisigning.SignMode) {
233234
t.Helper()
234235
pkAny, err := codectypes.NewAnyWithValue(pub1)
235236
require.NoError(t, err)
@@ -247,6 +248,6 @@ func checkCorrectData(t *testing.T, cdc codec.Codec, auxSignerData typestx.AuxSi
247248
require.Equal(t, chainID, auxSignerData.SignDoc.ChainId)
248249
require.Equal(t, msgAny, body.GetMessages()[0])
249250
require.Equal(t, pkAny, auxSignerData.SignDoc.PublicKey)
250-
require.Equal(t, signMode, auxSignerData.Mode)
251+
require.Equal(t, signMode, apisigning.SignMode(auxSignerData.Mode))
251252
require.Equal(t, rawSig, auxSignerData.Sig)
252253
}

‎client/tx/factory.go

+10-9
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"github.com/cosmos/go-bip39"
1212
"github.com/spf13/pflag"
1313

14+
apisigning "cosmossdk.io/api/cosmos/tx/signing/v1beta1"
1415
"cosmossdk.io/math"
1516

1617
"github.com/cosmos/cosmos-sdk/client"
@@ -47,7 +48,7 @@ type Factory struct {
4748
feePayer sdk.AccAddress
4849
gasPrices sdk.DecCoins
4950
extOptions []*codectypes.Any
50-
signMode signing.SignMode
51+
signMode apisigning.SignMode
5152
simulateAndExecute bool
5253
preprocessTxHook client.PreprocessTxFn
5354
}
@@ -62,18 +63,18 @@ func NewFactoryCLI(clientCtx client.Context, flagSet *pflag.FlagSet) (Factory, e
6263
return Factory{}, fmt.Errorf("failed to bind flags to viper: %w", err)
6364
}
6465

65-
signMode := signing.SignMode_SIGN_MODE_UNSPECIFIED
66+
signMode := apisigning.SignMode_SIGN_MODE_UNSPECIFIED
6667
switch clientCtx.SignModeStr {
6768
case flags.SignModeDirect:
68-
signMode = signing.SignMode_SIGN_MODE_DIRECT
69+
signMode = apisigning.SignMode_SIGN_MODE_DIRECT
6970
case flags.SignModeLegacyAminoJSON:
70-
signMode = signing.SignMode_SIGN_MODE_LEGACY_AMINO_JSON
71+
signMode = apisigning.SignMode_SIGN_MODE_LEGACY_AMINO_JSON
7172
case flags.SignModeDirectAux:
72-
signMode = signing.SignMode_SIGN_MODE_DIRECT_AUX
73+
signMode = apisigning.SignMode_SIGN_MODE_DIRECT_AUX
7374
case flags.SignModeTextual:
74-
signMode = signing.SignMode_SIGN_MODE_TEXTUAL
75+
signMode = apisigning.SignMode_SIGN_MODE_TEXTUAL
7576
case flags.SignModeEIP191:
76-
signMode = signing.SignMode_SIGN_MODE_EIP_191
77+
signMode = apisigning.SignMode_SIGN_MODE_EIP_191 //nolint:staticcheck // We still need to check if it was called
7778
}
7879

7980
var accNum, accSeq uint64
@@ -237,12 +238,12 @@ func (f Factory) WithSimulateAndExecute(sim bool) Factory {
237238
}
238239

239240
// SignMode returns the sign mode configured in the Factory
240-
func (f Factory) SignMode() signing.SignMode {
241+
func (f Factory) SignMode() apisigning.SignMode {
241242
return f.signMode
242243
}
243244

244245
// WithSignMode returns a copy of the Factory with an updated sign mode value.
245-
func (f Factory) WithSignMode(mode signing.SignMode) Factory {
246+
func (f Factory) WithSignMode(mode apisigning.SignMode) Factory {
246247
f.signMode = mode
247248
return f
248249
}

‎client/tx/tx.go

+16-9
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,14 @@ import (
1010

1111
gogogrpc "github.com/cosmos/gogoproto/grpc"
1212
"github.com/spf13/pflag"
13+
"google.golang.org/protobuf/types/known/anypb"
14+
15+
apisigning "cosmossdk.io/api/cosmos/tx/signing/v1beta1"
16+
txsigning "cosmossdk.io/x/tx/signing"
1317

1418
"github.com/cosmos/cosmos-sdk/client"
1519
"github.com/cosmos/cosmos-sdk/client/input"
20+
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
1621
cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
1722
sdk "github.com/cosmos/cosmos-sdk/types"
1823
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
@@ -168,7 +173,7 @@ func CalculateGas(
168173
// corresponding SignatureV2 if the signing is successful.
169174
func SignWithPrivKey(
170175
ctx context.Context,
171-
signMode signing.SignMode, signerData authsigning.SignerData,
176+
signMode apisigning.SignMode, signerData txsigning.SignerData,
172177
txBuilder client.TxBuilder, priv cryptotypes.PrivKey, txConfig client.TxConfig,
173178
accSeq uint64,
174179
) (signing.SignatureV2, error) {
@@ -206,7 +211,7 @@ func SignWithPrivKey(
206211
func countDirectSigners(data signing.SignatureData) int {
207212
switch data := data.(type) {
208213
case *signing.SingleSignatureData:
209-
if data.SignMode == signing.SignMode_SIGN_MODE_DIRECT {
214+
if data.SignMode == apisigning.SignMode_SIGN_MODE_DIRECT {
210215
return 1
211216
}
212217

@@ -254,12 +259,9 @@ func Sign(ctx client.Context, txf Factory, name string, txBuilder client.TxBuild
254259

255260
var err error
256261
signMode := txf.signMode
257-
if signMode == signing.SignMode_SIGN_MODE_UNSPECIFIED {
262+
if signMode == apisigning.SignMode_SIGN_MODE_UNSPECIFIED {
258263
// use the SignModeHandler's default mode if unspecified
259-
signMode, err = authsigning.APISignModeToInternal(txf.txConfig.SignModeHandler().DefaultMode())
260-
if err != nil {
261-
return err
262-
}
264+
signMode = txf.txConfig.SignModeHandler().DefaultMode()
263265
}
264266

265267
k, err := txf.keybase.Key(name)
@@ -277,12 +279,17 @@ func Sign(ctx client.Context, txf Factory, name string, txBuilder client.TxBuild
277279
return err
278280
}
279281

280-
signerData := authsigning.SignerData{
282+
anyPk, err := codectypes.NewAnyWithValue(pubKey)
283+
if err != nil {
284+
return err
285+
}
286+
287+
signerData := txsigning.SignerData{
281288
ChainID: txf.chainID,
282289
AccountNumber: txf.accountNumber,
283290
Sequence: txf.sequence,
284-
PubKey: pubKey,
285291
Address: addressStr,
292+
PubKey: &anypb.Any{TypeUrl: anyPk.TypeUrl, Value: anyPk.Value},
286293
}
287294

288295
// For SIGN_MODE_DIRECT, calling SetSignatures calls setSignerInfos on

0 commit comments

Comments
 (0)