Cherry-pick signature v2 (#1155)

* Cherry-pick signature v2

* Retract v5.0.0

* Make CI pick the job

* Remove master branch trigger from CI

Author: masihyeganeh

.github/workflows/ci.yml

@@ -1,9 +1,9 @@
 name: ci
 on:
   push:
-    branches: [ master ]
+    branches: [ release-v5 ]
   pull_request:
-    branches: [ master ]
+    branches: [ release-v5 ]
   workflow_dispatch:
 
 concurrency:

go.mod

@@ -254,3 +254,5 @@ require (
 	pgregory.net/rapid v1.1.0 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
+
+retract v5.0.0

integration-tests/modules/auth_test.go

@@ -10,6 +10,7 @@ import (
 	sdkmath "cosmossdk.io/math"
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 	clienttx "github.com/cosmos/cosmos-sdk/client/tx"
+	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	cosmoserrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/types/tx/signing"
@@ -246,6 +247,7 @@ func TestGasEstimation(t *testing.T) {
 	ctx, chain := integrationtests.NewCoreumTestingContext(t)
 
 	singlesigAddress := chain.GenAccount()
+	singlesigUnimportedAddress := sdk.AccAddress(secp256k1.GenPrivKey().PubKey().Address())
 
 	multisigPublicKey1, _, err := chain.GenMultisigAccount(3, 2)
 	require.NoError(t, err)
@@ -261,6 +263,7 @@ func TestGasEstimation(t *testing.T) {
 
 	// For accounts to exist on chain we need to fund them at least with min amount (1ucore).
 	chain.FundAccountWithOptions(ctx, t, singlesigAddress, integration.BalancesOptions{Amount: sdkmath.NewInt(1)})
+	chain.FundAccountWithOptions(ctx, t, singlesigUnimportedAddress, integration.BalancesOptions{Amount: sdkmath.NewInt(1)})
 	chain.FundAccountWithOptions(ctx, t, multisigAddress1, integration.BalancesOptions{Amount: sdkmath.NewInt(1)})
 	chain.FundAccountWithOptions(ctx, t, multisigAddress2, integration.BalancesOptions{Amount: sdkmath.NewInt(1)})
 
@@ -287,6 +290,38 @@ func TestGasEstimation(t *testing.T) {
 				return dgc.FixedGas + deterministicgas.BankSendPerCoinGas
 			},
 		},
+		{
+			name:        "singlesig_bank_send_unsigned",
+			fromAddress: singlesigAddress,
+			msgs: []sdk.Msg{
+				&banktypes.MsgSend{
+					FromAddress: singlesigAddress.String(),
+					ToAddress:   singlesigAddress.String(),
+					Amount:      sdk.NewCoins(chain.NewCoin(sdkmath.NewInt(1))),
+				},
+			},
+			simulateUnsigned: true,
+			// single signature no extra bytes.
+			expectedGas: func(txBytes []byte) uint64 {
+				return dgc.FixedGas + deterministicgas.BankSendPerCoinGas
+			},
+		},
+		{
+			name:        "singlesig_no_pub_key_bank_send_unsigned",
+			fromAddress: singlesigUnimportedAddress,
+			msgs: []sdk.Msg{
+				&banktypes.MsgSend{
+					FromAddress: singlesigUnimportedAddress.String(),
+					ToAddress:   singlesigUnimportedAddress.String(),
+					Amount:      sdk.NewCoins(chain.NewCoin(sdkmath.NewInt(1))),
+				},
+			},
+			simulateUnsigned: true,
+			// single signature no extra bytes.
+			expectedGas: func(txBytes []byte) uint64 {
+				return dgc.FixedGas + deterministicgas.BankSendPerCoinGas
+			},
+		},
 		{
 			name:        "multisig_2_3_bank_send",
 			fromAddress: multisigAddress1,
@@ -331,7 +366,7 @@ func TestGasEstimation(t *testing.T) {
 			},
 			simulateUnsigned: true,
 			expectedGas: func(txBytes []byte) uint64 {
-				signatureCostDifference := uint64(1610)
+				signatureCostDifference := uint64(1830)
 				bytesCost := uint64(len(txBytes)) * authParams.Params.TxSizeCostPerByte
 				expectedGas := dgc.FixedGas + deterministicgas.BankSendPerCoinGas + bytesCost - signatureCostDifference
 				return expectedGas

pkg/client/tx.go

@@ -18,16 +18,14 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/grpc/cmtservice"
 	"github.com/cosmos/cosmos-sdk/client/tx"
-	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/multisig"
 	"github.com/cosmos/cosmos-sdk/crypto/types"
+	multisigtypes "github.com/cosmos/cosmos-sdk/crypto/types/multisig"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	cosmoserrors "github.com/cosmos/cosmos-sdk/types/errors"
 	sdktx "github.com/cosmos/cosmos-sdk/types/tx"
 	"github.com/cosmos/cosmos-sdk/types/tx/signing"
-	authtx "github.com/cosmos/cosmos-sdk/x/auth/tx"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-	"github.com/cosmos/gogoproto/proto"
 	"github.com/pkg/errors"
 
 	"github.com/CoreumFoundation/coreum-tools/pkg/retry"
@@ -169,8 +167,10 @@ func BuildTxForSimulation(
 		txf = txf.WithGasAdjustment(clientCtx.GasAdjustment())
 	}
 
+	var signatureData signing.SignatureData = &signing.SingleSignatureData{
+		SignMode: txf.SignMode(),
+	}
 	var pubKey types.PubKey
-	var pubKeyAny *codectypes.Any
 	if !clientCtx.GetUnsignedSimulation() {
 		keyInfo, err := txf.Keybase().KeyByAddress(clientCtx.FromAddress())
 		if err != nil {
@@ -180,71 +180,37 @@ func BuildTxForSimulation(
 		if err != nil {
 			return nil, errors.WithStack(err)
 		}
-		pubKeyAny = keyInfo.PubKey
-	}
-
-	msgsAny := make([]*codectypes.Any, 0, len(msgs))
-	for _, msg := range msgs {
-		msgAny, err := codectypes.NewAnyWithValue(msg)
-		if err != nil {
-			return nil, errors.WithStack(err)
-		}
-		msgsAny = append(msgsAny, msgAny)
-	}
-
-	txBodyBytes, err := proto.Marshal(&sdktx.TxBody{
-		Messages: msgsAny,
-		Memo:     txf.Memo(),
-	})
-	if err != nil {
-		return nil, errors.WithStack(err)
-	}
 
-	var signatureData signing.SignatureData
-	if multisigPubKey, ok := pubKey.(*multisig.LegacyAminoPubKey); ok {
-		multiSignatureData := make([]signing.SignatureData, 0, multisigPubKey.Threshold)
-		for range multisigPubKey.Threshold {
-			multiSignatureData = append(multiSignatureData, &signing.SingleSignatureData{
-				SignMode: txf.SignMode(),
-			})
-		}
-		signatureData = &signing.MultiSignatureData{
-			Signatures: multiSignatureData,
+		if multisigPubKey, ok := pubKey.(*multisig.LegacyAminoPubKey); ok {
+			multiSignatureData := make([]signing.SignatureData, 0, multisigPubKey.Threshold)
+			for range multisigPubKey.Threshold {
+				multiSignatureData = append(multiSignatureData, &signing.SingleSignatureData{
+					SignMode: txf.SignMode(),
+				})
+			}
+			signatureData = &signing.MultiSignatureData{
+				Signatures: multiSignatureData,
+			}
 		}
 	} else {
-		signatureData = &signing.SingleSignatureData{
-			SignMode: txf.SignMode(),
-		}
+		// For unsigned simulation, signatureData doesn't matter. It should just not be nil
+		signatureData = multisigtypes.NewMultisig(4)
 	}
 
-	modeInfo, signature := authtx.SignatureDataToModeInfoAndSig(signatureData)
-
-	simAuthInfoBytes, err := proto.Marshal(&sdktx.AuthInfo{
-		SignerInfos: []*sdktx.SignerInfo{
-			{
-				PublicKey: pubKeyAny,
-				ModeInfo:  modeInfo,
-				Sequence:  txf.Sequence(),
-			},
-		},
-		Fee: &sdktx.Fee{},
-	})
+	signature := signing.SignatureV2{
+		PubKey:   pubKey,
+		Data:     signatureData,
+		Sequence: txf.Sequence(),
+	}
+	txBuilder, err := txf.BuildUnsignedTx(msgs...)
 	if err != nil {
 		return nil, errors.WithStack(err)
 	}
-
-	txBytes, err := proto.Marshal(&sdktx.TxRaw{
-		BodyBytes:     txBodyBytes,
-		AuthInfoBytes: simAuthInfoBytes,
-		Signatures: [][]byte{
-			signature,
-		},
-	})
-	if err != nil {
+	if err = txBuilder.SetSignatures(signature); err != nil {
 		return nil, errors.WithStack(err)
 	}
 
-	return txBytes, nil
+	return clientCtx.TxConfig().TxEncoder()(txBuilder.GetTx())
 }
 
 // BroadcastRawTx broadcast the txBytes using the clientCtx and set BroadcastMode.