Merge branch 'main' of github.com:cosmos/cosmos-sdk into kocu/cometbf…

…t-v2
cosmos · May 29, 2024 · 05180c1 · 05180c1
2 parents 64471d2 + ac49374
commit 05180c1
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 28 deletions.
diff --git a/core/context/context.go b/core/context/context.go
@@ -1,20 +1,5 @@
 package context
 
-// ExecMode defines the execution mode which can be set on a Context.
-type ExecMode uint8
-
-// All possible execution modes.
-const (
-	ExecModeCheck ExecMode = iota
-	ExecModeReCheck
-	ExecModeSimulate
-	ExecModePrepareProposal
-	ExecModeProcessProposal
-	ExecModeVoteExtension
-	ExecModeVerifyVoteExtension
-	ExecModeFinalize
-)
-
 const (
 	ExecModeKey = iota
 	CometInfoKey

diff --git a/server/v2/stf/internal/transaction.go b/server/v2/stf/internal/transaction.go
@@ -0,0 +1,18 @@
+package internal
+
+import "cosmossdk.io/core/transaction"
+
+// All possible transaction execution modes.
+// For backwards compatibility and easier casting, the ExecMode values must be:
+// 1) set equivalent to cosmos/cosmos-sdk/types package.
+// 2) a superset of core/transaction/service.go:ExecMode with same numeric values.
+const (
+	ExecModeCheck transaction.ExecMode = iota
+	ExecModeReCheck
+	ExecModeSimulate
+	ExecModePrepareProposal
+	ExecModeProcessProposal
+	ExecModeVoteExtension
+	ExecModeVerifyVoteExtension
+	ExecModeFinalize
+)
diff --git a/server/v2/stf/stf.go b/server/v2/stf/stf.go
@@ -7,14 +7,14 @@ import (
 
 	appmanager "cosmossdk.io/core/app"
 	appmodulev2 "cosmossdk.io/core/appmodule/v2"
-	corecontext "cosmossdk.io/core/context"
 	"cosmossdk.io/core/event"
 	"cosmossdk.io/core/gas"
 	"cosmossdk.io/core/header"
 	"cosmossdk.io/core/store"
 	"cosmossdk.io/core/transaction"
 	"cosmossdk.io/log"
 	stfgas "cosmossdk.io/server/v2/stf/gas"
+	"cosmossdk.io/server/v2/stf/internal"
 )
 
 // STF is a struct that manages the state transition component of the app.
@@ -87,7 +87,7 @@ func (s STF[T]) DeliverBlock(
 		return nil, nil, fmt.Errorf("unable to set initial header info, %w", err)
 	}
 
-	exCtx := s.makeContext(ctx, appmanager.ConsensusIdentity, newState, corecontext.ExecModeFinalize)
+	exCtx := s.makeContext(ctx, appmanager.ConsensusIdentity, newState, internal.ExecModeFinalize)
 	exCtx.setHeaderInfo(hi)
 	consMessagesResponses, err := s.runConsensusMessages(exCtx, block.ConsensusMessages)
 	if err != nil {
@@ -127,7 +127,7 @@ func (s STF[T]) DeliverBlock(
 		if err = isCtxCancelled(ctx); err != nil {
 			return nil, nil, err
 		}
-		txResults[i] = s.deliverTx(ctx, newState, txBytes, corecontext.ExecModeFinalize, hi)
+		txResults[i] = s.deliverTx(ctx, newState, txBytes, transaction.ExecModeFinalize, hi)
 	}
 	// reset events
 	exCtx.events = make([]event.Event, 0)
@@ -153,7 +153,7 @@ func (s STF[T]) deliverTx(
 	ctx context.Context,
 	state store.WriterMap,
 	tx T,
-	execMode corecontext.ExecMode,
+	execMode transaction.ExecMode,
 	hi header.Info,
 ) appmanager.TxResult {
 	// recover in the case of a panic
@@ -208,7 +208,7 @@ func (s STF[T]) validateTx(
 	if err != nil {
 		return 0, nil, err
 	}
-	validateCtx := s.makeContext(ctx, appmanager.RuntimeIdentity, validateState, corecontext.ExecModeCheck)
+	validateCtx := s.makeContext(ctx, appmanager.RuntimeIdentity, validateState, transaction.ExecModeCheck)
 	validateCtx.setHeaderInfo(hi)
 	validateCtx.setGasLimit(gasLimit)
 	err = s.doTxValidation(validateCtx, tx)
@@ -227,7 +227,7 @@ func (s STF[T]) execTx(
 	state store.WriterMap,
 	gasLimit uint64,
 	tx T,
-	execMode corecontext.ExecMode,
+	execMode transaction.ExecMode,
 	hi header.Info,
 ) ([]transaction.Msg, uint64, []event.Event, error) {
 	execState := s.branchFn(state)
@@ -283,7 +283,7 @@ func (s STF[T]) runTxMsgs(
 	state store.WriterMap,
 	gasLimit uint64,
 	tx T,
-	execMode corecontext.ExecMode,
+	execMode transaction.ExecMode,
 	hi header.Info,
 ) ([]transaction.Msg, uint64, []event.Event, error) {
 	txSenders, err := tx.GetSenders()
@@ -450,7 +450,7 @@ func (s STF[T]) Simulate(
 	if err != nil {
 		return appmanager.TxResult{}, nil
 	}
-	txr := s.deliverTx(ctx, simulationState, tx, corecontext.ExecModeSimulate, hi)
+	txr := s.deliverTx(ctx, simulationState, tx, internal.ExecModeSimulate, hi)
 
 	return txr, simulationState
 }
@@ -484,7 +484,7 @@ func (s STF[T]) Query(
 	if err != nil {
 		return nil, err
 	}
-	queryCtx := s.makeContext(ctx, nil, queryState, corecontext.ExecModeSimulate)
+	queryCtx := s.makeContext(ctx, nil, queryState, internal.ExecModeSimulate)
 	queryCtx.setHeaderInfo(hi)
 	queryCtx.setGasLimit(gasLimit)
 	return s.handleQuery(queryCtx, req)
@@ -503,7 +503,7 @@ func (s STF[T]) RunWithCtx(
 	closure func(ctx context.Context) error,
 ) (store.WriterMap, error) {
 	branchedState := s.branchFn(state)
-	stfCtx := s.makeContext(ctx, nil, branchedState, corecontext.ExecModeFinalize)
+	stfCtx := s.makeContext(ctx, nil, branchedState, internal.ExecModeFinalize)
 	return branchedState, closure(stfCtx)
 }
 
@@ -542,7 +542,7 @@ type executionContext struct {
 	// headerInfo contains the block info.
 	headerInfo header.Info
 	// execMode retains information about the exec mode.
-	execMode corecontext.ExecMode
+	execMode transaction.ExecMode
 
 	branchFn            branchFn
 	makeGasMeter        makeGasMeterFn
@@ -577,7 +577,7 @@ func (s STF[T]) makeContext(
 	ctx context.Context,
 	sender transaction.Identity,
 	store store.WriterMap,
-	execMode corecontext.ExecMode,
+	execMode transaction.ExecMode,
 ) *executionContext {
 	return newExecutionContext(
 		s.makeGasMeter,
@@ -597,7 +597,7 @@ func newExecutionContext(
 	ctx context.Context,
 	sender transaction.Identity,
 	state store.WriterMap,
-	execMode corecontext.ExecMode,
+	execMode transaction.ExecMode,
 ) *executionContext {
 	meter := makeGasMeterFn(gas.NoGasLimit)
 	meteredState := makeGasMeteredStoreFn(meter, state)