improve feemarket e2e tests

Author: vexxvakan

app/app.go

@@ -69,6 +69,7 @@ import (
 	upgrades "github.com/CosmosContracts/juno/v30/app/upgrades"
 	v28 "github.com/CosmosContracts/juno/v30/app/upgrades/v28"
 	v29 "github.com/CosmosContracts/juno/v30/app/upgrades/v29"
+	feemarkettypes "github.com/CosmosContracts/juno/v30/x/feemarket/types"
 )
 
 const (
@@ -296,6 +297,12 @@ func New(
 		panic(err)
 	}
 
+	// TODO: IMPORTANT!!! Create real denom resolver, this one uses the same amount
+	// token amount for every denom. 1ujuno != 1uatom in price.
+	// Resolve to denom should be based on the price of the denom in an oracle module
+	// or temporarily use a hardcoded token price ratio from ujuno to x token
+	app.AppKeepers.FeeMarketKeeper.SetDenomResolver(&feemarkettypes.TestDenomResolver{})
+
 	app.SetAnteHandler(anteHandler)
 	app.SetPostHandler(postHandler)
 

app/upgrades/v30/constants.go

@@ -4,6 +4,7 @@ import (
 	storetypes "cosmossdk.io/store/types"
 
 	"github.com/CosmosContracts/juno/v30/app/upgrades"
+	feemarkettypes "github.com/CosmosContracts/juno/v30/x/feemarket/types"
 )
 
 const UpgradeName = "v30"
@@ -15,5 +16,8 @@ var Upgrade = upgrades.Upgrade{
 		Deleted: []string{
 			"globalfee",
 		},
+		Added: []string{
+			feemarkettypes.ModuleName,
+		},
 	},
 }

app/upgrades/v30/upgrades.go

@@ -2,14 +2,17 @@ package v30
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	upgradetypes "cosmossdk.io/x/upgrade/types"
 
+	log "cosmossdk.io/log"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 
 	"github.com/CosmosContracts/juno/v30/app/keepers"
+	feemarkettypes "github.com/CosmosContracts/juno/v30/x/feemarket/types"
 )
 
 func CreateV30UpgradeHandler(
@@ -29,6 +32,48 @@ func CreateV30UpgradeHandler(
 		}
 		logger.Info(fmt.Sprintf("v30: post migration check: %v", versionMap))
 
+		err = configureFeemarketParams(ctx, k, logger)
+
 		return versionMap, nil
 	}
 }
+
+func configureFeemarketParams(ctx context.Context, k *keepers.AppKeepers, logger log.Logger) error {
+	mintParams, err := k.MintKeeper.GetParams(ctx)
+	if err != nil {
+		logger.Error("v30: failed to get x/mint params")
+		return errors.New("v30: failed to get x/mint params")
+	}
+
+	consensusParams, err := k.ConsensusParamsKeeper.ParamsStore.Get(ctx)
+	if err != nil {
+		logger.Error("v30: failed to get x/consensus params")
+		return errors.New("v30: failed to get x/consensus params")
+	}
+
+	newFeemarketParams := feemarkettypes.Params{
+		Alpha:               feemarkettypes.DefaultAIMDAlpha,
+		Beta:                feemarkettypes.DefaultAIMDBeta,
+		Gamma:               feemarkettypes.DefaultAIMDGamma,
+		Delta:               feemarkettypes.DefaultAIMDDelta,
+		MinBaseGasPrice:     feemarkettypes.DefaultMinBaseGasPrice,
+		MinLearningRate:     feemarkettypes.DefaultAIMDMinLearningRate,
+		MaxLearningRate:     feemarkettypes.DefaultAIMDMaxLearningRate,
+		MaxBlockUtilization: uint64(consensusParams.Block.MaxGas),
+		Window:              16,
+		FeeDenom:            mintParams.MintDenom,
+		Enabled:             true,
+		DistributeFees:      true,
+	}
+
+	sdkCtx := sdk.UnwrapSDKContext(ctx)
+	err = k.FeeMarketKeeper.SetParams(sdkCtx, newFeemarketParams)
+	if err != nil {
+		logger.Error("v30: failed to set x/feemarket params")
+		return errors.New("v30: failed to set x/feemarket params")
+	}
+
+	logger.Info("v30: successfully set x/feemarket params")
+
+	return nil
+}

interchaintest/suite/lib.go

