Add Grafana Pyroscope SDK support

cmd/utils/flags.go

@@ -1116,6 +1116,10 @@ var (
 		Usage:   "Enables blazing fast eth_getProof for executed block",
 		Aliases: []string{"experimental.commitment-history"},
 	}
+	AlwaysGenerateChangesetsFlag = cli.BoolFlag{
+		Name:  "experimental.always-generate-changesets",
+		Usage: "Enables blazing fast eth_getProof for executed block",
+	}
 
 	// ErigonDB geometry settings
 	ErigonDBStepSizeFlag = cli.Uint64Flag{
@@ -1913,6 +1917,7 @@ func SetEthConfig(ctx *cli.Context, nodeConfig *nodecfg.Config, cfg *ethconfig.C
 		statecfg.EnableHistoricalCommitment()
 	}
 
+	cfg.AlwaysGenerateChangesets = ctx.Bool(AlwaysGenerateChangesetsFlag.Name)
 	cfg.CaplinConfig.EnableUPnP = ctx.Bool(CaplinEnableUPNPlag.Name)
 	var err error
 	cfg.CaplinConfig.MaxInboundTrafficPerPeer, err = datasize.ParseString(ctx.String(CaplinMaxInboundTrafficPerPeerFlag.Name))

db/snapcfg/util.go

@@ -524,12 +524,12 @@ func LoadRemotePreverified(ctx context.Context) (err error) {
 	} else {
 		log.Info("Loading remote snapshot hashes")
 
-		err = snapshothashes.LoadSnapshots(ctx, snapshothashes.R2, snapshotGitBranch)
+		_, err = snapshothashes.LoadSnapshots(ctx, snapshothashes.R2, snapshotGitBranch)
 		if err != nil {
 			log.Root().Warn("Failed to load snapshot hashes from R2; falling back to GitHub", "err", err)
 
 			// Fallback to GitHub if R2 fails
-			err = snapshothashes.LoadSnapshots(ctx, snapshothashes.Github, snapshotGitBranch)
+			_, err = snapshothashes.LoadSnapshots(ctx, snapshothashes.Github, snapshotGitBranch)
 			if err != nil {
 				return err
 			}

db/state/statecfg/state_schema.go

@@ -69,7 +69,7 @@ func Configure(Schema SchemaGen, a AggSetters, dirs datadir.Dirs, salt *uint32,
 	a.AddDependencyBtwnDomains(kv.AccountsDomain, kv.CommitmentDomain)
 	a.AddDependencyBtwnDomains(kv.StorageDomain, kv.CommitmentDomain)
 
-	a.KeepRecentTxnsOfHistoriesWithDisabledSnapshots(100_000) // ~1k blocks of history
+	//a.KeepRecentTxnsOfHistoriesWithDisabledSnapshots(100_000) // ~1k blocks of history
 	return nil
 }
 

execution/tests/engineapi_test.go

@@ -0,0 +1,200 @@
+package executiontests
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"net/http"
+	"path"
+	"path/filepath"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/cenkalti/backoff/v4"
+	"github.com/stretchr/testify/require"
+
+	"github.com/erigontech/erigon/cmd/rpcdaemon/cli"
+	"github.com/erigontech/erigon/cmd/rpcdaemon/cli/httpcfg"
+	"github.com/erigontech/erigon/common/jwt"
+	"github.com/erigontech/erigon/common/log/v3"
+	"github.com/erigontech/erigon/common/testlog"
+	"github.com/erigontech/erigon/db/datadir"
+	"github.com/erigontech/erigon/db/kv/dbcfg"
+	"github.com/erigontech/erigon/execution/builder/buildercfg"
+	enginetypes "github.com/erigontech/erigon/execution/engineapi/engine_types"
+	"github.com/erigontech/erigon/execution/genesiswrite"
+	"github.com/erigontech/erigon/execution/tests/testutil"
+	"github.com/erigontech/erigon/execution/types"
+	"github.com/erigontech/erigon/node"
+	"github.com/erigontech/erigon/node/eth"
+	"github.com/erigontech/erigon/node/ethconfig"
+	"github.com/erigontech/erigon/node/nodecfg"
+	"github.com/erigontech/erigon/p2p"
+	"github.com/erigontech/erigon/rpc"
+	"github.com/erigontech/erigon/txnprovider/txpool/txpoolcfg"
+)
+
+func TestEngineApiPerformance(t *testing.T) {
+	if testing.Short() {
+		t.Skip()
+	}
+
+	engineApiTestDir := filepath.Join(".", "engineapi-performance-tests")
+	tm := new(testMatcher)
+	tm.walk(t, engineApiTestDir, func(t *testing.T, name string, test *EngineApiTest) {
+		t.Parallel()
+
+		ctx, cancel := context.WithCancel(context.Background())
+		defer cancel()
+		if err := tm.checkFailure(t, test.Run(ctx, t)); err != nil {
+			t.Error(err)
+		}
+	})
+}
+
+type EngineApiTest struct {
+	Genesis  *types.Genesis      `json:"genesis"`
+	Requests []*EngineApiRequest `json:"requests"`
+}
+
+func (eat *EngineApiTest) Run(ctx context.Context, t *testing.T) error {
+	logger := testlog.Logger(t, log.LvlDebug)
+	dataDir := t.TempDir()
+	dirs := datadir.New(dataDir)
+	engineApiPort, err := testutil.NextFreePort()
+	require.NoError(t, err)
+
+	httpConfig := httpcfg.HttpCfg{
+		AuthRpcHTTPListenAddress: "127.0.0.1",
+		AuthRpcPort:              engineApiPort,
+		JWTSecretPath:            path.Join(dataDir, "jwt.hex"),
+	}
+
+	nodeKeyConfig := p2p.NodeKeyConfig{}
+	nodeKey, err := nodeKeyConfig.LoadOrGenerateAndSave(nodeKeyConfig.DefaultPath(dataDir))
+	require.NoError(t, err)
+	nodeConfig := nodecfg.Config{
+		Dirs: dirs,
+		Http: httpConfig,
+		P2P: p2p.Config{
+			ListenAddr:      fmt.Sprintf("127.0.0.1:0"),
+			MaxPeers:        1,
+			MaxPendingPeers: 1,
+			NoDiscovery:     true,
+			NoDial:          true,
+			ProtocolVersion: []uint{},
+			AllowedPorts:    []uint{},
+			PrivateKey:      nodeKey,
+		},
+	}
+
+	txPoolConfig := txpoolcfg.DefaultConfig
+	txPoolConfig.DBDir = dirs.TxPool
+
+	ethConfig := ethconfig.Config{
+		Dirs: dirs,
+		Snapshot: ethconfig.BlocksFreezing{
+			NoDownloader: true,
+		},
+		TxPool: txPoolConfig,
+		Miner: buildercfg.MiningConfig{
+			EnabledPOS: true,
+		},
+	}
+
+	ethNode, err := node.New(ctx, &nodeConfig, logger)
+	require.NoError(t, err)
+	cleanNode := func(ethNode *node.Node) func() {
+		return func() {
+			err := ethNode.Close()
+			if errors.Is(err, node.ErrNodeStopped) {
+				return
+			}
+			require.NoError(t, err)
+		}
+	}
+	t.Cleanup(cleanNode(ethNode))
+
+	// init genesis
+	chainDB, err := node.OpenDatabase(ctx, ethNode.Config(), dbcfg.ChainDB, "", false, logger)
+	require.NoError(t, err)
+	_, _, err = genesiswrite.CommitGenesisBlock(chainDB, eat.Genesis, ethNode.Config().Dirs, logger)
+	require.NoError(t, err)
+	chainDB.Close()
+
+	// start node
+	ethBackend, err := eth.New(ctx, ethNode, &ethConfig, logger, nil)
+	require.NoError(t, err)
+	err = ethBackend.Init(ethNode, &ethConfig, eat.Genesis.Config)
+	require.NoError(t, err)
+	err = ethNode.Start()
+	require.NoError(t, err)
+
+	// init engine api client
+	jwtSecret, err := cli.ObtainJWTSecret(&httpConfig, logger)
+	require.NoError(t, err)
+	//goland:noinspection HttpUrlsUsage
+	engineApiUrl := fmt.Sprintf("http://%s:%d", httpConfig.AuthRpcHTTPListenAddress, httpConfig.AuthRpcPort)
+	jwtRoundTripper := jwt.NewHttpRoundTripper(http.DefaultTransport, jwtSecret)
+	httpClient := &http.Client{Timeout: 30 * time.Second, Transport: jwtRoundTripper}
+	rpcClient, err := rpc.DialHTTPWithClient(engineApiUrl, httpClient, logger)
+	require.NoError(t, err)
+
+	// perform requests
+	sendRequestWithRetry := func(req func() error) error {
+		// needed as there may be a race between when engine api has been initialised and this test hitting it
+		return backoff.Retry(req, backoff.WithMaxRetries(backoff.NewConstantBackOff(100*time.Millisecond), 100))
+	}
+	timeout := time.After(time.Minute)
+	queue := eat.Requests
+	requestCounter := 1
+	for len(queue) > 0 {
+		request := queue[0]
+		var status enginetypes.EngineStatus
+		var requestType string
+		if strings.HasPrefix(request.Method, "engine_forkchoiceUpdatedV") {
+			var result enginetypes.ForkChoiceUpdatedResponse
+			err = sendRequestWithRetry(func() error {
+				return rpcClient.CallContext(ctx, &result, request.Method, request.Params...)
+			})
+			require.NoError(t, err)
+			status = result.PayloadStatus.Status
+			requestType = "forkchoiceUpdated"
+		} else if strings.HasPrefix(request.Method, "engine_newPayloadV") {
+			var result enginetypes.PayloadStatus
+			err = sendRequestWithRetry(func() error {
+				return rpcClient.CallContext(ctx, &result, request.Method, request.Params...)
+			})
+			require.NoError(t, err)
+			status = result.Status
+			requestType = "newPayload"
+		} else {
+			panic("unexpected method: " + request.Method)
+		}
+
+		if status == enginetypes.SyncingStatus {
+			select {
+			case <-timeout:
+				t.Fatalf("timeout waiting for syncing to finish: request=%d, type=%s", requestCounter, requestType)
+			default: // continue
+			}
+
+			logger.Debug("waiting for syncing to finish", "request", requestCounter, "type", requestType)
+			time.Sleep(200 * time.Millisecond)
+			continue // retry the request
+		}
+
+		require.Equal(t, enginetypes.ValidStatus, status, "unexpected status for request=%d, type=%s", requestCounter, requestType)
+		queue = queue[1:]
+		requestCounter++
+	}
+
+	return nil
+}
+
+type EngineApiRequest struct {
+	Method string        `json:"method"`
+	Params []interface{} `json:"params"`
+	Id     uint64        `json:"id"`
+}

execution/vm/contracts.go

@@ -474,7 +474,6 @@ func modExpMultComplexityEip198(x uint32) uint64 {
 
 // RequiredGas returns the gas required to execute the pre-compiled contract.
 func (c *bigModExp) RequiredGas(input []byte) uint64 {
-
 	var minGas uint64
 	var adjExpFactor uint64
 	var finalDivisor uint64

execution/vm/testdata/precompiles/bn254Add.json

@@ -110,5 +110,12 @@
     "Name": "cdetrio14",
     "Gas": 150,
     "NoBenchmark": false
+  },
+  {
+    "Input": "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",
+    "Expected": "030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd315ed738c0e0a7c92e7845f96b2ae9c0a68a6a449e3538fc7ff3ebf7a5a18a2c4",
+    "Name": "add12",
+    "Gas": 150,
+    "NoBenchmark": false
   }
 ]

go.mod

@@ -5,7 +5,7 @@ go 1.24.0
 replace github.com/holiman/bloomfilter/v2 => github.com/AskAlexSharov/bloomfilter/v2 v2.0.9
 
 require (
-	github.com/erigontech/erigon-snapshot v1.3.1-0.20250718024755-5b6d5407844d
+	github.com/erigontech/erigon-snapshot v1.3.1-0.20250731094644-2f399d9fb4a1
 	github.com/erigontech/erigonwatch v0.0.0-20240718131902-b6576bde1116
 	github.com/erigontech/mdbx-go v0.39.11
 	github.com/erigontech/secp256k1 v1.2.0
@@ -195,6 +195,8 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/google/gopacket v1.1.19 // indirect
 	github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e // indirect
+	github.com/grafana/pyroscope-go v1.2.7 // indirect
+	github.com/grafana/pyroscope-go/godeltaprof v0.1.9 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/ianlancetaylor/cgosymbolizer v0.0.0-20241129212102-9c50ad6b591e // indirect
 	github.com/imdario/mergo v0.3.11 // indirect

go.sum

@@ -301,8 +301,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
 github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/erigontech/erigon-snapshot v1.3.1-0.20250718024755-5b6d5407844d h1:8EEw4EDiVVx84WKrHSyNGuWLrbxJ3x+OnoXUsYIXo9U=
-github.com/erigontech/erigon-snapshot v1.3.1-0.20250718024755-5b6d5407844d/go.mod h1:ooHlCl+eEYzebiPu+FP6Q6SpPUeMADn8Jxabv3IKb9M=
+github.com/erigontech/erigon-snapshot v1.3.1-0.20250731094644-2f399d9fb4a1 h1:aBU9c1vo74ZFPzvUhSpU8kvlMgoGlXOKO7hxiZBJYRM=
+github.com/erigontech/erigon-snapshot v1.3.1-0.20250731094644-2f399d9fb4a1/go.mod h1:ooHlCl+eEYzebiPu+FP6Q6SpPUeMADn8Jxabv3IKb9M=
 github.com/erigontech/erigonwatch v0.0.0-20240718131902-b6576bde1116 h1:KCFa2uXEfZoBjV4buzjWmCmoqVLXiGCq0ZmQ2OjeRvQ=
 github.com/erigontech/erigonwatch v0.0.0-20240718131902-b6576bde1116/go.mod h1:8vQ+VjvLu2gkPs8EwdPrOTAAo++WuLuBi54N7NuAF0I=
 github.com/erigontech/mdbx-go v0.39.11 h1:4qp5jDakeisZ+1ABaLcQe46acE/Z0Q+/mcCAahXRnR8=
@@ -496,6 +496,10 @@ github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51
 github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/grafana/pyroscope-go v1.2.7 h1:VWBBlqxjyR0Cwk2W6UrE8CdcdD80GOFNutj0Kb1T8ac=
+github.com/grafana/pyroscope-go v1.2.7/go.mod h1:o/bpSLiJYYP6HQtvcoVKiE9s5RiNgjYTj1DhiddP2Pc=
+github.com/grafana/pyroscope-go/godeltaprof v0.1.9 h1:c1Us8i6eSmkW+Ez05d3co8kasnuOY813tbMN8i/a3Og=
+github.com/grafana/pyroscope-go/godeltaprof v0.1.9/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU=
 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI=
 github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8=

node/cli/default_flags.go

@@ -89,6 +89,7 @@ var DefaultFlags = []cli.Flag{
 	&utils.RPCGlobalTxFeeCapFlag,
 	&utils.TxpoolApiAddrFlag,
 	&utils.TraceMaxtracesFlag,
+	&utils.AlwaysGenerateChangesetsFlag,
 
 	&HTTPReadTimeoutFlag,
 	&HTTPWriteTimeoutFlag,