neutron-org · pr0n00gler · Nov 27, 2023 · Sep 22, 2023 · Oct 10, 2023 · Sep 28, 2023
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -18,14 +18,14 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.19'
+          go-version: '1.20'
           cache: false
       - uses: actions/checkout@v3
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: 'v1.51.2'
+          version: 'v1.52.1'
           # Optional: working directory, useful for monorepos
           # working-directory: somedir
 

diff --git a/app/app.go b/app/app.go
@@ -10,7 +10,6 @@ import (
 
 	globalfeetypes "github.com/cosmos/gaia/v11/x/globalfee/types"
 	"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward"
-
 	"github.com/cosmos/interchain-security/v3/testutil/integration"
 
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
@@ -149,6 +148,16 @@ import (
 	consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types"
 	pfmkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/keeper"
 	pfmtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types"
+
+	"github.com/neutron-org/neutron/x/dex"
+	dexkeeper "github.com/neutron-org/neutron/x/dex/keeper"
+	dextypes "github.com/neutron-org/neutron/x/dex/types"
+
+	"github.com/neutron-org/neutron/x/ibcswap"
+	ibcswapkeeper "github.com/neutron-org/neutron/x/ibcswap/keeper"
+	ibcswaptypes "github.com/neutron-org/neutron/x/ibcswap/types"
+
+	gmpmiddleware "github.com/neutron-org/neutron/x/gmp"
 )
 
 const (
@@ -204,6 +213,8 @@ var (
 		ibchooks.AppModuleBasic{},
 		packetforward.AppModuleBasic{},
 		globalfee.AppModule{},
+		dex.AppModuleBasic{},
+		ibcswap.AppModuleBasic{},
 	)
 
 	// module account permissions
@@ -219,6 +230,8 @@ var (
 		ccvconsumertypes.ConsumerToSendToProviderName: nil,
 		tokenfactorytypes.ModuleName:                  {authtypes.Minter, authtypes.Burner},
 		crontypes.ModuleName:                          nil,
+		dextypes.ModuleName:                           {authtypes.Minter, authtypes.Burner},
+		ibcswaptypes.ModuleName:                       {authtypes.Burner},
 	}
 )
 
@@ -279,9 +292,11 @@ type App struct {
 	ConsumerKeeper      ccvconsumerkeeper.Keeper
 	TokenFactoryKeeper  *tokenfactorykeeper.Keeper
 	CronKeeper          cronkeeper.Keeper
-	RouterKeeper        *pfmkeeper.Keeper
+	PFMKeeper           *pfmkeeper.Keeper
+	DexKeeper           dexkeeper.Keeper
+	SwapKeeper          ibcswapkeeper.Keeper
 
-	RouterModule packetforward.AppModule
+	PFMModule packetforward.AppModule
 
 	HooksTransferIBCModule *ibchooks.IBCMiddleware
 	HooksICS4Wrapper       ibchooks.ICS4Middleware
@@ -356,7 +371,7 @@ func New(
 		icahosttypes.StoreKey, capabilitytypes.StoreKey,
 		interchainqueriesmoduletypes.StoreKey, contractmanagermoduletypes.StoreKey, interchaintxstypes.StoreKey, wasmtypes.StoreKey, feetypes.StoreKey,
 		feeburnertypes.StoreKey, adminmoduletypes.StoreKey, ccvconsumertypes.StoreKey, tokenfactorytypes.StoreKey, pfmtypes.StoreKey,
-		crontypes.StoreKey, ibchookstypes.StoreKey, consensusparamtypes.StoreKey, crisistypes.StoreKey,
+		crontypes.StoreKey, ibchookstypes.StoreKey, consensusparamtypes.StoreKey, crisistypes.StoreKey, dextypes.StoreKey,
 	)
 	tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey)
 	memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey, feetypes.MemStoreKey)
@@ -490,8 +505,8 @@ func New(
 	)
 	feeBurnerModule := feeburner.NewAppModule(appCodec, *app.FeeBurnerKeeper)
 
