LaconicNetwork/cosmos-sdk
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

fix(baseapp): populate header info in NewUncachedContext (backport #22557) (#22565)

Browse Source
This commit is contained in:
mergify[bot] 2024-11-20 11:54:48 +04:00 committed by GitHub
parent 3a26c3be15
commit 7c1bb027ab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
baseapp/test_helpers.go
View File

@ -3,6 +3,7 @@ package baseapp
import (
cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1"
coreheader "cosmossdk.io/core/header"
errorsmod "cosmossdk.io/errors"
sdk "github.com/cosmos/cosmos-sdk/types"
@ -50,7 +51,8 @@ func (app *BaseApp) SimWriteState() {
func (app *BaseApp) NewContextLegacy(isCheckTx bool, header cmtproto.Header) sdk.Context {
if isCheckTx {
return sdk.NewContext(app.checkState.ms, true, app.logger).
WithMinGasPrices(app.minGasPrices).WithBlockHeader(header)
WithMinGasPrices(app.minGasPrices).
WithBlockHeader(header)
}
return sdk.NewContext(app.finalizeBlockState.ms, false, app.logger).WithBlockHeader(header)
@ -62,7 +64,12 @@ func (app *BaseApp) NewContext(isCheckTx bool) sdk.Context {
}
func (app *BaseApp) NewUncachedContext(isCheckTx bool, header cmtproto.Header) sdk.Context {
return sdk.NewContext(app.cms, isCheckTx, app.logger).WithBlockHeader(header)
return sdk.NewContext(app.cms, isCheckTx, app.logger).
WithBlockHeader(header).
WithHeaderInfo(coreheader.Info{
Height: header.Height,
Time: header.Time,
})
}
func (app *BaseApp) GetContextForFinalizeBlock(txBytes []byte) sdk.Context {

6
testutil/sims/app_helpers.go
View File

@ -10,7 +10,6 @@ import (
cmtjson "github.com/cometbft/cometbft/libs/json"
cmttypes "github.com/cometbft/cometbft/types"
coreheader "cosmossdk.io/core/header"
corestore "cosmossdk.io/core/store"
coretesting "cosmossdk.io/core/testing"
"cosmossdk.io/depinject"
@ -130,10 +129,7 @@ func NextBlock(app *runtime.App, ctx sdk.Context, jumpTime time.Duration) (sdk.C
header.Time = newBlockTime
header.Height++
newCtx := app.BaseApp.NewUncachedContext(false, header).WithHeaderInfo(coreheader.Info{
Height: header.Height,
Time: header.Time,
})
newCtx := app.BaseApp.NewUncachedContext(false, header)
return newCtx, nil
}