refactor!: remove some legacy amino stuff needed for #11275

CHANGELOG.md

@@ -140,6 +140,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (crypto) [#15070](https://github.com/cosmos/cosmos-sdk/pull/15070) `GenerateFromPassword` and `Cost` from `bcrypt.go` now take a `uint32` instead of a `int` type.  
 * (client) [#15123](https://github.com/cosmos/cosmos-sdk/pull/15123) `NewFactoryCLI` now returns an error, in addition to the `Factory`.
 * (x/capability) [#15344](https://github.com/cosmos/cosmos-sdk/pull/15344) Capability module was removed and is now housed in [IBC-GO](https://github.com/cosmos/ibc-go). 
+* [#15299](https://github.com/cosmos/cosmos-sdk/pull/15299) remove `StdTx` transaction and signing APIs. No SDK version has actually supported `StdTx` since before Stargate.
 
 ### Client Breaking Changes
 
@@ -152,6 +153,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (x/gov) [#14880](https://github.com/cosmos/cosmos-sdk/pull/14880) Remove `<app> tx gov submit-legacy-proposal cancel-software-upgrade` and `software-upgrade` commands. These commands are now in the `x/upgrade` module and using gov v1. Use `tx upgrade software-upgrade` instead.
 * (grpc-web) [#14652](https://github.com/cosmos/cosmos-sdk/pull/14652) Remove `grpc-web.address` flag.
 * (client) [#14342](https://github.com/cosmos/cosmos-sdk/pull/14342) `<app> config` command is now a sub-command. Use `<app> config --help` to learn more.
+* (cli) [#15299](https://github.com/cosmos/cosmos-sdk/pull/15299) remove `--amino` flag from `sign` and `multi-sign` commands. Amino `StdTx` has been deprecated for a while. Amino JSON signing still works as expected. 
 
 ### Bug Fixes
 

client/tx/legacy_test.go

@@ -1,164 +1,23 @@
 package tx_test
 
 import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"github.com/stretchr/testify/suite"
-
-	"cosmossdk.io/depinject"
-	"github.com/cosmos/cosmos-sdk/client"
-	clienttestutil "github.com/cosmos/cosmos-sdk/client/testutil"
-	tx2 "github.com/cosmos/cosmos-sdk/client/tx"
-	"github.com/cosmos/cosmos-sdk/codec"
-	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/cosmos/cosmos-sdk/testutil/testdata"
 	"github.com/cosmos/cosmos-sdk/types"
 	typestx "github.com/cosmos/cosmos-sdk/types/tx"
-	signing2 "github.com/cosmos/cosmos-sdk/types/tx/signing"
-	"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
-	"github.com/cosmos/cosmos-sdk/x/auth/tx"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 )
 
 const (
 	memo          = "waboom"
-	gas           = uint64(10000)
 	timeoutHeight = uint64(5)
 )
 
 var (
-	fee            = types.NewCoins(types.NewInt64Coin("bam", 100))
 	_, pub1, addr1 = testdata.KeyTestPubAddr()
 	_, _, addr2    = testdata.KeyTestPubAddr()
 	rawSig         = []byte("dummy")
-	sig            = signing2.SignatureV2{
-		PubKey: pub1,
-		Data: &signing2.SingleSignatureData{
-			SignMode:  signing2.SignMode_SIGN_MODE_LEGACY_AMINO_JSON,
-			Signature: rawSig,
-		},
-	}
-	msg0 = banktypes.NewMsgSend(addr1, addr2, types.NewCoins(types.NewInt64Coin("wack", 1)))
-	msg1 = banktypes.NewMsgSend(addr1, addr2, types.NewCoins(types.NewInt64Coin("wack", 2)))
+	msg1           = banktypes.NewMsgSend(addr1, addr2, types.NewCoins(types.NewInt64Coin("wack", 2)))
 
 	chainID = "test-chain"
 	tip     = &typestx.Tip{Tipper: addr1.String(), Amount: testdata.NewTestFeeAmount()}
 )
-
-func buildTestTx(t *testing.T, builder client.TxBuilder) {
-	builder.SetMemo(memo)
-	builder.SetGasLimit(gas)
-	builder.SetFeeAmount(fee)
-	err := builder.SetMsgs(msg0, msg1)
-	require.NoError(t, err)
-	err = builder.SetSignatures(sig)
-	require.NoError(t, err)
-	builder.SetTimeoutHeight(timeoutHeight)
-}
-
-type TestSuite struct {
-	suite.Suite
-	amino    *codec.LegacyAmino
-	protoCfg client.TxConfig
-	aminoCfg client.TxConfig
-}
-
-func (s *TestSuite) SetupSuite() {
-	var (
-		reg   codectypes.InterfaceRegistry
-		amino *codec.LegacyAmino
-	)
-	err := depinject.Inject(clienttestutil.TestConfig, &reg, &amino)
-	require.NoError(s.T(), err)
-
-	s.protoCfg = tx.NewTxConfig(codec.NewProtoCodec(reg), tx.DefaultSignModes)
-	s.aminoCfg = legacytx.StdTxConfig{Cdc: amino}
-}
-
-func (s *TestSuite) TestCopyTx() {
-	// proto -> amino -> proto
-	protoBuilder := s.protoCfg.NewTxBuilder()
-	buildTestTx(s.T(), protoBuilder)
-	aminoBuilder := s.aminoCfg.NewTxBuilder()
-	err := tx2.CopyTx(protoBuilder.GetTx(), aminoBuilder, false)
-	s.Require().NoError(err)
-	protoBuilder2 := s.protoCfg.NewTxBuilder()
-	err = tx2.CopyTx(aminoBuilder.GetTx(), protoBuilder2, false)
-	s.Require().NoError(err)
-	// Check sigs, signers and msgs.
-	sigsV2_1, err := protoBuilder.GetTx().GetSignaturesV2()
-	s.Require().NoError(err)
-	sigsV2_2, err := protoBuilder2.GetTx().GetSignaturesV2()
-	s.Require().NoError(err)
-	s.Require().Equal(sigsV2_1, sigsV2_2)
-	s.Require().Equal(protoBuilder.GetTx().GetSigners(), protoBuilder2.GetTx().GetSigners())
-	s.Require().Equal(protoBuilder.GetTx().GetMsgs()[0], protoBuilder2.GetTx().GetMsgs()[0])
-	s.Require().Equal(protoBuilder.GetTx().GetMsgs()[1], protoBuilder2.GetTx().GetMsgs()[1])
-
-	// amino -> proto -> amino
-	aminoBuilder = s.aminoCfg.NewTxBuilder()
-	buildTestTx(s.T(), aminoBuilder)
-	protoBuilder = s.protoCfg.NewTxBuilder()
-	err = tx2.CopyTx(aminoBuilder.GetTx(), protoBuilder, false)
-	s.Require().NoError(err)
-	aminoBuilder2 := s.aminoCfg.NewTxBuilder()
-	err = tx2.CopyTx(protoBuilder.GetTx(), aminoBuilder2, false)
-	s.Require().NoError(err)
-	// Check sigs, signers, and msgs
-	sigsV2_1, err = aminoBuilder.GetTx().GetSignaturesV2()
-	s.Require().NoError(err)
-	sigsV2_2, err = aminoBuilder2.GetTx().GetSignaturesV2()
-	s.Require().NoError(err)
-	s.Require().Equal(sigsV2_1, sigsV2_2)
-	s.Require().Equal(aminoBuilder.GetTx().GetSigners(), aminoBuilder2.GetTx().GetSigners())
-	s.Require().Equal(aminoBuilder.GetTx().GetMsgs()[0], aminoBuilder2.GetTx().GetMsgs()[0])
-	s.Require().Equal(aminoBuilder.GetTx().GetMsgs()[1], aminoBuilder2.GetTx().GetMsgs()[1])
-}
-
-func (s *TestSuite) TestConvertTxToStdTx() {
-	// proto tx
-	protoBuilder := s.protoCfg.NewTxBuilder()
-	buildTestTx(s.T(), protoBuilder)
-	stdTx, err := tx2.ConvertTxToStdTx(s.amino, protoBuilder.GetTx())
-	s.Require().NoError(err)
-	s.Require().Equal(memo, stdTx.Memo)
-	s.Require().Equal(gas, stdTx.Fee.Gas)
-	s.Require().Equal(fee, stdTx.Fee.Amount)
-	s.Require().Equal(msg0, stdTx.Msgs[0])
-	s.Require().Equal(msg1, stdTx.Msgs[1])
-	s.Require().Equal(timeoutHeight, stdTx.TimeoutHeight)
-	s.Require().Equal(sig.PubKey, stdTx.Signatures[0].PubKey)
-	s.Require().Equal(sig.Data.(*signing2.SingleSignatureData).Signature, stdTx.Signatures[0].Signature)
-
-	// SIGN_MODE_DIRECT should fall back to an unsigned tx
-	err = protoBuilder.SetSignatures(signing2.SignatureV2{
-		PubKey: pub1,
-		Data: &signing2.SingleSignatureData{
-			SignMode:  signing2.SignMode_SIGN_MODE_DIRECT,
-			Signature: []byte("dummy"),
-		},
-	})
-	s.Require().NoError(err)
-	stdTx, err = tx2.ConvertTxToStdTx(s.amino, protoBuilder.GetTx())
-	s.Require().NoError(err)
-	s.Require().Equal(memo, stdTx.Memo)
-	s.Require().Equal(gas, stdTx.Fee.Gas)
-	s.Require().Equal(fee, stdTx.Fee.Amount)
-	s.Require().Equal(msg0, stdTx.Msgs[0])
-	s.Require().Equal(msg1, stdTx.Msgs[1])
-	s.Require().Equal(timeoutHeight, stdTx.TimeoutHeight)
-	s.Require().Empty(stdTx.Signatures)
-
-	// std tx
-	aminoBuilder := s.aminoCfg.NewTxBuilder()
-	buildTestTx(s.T(), aminoBuilder)
-	stdTx = aminoBuilder.GetTx().(legacytx.StdTx)
-	stdTx2, err := tx2.ConvertTxToStdTx(s.amino, stdTx)
-	s.Require().NoError(err)
-	s.Require().Equal(stdTx, stdTx2)
-}
-
-func TestTestSuite(t *testing.T) {
-	suite.Run(t, new(TestSuite))
-}

codec/amino_codec_test.go

@@ -7,15 +7,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/cosmos/cosmos-sdk/testutil/testdata"
-	"github.com/cosmos/cosmos-sdk/types/module/testutil"
-	"github.com/cosmos/cosmos-sdk/x/auth"
-	"github.com/cosmos/cosmos-sdk/x/auth/client/cli"
-	"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
-	"github.com/cosmos/cosmos-sdk/x/staking"
 )
 
 func createTestCodec() *codec.LegacyAmino {
@@ -120,25 +114,3 @@ func TestAminoCodecUnpackAnyFails(t *testing.T) {
 	require.Error(t, err)
 	require.Equal(t, err, errors.New("AminoCodec can't handle unpack protobuf Any's"))
 }
-
-func TestAminoCodecFullDecodeAndEncode(t *testing.T) {
-	// This tx comes from https://github.com/cosmos/cosmos-sdk/issues/8117.
-	txSigned := `{"type":"cosmos-sdk/StdTx","value":{"msg":[{"type":"cosmos-sdk/MsgCreateValidator","value":{"description":{"moniker":"fulltest","identity":"satoshi","website":"example.com","details":"example inc"},"commission":{"rate":"0.500000000000000000","max_rate":"1.000000000000000000","max_change_rate":"0.200000000000000000"},"min_self_delegation":"1000000","delegator_address":"cosmos14pt0q5cwf38zt08uu0n6yrstf3rndzr5057jys","validator_address":"cosmosvaloper14pt0q5cwf38zt08uu0n6yrstf3rndzr52q28gr","pubkey":{"type":"tendermint/PubKeyEd25519","value":"CYrOiM3HtS7uv1B1OAkknZnFYSRpQYSYII8AtMMtev0="},"value":{"denom":"umuon","amount":"700000000"}}}],"fee":{"amount":[{"denom":"umuon","amount":"6000"}],"gas":"160000"},"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AwAOXeWgNf1FjMaayrSnrOOKz+Fivr6DiI/i0x0sZCHw"},"signature":"RcnfS/u2yl7uIShTrSUlDWvsXo2p2dYu6WJC8VDVHMBLEQZWc8bsINSCjOnlsIVkUNNe1q/WCA9n3Gy1+0zhYA=="}],"memo":"","timeout_height":"0"}}`
-	legacyCdc := testutil.MakeTestEncodingConfig(staking.AppModuleBasic{}, auth.AppModuleBasic{}).Amino
-	var tx legacytx.StdTx
-	err := legacyCdc.UnmarshalJSON([]byte(txSigned), &tx)
-	require.NoError(t, err)
-
-	// Marshalling/unmarshalling the tx should work.
-	marshaledTx, err := legacyCdc.MarshalJSON(tx)
-	require.NoError(t, err)
-	require.Equal(t, txSigned, string(marshaledTx))
-
-	// Marshalling/unmarshalling the tx wrapped in a struct should work.
-	txRequest := &cli.BroadcastReq{
-		Mode: flags.BroadcastSync,
-		Tx:   tx,
-	}
-	_, err = legacyCdc.MarshalJSON(txRequest)
-	require.NoError(t, err)
-}