chore: cleanup (#19843)

server/v2/core/appmanager/app.go → core/app/app.go

@@ -1,4 +1,4 @@
-package appmanager
+package app
 
 import (
 	"time"
@@ -23,6 +23,8 @@ type BlockRequest[T any] struct {
 	Height            uint64
 	Time              time.Time
 	Hash              []byte
+	ChainId           string
+	AppHash           []byte
 	Txs               []T
 	ConsensusMessages []transaction.Type
 }
@@ -51,8 +53,13 @@ type ResponseInitChain struct {
 
 type TxResult struct {
 	Events    []event.Event
-	GasUsed   uint64
-	GasWanted uint64
 	Resp      []transaction.Type
 	Error     error
+	Code      uint32
+	Data      []byte
+	Log       string
+	Info      string
+	GasWanted uint64
+	GasUsed   uint64
+	Codespace string
 }

server/v2/core/appmanager/codec.go → core/app/codec.go

@@ -1,4 +1,4 @@
-package appmanager
+package app
 
 import (
 	"github.com/cosmos/gogoproto/jsonpb"

core/app/identity.go

@@ -0,0 +1,3 @@
+package app
+
+var RuntimeIdentity = []byte("runtime")

go.work.example

@@ -41,7 +41,6 @@ use (
 	./x/accounts/defaults/lockup
 	./server/v2/appmanager
 	./server/v2/cometbft
-	./server/v2/core
 	./server/v2/stf
 	./server/v2
 	./runtime/v2

runtime/gas.go

@@ -63,11 +63,15 @@ func (gm SDKGasMeter) Limit() storetypes.Gas {
 }
 
 func (gm SDKGasMeter) ConsumeGas(amount storetypes.Gas, descriptor string) {
-	gm.gm.Consume(amount, descriptor)
+	if err := gm.gm.Consume(amount, descriptor); err != nil {
+		panic(err)
+	}
 }
 
 func (gm SDKGasMeter) RefundGas(amount storetypes.Gas, descriptor string) {
-	gm.gm.Refund(amount, descriptor)
+	if err := gm.gm.Refund(amount, descriptor); err != nil {
+		panic(err)
+	}
 }
 
 func (gm SDKGasMeter) IsPastLimit() bool {

runtime/v2/app.go

@@ -8,11 +8,11 @@ import (
 
 	runtimev2 "cosmossdk.io/api/cosmos/app/runtime/v2"
 	appv1alpha1 "cosmossdk.io/api/cosmos/app/v1alpha1"
+	coreappmanager "cosmossdk.io/core/app"
 	corestore "cosmossdk.io/core/store"
 	"cosmossdk.io/core/transaction"
 	"cosmossdk.io/log"
 	"cosmossdk.io/server/v2/appmanager"
-	coreappmanager "cosmossdk.io/server/v2/core/appmanager"
 	"cosmossdk.io/server/v2/stf"
 	storetypes "cosmossdk.io/store/types"
 

runtime/v2/go.mod

@@ -9,7 +9,6 @@ replace (
 	cosmossdk.io/depinject => ../../depinject
 	cosmossdk.io/server/v2 => ../../server/v2
 	cosmossdk.io/server/v2/appmanager => ../../server/v2/appmanager
-	cosmossdk.io/server/v2/core => ../../server/v2/core
 	cosmossdk.io/server/v2/stf => ../../server/v2/stf
 	cosmossdk.io/store/v2 => ../../store
 	cosmossdk.io/x/accounts => ../../x/accounts
@@ -39,7 +38,6 @@ require (
 	cosmossdk.io/depinject v1.0.0-alpha.4
 	cosmossdk.io/log v1.3.1
 	cosmossdk.io/server/v2/appmanager v0.0.0-00010101000000-000000000000
-	cosmossdk.io/server/v2/core v0.0.0-00010101000000-000000000000
 	cosmossdk.io/server/v2/stf v0.0.0-00010101000000-000000000000
 	cosmossdk.io/store v1.1.0
 	cosmossdk.io/store/v2 v2.0.0-00010101000000-000000000000

server/v2/api/grpc/server.go

@@ -14,9 +14,9 @@ import (
 	"google.golang.org/protobuf/proto"
 
 	_ "cosmossdk.io/api/amino" // Import amino.proto file for reflection
+	appmanager "cosmossdk.io/core/app"
 	"cosmossdk.io/log"
 	"cosmossdk.io/server/v2/api/grpc/gogoreflection"
-	"cosmossdk.io/server/v2/core/appmanager"
 )
 
 const serverName = "grpc-server"

server/v2/api/telemetry/metrics.go

@@ -28,6 +28,7 @@ const (
 	FormatDefault    = ""
 	FormatPrometheus = "prometheus"
 	FormatText       = "text"
+	ContentTypeText  = `text/plain; version=` + expfmt.TextVersion + `; charset=utf-8`
 
 	MetricSinkInMem      = "mem"
 	MetricSinkStatsd     = "statsd"
@@ -155,15 +156,15 @@ func (m *Metrics) gatherPrometheus() (GatherResponse, error) {
 	buf := &bytes.Buffer{}
 	defer buf.Reset()
 
-	e := expfmt.NewEncoder(buf, expfmt.FmtText)
+	e := expfmt.NewEncoder(buf, expfmt.NewFormat(expfmt.TypeTextPlain))
 
 	for _, mf := range metricsFamilies {
 		if err := e.Encode(mf); err != nil {
 			return GatherResponse{}, fmt.Errorf("failed to encode prometheus metrics: %w", err)
 		}
 	}
 
-	return GatherResponse{ContentType: string(expfmt.FmtText), Metrics: buf.Bytes()}, nil
+	return GatherResponse{ContentType: ContentTypeText, Metrics: buf.Bytes()}, nil
 }
 
 // gatherGeneric collects generic metrics and returns a GatherResponse.

server/v2/appmanager/appmanager.go

@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"io"
 
+	appmanager "cosmossdk.io/core/app"
 	corestore "cosmossdk.io/core/store"
 	"cosmossdk.io/core/transaction"
 	"cosmossdk.io/server/v2/appmanager/store"
-	"cosmossdk.io/server/v2/core/appmanager"
 	"cosmossdk.io/server/v2/stf"
 )
 
@@ -50,7 +50,7 @@ func (a AppManager[T]) ValidateTx(ctx context.Context, tx T) (appmanager.TxResul
 	if err != nil {
 		return appmanager.TxResult{}, err
 	}
-	return a.stf.ValidateTx(ctx, latestState, a.config.ValidateTxGasLimit, tx), nil
+	return a.stf.ValidateTx(ctx, latestState, a.config.ValidateTxGasLimit, tx, nil), nil
 }
 
 // Simulate runs validation and execution flow of a Tx.

server/v2/appmanager/go.mod

@@ -11,7 +11,6 @@ replace (
 
 require (
 	cosmossdk.io/core v0.12.0
-	cosmossdk.io/server/v2/core v0.0.0-00010101000000-000000000000
 	cosmossdk.io/server/v2/stf v0.0.0-00010101000000-000000000000
 	cosmossdk.io/store/v2 v2.0.0-00010101000000-000000000000
 	github.com/stretchr/testify v1.9.0

server/v2/cometbft/abci.go

@@ -7,9 +7,9 @@ import (
 	"sync/atomic"
 
 	abci "github.com/cometbft/cometbft/abci/types"
-	"google.golang.org/protobuf/proto"
 
-	corecomet "cosmossdk.io/core/comet"
+	consensusv1 "cosmossdk.io/api/cosmos/consensus/v1"
+	coreappmgr "cosmossdk.io/core/app"
 	"cosmossdk.io/core/event"
 	"cosmossdk.io/core/store"
 	"cosmossdk.io/core/transaction"
@@ -20,7 +20,6 @@ import (
 	"cosmossdk.io/server/v2/cometbft/mempool"
 	"cosmossdk.io/server/v2/cometbft/types"
 	cometerrors "cosmossdk.io/server/v2/cometbft/types/errors"
-	coreappmgr "cosmossdk.io/server/v2/core/appmanager"
 	"cosmossdk.io/server/v2/streaming"
 	"cosmossdk.io/store/v2/snapshots"
 )
@@ -52,6 +51,8 @@ type Consensus[T transaction.Tx] struct {
 	processProposalHandler handlers.ProcessHandler[T]
 	verifyVoteExt          handlers.VerifyVoteExtensionhandler
 	extendVote             handlers.ExtendVoteHandler
+
+	chainID string
 }
 
 func NewConsensus[T transaction.Tx](
@@ -120,7 +121,6 @@ type BlockData struct {
 // CheckTx implements types.Application.
 // It is called by cometbft to verify transaction validity
 func (c *Consensus[T]) CheckTx(ctx context.Context, req *abci.RequestCheckTx) (*abci.ResponseCheckTx, error) {
-	// TODO: evaluate here if to return error, or CheckTxResponse.error.
 	decodedTx, err := c.txCodec.Decode(req.Tx)
 	if err != nil {
 		return nil, err
@@ -132,10 +132,14 @@ func (c *Consensus[T]) CheckTx(ctx context.Context, req *abci.RequestCheckTx) (*
 	}
 
 	cometResp := &abci.ResponseCheckTx{
-		// Code:      resp.Code, //TODO: extract error code from resp.Error
+		Code:      resp.Code,
 		GasWanted: uint64ToInt64(resp.GasWanted),
 		GasUsed:   uint64ToInt64(resp.GasUsed),
 		Events:    intoABCIEvents(resp.Events, c.cfg.IndexEvents),
+		Info:      resp.Info,
+		Data:      resp.Data,
+		Log:       resp.Log,
+		Codespace: resp.Codespace,
 	}
 	if resp.Error != nil {
 		cometResp.Code = 1
@@ -219,7 +223,9 @@ func (c *Consensus[T]) Query(ctx context.Context, req *abci.RequestQuery) (*abci
 func (c *Consensus[T]) InitChain(ctx context.Context, req *abci.RequestInitChain) (*abci.ResponseInitChain, error) {
 	c.logger.Info("InitChain", "initialHeight", req.InitialHeight, "chainID", req.ChainId)
 
-	// TODO: won't work for now
+	c.chainID = req.ChainId
+
+	// TODO: populate
 	return &abci.ResponseInitChain{
 		ConsensusParams: req.ConsensusParams,
 		Validators:      req.Validators,
@@ -250,7 +256,6 @@ func (c *Consensus[T]) PrepareProposal(ctx context.Context, req *abci.RequestPre
 		return nil, err
 	}
 
-	// TODO add bytes method in x/tx or cachetx
 	encodedTxs := make([][]byte, len(txs))
 	for i, tx := range txs {
 		encodedTxs[i] = tx.Bytes()
@@ -300,8 +305,8 @@ func (c *Consensus[T]) FinalizeBlock(ctx context.Context, req *abci.RequestFinal
 	}
 
 	// for passing consensus info as a consensus message
-	cometInfo := &types.ConsensusInfo{
-		Info: corecomet.Info{
+	cometInfo := &consensusv1.ConsensusMsgCometInfoRequest{
+		Info: &consensusv1.CometInfo{
 			Evidence:        ToSDKEvidence(req.Misbehavior),
 			ValidatorsHash:  req.NextValidatorsHash,
 			ProposerAddress: req.ProposerAddress,
@@ -317,12 +322,19 @@ func (c *Consensus[T]) FinalizeBlock(ctx context.Context, req *abci.RequestFinal
 		return nil, err
 	}
 
+	cid, err := c.store.LastCommitID()
+	if err != nil {
+		return nil, err
+	}
+
 	blockReq := &coreappmgr.BlockRequest[T]{
 		Height:            uint64(req.Height),
 		Time:              req.Time,
 		Hash:              req.Hash,
+		AppHash:           cid.Hash,
+		ChainId:           c.chainID,
 		Txs:               decodedTxs,
-		ConsensusMessages: []proto.Message{cometInfo},
+		ConsensusMessages: []transaction.Type{cometInfo},
 	}
 
 	resp, newState, err := c.app.DeliverBlock(ctx, blockReq)
@@ -358,7 +370,7 @@ func (c *Consensus[T]) FinalizeBlock(ctx context.Context, req *abci.RequestFinal
 	// remove txs from the mempool
 	err = c.mempool.Remove(decodedTxs)
 	if err != nil {
-		return nil, fmt.Errorf("unable to remove txs: %w", err) // TODO: evaluate what erroring means here, and if we should even error.
+		return nil, fmt.Errorf("unable to remove txs: %w", err)
 	}
 
 	c.lastCommittedBlock.Store(&BlockData{

server/v2/cometbft/client/grpc/cmtservice/service.go

@@ -249,8 +249,9 @@ func (s queryServer) ABCIQuery(ctx context.Context, req *ABCIQueryRequest) (*ABC
 
 	if path := SplitABCIQueryPath(req.Path); len(path) > 0 {
 		switch path[0] {
-		case "app", "store", "p2p", "custom": // TODO: check if we can use the ones from abci.go without having circular deps.
+		case "app", "store", "p2p", "custom":
 			// valid path
+			// TODO complete this
 
 		default:
 			// Otherwise, error as to prevent either valid gRPC service requests or

server/v2/cometbft/config.go

@@ -18,7 +18,7 @@ type Config struct {
 	HaltTime        uint64              `mapstructure:"halt_time" toml:"halt_time"`
 	// end of app.toml config options
 
-	AddrPeerFilter types.PeerFilter // filter peers by address and port // TODO:
+	AddrPeerFilter types.PeerFilter // filter peers by address and port
 	IdPeerFilter   types.PeerFilter // filter peers by node ID
 
 	Transport  string `mapstructure:"transport" toml:"transport"`

server/v2/cometbft/go.mod

@@ -9,7 +9,6 @@ replace (
 	cosmossdk.io/runtime/v2 => ../../../runtime/v2
 	cosmossdk.io/server/v2 => ../
 	cosmossdk.io/server/v2/appmanager => ../appmanager
-	cosmossdk.io/server/v2/core => ../core
 	cosmossdk.io/server/v2/stf => ../stf
 	cosmossdk.io/store/v2 => ../../../store
 	cosmossdk.io/x/accounts => ../../../x/accounts
@@ -29,15 +28,13 @@ require (
 	cosmossdk.io/log v1.3.1
 	cosmossdk.io/server/v2 v2.0.0-00010101000000-000000000000
 	cosmossdk.io/server/v2/appmanager v0.0.0-00010101000000-000000000000
-	cosmossdk.io/server/v2/core v0.0.0-00010101000000-000000000000
 	cosmossdk.io/server/v2/stf v0.0.0-00010101000000-000000000000
 	cosmossdk.io/store/v2 v2.0.0-00010101000000-000000000000
 	cosmossdk.io/x/auth v0.0.0-00010101000000-000000000000
 	github.com/cometbft/cometbft v0.38.6
 	github.com/cosmos/cosmos-proto v1.0.0-beta.4
 	github.com/cosmos/cosmos-sdk v0.51.0
 	github.com/cosmos/gogoproto v1.4.11
-	github.com/cosmos/ics23/go v0.10.0
 	github.com/golang/protobuf v1.5.4
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
 	github.com/spf13/cast v1.6.0
@@ -83,6 +80,7 @@ require (
 	github.com/cosmos/go-bip39 v1.0.0 // indirect
 	github.com/cosmos/gogogateway v1.2.0 // indirect
 	github.com/cosmos/iavl v1.1.1 // indirect
+	github.com/cosmos/ics23/go v0.10.0 // indirect
 	github.com/cosmos/ledger-cosmos-go v0.13.3 // indirect
 	github.com/danieljoos/wincred v1.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect

server/v2/cometbft/handlers/defaults.go

@@ -6,14 +6,14 @@ import (
 	"fmt"
 
 	abci "github.com/cometbft/cometbft/abci/types"
-	"github.com/cosmos/gogoproto/proto" // TODO: use protov2
+	"github.com/cosmos/gogoproto/proto"
 
 	consensusv1 "cosmossdk.io/api/cosmos/consensus/v1"
 	"cosmossdk.io/core/store"
 	"cosmossdk.io/core/transaction"
 
+	appmanager "cosmossdk.io/core/app"
 	"cosmossdk.io/server/v2/cometbft/mempool"
-	"cosmossdk.io/server/v2/core/appmanager"
 )
 
 type AppManager[T transaction.Tx] interface {
@@ -58,7 +58,6 @@ func (h *DefaultProposalHandler[T]) PrepareHandler() PrepareHandler[T] {
 
 		defer h.txSelector.Clear()
 
-		// TODO: can we assume nil mempool is NoOp?
 		// If the mempool is nil or NoOp we simply return the transactions
 		// requested from CometBFT, which, by default, should be in FIFO order.
 		//
@@ -112,7 +111,6 @@ func (h *DefaultProposalHandler[T]) ProcessHandler() ProcessHandler[T] {
 			return nil
 		}
 
-		// TODO: not using this request for now
 		_, ok := req.(*abci.RequestProcessProposal)
 		if !ok {
 			return fmt.Errorf("invalid request type: %T", req)

server/v2/cometbft/handlers/handlers.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	abci "github.com/cometbft/cometbft/abci/types"
-	"github.com/cosmos/gogoproto/proto" // TODO: use protov2
+	"github.com/cosmos/gogoproto/proto"
 
 	"cosmossdk.io/core/store"
 	"cosmossdk.io/core/transaction"

server/v2/cometbft/snapshots.go

@@ -12,7 +12,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/server/types"
 	"github.com/spf13/cast"
 
-	// "cosmossdk.io/store/v2/db"
 	"cosmossdk.io/store/v2/snapshots"
 	snapshottypes "cosmossdk.io/store/v2/snapshots/types"
 )
@@ -29,10 +28,6 @@ func GetSnapshotStore(appOpts types.AppOptions) (*snapshots.Store, error) {
 		return nil, fmt.Errorf("failed to create snapshots directory: %w", err)
 	}
 
-	// snapshotDB, err := db.NewGoLevelDB("metadata", snapshotDir, nil) // TODO: goleveldb? talk with storage team on if this will change
-	// if err != nil {
-	// 	return nil, err
-	// }
 	snapshotStore, err := snapshots.NewStore(snapshotDir)
 	if err != nil {
 		return nil, err