Revert "release 2.55: Revert PR 8829 (erigontech#8896)"

This reverts commit b39f324.
and this recovers erigontech#8829

Co-Authored-By: battlmonstr <11477595+battlmonstr@users.noreply.github.com>

.github/workflows/ci.yml

@@ -29,7 +29,7 @@ jobs:
     if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }}
     strategy:
       matrix:
-        os: [ ubuntu-20.04, macos-11 ] # list of os: https://github.com/actions/virtual-environments
+        os: [ ubuntu-22.04, macos-13-xlarge ] # list of os: https://github.com/actions/virtual-environments
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -113,7 +113,7 @@ jobs:
   docker-build-check:
     # don't run this on devel - the PR must have run it to be merged and it misleads that this pushes the docker image
     if: (${{ github.event_name == 'push' || !github.event.pull_request.draft }}) && ${{ github.ref != 'refs/heads/devel' }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: AutoModality/action-clean@v1
       - uses: actions/checkout@v3
@@ -129,7 +129,7 @@ jobs:
 
 #  automated-tests:
 #    runs-on:
-#      ubuntu-20.04
+#      ubuntu-22.04
 #    if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }}
 #    steps:
 #      - uses: actions/checkout@v3

.github/workflows/test-integration-caplin.yml

@@ -21,8 +21,7 @@ jobs:
     strategy:
       matrix:
 #        disable macos-11 until https://github.com/ledgerwatch/erigon/issues/8789
-#        os: [ ubuntu-20.04, macos-11 ] # list of os: https://github.com/actions/virtual-environments
-        os: [ ubuntu-20.04 ] # list of os: https://github.com/actions/virtual-environments
+        os: [ ubuntu-22.04 ] # list of os: https://github.com/actions/virtual-environments
     runs-on: ${{ matrix.os }}
 
     steps:

.github/workflows/test-integration.yml

@@ -14,7 +14,7 @@ jobs:
   tests:
     strategy:
       matrix:
-        os: [ ubuntu-20.04, macos-11 ] # list of os: https://github.com/actions/virtual-environments
+        os: [ ubuntu-22.04, macos-13-xlarge ] # list of os: https://github.com/actions/virtual-environments
     runs-on: ${{ matrix.os }}
 
     steps:

Dockerfile

@@ -15,7 +15,7 @@ ADD . .
 RUN --mount=type=cache,target=/root/.cache \
     --mount=type=cache,target=/tmp/go-build \
     --mount=type=cache,target=/go/pkg/mod \
-    make all
+    make BUILD_TAGS=nosqlite,noboltdb,nosilkworm all
 
 
 FROM docker.io/library/golang:1.20-alpine3.17 AS tools-builder

cmd/utils/flags.go

@@ -909,11 +909,6 @@ var (
 		Usage: "Comma separated list of support session ids to connect to",
 	}
 
-	SilkwormLibraryPathFlag = cli.StringFlag{
-		Name:  "silkworm.libpath",
-		Usage: "Path to the Silkworm library",
-		Value: "",
-	}
 	SilkwormExecutionFlag = cli.BoolFlag{
 		Name:  "silkworm.exec",
 		Usage: "Enable Silkworm block execution",
@@ -926,6 +921,7 @@ var (
 		Name:  "silkworm.sentry",
 		Usage: "Enable embedded Silkworm Sentry service",
 	}
+
 	BeaconAPIFlag = cli.BoolFlag{
 		Name:  "beacon.api",
 		Usage: "Enable beacon API",
@@ -1640,10 +1636,7 @@ func setCaplin(ctx *cli.Context, cfg *ethconfig.Config) {
 }
 
 func setSilkworm(ctx *cli.Context, cfg *ethconfig.Config) {
-	cfg.SilkwormLibraryPath = ctx.String(SilkwormLibraryPathFlag.Name)
-	if ctx.IsSet(SilkwormExecutionFlag.Name) {
-		cfg.SilkwormExecution = ctx.Bool(SilkwormExecutionFlag.Name)
-	}
+	cfg.SilkwormExecution = ctx.Bool(SilkwormExecutionFlag.Name)
 	cfg.SilkwormRpcDaemon = ctx.Bool(SilkwormRpcDaemonFlag.Name)
 	cfg.SilkwormSentry = ctx.Bool(SilkwormSentryFlag.Name)
 }

eth/backend.go

@@ -361,8 +361,8 @@ func New(ctx context.Context, stack *node.Node, config *ethconfig.Config, logger
 
 	backend.gasPrice, _ = uint256.FromBig(config.Miner.GasPrice)
 
-	if config.SilkwormLibraryPath != "" {
-		backend.silkworm, err = silkworm.New(config.SilkwormLibraryPath, config.Dirs.DataDir)
+	if config.SilkwormExecution || config.SilkwormRpcDaemon || config.SilkwormSentry {
+		backend.silkworm, err = silkworm.New(config.Dirs.DataDir)
 		if err != nil {
 			return nil, err
 		}
@@ -403,7 +403,7 @@ func New(ctx context.Context, stack *node.Node, config *ethconfig.Config, logger
 			MaxPeers:    p2pConfig.MaxPeers,
 		}
 
-		silkwormSentryService := backend.silkworm.NewSentryService(settings)
+		silkwormSentryService := silkworm.NewSentryService(backend.silkworm, settings)
 		backend.silkwormSentryService = &silkwormSentryService
 
 		sentryClient, err := sentry_multi_client.GrpcClient(backend.sentryCtx, apiAddr)
@@ -980,7 +980,7 @@ func (s *Ethereum) Init(stack *node.Node, config *ethconfig.Config) error {
 	s.apiList = jsonrpc.APIList(chainKv, ethRpcClient, txPoolRpcClient, miningRpcClient, ff, stateCache, blockReader, s.agg, &httpRpcCfg, s.engine, s.seqRPCService, s.historicalRPCService, s.logger)
 
 	if config.SilkwormRpcDaemon && httpRpcCfg.Enabled {
-		silkwormRPCDaemonService := s.silkworm.NewRpcDaemonService(chainKv)
+		silkwormRPCDaemonService := silkworm.NewRpcDaemonService(s.silkworm, chainKv)
 		s.silkwormRPCDaemonService = &silkwormRPCDaemonService
 	} else {
 		go func() {
@@ -1462,7 +1462,9 @@ func (s *Ethereum) Stop() error {
 		}
 	}
 	if s.silkworm != nil {
-		s.silkworm.Close()
+		if err := s.silkworm.Close(); err != nil {
+			s.logger.Error("silkworm.Close error", "err", err)
+		}
 	}
 
 	return nil

eth/ethconfig/config.go

@@ -106,9 +106,6 @@ var Defaults = Config{
 		KeepBlocks: false,
 		Produce:    true,
 	},
-
-	// applies if SilkwormLibraryPath is set
-	SilkwormExecution: true,
 }
 
 func init() {
@@ -269,10 +266,9 @@ type Config struct {
 	ForcePartialCommit bool
 
 	// Embedded Silkworm support
-	SilkwormLibraryPath string
-	SilkwormExecution   bool
-	SilkwormRpcDaemon   bool
-	SilkwormSentry      bool
+	SilkwormExecution bool
+	SilkwormRpcDaemon bool
+	SilkwormSentry    bool
 
 	DisableTxPoolGossip bool
 

eth/stagedsync/stage_execute.go

@@ -465,7 +465,7 @@ Loop:
 
 		_, isMemoryMutation := tx.(*membatchwithdb.MemoryMutation)
 		if cfg.silkworm != nil && !isMemoryMutation {
-			blockNum, err = cfg.silkworm.ExecuteBlocks(tx, cfg.chainConfig.ChainID, blockNum, to, uint64(cfg.batchSize), writeChangeSets, writeReceipts, writeCallTraces)
+			blockNum, err = silkworm.ExecuteBlocks(cfg.silkworm, tx, cfg.chainConfig.ChainID, blockNum, to, uint64(cfg.batchSize), writeChangeSets, writeReceipts, writeCallTraces)
 		} else {
 			err = executeBlock(block, tx, batch, cfg, *cfg.vmConfig, writeChangeSets, writeReceipts, writeCallTraces, initialCycle, stateStream, logger)
 		}

params/version.go

@@ -29,47 +29,24 @@ var (
 	GitTag    string
 )
 
-// Version is the version of upstream erigon
 // see https://calver.org
 const (
-	VersionMajor       = 2  // Major version component of the current release
-	VersionMinor       = 56 // Minor version component of the current release
-	VersionMicro       = 2  // Patch version component of the current release
-	VersionModifier    = "" // Modifier component of the current release
+	VersionMajor       = 2        // Major version component of the current release
+	VersionMinor       = 38       // Minor version component of the current release
+	VersionMicro       = 0        // Patch version component of the current release
+	VersionModifier    = "stable" // Modifier component of the current release
 	VersionKeyCreated  = "ErigonVersionCreated"
 	VersionKeyFinished = "ErigonVersionFinished"
 )
 
-// OPVersion is the version of op-erigon
-const (
-	OPVersionMajor    = 0          // Major version component of the current release
-	OPVersionMinor    = 5          // Minor version component of the current release
-	OPVersionMicro    = 0          // Patch version component of the current release
-	OPVersionModifier = "unstable" // Version metadata to append to the version string
-)
-
 // Version holds the textual version string.
 var Version = func() string {
-	return fmt.Sprintf("%d.%02d.%d", OPVersionMajor, OPVersionMinor, OPVersionMicro)
+	return fmt.Sprintf("%d.%02d.%d", VersionMajor, VersionMinor, VersionMicro)
 }()
 
 // VersionWithMeta holds the textual version string including the metadata.
 var VersionWithMeta = func() string {
 	v := Version
-	if OPVersionModifier != "" {
-		v += "-" + OPVersionModifier
-	}
-	return v
-}()
-
-// ErigonVersion holds the textual erigon version string.
-var ErigonVersion = func() string {
-	return fmt.Sprintf("%d.%d.%d", VersionMajor, VersionMinor, VersionMicro)
-}()
-
-// ErigonVersionWithMeta holds the textual erigon version string including the metadata.
-var ErigonVersionWithMeta = func() string {
-	v := ErigonVersion
 	if VersionModifier != "" {
 		v += "-" + VersionModifier
 	}

turbo/cli/default_flags.go

@@ -175,7 +175,6 @@ var DefaultFlags = []cli.Flag{
 	&utils.GenesisPathFlag,
 	&utils.OtsSearchMaxCapFlag,
 
-	&utils.SilkwormLibraryPathFlag,
 	&utils.SilkwormExecutionFlag,
 	&utils.SilkwormRpcDaemonFlag,
 	&utils.SilkwormSentryFlag,

turbo/silkworm/silkworm.go

@@ -7,6 +7,7 @@ import (
 	"github.com/erigontech/silkworm-go"
 	"github.com/ledgerwatch/erigon-lib/kv"
 	"github.com/ledgerwatch/erigon/consensus"
+	"math/big"
 )
 
 type Silkworm = silkworm_go.Silkworm