fix x/auth tests

client/testutil/suite.go

@@ -267,7 +267,7 @@ func (s *TxConfigTestSuite) TestTxEncodeDecode() {
 	s.Require().Equal(memo, tx3.GetMemo())
 	tx3Sigs, err := tx3.GetSignaturesV2()
 	s.Require().NoError(err)
-	s.Require().Equal([][]byte{dummySig}, tx3Sigs)
+	s.Require().Equal([]signingtypes.SignatureV2{sig}, tx3Sigs)
 	s.Require().Equal([]crypto.PubKey{pubkey}, tx3.GetPubKeys())
 
 	s.T().Log("JSON encode transaction")
@@ -286,7 +286,7 @@ func (s *TxConfigTestSuite) TestTxEncodeDecode() {
 	s.Require().Equal(memo, tx3.GetMemo())
 	tx3Sigs, err = tx3.GetSignaturesV2()
 	s.Require().NoError(err)
-	s.Require().Equal([][]byte{dummySig}, tx3Sigs)
+	s.Require().Equal([]signingtypes.SignatureV2{sig}, tx3Sigs)
 	s.Require().Equal([]crypto.PubKey{pubkey}, tx3.GetPubKeys())
 }
 

x/auth/ante/basic.go

@@ -102,6 +102,7 @@ func (cgts ConsumeTxSizeGasDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, sim
 	// simulate gas cost for signatures in simulate mode
 	if simulate {
 		// in simulate mode, each element should be a nil signature
+		// TODO: Needs to be able to handle SignaturesV2 which may return nil, Currently this cannot return nil signatures
 		sigs, err := sigTx.GetSignaturesV2()
 		if err != nil {
 			return ctx, err

x/auth/ante/basic_test.go

@@ -149,7 +149,7 @@ func (suite *AnteTestSuite) TestConsumeGasForTxSize() {
 	suite.Require().True(len(simTxBytes) < len(txBytes), "simulated tx still has signatures")
 
 	// Set suite.ctx with smaller simulated TxBytes manually
-	suite.ctx = suite.ctx.WithTxBytes(txBytes)
+	suite.ctx = suite.ctx.WithTxBytes(simTxBytes)
 
 	beforeSimGas := suite.ctx.GasMeter().GasConsumed()
 

x/auth/client/cli/cli_test.go

@@ -193,7 +193,9 @@ func (s *IntegrationTestSuite) TestCLISendGenerateSignAndBroadcast() {
 	s.Require().NoError(err)
 	s.Require().Equal(txBuilder.GetTx().GetGas(), uint64(flags.DefaultGasLimit))
 	s.Require().Equal(len(txBuilder.GetTx().GetMsgs()), 1)
-	s.Require().Equal(0, len(txBuilder.GetTx().GetSignatures()))
+	sigs, err := txBuilder.GetTx().GetSignaturesV2()
+	s.Require().NoError(err)
+	s.Require().Equal(0, len(sigs))
 
 	// Test generate sendTx with --gas=$amount
 	limitedGasGeneratedTx, err := bankcli.MsgSendExec(
@@ -215,7 +217,9 @@ func (s *IntegrationTestSuite) TestCLISendGenerateSignAndBroadcast() {
 	s.Require().NoError(err)
 	s.Require().Equal(txBuilder.GetTx().GetGas(), uint64(100))
 	s.Require().Equal(len(txBuilder.GetTx().GetMsgs()), 1)
-	s.Require().Equal(0, len(txBuilder.GetTx().GetSignatures()))
+	sigs, err = txBuilder.GetTx().GetSignaturesV2()
+	s.Require().NoError(err)
+	s.Require().Equal(0, len(sigs))
 
 	resp, err := bankcli.QueryBalancesExec(val1.ClientCtx, val1.Address)
 	s.Require().NoError(err)
@@ -274,7 +278,9 @@ func (s *IntegrationTestSuite) TestCLISendGenerateSignAndBroadcast() {
 	txBuilder, err = val1.ClientCtx.TxConfig.WrapTxBuilder(signedFinalTx)
 	s.Require().NoError(err)
 	s.Require().Equal(len(txBuilder.GetTx().GetMsgs()), 1)
-	s.Require().Equal(1, len(txBuilder.GetTx().GetSignatures()))
+	sigs, err = txBuilder.GetTx().GetSignaturesV2()
+	s.Require().NoError(err)
+	s.Require().Equal(1, len(sigs))
 	s.Require().Equal(val1.Address.String(), txBuilder.GetTx().GetSigners()[0].String())
 
 	// Write the output to disk

x/auth/tx/builder.go

@@ -237,15 +237,23 @@ func (w *wrapper) GetSignaturesV2() ([]signing.SignatureV2, error) {
 	res := make([]signing.SignatureV2, n)
 
 	for i, si := range signerInfos {
-		var err error
-		sigData, err := ModeInfoAndSigToSignatureData(si.ModeInfo, sigs[i])
-		if err != nil {
-			return nil, err
-		}
-		res[i] = signing.SignatureV2{
-			PubKey:   pubKeys[i],
-			Data:     sigData,
-			Sequence: si.GetSequence(),
+		// handle nil signatures (in case of simulation)
+		if si.ModeInfo == nil {
+			res[i] = signing.SignatureV2{
+				PubKey: pubKeys[i],
+			}
+		} else {
+			var err error
+			sigData, err := ModeInfoAndSigToSignatureData(si.ModeInfo, sigs[i])
+			if err != nil {
+				return nil, err
+			}
+			res[i] = signing.SignatureV2{
+				PubKey:   pubKeys[i],
+				Data:     sigData,
+				Sequence: si.GetSequence(),
+			}
+
 		}
 	}