Skip to content

Commit c2fca0f

Browse files
authored
Skip consensus params on eth_getLogs contexts (#4734)
On the default pebbledb receipt store, `eth_getLogs`, filter polls and log subscriptions scan block by block, and each block builds four or five SDK contexts through `RPCContextProvider`. Every build calls `GetConsensusParams`, which costs 14 store reads, but nothing on the log path reads `ctx.ConsensusParams()`. Under getLogs load on v6.7.2, this was about 26% of node CPU in an RPC operator's production profile. This change adds `RPCContextProviderWithoutConsensusParams`, which returns the same context without `ConsensusParams`. It is passed to `NewEVMHTTPServer` and `NewEVMWebSocketServer` as `logCtxProvider` and used only by `FilterAPI` and the subscription `LogFetcher`. Every other API keeps `RPCContextProvider`, including newHeads, which reads the block gas limit. The change is RPC-only and does not touch state or consensus code. Measured on a local single-validator chain (v6.7.2 with this change applied, about 45k blocks, `worker_pool_size = 1024`), 20 parallel 2000-block `eth_getLogs` calls went from 5.4 to 13.7 req/s, with p50 dropping from 3.7s to 1.5s. A single 2000-block query went from about 390ms to 145ms, and a 1490-log response hashed identically before and after. The new app test checks that the provider differs from `RPCContextProvider` only in `ConsensusParams`, and the `evmrpc` suites run their log tests against contexts without them. Part of PLT-1566.
1 parent 024e446 commit c2fca0f

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
@@ -2425,21 +2425,25 @@ func (app *App) RegisterAPIRoutes(apiSvr *api.Server, apiConfig config.APIConfig
24252425
}
24262426

24272427
func (app *App) RPCContextProvider(i int64) sdk.Context {
2428+
ctx := app.RPCContextProviderWithoutConsensusParams(i)
2429+
// Neither GetCheckCtx nor CreateQueryContext sets ConsensusParams (only
2430+
// the tx-execution path does, via getContextForTx), so without this,
2431+
// ctx.ConsensusParams() returns nil from any RPC handler. evmrpc/block.go's
2432+
// gasLimit and evmrpc/info.go's gas-used-ratio rely on it.
2433+
return ctx.WithConsensusParams(app.GetConsensusParams(ctx))
2434+
}
2435+
2436+
// RPCContextProviderWithoutConsensusParams returns the context RPCContextProvider
2437+
// returns for height i, with ConsensusParams left nil.
2438+
func (app *App) RPCContextProviderWithoutConsensusParams(i int64) sdk.Context {
24282439
if i == evmrpc.LatestCtxHeight {
24292440
ctx := app.GetCheckCtx()
2430-
// Populate ConsensusParams on the RPC ctx. Neither GetCheckCtx nor
2431-
// CreateQueryContext sets it (only the tx-execution path does, via
2432-
// getContextForTx), so without this, ctx.ConsensusParams() returns
2433-
// nil from any RPC handler. evmrpc/block.go's gasLimit and
2434-
// evmrpc/info.go's gas-used-ratio rely on it.
2435-
ctx = ctx.WithConsensusParams(app.GetConsensusParams(ctx))
24362441
return ctx.WithIsEVM(true).WithTraceMode(true).WithIsCheckTx(false).WithClosestUpgradeName(LatestUpgrade)
24372442
}
24382443
ctx, err := app.CreateQueryContext(i, false)
24392444
if err != nil {
24402445
panic(err)
24412446
}
2442-
ctx = ctx.WithConsensusParams(app.GetConsensusParams(ctx))
24432447
closestUpgrade, upgradeHeight := app.UpgradeKeeper.GetClosestUpgrade(app.GetCheckCtx(), i)
24442448
if closestUpgrade == "" && upgradeHeight == 0 {
24452449
closestUpgrade = LatestUpgrade
@@ -2512,7 +2516,7 @@ func (app *App) RegisterLocalServices(node client.LocalClient, txConfig client.T
25122516
// Autobahn serves the node's EVM-only JSON-RPC. Cosmos evmrpc would bind
25132517
// the same 8545 once Initialized fires (mock-app forwards InitChain).
25142518
if app.evmRPCConfig.HTTPEnabled && !app.autobahnEnabled {
2515-
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)
2519+
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)
25162520
if err != nil {
25172521
panic(err)
25182522
}
@@ -2525,7 +2529,7 @@ func (app *App) RegisterLocalServices(node client.LocalClient, txConfig client.T
25252529
}
25262530

25272531
if app.evmRPCConfig.WSEnabled && !app.autobahnEnabled {
2528-
evmWSServer, err := evmrpc.NewEVMWebSocketServer(app.evmRPCConfig, node, &app.EvmKeeper, app.BeginBlockKeepers, app.BaseApp, app.TracerAnteHandler, rpcCtxProvider, txConfigProvider, DefaultNodeHome, app.GetStateStore(), app.autobahnEnabled, headNotifier)
2532+
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)
25292533
if err != nil {
25302534
panic(err)
25312535
}

‎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
@@ -48,6 +48,7 @@ func NewEVMHTTPServer(
4848
app *baseapp.BaseApp,
4949
antehandler sdk.AnteHandler,
5050
ctxProvider func(int64) sdk.Context,
51+
logCtxProvider func(int64) sdk.Context,
5152
txConfigProvider func(int64) client.TxConfig,
5253
homeDir string,
5354
stateStore types.StateStore,
@@ -172,7 +173,7 @@ func NewEVMHTTPServer(
172173
Service: NewFilterAPI(
173174
tmClient,
174175
k,
175-
ctxProvider,
176+
logCtxProvider,
176177
txConfigProvider,
177178
&FilterConfig{timeout: config.FilterTimeout, maxLog: config.MaxLogNoBlock, maxLogBytes: config.MaxLogBytes, maxBlock: config.MaxBlocksForLog, maxFilters: config.MaxFilters, maxBlockFilterHashes: config.MaxBlockFilterHashes},
178179
ConnectionTypeHTTP,
@@ -242,6 +243,7 @@ func NewEVMWebSocketServer(
242243
app *baseapp.BaseApp,
243244
antehandler sdk.AnteHandler,
244245
ctxProvider func(int64) sdk.Context,
246+
logCtxProvider func(int64) sdk.Context,
245247
txConfigProvider func(int64) client.TxConfig,
246248
homeDir string,
247249
stateStore types.StateStore,
@@ -328,7 +330,7 @@ func NewEVMWebSocketServer(
328330
Service: NewSubscriptionAPI(tmClient, k, ctxProvider, &LogFetcher{
329331
tmClient: tmClient,
330332
k: k,
331-
ctxProvider: ctxProvider,
333+
ctxProvider: logCtxProvider,
332334
txConfigProvider: txConfigProvider,
333335
dbReadSemaphore: dbReadSemaphore,
334336
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
@@ -204,6 +204,7 @@ func setupTestServer(
204204
a.BaseApp,
205205
a.TracerAnteHandler,
206206
ctxProvider,
207+
func(height int64) sdk.Context { return ctxProvider(height).WithConsensusParams(nil) },
207208
func(int64) client.TxConfig { return a.GetTxConfig() },
208209
"",
209210
a.GetStateStore(),

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

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

0 commit comments

Comments
 (0)