@@ -9,7 +9,6 @@ import (
 	"testing"
 	"time"
 
-	"cosmossdk.io/math"
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/crypto/keyring"
 
@@ -42,24 +41,15 @@ type KeyringOverride struct {
 }
 
 type TestTxConfig struct {
-	SmallSendsNum          int
-	LargeSendsNum          int
-	TargetIncreaseGasPrice math.LegacyDec
+	SmallSendsNum int
+	LargeSendsNum int
 }
 
 func (tx *TestTxConfig) Validate() error {
 	if tx.SmallSendsNum < 1 || tx.LargeSendsNum < 1 {
 		return fmt.Errorf("sends num should be greater than 1")
 	}
 
-	if tx.TargetIncreaseGasPrice.IsNil() {
-		return fmt.Errorf("target increase gas price is nil")
-	}
-
-	if tx.TargetIncreaseGasPrice.LTE(math.LegacyZeroDec()) {
-		return fmt.Errorf("target increase gas price is less than or equal to 0")
-	}
-
 	return nil
 }
 

interchaintest/suite/setup.go

@@ -37,23 +37,17 @@ var (
 	DefaultNumValidators    = 1
 	DefaultNumFullNodes     = 0
 	DefaultHaltHeightDelta  = int64(9) // will propose upgrade this many blocks in the future
-	DefaultMinBaseGasPrice  = sdkmath.LegacyMustNewDecFromStr("0.001")
-	DefaultBaseGasPrice     = sdkmath.LegacyMustNewDecFromStr("0.1")
+	DefaultMinBaseGasPrice  = sdkmath.LegacyMustNewDecFromStr("0.002")
+	DefaultBaseGasPrice     = sdkmath.LegacyMustNewDecFromStr("1")
 	DefaultNoHostMount      = false
 
 	JunoRepo              = "ghcr.io/cosmoscontracts/juno"
-	HubRepo               = "ghcr.io/cosmos/gaia"
 	junoRepo, junoVersion = GetDockerImageInfo()
 	JunoImage             = ibc.DockerImage{
 		Repository: junoRepo,
 		Version:    junoVersion,
 		UIDGID:     "1025:1025",
 	}
-	HubImage = ibc.DockerImage{
-		Repository: HubRepo,
-		Version:    "v23.3.0",
-		UIDGID:     "1025:1025",
-	}
 
 	DefaultGenesisKV = []cosmos.GenesisKV{
 		{
@@ -94,8 +88,8 @@ var (
 				MinBaseGasPrice:     DefaultMinBaseGasPrice,
 				MinLearningRate:     feemarkettypes.DefaultAIMDMinLearningRate,
 				MaxLearningRate:     feemarkettypes.DefaultAIMDMaxLearningRate,
-				MaxBlockUtilization: 100_000_000,
-				Window:              16,
+				MaxBlockUtilization: 3_000_000,
+				Window:              8,
 				FeeDenom:            DefaultDenom,
 				Enabled:             true,
 				DistributeFees:      false,
@@ -106,7 +100,7 @@ var (
 			Value: feemarkettypes.State{
 				BaseGasPrice: DefaultBaseGasPrice,
 				LearningRate: feemarkettypes.DefaultAIMDMaxLearningRate,
-				Window:       make([]uint64, 16),
+				Window:       make([]uint64, 8),
 				Index:        0,
 			},
 		},
@@ -123,7 +117,7 @@ var (
 		Gas:            "auto",
 		CoinType:       "118",
 		GasPrices:      "",
-		GasAdjustment:  10,
+		GasAdjustment:  3,
 		TrustingPeriod: "112h",
 		NoHostMount:    DefaultNoHostMount,
 		EncodingConfig: MakeJunoEncoding(),
@@ -141,9 +135,8 @@ var (
 	}
 
 	DefaultTxCfg = TestTxConfig{
-		SmallSendsNum:          1,
-		LargeSendsNum:          400,
-		TargetIncreaseGasPrice: sdkmath.LegacyMustNewDecFromStr("0.11"),
+		SmallSendsNum: 1,
+		LargeSendsNum: 400,
 	}
 )
 
@@ -154,7 +147,7 @@ func init() {
 	sdk.GetConfig().SetCoinType(118)
 }
 
-// junoEncoding registers the Juno specific module codecs so that the associated types and msgs
+// MakeJunoEncoding registers the Juno specific module codecs so that the associated types and msgs
 // will be supported when writing to the blocksdb sqlite database.
 func MakeJunoEncoding() *testutil.TestEncodingConfig {
 	cfg := cosmos.DefaultEncoding()

interchaintest/suite/tx.go

@@ -59,7 +59,7 @@ func (s *E2ETestSuite) SendCoinsMultiBroadcast(sender, receiver ibc.Wallet, amt,
 		}
 	}
 
-	tx := s.CreateTx(s.Chain, sender, fees.String(), gas, false, msgs...)
+	tx := s.CreateTx(s.Chain, sender, fees.String(), gas, true, msgs...)
 
 	// get an rpc endpoint for the chain
 	c := s.Chain.Nodes()[0].Client
@@ -240,7 +240,10 @@ func (s *E2ETestSuite) CreateTx(chain *cosmos.CosmosChain, user cosmos.User, fee
 	// update sequence number
 	txf = txf.WithSequence(txf.Sequence())
 	if bumpSequence {
-		txf = txf.WithSequence(txf.Sequence() + 1)
+		if txf.Sequence() == 0 {
+			txf = txf.WithSequence(0)
+		}
+		txf = txf.WithSequence(txf.Sequence())
 	}
 
 	// sign the tx