Skip to content

Commit 0ca519f

Browse files
seidroid[bot]masih
andauthored
Backport release/v6.8: Skip consensus params on eth_getLogs contexts (#4744)
Backport of #4734 to `release/v6.8`. Co-authored-by: Masih H. Derkani <m@derkani.org>
1 parent 35f6bf1 commit 0ca519f

7 files changed

Lines changed: 63 additions & 19 deletions

File tree

‎app/app.go‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2442,21 +2442,25 @@ func (app *App) RegisterAPIRoutes(apiSvr *api.Server, apiConfig config.APIConfig
24422442
}
24432443

24442444
func (app *App) RPCContextProvider(i int64) sdk.Context {
2445+
ctx := app.RPCContextProviderWithoutConsensusParams(i)
2446+
// Neither GetCheckCtx nor CreateQueryContext sets ConsensusParams (only
2447+
// the tx-execution path does, via getContextForTx), so without this,
2448+
// ctx.ConsensusParams() returns nil from any RPC handler. evmrpc/block.go's
2449+
// gasLimit and evmrpc/info.go's gas-used-ratio rely on it.
2450+
return ctx.WithConsensusParams(app.GetConsensusParams(ctx))
2451+
}
2452+
2453+
// RPCContextProviderWithoutConsensusParams returns the context RPCContextProvider
2454+
// returns for height i, with ConsensusParams left nil.
2455+
func (app *App) RPCContextProviderWithoutConsensusParams(i int64) sdk.Context {
24452456
if i == evmrpc.LatestCtxHeight {
24462457
ctx := app.GetCheckCtx()
2447-
// Populate ConsensusParams on the RPC ctx. Neither GetCheckCtx nor
2448-
// CreateQueryContext sets it (only the tx-execution path does, via
2449-
// getContextForTx), so without this, ctx.ConsensusParams() returns
2450-
// nil from any RPC handler. evmrpc/block.go's gasLimit and
2451-
// evmrpc/info.go's gas-used-ratio rely on it.
2452-
ctx = ctx.WithConsensusParams(app.GetConsensusParams(ctx))
24532458
return ctx.WithIsEVM(true).WithTraceMode(true).WithIsCheckTx(false).WithClosestUpgradeName(LatestUpgrade)
24542459
}
24552460
ctx, err := app.CreateQueryContext(i, false)
24562461
if err != nil {
24572462
panic(err)
24582463
}
2459-
ctx = ctx.WithConsensusParams(app.GetConsensusParams(ctx))
24602464
closestUpgrade, upgradeHeight := app.UpgradeKeeper.GetClosestUpgrade(app.GetCheckCtx(), i)
24612465
if closestUpgrade == "" && upgradeHeight == 0 {
24622466
closestUpgrade = LatestUpgrade
@@ -2529,7 +2533,7 @@ func (app *App) RegisterLocalServices(node client.LocalClient, txConfig client.T
25292533
// Autobahn serves the node's EVM-only JSON-RPC. Cosmos evmrpc would bind
25302534
// the same 8545 once Initialized fires (mock-app forwards InitChain).
25312535
if app.evmRPCConfig.HTTPEnabled && !app.autobahnEnabled {
2532-
evmHTTPServer, err := evmrpc.NewEVMHTTPServer(app.evmRPCConfig, node, &app.EvmKeeper, app.BeginBlockKeepers, app.BaseApp, app.TracerAnteHandler, app.RPCContextProvider, txConfigProvider, DefaultNodeHome, app.GetStateStore(), app.autobahnEnabled, headNotifier, traceCtxProvider)
2536+
evmHTTPServer, err := evmrpc.NewEVMHTTPServer(app.evmRPCConfig, node, &app.EvmKeeper, app.BeginBlockKeepers, app.BaseApp, app.TracerAnteHandler, app.RPCContextProvider, app.RPCContextProviderWithoutConsensusParams, txConfigProvider, DefaultNodeHome, app.GetStateStore(), app.autobahnEnabled, headNotifier, traceCtxProvider)
25332537
if err != nil {
25342538
panic(err)
25352539
}
@@ -2542,7 +2546,7 @@ func (app *App) RegisterLocalServices(node client.LocalClient, txConfig client.T
25422546
}
25432547

25442548
if app.evmRPCConfig.WSEnabled && !app.autobahnEnabled {
2545-
evmWSServer, err := evmrpc.NewEVMWebSocketServer(app.evmRPCConfig, node, &app.EvmKeeper, app.BeginBlockKeepers, app.BaseApp, app.TracerAnteHandler, rpcCtxProvider, txConfigProvider, DefaultNodeHome, app.GetStateStore(), app.autobahnEnabled, headNotifier)
2549+
evmWSServer, err := evmrpc.NewEVMWebSocketServer(app.evmRPCConfig, node, &app.EvmKeeper, app.BeginBlockKeepers, app.BaseApp, app.TracerAnteHandler, rpcCtxProvider, app.RPCContextProviderWithoutConsensusParams, txConfigProvider, DefaultNodeHome, app.GetStateStore(), app.autobahnEnabled, headNotifier)
25462550
if err != nil {
25472551
panic(err)
25482552
}

‎app/app_test.go‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -977,6 +977,37 @@ func TestRPCContextProviderPopulatesConsensusParams(t *testing.T) {
977977
})
978978
}
979979

980+
func TestRPCContextProviderWithoutConsensusParams(t *testing.T) {
981+
valPub := cosmosed25519.GenPrivKey().PubKey()
982+
accAddr := sdk.AccAddress(valPub.Address())
983+
genAcc := authtypes.NewBaseAccount(accAddr, nil, 0, 0)
984+
balance := banktypes.Balance{
985+
Address: accAddr.String(),
986+
Coins: sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.DefaultPowerReduction)),
987+
}
988+
tmPub, err := cryptocodec.ToTmPubKeyInterface(valPub)
989+
require.NoError(t, err)
990+
valSet := tmtypes.NewValidatorSet([]*tmtypes.Validator{tmtypes.NewValidator(tmPub, 1)})
991+
testApp := app.SetupWithGenesisValSet(t, valSet, []authtypes.GenesisAccount{genAcc}, balance)
992+
993+
for name, height := range map[string]int64{
994+
"latest height": evmrpc.LatestCtxHeight,
995+
"historical height": testApp.LastBlockHeight(),
996+
} {
997+
t.Run(name, func(t *testing.T) {
998+
want := testApp.RPCContextProvider(height)
999+
got := testApp.RPCContextProviderWithoutConsensusParams(height)
1000+
require.NotNil(t, want.ConsensusParams())
1001+
require.Nil(t, got.ConsensusParams())
1002+
require.Equal(t, want.BlockHeight(), got.BlockHeight())
1003+
require.Equal(t, want.ClosestUpgradeName(), got.ClosestUpgradeName())
1004+
require.Equal(t, want.IsEVM(), got.IsEVM())
1005+
require.Equal(t, want.IsTracing(), got.IsTracing())
1006+
require.Equal(t, want.IsCheckTx(), got.IsCheckTx())
1007+
})
1008+
}
1009+
}
1010+
9801011
func TestSnapshotAwareRPCContextProviderPopulatesConsensusParams(t *testing.T) {
9811012
valPub := cosmosed25519.GenPrivKey().PubKey()
9821013
accAddr := sdk.AccAddress(valPub.Address())

‎evmrpc/filter_not_configured_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ func TestGetRewardsWithoutReceiptStore(t *testing.T) {
7474
func TestEVMServersRefuseWithoutReceiptStore(t *testing.T) {
7575
t.Parallel()
7676

77-
_, err := NewEVMHTTPServer(evmrpcconfig.Config{}, nil, &keeper.Keeper{}, legacyabci.BeginBlockKeepers{}, nil, nil, nil, nil, "", nil, false, nil)
77+
_, err := NewEVMHTTPServer(evmrpcconfig.Config{}, nil, &keeper.Keeper{}, legacyabci.BeginBlockKeepers{}, nil, nil, nil, nil, nil, "", nil, false, nil)
7878
require.ErrorIs(t, err, receipt.ErrNotConfigured)
7979

80-
_, err = NewEVMWebSocketServer(evmrpcconfig.Config{}, nil, &keeper.Keeper{}, legacyabci.BeginBlockKeepers{}, nil, nil, nil, nil, "", nil, false, nil)
80+
_, err = NewEVMWebSocketServer(evmrpcconfig.Config{}, nil, &keeper.Keeper{}, legacyabci.BeginBlockKeepers{}, nil, nil, nil, nil, nil, "", nil, false, nil)
8181
require.ErrorIs(t, err, receipt.ErrNotConfigured)
8282
}

‎evmrpc/server.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ func NewEVMHTTPServer(
4949
app *baseapp.BaseApp,
5050
antehandler sdk.AnteHandler,
5151
ctxProvider func(int64) sdk.Context,
52+
logCtxProvider func(int64) sdk.Context,
5253
txConfigProvider func(int64) client.TxConfig,
5354
homeDir string,
5455
stateStore types.StateStore,
@@ -174,7 +175,7 @@ func NewEVMHTTPServer(
174175
Service: NewFilterAPI(
175176
tmClient,
176177
k,
177-
ctxProvider,
178+
logCtxProvider,
178179
txConfigProvider,
179180
&FilterConfig{timeout: config.FilterTimeout, maxLog: config.MaxLogNoBlock, maxLogBytes: config.MaxLogBytes, maxBlock: config.MaxBlocksForLog, maxFilters: config.MaxFilters, maxBlockFilterHashes: config.MaxBlockFilterHashes},
180181
ConnectionTypeHTTP,
@@ -254,6 +255,7 @@ func NewEVMWebSocketServer(
254255
app *baseapp.BaseApp,
255256
antehandler sdk.AnteHandler,
256257
ctxProvider func(int64) sdk.Context,
258+
logCtxProvider func(int64) sdk.Context,
257259
txConfigProvider func(int64) client.TxConfig,
258260
homeDir string,
259261
stateStore types.StateStore,
@@ -340,7 +342,7 @@ func NewEVMWebSocketServer(
340342
Service: NewSubscriptionAPI(tmClient, k, ctxProvider, &LogFetcher{
341343
tmClient: tmClient,
342344
k: k,
343-
ctxProvider: ctxProvider,
345+
ctxProvider: logCtxProvider,
344346
txConfigProvider: txConfigProvider,
345347
dbReadSemaphore: dbReadSemaphore,
346348
globalBlockCache: globalBlockCache,

‎evmrpc/setup_test.go‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -638,6 +638,10 @@ func init() {
638638
}
639639
return Ctx.WithIsTracing(true)
640640
}
641+
// The log path runs against contexts without ConsensusParams, as in production.
642+
logCtxProvider := func(height int64) sdk.Context {
643+
return ctxProvider(height).WithConsensusParams(nil)
644+
}
641645
// Start good http server
642646
goodConfig := evmrpcconfig.DefaultConfig
643647
goodConfig.HTTPPort = TestPort
@@ -646,7 +650,7 @@ func init() {
646650
goodConfig.MaxLogNoBlock = 10
647651
goodConfig.EnabledLegacySeiApis = evmrpc.SeiLegacyAllGatedMethodNames()
648652
txConfigProvider := func(int64) client.TxConfig { return TxConfig }
649-
HttpServer, err := evmrpc.NewEVMHTTPServer(goodConfig, filterClient, EVMKeeper, testApp.BeginBlockKeepers, testApp.BaseApp, testApp.TracerAnteHandler, ctxProvider, txConfigProvider, "", nil, false, nil)
653+
HttpServer, err := evmrpc.NewEVMHTTPServer(goodConfig, filterClient, EVMKeeper, testApp.BeginBlockKeepers, testApp.BaseApp, testApp.TracerAnteHandler, ctxProvider, logCtxProvider, txConfigProvider, "", nil, false, nil)
650654
if err != nil {
651655
panic(err)
652656
}
@@ -658,7 +662,7 @@ func init() {
658662
badConfig := evmrpcconfig.DefaultConfig
659663
badConfig.HTTPPort = TestBadPort
660664
badConfig.FilterTimeout = 500 * time.Millisecond
661-
badHTTPServer, err := evmrpc.NewEVMHTTPServer(badConfig, &MockBadClient{}, EVMKeeper, testApp.BeginBlockKeepers, testApp.BaseApp, testApp.TracerAnteHandler, ctxProvider, txConfigProvider, "", nil, false, nil)
665+
badHTTPServer, err := evmrpc.NewEVMHTTPServer(badConfig, &MockBadClient{}, EVMKeeper, testApp.BeginBlockKeepers, testApp.BaseApp, testApp.TracerAnteHandler, ctxProvider, logCtxProvider, txConfigProvider, "", nil, false, nil)
662666
if err != nil {
663667
panic(err)
664668
}
@@ -680,6 +684,7 @@ func init() {
680684
testApp.BaseApp,
681685
testApp.TracerAnteHandler,
682686
ctxProvider,
687+
logCtxProvider,
683688
txConfigProvider,
684689
"",
685690
nil,
@@ -706,6 +711,7 @@ func init() {
706711
testApp.BaseApp,
707712
testApp.TracerAnteHandler,
708713
ctxProvider,
714+
logCtxProvider,
709715
txConfigProvider,
710716
"",
711717
nil,
@@ -720,7 +726,7 @@ func init() {
720726
}
721727

722728
// Start ws server
723-
wsServer, err := evmrpc.NewEVMWebSocketServer(goodConfig, &MockClient{}, EVMKeeper, testApp.BeginBlockKeepers, testApp.BaseApp, testApp.TracerAnteHandler, ctxProvider, txConfigProvider, "", nil, false, nil)
729+
wsServer, err := evmrpc.NewEVMWebSocketServer(goodConfig, &MockClient{}, EVMKeeper, testApp.BeginBlockKeepers, testApp.BaseApp, testApp.TracerAnteHandler, ctxProvider, logCtxProvider, txConfigProvider, "", nil, false, nil)
724730
if err != nil {
725731
panic(err)
726732
}
@@ -732,7 +738,7 @@ func init() {
732738
// Setup: Autobahn HTTP FilterAPI on its own notifier so parallel newHeads tests do not mix hashes.
733739
notifierHTTPConfig := goodConfig
734740
notifierHTTPConfig.HTTPPort = TestNotifierHTTPPort
735-
notifierHTTPServer, err := evmrpc.NewEVMHTTPServer(notifierHTTPConfig, &MockClient{}, EVMKeeper, testApp.BeginBlockKeepers, testApp.BaseApp, testApp.TracerAnteHandler, ctxProvider, txConfigProvider, "", nil, true, BlockFilterNotifierForTest)
741+
notifierHTTPServer, err := evmrpc.NewEVMHTTPServer(notifierHTTPConfig, &MockClient{}, EVMKeeper, testApp.BeginBlockKeepers, testApp.BaseApp, testApp.TracerAnteHandler, ctxProvider, logCtxProvider, txConfigProvider, "", nil, true, BlockFilterNotifierForTest)
736742
if err != nil {
737743
panic(err)
738744
}
@@ -742,7 +748,7 @@ func init() {
742748
// Setup: Autobahn WS newHeads on NotifierForTest.
743749
notifierWSConfig := goodConfig
744750
notifierWSConfig.WSPort = TestNotifierWSPort
745-
notifierWSServer, err := evmrpc.NewEVMWebSocketServer(notifierWSConfig, &MockClient{}, EVMKeeper, testApp.BeginBlockKeepers, testApp.BaseApp, testApp.TracerAnteHandler, ctxProvider, txConfigProvider, "", nil, true, NotifierForTest)
751+
notifierWSServer, err := evmrpc.NewEVMWebSocketServer(notifierWSConfig, &MockClient{}, EVMKeeper, testApp.BeginBlockKeepers, testApp.BaseApp, testApp.TracerAnteHandler, ctxProvider, logCtxProvider, txConfigProvider, "", nil, true, NotifierForTest)
746752
if err != nil {
747753
panic(err)
748754
}

‎evmrpc/tests/utils.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ func setupTestServer(
202202
a.BaseApp,
203203
a.TracerAnteHandler,
204204
ctxProvider,
205+
func(height int64) sdk.Context { return ctxProvider(height).WithConsensusParams(nil) },
205206
func(int64) client.TxConfig { return a.GetTxConfig() },
206207
"",
207208
a.GetStateStore(),

‎giga/evmonly/rpc/parity/v2record/chain_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ func (c *v2Chain) serve() parity.Caller {
314314
cfg.HTTPPort = port
315315
a := c.app
316316
server, err := evmrpc.NewEVMHTTPServer(cfg, c.client, &a.EvmKeeper, a.BeginBlockKeepers, a.BaseApp, a.TracerAnteHandler,
317-
a.RPCContextProvider, func(int64) client.TxConfig { return a.GetTxConfig() }, "", a.GetStateStore(), false, nil)
317+
a.RPCContextProvider, a.RPCContextProviderWithoutConsensusParams, func(int64) client.TxConfig { return a.GetTxConfig() }, "", a.GetStateStore(), false, nil)
318318
require.NoError(c.t, err)
319319
c.settle()
320320
require.NoError(c.t, server.Start())

0 commit comments

Comments
 (0)