Merge branch 'releases/v4.x' into feat/no-signature-checker

Makefile

@@ -178,7 +178,7 @@ test: test-unit
 test-all: check test-race test-cover
 
 test-unit:
-	@VERSION=$(VERSION) go test -mod=readonly -tags='ledger test_ledger_mock' ./...
+	@VERSION=$(VERSION) go test -mod=readonly -tags='ledger test_ledger_mock' `go list ./... | grep -v dex`
 
 test-race:
 	@VERSION=$(VERSION) go test -mod=readonly -race -tags='ledger test_ledger_mock' ./...

app/app.go

@@ -192,10 +192,6 @@ import (
 	dexkeeper "github.com/neutron-org/neutron/v4/x/dex/keeper"
 	dextypes "github.com/neutron-org/neutron/v4/x/dex/types"
 
-	"github.com/neutron-org/neutron/v4/x/ibcswap"
-	ibcswapkeeper "github.com/neutron-org/neutron/v4/x/ibcswap/keeper"
-	ibcswaptypes "github.com/neutron-org/neutron/v4/x/ibcswap/types"
-
 	globalfeekeeper "github.com/neutron-org/neutron/v4/x/globalfee/keeper"
 	gmpmiddleware "github.com/neutron-org/neutron/v4/x/gmp"
 
@@ -276,7 +272,6 @@ var (
 		globalfee.AppModule{},
 		feemarket.AppModuleBasic{},
 		dex.AppModuleBasic{},
-		ibcswap.AppModuleBasic{},
 		oracle.AppModuleBasic{},
 		marketmap.AppModuleBasic{},
 		dynamicfees.AppModuleBasic{},
@@ -297,7 +292,6 @@ var (
 		tokenfactorytypes.ModuleName:                  {authtypes.Minter, authtypes.Burner},
 		crontypes.ModuleName:                          nil,
 		dextypes.ModuleName:                           {authtypes.Minter, authtypes.Burner},
-		ibcswaptypes.ModuleName:                       {authtypes.Burner},
 		oracletypes.ModuleName:                        nil,
 		marketmaptypes.ModuleName:                     nil,
 		feemarkettypes.FeeCollectorName:               nil,
@@ -369,7 +363,6 @@ type App struct {
 	CronKeeper          cronkeeper.Keeper
 	PFMKeeper           *pfmkeeper.Keeper
 	DexKeeper           dexkeeper.Keeper
-	SwapKeeper          ibcswapkeeper.Keeper
 	GlobalFeeKeeper     globalfeekeeper.Keeper
 
 	PFMModule packetforward.AppModule
@@ -752,15 +745,6 @@ func New(
 
 	dexModule := dex.NewAppModule(appCodec, app.DexKeeper, app.BankKeeper)
 
-	app.SwapKeeper = ibcswapkeeper.NewKeeper(
-		appCodec,
-		app.MsgServiceRouter(),
-		app.IBCKeeper.ChannelKeeper,
-		app.BankKeeper,
-	)
-
-	swapModule := ibcswap.NewAppModule(app.SwapKeeper)
-
 	wasmDir := filepath.Join(homePath, "wasm")
 	wasmConfig, err := wasm.ReadWasmConfig(appOpts)
 	if err != nil {
@@ -919,7 +903,6 @@ func New(
 		pfmkeeper.DefaultRefundTransferPacketTimeoutTimestamp,
 	)
 
-	ibcStack = ibcswap.NewIBCMiddleware(ibcStack, app.SwapKeeper)
 	ibcStack = gmpmiddleware.NewIBCMiddleware(ibcStack)
 
 	ibcRouter.AddRoute(icacontrollertypes.SubModuleName, icaControllerStack).
@@ -970,7 +953,6 @@ func New(
 		globalfee.NewAppModule(app.GlobalFeeKeeper, app.GetSubspace(globalfee.ModuleName), app.AppCodec(), app.keys[globalfee.ModuleName]),
 		feemarket.NewAppModule(appCodec, *app.FeeMarkerKeeper),
 		dynamicfees.NewAppModule(appCodec, *app.DynamicFeesKeeper),
-		swapModule,
 		dexModule,
 		marketmapModule,
 		oracleModule,
@@ -1019,7 +1001,6 @@ func New(
 		oracletypes.ModuleName,
 		globalfee.ModuleName,
 		feemarkettypes.ModuleName,
-		ibcswaptypes.ModuleName,
 		dextypes.ModuleName,
 	)
 
@@ -1055,7 +1036,6 @@ func New(
 		oracletypes.ModuleName,
 		globalfee.ModuleName,
 		feemarkettypes.ModuleName,
-		ibcswaptypes.ModuleName,
 		dextypes.ModuleName,
 	)
 
@@ -1096,7 +1076,6 @@ func New(
 		feemarkettypes.ModuleName,
 		oracletypes.ModuleName,
 		marketmaptypes.ModuleName,
-		ibcswaptypes.ModuleName,
 		dextypes.ModuleName,
 		dynamicfeestypes.ModuleName,
 	)

go.mod

@@ -38,7 +38,7 @@ require (
 	github.com/prometheus/client_golang v1.19.1
 	github.com/rs/zerolog v1.32.0
 	github.com/skip-mev/block-sdk/v2 v2.1.2
-	github.com/skip-mev/feemarket v1.1.0
+	github.com/skip-mev/feemarket v1.1.1
 	github.com/skip-mev/slinky v1.0.3
 	github.com/spf13/cast v1.6.0
 	github.com/spf13/cobra v1.8.1

go.sum

@@ -1089,8 +1089,8 @@ github.com/skip-mev/block-sdk/v2 v2.1.2 h1:fNKbrb+PVVzuU0JiSuWgBV4Afj5zZ1VeHQJp8
 github.com/skip-mev/block-sdk/v2 v2.1.2/go.mod h1:kIq7SMva0/eHKTCiG/oI5XGxD4HNVK0t71TrUZqHcvA=
 github.com/skip-mev/chaintestutil v0.0.0-20240514161515-056d7ba45610 h1:4JlsiRVt/YZOvrKH525T7sZXgEWUEjqSDMwE6fXNbdo=
 github.com/skip-mev/chaintestutil v0.0.0-20240514161515-056d7ba45610/go.mod h1:kB8gFZX07CyJnw8q9iEZijI3qJTIe1K/Y++P5VGkrcg=
-github.com/skip-mev/feemarket v1.1.0 h1:3z/3Mplmk4t1C/IjghC+OE361L9n8dR3Xr7bXIcS7ec=
-github.com/skip-mev/feemarket v1.1.0/go.mod h1:CVsCaHxJDK4y271c1Dan6Z8G2QaOyWJLoSBnDEPon40=
+github.com/skip-mev/feemarket v1.1.1 h1:L34K7N2J6o635kzNYRAvQ93+hAFtSiJ2t03jmaNx0zw=
+github.com/skip-mev/feemarket v1.1.1/go.mod h1:DUa6djUsTeMOrbrcIZqWSVxU9IZNCXp96ruaojyBNpc=
 github.com/skip-mev/slinky v1.0.3 h1:+7Yw+HHjYqJ7gb5nrG1k2bplNG+qEmn5wws+OesdY2M=
 github.com/skip-mev/slinky v1.0.3/go.mod h1:EE3O71wIJ74OciYh62Fc5EysF07KArBEYb6lDmTIKVM=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=

tests/feemarket/go.mod

@@ -16,7 +16,7 @@ replace (
 require (
 	cosmossdk.io/math v1.3.0
 	github.com/cosmos/cosmos-sdk v0.50.9
-	github.com/skip-mev/feemarket v1.1.0
+	github.com/skip-mev/feemarket v1.1.1
 	github.com/skip-mev/feemarket/tests/e2e v1.10.0
 	github.com/skip-mev/slinky v1.0.0
 	github.com/strangelove-ventures/interchaintest/v8 v8.4.0

tests/feemarket/go.sum

@@ -1059,6 +1059,7 @@ github.com/skip-mev/chaintestutil v0.0.0-20240514161515-056d7ba45610 h1:4JlsiRVt
 github.com/skip-mev/chaintestutil v0.0.0-20240514161515-056d7ba45610/go.mod h1:kB8gFZX07CyJnw8q9iEZijI3qJTIe1K/Y++P5VGkrcg=
 github.com/skip-mev/feemarket v1.1.0 h1:3z/3Mplmk4t1C/IjghC+OE361L9n8dR3Xr7bXIcS7ec=
 github.com/skip-mev/feemarket v1.1.0/go.mod h1:CVsCaHxJDK4y271c1Dan6Z8G2QaOyWJLoSBnDEPon40=
+github.com/skip-mev/feemarket v1.1.1/go.mod h1:DUa6djUsTeMOrbrcIZqWSVxU9IZNCXp96ruaojyBNpc=
 github.com/skip-mev/feemarket/tests/e2e v1.10.0 h1:oKAZSo+rynd2b7+T8/U+4C+h//rrTdjLICG2Awjk8YA=
 github.com/skip-mev/feemarket/tests/e2e v1.10.0/go.mod h1:57BURopGhr+L0zDkhj1E9jzP9W8rMzRb3b+MT+trlB4=
 github.com/skip-mev/interchaintest/v8 v8.0.1-0.20240611183342-72ec508eb966 h1:X5BD7m4QieHlORqGho1Af8r0O1GSWBRYO330xyu2kzQ=

tests/ibc/ibc_setup_test.go

@@ -5,7 +5,6 @@ import (
 
 	"cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward"
 	transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types"
 	clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" //nolint:staticcheck
 	channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types"
@@ -20,12 +19,10 @@ import (
 
 	appparams "github.com/neutron-org/neutron/v4/app/params"
 	"github.com/neutron-org/neutron/v4/testutil"
-	dextypes "github.com/neutron-org/neutron/v4/x/dex/types"
 )
 
 var (
 	nativeDenom            = appparams.DefaultDenom
-	ibcTransferAmount      = math.NewInt(100_000)
 	genesisWalletAmount, _ = math.NewIntFromString("10000000000000000000")
 )
 
@@ -338,38 +335,3 @@ func (s *IBCTestSuite) assertChainBBalance(addr sdk.AccAddress, denom string, ex
 func (s *IBCTestSuite) assertChainCBalance(addr sdk.AccAddress, denom string, expectedAmt math.Int) {
 	s.assertBalance(s.bundleC.App.GetTestBankKeeper(), s.bundleC.Chain, addr, denom, expectedAmt)
 }
-
-func (s *IBCTestSuite) ReceiverOverrideAddr(channel, sender string) sdk.AccAddress {
-	addr, err := packetforward.GetReceiver(channel, sender)
-	if err != nil {
-		panic("Cannot calc receiver override: " + err.Error())
-	}
-	return sdk.MustAccAddressFromBech32(addr)
-}
-
-func (s *IBCTestSuite) neutronDeposit(
-	token0 string,
-	token1 string,
-	depositAmount0 math.Int,
-	depositAmount1 math.Int,
-	tickIndex int64,
-	fee uint64,
-	creator sdk.AccAddress,
-) {
-	// create deposit msg
-	msgDeposit := dextypes.NewMsgDeposit(
-		creator.String(),
-		creator.String(),
-		token0,
-		token1,
-		[]math.Int{depositAmount0},
-		[]math.Int{depositAmount1},
-		[]int64{tickIndex},
-		[]uint64{fee},
-		[]*dextypes.DepositOptions{{DisableAutoswap: false}},
-	)
-
-	// execute deposit msg
-	_, err := s.neutronChain.SendMsgs(msgDeposit)
-	s.Assert().NoError(err, "Deposit Failed")
-}