-	// RouterKeeper must be created before TransferKeeper
-	app.RouterKeeper = pfmkeeper.NewKeeper(
+	// PFMKeeper must be created before TransferKeeper
+	app.PFMKeeper = pfmkeeper.NewKeeper(
 		appCodec,
 		app.keys[pfmtypes.StoreKey],
 		app.TransferKeeper.Keeper,
@@ -504,7 +519,7 @@ func New(
 	wasmHooks := ibchooks.NewWasmHooks(nil, sdk.GetConfig().GetBech32AccountAddrPrefix()) // The contract keeper needs to be set later
 	app.HooksICS4Wrapper = ibchooks.NewICS4Middleware(
 		app.IBCKeeper.ChannelKeeper,
-		app.RouterKeeper,
+		app.PFMKeeper,
 		&wasmHooks,
 	)
 
@@ -523,7 +538,7 @@ func New(
 		contractmanager.NewSudoLimitWrapper(app.ContractManagerKeeper, &app.WasmKeeper),
 	)
 
-	app.RouterKeeper.SetTransferKeeper(app.TransferKeeper.Keeper)
+	app.PFMKeeper.SetTransferKeeper(app.TransferKeeper.Keeper)
 
 	transferModule := transferSudo.NewAppModule(app.TransferKeeper)
 
@@ -569,6 +584,25 @@ func New(
 			app.TokenFactoryKeeper.Hooks(),
 		))
 
+	app.DexKeeper = *dexkeeper.NewKeeper(
+		appCodec,
+		keys[dextypes.StoreKey],
+		keys[dextypes.MemStoreKey],
+		app.BankKeeper.WithMintCoinsRestriction(dextypes.NewDexDenomMintCoinsRestriction()),
+		authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(),
+	)
+
+	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 {
@@ -681,16 +715,19 @@ func New(
 	contractManagerModule := contractmanager.NewAppModule(appCodec, app.ContractManagerKeeper)
 	ibcHooksModule := ibchooks.NewAppModule(app.AccountKeeper)
 
-	app.RouterModule = packetforward.NewAppModule(app.RouterKeeper, app.GetSubspace(pfmtypes.ModuleName))
+	app.PFMModule = packetforward.NewAppModule(app.PFMKeeper, app.GetSubspace(pfmtypes.ModuleName))
 
-	ibcStack := packetforward.NewIBCMiddleware(
+	var ibcStack ibcporttypes.IBCModule = packetforward.NewIBCMiddleware(
 		app.HooksTransferIBCModule,
-		app.RouterKeeper,
+		app.PFMKeeper,
 		0,
 		pfmkeeper.DefaultForwardTransferPacketTimeoutTimestamp,
 		pfmkeeper.DefaultRefundTransferPacketTimeoutTimestamp,
 	)
 
+	ibcStack = ibcswap.NewIBCMiddleware(ibcStack, app.SwapKeeper)
+	ibcStack = gmpmiddleware.NewIBCMiddleware(ibcStack)
+
 	ibcRouter.AddRoute(icacontrollertypes.SubModuleName, icaControllerStack).
 		AddRoute(icahosttypes.SubModuleName, icaHostIBCModule).
 		AddRoute(ibctransfertypes.ModuleName, ibcStack).
@@ -726,7 +763,7 @@ func New(
 		transferModule,
 		consumerModule,
 		icaModule,
-		app.RouterModule,
+		app.PFMModule,
 		interchainQueriesModule,
 		interchainTxsModule,
 		feeModule,
@@ -737,6 +774,8 @@ func New(
 		tokenfactory.NewAppModule(appCodec, *app.TokenFactoryKeeper, app.AccountKeeper, app.BankKeeper),
 		cronModule,
 		globalfee.NewAppModule(app.GetSubspace(globalfee.ModuleName)),
+		swapModule,
+		dexModule,
 		crisis.NewAppModule(&app.CrisisKeeper, skipGenesisInvariants, app.GetSubspace(crisistypes.ModuleName)), // always be last to make sure that it checks for all invariants and not only part of them
 	)
 
@@ -772,6 +811,8 @@ func New(
 		pfmtypes.ModuleName,
 		crontypes.ModuleName,
 		globalfee.ModuleName,
+		ibcswaptypes.ModuleName,
+		dextypes.ModuleName,
 	)
 
 	app.mm.SetOrderEndBlockers(
@@ -802,6 +843,10 @@ func New(
 		pfmtypes.ModuleName,
 		crontypes.ModuleName,
 		globalfee.ModuleName,
+		ibcswaptypes.ModuleName,
+		// NOTE: Because of the gas sensitivity of PurgeExpiredLimit order operations
+		// dexmodule must be the last endBlock module to run
+		dextypes.ModuleName,
 	)
 
 	// NOTE: The genutils module must occur after staking so that pools are
@@ -837,6 +882,8 @@ func New(
 		pfmtypes.ModuleName,
 		crontypes.ModuleName,
 		globalfee.ModuleName,
+		ibcswaptypes.ModuleName,
+		dextypes.ModuleName,
 	)
 
 	app.mm.RegisterInvariants(&app.CrisisKeeper)
@@ -860,11 +907,12 @@ func New(
 		transferModule,
 		consumerModule,
 		icaModule,
-		app.RouterModule,
+		app.PFMModule,
 		interchainQueriesModule,
 		interchainTxsModule,
 		feeBurnerModule,
 		cronModule,
+		dexModule,
 	)
 	app.sm.RegisterStoreDecoders()
 
@@ -998,12 +1046,22 @@ func (app *App) EndBlocker(ctx sdk.Context, req abci.RequestEndBlock) abci.Respo
 	return app.mm.EndBlock(ctx, req)
 }
 
+func (app *App) EnsureBlockGasMeter(ctx sdk.Context) {
+	// TrancheKey generation and LimitOrderExpirationPurge both rely on a BlockGas meter.
+	// check that it works at startup
+	cp := app.GetConsensusParams(ctx)
+	if cp == nil || cp.Block == nil || cp.Block.MaxGas <= 0 {
+		panic("BlockGas meter must be initialized. Genesis must provide value for Block.MaxGas")
+	}
+}
+
 // InitChainer application update at chain initialization
 func (app *App) InitChainer(ctx sdk.Context, req abci.RequestInitChain) abci.ResponseInitChain {
 	var genesisState GenesisState
 	if err := tmjson.Unmarshal(req.AppStateBytes, &genesisState); err != nil {
 		panic(err)
 	}
+	app.EnsureBlockGasMeter(ctx)
 	app.UpgradeKeeper.SetModuleVersionMap(ctx, app.mm.GetVersionMap())
 	return app.mm.InitGenesis(ctx, app.appCodec, genesisState)
 }

diff --git a/app/proposals_allowlisting.go b/app/proposals_allowlisting.go
@@ -11,13 +11,15 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/params/types/proposal"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 	globalfeetypes "github.com/cosmos/gaia/v11/x/globalfee/types"
+	pfmtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types"
 	icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types"
 	ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
 	ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
 	ccvconsumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
 
 	contractmanagertypes "github.com/neutron-org/neutron/x/contractmanager/types"
 	crontypes "github.com/neutron-org/neutron/x/cron/types"
+	dextypes "github.com/neutron-org/neutron/x/dex/types"
 	feeburnertypes "github.com/neutron-org/neutron/x/feeburner/types"
 	feerefundertypes "github.com/neutron-org/neutron/x/feerefunder/types"
 	interchainqueriestypes "github.com/neutron-org/neutron/x/interchainqueries/types"
@@ -66,9 +68,11 @@ func isSdkMessageWhitelisted(msg sdk.Msg) bool {
 		*feerefundertypes.MsgUpdateParams,
 		*crontypes.MsgUpdateParams,
 		*contractmanagertypes.MsgUpdateParams,
+		*dextypes.MsgUpdateParams,
 		*banktypes.MsgUpdateParams,
 		*crisistypes.MsgUpdateParams,
 		*minttypes.MsgUpdateParams,
+		*pfmtypes.MsgUpdateParams,
 		*authtypes.MsgUpdateParams:
 		return true
 	}

diff --git a/app/upgrades/v1.1.0/constants.go b/app/upgrades/v1.1.0/constants.go
@@ -6,6 +6,7 @@ import (
 	crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
 
 	"github.com/neutron-org/neutron/app/upgrades"
+	dextypes "github.com/neutron-org/neutron/x/dex/types"
 )
 
 const (
@@ -22,6 +23,7 @@ var Upgrade = upgrades.Upgrade{
 		Added: []string{
 			consensusparamtypes.ModuleName,
 			crisistypes.ModuleName,
+			dextypes.ModuleName,
 		},
 	},
 }
diff --git a/contracts/credits_vault.wasm b/contracts/credits_vault.wasm
diff --git a/contracts/cwd_core.wasm b/contracts/cwd_core.wasm
diff --git a/contracts/cwd_pre_propose_multiple.wasm b/contracts/cwd_pre_propose_multiple.wasm
diff --git a/contracts/cwd_pre_propose_overrule.wasm b/contracts/cwd_pre_propose_overrule.wasm
diff --git a/contracts/cwd_pre_propose_single.wasm b/contracts/cwd_pre_propose_single.wasm
diff --git a/contracts/cwd_proposal_multiple.wasm b/contracts/cwd_proposal_multiple.wasm
diff --git a/contracts/cwd_proposal_single.wasm b/contracts/cwd_proposal_single.wasm
diff --git a/contracts/cwd_security_subdao_pre_propose.wasm b/contracts/cwd_security_subdao_pre_propose.wasm
diff --git a/contracts/cwd_subdao_core.wasm b/contracts/cwd_subdao_core.wasm
diff --git a/contracts/cwd_subdao_pre_propose_single.wasm b/contracts/cwd_subdao_pre_propose_single.wasm
diff --git a/contracts/cwd_subdao_pre_propose_single_no_timelock.wasm b/contracts/cwd_subdao_pre_propose_single_no_timelock.wasm
diff --git a/contracts/cwd_subdao_proposal_single.wasm b/contracts/cwd_subdao_proposal_single.wasm
diff --git a/contracts/cwd_subdao_timelock_single.wasm b/contracts/cwd_subdao_timelock_single.wasm
diff --git a/contracts/investors_vesting_vault.wasm b/contracts/investors_vesting_vault.wasm
diff --git a/contracts/lockdrop_vault.wasm b/contracts/lockdrop_vault.wasm
diff --git a/contracts/neutron_distribution.wasm b/contracts/neutron_distribution.wasm
diff --git a/contracts/neutron_reserve.wasm b/contracts/neutron_reserve.wasm
diff --git a/contracts/neutron_vault.wasm b/contracts/neutron_vault.wasm
diff --git a/contracts/neutron_voting_registry.wasm b/contracts/neutron_voting_registry.wasm
diff --git a/contracts/vesting_lp_vault.wasm b/contracts/vesting_lp_vault.wasm
diff --git a/go.mod b/go.mod
@@ -17,7 +17,7 @@ require (
 	github.com/cosmos/cosmos-sdk v0.47.6
 	github.com/cosmos/gaia/v11 v11.0.0-00010101000000-000000000000
 	github.com/cosmos/gogoproto v1.4.10
-	github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.1
+	github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.2
 	github.com/cosmos/ibc-go/v7 v7.3.1
 	github.com/cosmos/ics23/go v0.10.0
 	github.com/cosmos/interchain-security/v3 v3.1.0
@@ -27,6 +27,7 @@ require (
 	github.com/gorilla/mux v1.8.1
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1
+	github.com/iancoleman/orderedmap v0.2.0
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.16.0
 	github.com/rs/zerolog v1.30.0
@@ -35,8 +36,10 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.16.0
 	github.com/stretchr/testify v1.8.4
+	golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb
 	google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17
 	google.golang.org/grpc v1.59.0
+	google.golang.org/protobuf v1.31.0
 	gopkg.in/yaml.v2 v2.4.0
 )
 
@@ -121,7 +124,6 @@ require (
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/hdevalence/ed25519consensus v0.1.0 // indirect
 	github.com/huandu/skiplist v1.2.0 // indirect
-	github.com/iancoleman/orderedmap v0.2.0 // indirect
 	github.com/improbable-eng/grpc-web v0.15.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
@@ -168,7 +170,6 @@ require (
 	go.etcd.io/bbolt v1.3.7 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	golang.org/x/crypto v0.14.0 // indirect
-	golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb // indirect
 	golang.org/x/net v0.17.0 // indirect
 	golang.org/x/oauth2 v0.13.0 // indirect
 	golang.org/x/sync v0.3.0 // indirect
@@ -180,7 +181,6 @@ require (
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	nhooyr.io/websocket v1.8.6 // indirect

diff --git a/go.sum b/go.sum
@@ -401,8 +401,8 @@ github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoK
 github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek=
 github.com/cosmos/iavl v0.20.1 h1:rM1kqeG3/HBT85vsZdoSNsehciqUQPWrR4BYmqE2+zg=
 github.com/cosmos/iavl v0.20.1/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A=
-github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.1 h1:PqIK9vTr6zxCdQmrDZwxwL4KMAqg/GRGsiMEiaMP4wA=
-github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.1/go.mod h1:UvDmcGIWJPIytq+Q78/ff5NTOsuX/7IrNgEugTW5i0s=
+github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.2 h1:6zjj+yIpMbCTRI2eJ2fXuflElENs3mrUSLH/TSWL8fk=
+github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.2/go.mod h1:UvDmcGIWJPIytq+Q78/ff5NTOsuX/7IrNgEugTW5i0s=
 github.com/cosmos/ibc-go/v7 v7.3.1 h1:bil1IjnHdyWDASFYKfwdRiNtFP6WK3osW7QFEAgU4I8=
 github.com/cosmos/ibc-go/v7 v7.3.1/go.mod h1:wvx4pPBofe5ZdMNV3OFRxSI4auEP5Qfqf8JXLLNV04g=
 github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM=

diff --git a/network/init-neutrond.sh b/network/init-neutrond.sh
@@ -721,8 +721,7 @@ set_genesis_param_jq ".app_state.globalfee.params.bypass_min_fee_msg_types" "$BY
 set_genesis_param proposer_fee                          "\"0.25\""                                        # builder(POB)
 set_genesis_param escrow_account_address                "\"$CONSUMER_REDISTRIBUTE_ACCOUNT_ADDRESS_B64\"," # builder(POB)
 set_genesis_param sudo_call_gas_limit                   "\"1000000\""                                     # contractmanager
-
-cat $GENESIS_PATH
+set_genesis_param max_gas                               "\"1000000000\""                                  # consensus_params
 
 if ! jq -e . "$GENESIS_PATH" >/dev/null 2>&1; then
     echo "genesis appears to become incorrect json" >&2

diff --git a/proto/neutron/dex/deposit_record.proto b/proto/neutron/dex/deposit_record.proto
@@ -0,0 +1,20 @@
+syntax = "proto3";
+package neutron.dex;
+
+option go_package = "github.com/neutron-org/neutron/x/dex/types";
+import "gogoproto/gogo.proto";
+import "neutron/dex/pair_id.proto";
+
+message DepositRecord {
+  PairID pair_id = 1;
+  string shares_owned = 2 [
+                          (gogoproto.moretags)   = "yaml:\"shares_owned\"",
+                          (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+                          (gogoproto.nullable)   = false,
+                          (gogoproto.jsontag) = "shares_owned"
+                          ];
+  int64 center_tick_index = 3;
+  int64 lower_tick_index = 4;
+  int64 upper_tick_index = 5;
+  uint64 fee = 6;
+}