chore: resolved merge conflicts with v0.50.0-upgrade branch

app/app.go

@@ -125,10 +125,10 @@ import (
 	palomamempool "github.com/palomachain/paloma/app/mempool"
 	appparams "github.com/palomachain/paloma/app/params"
 
-	// xchain "github.com/palomachain/paloma/internal/x-chain"
-	// consensusmodule "github.com/palomachain/paloma/x/consensus"
-	// consensusmodulekeeper "github.com/palomachain/paloma/x/consensus/keeper"
-	// consensusmoduletypes "github.com/palomachain/paloma/x/consensus/types"
+	consensusmodule "github.com/palomachain/paloma/x/consensus"
+	consensusmodulekeeper "github.com/palomachain/paloma/x/consensus/keeper"
+	consensusmoduletypes "github.com/palomachain/paloma/x/consensus/types"
+
 	gravitymodule "github.com/palomachain/paloma/x/gravity"
 	gravityclient "github.com/palomachain/paloma/x/gravity/client"
 	gravitymodulekeeper "github.com/palomachain/paloma/x/gravity/keeper"
@@ -198,14 +198,14 @@ var (
 		evidence.AppModuleBasic{},
 		vesting.AppModuleBasic{},
 		schedulermodule.AppModuleBasic{},
-		// consensusmodule.AppModuleBasic{},
+		consensusmodule.AppModuleBasic{},
 		// valsetmodule.AppModuleBasic{},
 		wasm.AppModuleBasic{},
 		evm.AppModuleBasic{},
 		gravitymodule.AppModuleBasic{},
 		// palomamodule.AppModuleBasic{},
 		// treasurymodule.AppModuleBasic{},
-		// consensus.AppModuleBasic{},
+		consensus.AppModuleBasic{},
 		transfer.AppModuleBasic{},
 		ibc.AppModuleBasic{},
 		ica.AppModuleBasic{},
@@ -285,15 +285,15 @@ type App struct {
 	TransferKeeper            ibctransferkeeper.Keeper
 
 	SchedulerKeeper schedulermodulekeeper.Keeper
-	// ConsensusKeeper consensusmodulekeeper.Keeper
+	ConsensusKeeper consensusmodulekeeper.Keeper
 	// ValsetKeeper    valsetmodulekeeper.Keeper
 	// PalomaKeeper    palomamodulekeeper.Keeper
 	// TreasuryKeeper  treasurymodulekeeper.Keeper
 	GravityKeeper gravitymodulekeeper.Keeper
 	wasmKeeper    wasmkeeper.Keeper
 	EvmKeeper     evmmodulekeeper.Keeper
 
-	// mm is the module manager
+	// ModuleManager is the module manager
 	ModuleManager      *module.Manager
 	BasicModuleManager module.BasicManager
 
@@ -363,7 +363,7 @@ func New(
 		icacontrollertypes.StoreKey,
 		capabilitytypes.StoreKey,
 		schedulermoduletypes.StoreKey,
-		// consensusmoduletypes.StoreKey,
+		consensusmoduletypes.StoreKey,
 		// valsetmoduletypes.StoreKey,
 		// treasurymoduletypes.StoreKey,
 		evmmoduletypes.StoreKey,
@@ -376,7 +376,7 @@ func New(
 	memKeys := storetypes.NewMemoryStoreKeys(
 		capabilitytypes.MemStoreKey,
 		// valsetmoduletypes.MemStoreKey,
-		// consensusmoduletypes.MemStoreKey,
+		consensusmoduletypes.MemStoreKey,
 		evmmoduletypes.MemStoreKey,
 		schedulermoduletypes.MemStoreKey,
 		// treasurymoduletypes.MemStoreKey,
@@ -415,7 +415,7 @@ func New(
 	scopedICAControllerKeeper := app.CapabilityKeeper.ScopeToModule(icacontrollertypes.SubModuleName)
 	scopedTransferKeeper := app.CapabilityKeeper.ScopeToModule(ibctransfertypes.ModuleName)
 	scopedWasmKeeper := app.CapabilityKeeper.ScopeToModule(wasmtypes.ModuleName)
-	// scopedConsensusKeeper := app.CapabilityKeeper.ScopeToModule(consensusmoduletypes.ModuleName)
+	scopedConsensusKeeper := app.CapabilityKeeper.ScopeToModule(consensusmoduletypes.ModuleName)
 
 	app.CapabilityKeeper.Seal()
 
@@ -575,16 +575,15 @@ func New(
 	// 	sdk.DefaultPowerReduction,
 	// )
 
-	// consensusRegistry := consensusmodulekeeper.NewRegistry()
+	consensusRegistry := consensusmodulekeeper.NewRegistry()
 
-	// app.ConsensusKeeper = *consensusmodulekeeper.NewKeeper(
-	// 	appCodec,
-	// 	keys[consensusmoduletypes.StoreKey],
-	// 	memKeys[consensusmoduletypes.MemStoreKey],
-	// 	app.GetSubspace(consensusmoduletypes.ModuleName),
-	// 	app.ValsetKeeper,
-	// 	consensusRegistry,
-	// )
+	app.ConsensusKeeper = *consensusmodulekeeper.NewKeeper(
+		appCodec,
+		runtime.NewKVStoreService(keys[consensusmoduletypes.StoreKey]),
+		app.GetSubspace(consensusmoduletypes.ModuleName),
+		nil, // TODO: pass valset keeper
+		consensusRegistry,
+	)
 
 	app.EvmKeeper = *evmmodulekeeper.NewKeeper(
 		appCodec,
@@ -657,7 +656,7 @@ func New(
 	// 	nil, // app.SchedulerKeeper,
 	// )
 
-	// app.ScopedConsensusKeeper = scopedConsensusKeeper
+	app.ScopedConsensusKeeper = scopedConsensusKeeper
 
 	govRouter := govv1beta1.NewRouter()
 	govRouter.
@@ -772,7 +771,7 @@ func New(
 	// must be passed by reference here.
 
 	evmModule := evm.NewAppModule(appCodec, app.EvmKeeper, app.AccountKeeper, app.BankKeeper)
-	// consensusModule := consensusmodule.NewAppModule(appCodec, app.ConsensusKeeper, app.AccountKeeper, app.BankKeeper)
+	consensusModule := consensusmodule.NewAppModule(appCodec, app.ConsensusKeeper, app.AccountKeeper, app.BankKeeper)
 	// valsetModule := valsetmodule.NewAppModule(appCodec, app.ValsetKeeper, app.AccountKeeper, app.BankKeeper)
 	schedulerModule := schedulermodule.NewAppModule(appCodec, app.SchedulerKeeper, app.AccountKeeper, app.BankKeeper)
 	// palomaModule := palomamodule.NewAppModule(appCodec, app.PalomaKeeper, app.AccountKeeper, app.BankKeeper)
@@ -800,7 +799,7 @@ func New(
 		evidence.NewAppModule(app.EvidenceKeeper),
 		params.NewAppModule(app.ParamsKeeper),
 		schedulerModule,
-		// consensusModule,
+		consensusModule,
 		// valsetModule,
 		evmModule,
 		gravityModule,
@@ -840,7 +839,7 @@ func New(
 		stakingtypes.ModuleName,
 		feegrant.ModuleName,
 		schedulermoduletypes.ModuleName,
-		// consensusmoduletypes.ModuleName,
+		consensusmoduletypes.ModuleName,
 		govtypes.ModuleName,
 		crisistypes.ModuleName,
 		banktypes.ModuleName,
@@ -873,7 +872,7 @@ func New(
 		slashingtypes.ModuleName,
 		evidencetypes.ModuleName,
 		feegrant.ModuleName,
-		// consensusmoduletypes.ModuleName,
+		consensusmoduletypes.ModuleName,
 		crisistypes.ModuleName,
 		banktypes.ModuleName,
 		paramstypes.ModuleName,
@@ -916,7 +915,7 @@ func New(
 		evidencetypes.ModuleName,
 		ibctransfertypes.ModuleName,
 		schedulermoduletypes.ModuleName,
-		// consensusmoduletypes.ModuleName,
+		consensusmoduletypes.ModuleName,
 		// valsetmoduletypes.ModuleName,
 		// palomamoduletypes.ModuleName,
 		ibctransfertypes.ModuleName,
@@ -1009,9 +1008,9 @@ func New(
 		}
 	}
 
-	// consensusRegistry.Add(
-	// 	app.EvmKeeper,
-	// )
+	consensusRegistry.Add(
+		app.EvmKeeper,
+	)
 
 	return app
 }
@@ -1170,7 +1169,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
 	paramsKeeper.Subspace(icahosttypes.SubModuleName)
 	paramsKeeper.Subspace(icacontrollertypes.SubModuleName)
 	paramsKeeper.Subspace(schedulermoduletypes.ModuleName)
-	// paramsKeeper.Subspace(consensusmoduletypes.ModuleName)
+	paramsKeeper.Subspace(consensusmoduletypes.ModuleName)
 	// paramsKeeper.Subspace(valsetmoduletypes.ModuleName)
 	paramsKeeper.Subspace(wasmtypes.ModuleName)
 	paramsKeeper.Subspace(evmmoduletypes.ModuleName)

cmd/palomad/conifg.go

@@ -0,0 +1,13 @@
+package main
+
+import tmcfg "github.com/cometbft/cometbft/config"
+
+func initCometBFTConfig() *tmcfg.Config {
+	cfg := tmcfg.DefaultConfig()
+
+	// these values put a higher strain on node memory
+	// cfg.P2P.MaxNumInboundPeers = 100
+	// cfg.P2P.MaxNumOutboundPeers = 40
+
+	return cfg
+}

go.mod

@@ -79,8 +79,30 @@ require (
 )
 
 require (
-	// cloud.google.com/go v0.110.10 // indirect
-	// cloud.google.com/go/compute v1.23.3 // indirect
+	github.com/consensys/bavard v0.1.13 // indirect
+	github.com/consensys/gnark-crypto v0.12.1 // indirect
+	github.com/crate-crypto/go-kzg-4844 v0.7.0 // indirect
+	github.com/ethereum/c-kzg-4844 v0.4.0 // indirect
+	github.com/mmcloughlin/addchain v0.4.0 // indirect
+	github.com/rivo/uniseg v0.2.0 // indirect
+	github.com/supranational/blst v0.3.11 // indirect
+	rsc.io/tmplfunc v0.0.3 // indirect
+)
+
+require (
+	github.com/consensys/bavard v0.1.13 // indirect
+	github.com/consensys/gnark-crypto v0.12.1 // indirect
+	github.com/crate-crypto/go-kzg-4844 v0.7.0 // indirect
+	github.com/ethereum/c-kzg-4844 v0.4.0 // indirect
+	github.com/mmcloughlin/addchain v0.4.0 // indirect
+	github.com/rivo/uniseg v0.2.0 // indirect
+	github.com/supranational/blst v0.3.11 // indirect
+	rsc.io/tmplfunc v0.0.3 // indirect
+)
+
+require (
+	cloud.google.com/go v0.110.10 // indirect
+	cloud.google.com/go/compute v1.23.3 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	// cloud.google.com/go/iam v1.1.5 // indirect
 	cloud.google.com/go/storage v1.30.1 // indirect

x/consensus/genesis.go

@@ -1,19 +1,20 @@
 package consensus
 
 import (
-	sdk "github.com/cosmos/cosmos-sdk/types"
+	"context"
+
 	"github.com/palomachain/paloma/x/consensus/keeper"
 	"github.com/palomachain/paloma/x/consensus/types"
 )
 
 // InitGenesis initializes the capability module's state from a provided genesis
 // state.
-func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState) {
+func InitGenesis(ctx context.Context, k keeper.Keeper, genState types.GenesisState) {
 	k.SetParams(ctx, genState.Params)
 }
 
 // ExportGenesis returns the capability module's exported genesis.
-func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState {
+func ExportGenesis(ctx context.Context, k keeper.Keeper) *types.GenesisState {
 	genesis := types.DefaultGenesis()
 	genesis.Params = k.GetParams(ctx)
 

x/consensus/keeper/attest.go

@@ -1,35 +1,36 @@
 package keeper
 
 import (
+	"context"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/palomachain/paloma/util/liblog"
 )
 
 // CheckAndProcessAttestedMessages is supposed to be used within the
 // EndBlocker. It will get messages for the attestators that have reached a
 // consensus and process them.
-func (k Keeper) CheckAndProcessAttestedMessages(ctx sdk.Context) error {
+func (k Keeper) CheckAndProcessAttestedMessages(ctx context.Context) error {
+	sdkCtx := sdk.UnwrapSDKContext(ctx)
 	for _, supportedConsensusQueue := range k.registry.slice {
-		opts, err := supportedConsensusQueue.SupportedQueues(ctx)
+		opts, err := supportedConsensusQueue.SupportedQueues(sdkCtx)
 		if err != nil {
 			return err
 		}
 		for _, opt := range opts {
-			msgs, err := k.GetMessagesFromQueue(ctx, opt.QueueTypeName, 0)
+			msgs, err := k.GetMessagesFromQueue(sdkCtx, opt.QueueTypeName, 0)
 			if err != nil {
 				return err
 			}
 
 			for _, msg := range msgs {
-				k.Logger(ctx).Debug(
-					"check-and-process-attested-messages-queue",
-					"id", msg.GetId(),
-					"nonce", msg.Nonce(),
-				)
-				cq, err := k.getConsensusQueue(ctx, opt.QueueTypeName)
+				liblog.FromSDKLogger(k.Logger(sdkCtx)).WithFields("id", msg.GetId(), "nonce", msg.Nonce()).Debug(
+					"check-and-process-attested-messages-queue.")
+				cq, err := k.getConsensusQueue(sdkCtx, opt.QueueTypeName)
 				if err != nil {
 					return err
 				}
-				if err := opt.ProcessMessageForAttestation(ctx, cq, msg); err != nil {
+				if err := opt.ProcessMessageForAttestation(sdkCtx, cq, msg); err != nil {
 					return err
 				}
 			}

x/consensus/keeper/cleanup.go

@@ -1,24 +1,27 @@
 package keeper
 
 import (
+	"context"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
-func (k Keeper) DeleteOldMessages(ctx sdk.Context, blocksAgo int64) error {
+func (k Keeper) DeleteOldMessages(ctx context.Context, blocksAgo int64) error {
+	sdkCtx := sdk.UnwrapSDKContext(ctx)
 	for _, supportedConsensusQueue := range k.registry.slice {
-		opts, err := supportedConsensusQueue.SupportedQueues(ctx)
+		opts, err := supportedConsensusQueue.SupportedQueues(sdkCtx)
 		if err != nil {
 			return err
 		}
 		for _, opt := range opts {
-			msgs, err := k.GetMessagesFromQueue(ctx, opt.QueueTypeName, 9999)
+			msgs, err := k.GetMessagesFromQueue(sdkCtx, opt.QueueTypeName, 9999)
 			if err != nil {
 				return err
 			}
 
 			for _, msg := range msgs {
-				if ctx.BlockHeight()-msg.GetAddedAtBlockHeight() > blocksAgo {
-					err = k.DeleteJob(ctx, opt.QueueTypeName, msg.GetId())
+				if sdkCtx.BlockHeight()-msg.GetAddedAtBlockHeight() > blocksAgo {
+					err = k.DeleteJob(sdkCtx, opt.QueueTypeName, msg.GetId())
 					if err != nil {
 						return err
 					}