Feat/sdk50

app/ante/ante.go

@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"runtime/debug"
 
-	tmlog "github.com/cometbft/cometbft/libs/log"
+	tmlog "cosmossdk.io/log"
 
 	errorsmod "cosmossdk.io/errors"
 	"github.com/cosmos/cosmos-sdk/crypto/types/multisig"
@@ -31,6 +31,7 @@ import (
 
 	"swisstronik/crypto/ethsecp256k1"
 
+	storetypes "cosmossdk.io/store/types"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
 )
 
@@ -115,7 +116,7 @@ var _ authante.SignatureVerificationGasConsumer = DefaultSigVerificationGasConsu
 // for signature verification based upon the public key type. The cost is fetched from the given params and is matched
 // by the concrete type.
 func DefaultSigVerificationGasConsumer(
-	meter sdk.GasMeter, sig signing.SignatureV2, params authtypes.Params,
+	meter storetypes.GasMeter, sig signing.SignatureV2, params authtypes.Params,
 ) error {
 	pubkey := sig.PubKey
 	switch pubkey := pubkey.(type) {
@@ -141,7 +142,7 @@ func DefaultSigVerificationGasConsumer(
 
 // ConsumeMultisignatureVerificationGas consumes gas from a GasMeter for verifying a multisig pubkey signature
 func ConsumeMultisignatureVerificationGas(
-	meter sdk.GasMeter, sig *signing.MultiSignatureData, pubkey multisig.PubKey,
+	meter storetypes.GasMeter, sig *signing.MultiSignatureData, pubkey multisig.PubKey,
 	params authtypes.Params, accSeq uint64,
 ) error {
 	size := sig.BitArray.Count()

app/ante/ante_test.go

@@ -20,7 +20,8 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"swisstronik/app"
+	storetypes "cosmossdk.io/store/types"
+
 	"swisstronik/app/ante"
 	"swisstronik/crypto/ethsecp256k1"
 	"swisstronik/encoding"
@@ -30,12 +31,13 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	ethparams "github.com/ethereum/go-ethereum/params"
 
+	signingv1beta1 "cosmossdk.io/api/cosmos/tx/signing/v1beta1"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
 )
 
 func (suite AnteTestSuite) TestAnteHandler() {
-	var acc authtypes.AccountI
+	var acc sdk.AccountI
 	addr, privKey := tests.RandomEthAddressWithPrivateKey()
 	to := tests.RandomEthAddress()
 
@@ -355,14 +357,14 @@ func (suite AnteTestSuite) TestAnteHandler() {
 					sdk.NewCoins(
 						sdk.NewCoin(
 							"uswtr",
-							sdk.NewInt(1),
+							sdkmath.NewInt(1),
 						),
 					),
 				)
 
 				txBuilder := suite.CreateTestSingleSignedTx(
 					privKey,
-					signing.SignMode_SIGN_MODE_LEGACY_AMINO_JSON,
+					signingv1beta1.SignMode_SIGN_MODE_LEGACY_AMINO_JSON,
 					msg,
 					suite.ctx.ChainID(),
 					2000000,
@@ -385,14 +387,14 @@ func (suite AnteTestSuite) TestAnteHandler() {
 					sdk.NewCoins(
 						sdk.NewCoin(
 							"uswtr",
-							sdk.NewInt(1),
+							sdkmath.NewInt(1),
 						),
 					),
 				)
 
 				txBuilder := suite.CreateTestSignedMultisigTx(
 					privKeys,
-					signing.SignMode_SIGN_MODE_LEGACY_AMINO_JSON,
+					signingv1beta1.SignMode_SIGN_MODE_LEGACY_AMINO_JSON,
 					msg,
 					suite.ctx.ChainID(),
 					2000000,
@@ -415,14 +417,14 @@ func (suite AnteTestSuite) TestAnteHandler() {
 					sdk.NewCoins(
 						sdk.NewCoin(
 							"uswtr",
-							sdk.NewInt(1),
+							sdkmath.NewInt(1),
 						),
 					),
 				)
 
 				txBuilder := suite.CreateTestSignedMultisigTx(
 					privKeys,
-					signing.SignMode_SIGN_MODE_LEGACY_AMINO_JSON,
+					signingv1beta1.SignMode_SIGN_MODE_LEGACY_AMINO_JSON,
 					msg,
 					suite.ctx.ChainID(),
 					2000000,
@@ -447,7 +449,7 @@ func (suite AnteTestSuite) TestAnteHandler() {
 
 				txBuilder := suite.CreateTestSignedMultisigTx(
 					privKeys,
-					signing.SignMode_SIGN_MODE_LEGACY_AMINO_JSON,
+					signingv1beta1.SignMode_SIGN_MODE_LEGACY_AMINO_JSON,
 					msg,
 					suite.ctx.ChainID(),
 					2000000,
@@ -470,14 +472,14 @@ func (suite AnteTestSuite) TestAnteHandler() {
 					sdk.NewCoins(
 						sdk.NewCoin(
 							"uswtr",
-							sdk.NewInt(1),
+							sdkmath.NewInt(1),
 						),
 					),
 				)
 
 				txBuilder := suite.CreateTestSignedMultisigTx(
 					privKeys,
-					signing.SignMode_SIGN_MODE_LEGACY_AMINO_JSON,
+					signingv1beta1.SignMode_SIGN_MODE_LEGACY_AMINO_JSON,
 					msg,
 					"ethermint_9005-1",
 					2000000,
@@ -500,14 +502,14 @@ func (suite AnteTestSuite) TestAnteHandler() {
 					sdk.NewCoins(
 						sdk.NewCoin(
 							"uswtr",
-							sdk.NewInt(1),
+							sdkmath.NewInt(1),
 						),
 					),
 				)
 
 				txBuilder := suite.CreateTestSignedMultisigTx(
 					privKeys,
-					signing.SignMode_SIGN_MODE_DIRECT,
+					signingv1beta1.SignMode_SIGN_MODE_DIRECT,
 					msg,
 					suite.ctx.ChainID(),
 					2000000,
@@ -530,14 +532,14 @@ func (suite AnteTestSuite) TestAnteHandler() {
 					sdk.NewCoins(
 						sdk.NewCoin(
 							"uswtr",
-							sdk.NewInt(1),
+							sdkmath.NewInt(1),
 						),
 					),
 				)
 
 				txBuilder := suite.CreateTestSignedMultisigTx(
 					privKeys,
-					signing.SignMode_SIGN_MODE_DIRECT,
+					signingv1beta1.SignMode_SIGN_MODE_LEGACY_AMINO_JSON,
 					msg,
 					suite.ctx.ChainID(),
 					2000,
@@ -560,21 +562,21 @@ func (suite AnteTestSuite) TestAnteHandler() {
 					sdk.NewCoins(
 						sdk.NewCoin(
 							"uswtr",
-							sdk.NewInt(1),
+							sdkmath.NewInt(1),
 						),
 					),
 				)
 
 				txBuilder := suite.CreateTestSignedMultisigTx(
 					privKeys,
-					signing.SignMode_SIGN_MODE_DIRECT,
+					signingv1beta1.SignMode_SIGN_MODE_DIRECT,
 					msg,
 					suite.ctx.ChainID(),
 					2000,
 					"EIP-712",
 				)
 
-				msg.Amount[0].Amount = sdk.NewInt(5)
+				msg.Amount[0].Amount = sdkmath.NewInt(5)
 				txBuilder.SetMsgs(msg)
 
 				return txBuilder.GetTx()
@@ -593,14 +595,14 @@ func (suite AnteTestSuite) TestAnteHandler() {
 					sdk.NewCoins(
 						sdk.NewCoin(
 							"uswtr",
-							sdk.NewInt(1),
+							sdkmath.NewInt(1),
 						),
 					),
 				)
 
 				txBuilder := suite.CreateTestSignedMultisigTx(
 					privKeys,
-					signing.SignMode_SIGN_MODE_DIRECT,
+					signingv1beta1.SignMode_SIGN_MODE_DIRECT,
 					msg,
 					suite.ctx.ChainID(),
 					2000,
@@ -622,14 +624,14 @@ func (suite AnteTestSuite) TestAnteHandler() {
 					sdk.NewCoins(
 						sdk.NewCoin(
 							"uswtr",
-							sdk.NewInt(1),
+							sdkmath.NewInt(1),
 						),
 					),
 				)
 
 				txBuilder := suite.CreateTestSingleSignedTx(
 					privKey,
-					signing.SignMode_SIGN_MODE_DIRECT,
+					signingv1beta1.SignMode_SIGN_MODE_DIRECT,
 					msg,
 					suite.ctx.ChainID(),
 					2000,
@@ -1075,7 +1077,7 @@ func (suite AnteTestSuite) TestAnteHandlerWithParams() {
 func (suite *AnteTestSuite) TestConsumeSignatureVerificationGas() {
 	params := authtypes.DefaultParams()
 	msg := []byte{1, 2, 3, 4}
-	encodingConfig := encoding.MakeConfig(app.ModuleBasics)
+	encodingConfig := encoding.MakeConfig()
 	cdc := encodingConfig.Amino
 
 	p := authtypes.DefaultParams()
@@ -1096,7 +1098,7 @@ func (suite *AnteTestSuite) TestConsumeSignatureVerificationGas() {
 	}
 
 	type args struct {
-		meter  sdk.GasMeter
+		meter  storetypes.GasMeter
 		sig    signing.SignatureData
 		pubkey cryptotypes.PubKey
 		params authtypes.Params
@@ -1107,11 +1109,11 @@ func (suite *AnteTestSuite) TestConsumeSignatureVerificationGas() {
 		gasConsumed uint64
 		shouldErr   bool
 	}{
-		{"PubKeyEd25519", args{sdk.NewInfiniteGasMeter(), nil, ed25519.GenPrivKey().PubKey(), params}, p.SigVerifyCostED25519, true},
-		{"PubKeyEthSecp256k1", args{sdk.NewInfiniteGasMeter(), nil, pkSet1[0], params}, 21_000, false},
-		{"PubKeySecp256r1", args{sdk.NewInfiniteGasMeter(), nil, skR1.PubKey(), params}, p.SigVerifyCostSecp256r1(), true},
-		{"Multisig", args{sdk.NewInfiniteGasMeter(), multisignature1, multisigKey1, params}, expectedCost1, false},
-		{"unknown key", args{sdk.NewInfiniteGasMeter(), nil, nil, params}, 0, true},
+		{"PubKeyEd25519", args{storetypes.NewInfiniteGasMeter(), nil, ed25519.GenPrivKey().PubKey(), params}, p.SigVerifyCostED25519, true},
+		{"PubKeyEthSecp256k1", args{storetypes.NewInfiniteGasMeter(), nil, pkSet1[0], params}, 21_000, false},
+		{"PubKeySecp256r1", args{storetypes.NewInfiniteGasMeter(), nil, skR1.PubKey(), params}, p.SigVerifyCostSecp256r1(), true},
+		{"Multisig", args{storetypes.NewInfiniteGasMeter(), multisignature1, multisigKey1, params}, expectedCost1, false},
+		{"unknown key", args{storetypes.NewInfiniteGasMeter(), nil, nil, params}, 0, true},
 	}
 	for _, tt := range tests {
 		sigV2 := signing.SignatureV2{

app/ante/eip712.go

@@ -28,26 +28,28 @@ import (
 	authante "github.com/cosmos/cosmos-sdk/x/auth/ante"
 	"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
 	authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
-	ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante"
+	ibcante "github.com/cosmos/ibc-go/v8/modules/core/ante"
 
 	"swisstronik/crypto/ethsecp256k1"
 	"swisstronik/ethereum/eip712"
-	ethermint "swisstronik/types"
 
 	ethcrypto "github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/crypto/secp256k1"
 	"github.com/ethereum/go-ethereum/signer/core/apitypes"
 
 	evmtypes "swisstronik/x/evm/types"
 
+	swisstroniktypes "swisstronik/types"
+
+	txsigning "cosmossdk.io/x/tx/signing"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 )
 
 var ethermintCodec codec.ProtoCodecMarshaler
 
 func init() {
 	registry := codectypes.NewInterfaceRegistry()
-	ethermint.RegisterInterfaces(registry)
+	swisstroniktypes.RegisterInterfaces(registry)
 	ethermintCodec = codec.NewProtoCodec(registry)
 }
 
@@ -87,13 +89,13 @@ func NewLegacyCosmosAnteHandlerEip712(options HandlerOptions) sdk.AnteHandler {
 // CONTRACT: Tx must implement SigVerifiableTx interface
 type LegacyEip712SigVerificationDecorator struct {
 	ak              evmtypes.AccountKeeper
-	signModeHandler authsigning.SignModeHandler
+	signModeHandler *txsigning.HandlerMap
 }
 
 // Deprecated: NewLegacyEip712SigVerificationDecorator creates a new LegacyEip712SigVerificationDecorator
 func NewLegacyEip712SigVerificationDecorator(
 	ak evmtypes.AccountKeeper,
-	signModeHandler authsigning.SignModeHandler,
+	signModeHandler *txsigning.HandlerMap,
 ) LegacyEip712SigVerificationDecorator {
 	return LegacyEip712SigVerificationDecorator{
 		ak:              ak,
@@ -130,7 +132,10 @@ func (svd LegacyEip712SigVerificationDecorator) AnteHandle(ctx sdk.Context,
 		return ctx, err
 	}
 
-	signerAddrs := sigTx.GetSigners()
+	signerAddrs, err := sigTx.GetSigners()
+	if err != nil {
+		return ctx, err
+	}
 
 	// EIP712 allows just one signature
 	if len(sigs) != 1 {
@@ -202,7 +207,7 @@ func VerifySignature(
 	pubKey cryptotypes.PubKey,
 	signerData authsigning.SignerData,
 	sigData signing.SignatureData,
-	_ authsigning.SignModeHandler,
+	_ *txsigning.HandlerMap,
 	tx authsigning.Tx,
 ) error {
 	switch data := sigData.(type) {
@@ -233,10 +238,10 @@ func VerifySignature(
 				Amount: tx.GetFee(),
 				Gas:    tx.GetGas(),
 			},
-			msgs, tx.GetMemo(), tx.GetTip(),
+			msgs, tx.GetMemo(),
 		)
 
-		signerChainID, err := ethermint.ParseChainID(signerData.ChainID)
+		signerChainID, err := swisstroniktypes.ParseChainID(signerData.ChainID)
 		if err != nil {
 			return errorsmod.Wrapf(err, "failed to parse chain-id: %s", signerData.ChainID)
 		}
@@ -250,7 +255,7 @@ func VerifySignature(
 			return errorsmod.Wrap(errortypes.ErrUnknownExtensionOptions, "tx doesnt contain expected amount of extension options")
 		}
 
-		extOpt, ok := opts[0].GetCachedValue().(*ethermint.ExtensionOptionsWeb3Tx)
+		extOpt, ok := opts[0].GetCachedValue().(*swisstroniktypes.ExtensionOptionsWeb3Tx)
 		if !ok {
 			return errorsmod.Wrap(errortypes.ErrUnknownExtensionOptions, "unknown extension option")
 		}