Merge branch 'main' into e2e-node-api

berachain · Sep 30, 2024 · c1c5e46 · c1c5e46
2 parents f4be7e8 + b6c134d
commit c1c5e46
Show file tree

Hide file tree

Showing 27 changed files with 147 additions and 163 deletions.
diff --git a/mod/consensus/pkg/cometbft/service/options.go b/mod/consensus/pkg/cometbft/service/options.go
@@ -81,12 +81,3 @@ func SetChainID[
 ](chainID string) func(*Service[LoggerT]) {
 	return func(s *Service[LoggerT]) { s.chainID = chainID }
 }
-
-func (s *Service[_]) SetName(name string) {
-	s.name = name
-}
-
-// SetVersion sets the application's version string.
-func (s *Service[_]) SetVersion(v string) {
-	s.version = v
-}
diff --git a/mod/consensus/pkg/cometbft/service/service.go b/mod/consensus/pkg/cometbft/service/service.go
@@ -87,7 +87,6 @@ func NewService[
 	logger LoggerT,
 	db dbm.DB,
 	middleware MiddlewareI,
-	loadLatest bool,
 	cmtCfg *cmtcfg.Config,
 	cs common.ChainSpec,
 	options ...func(*Service[LoggerT]),
@@ -102,9 +101,9 @@ func NewService[
 		Middleware: middleware,
 		cmtCfg:     cmtCfg,
 		paramStore: params.NewConsensusParamsStore(cs),
+		version:    version.Version,
 	}
 
-	s.SetVersion(version.Version)
 	s.MountStore(storeKey, storetypes.StoreTypeIAVL)
 
 	for _, option := range options {
@@ -115,11 +114,9 @@ func NewService[
 		s.sm.CommitMultiStore().SetInterBlockCache(s.interBlockCache)
 	}
 
-	// Load the s.
-	if loadLatest {
-		if err := s.sm.LoadLatestVersion(); err != nil {
-			panic(err)
-		}
+	// Load latest height, once all stores have been set
+	if err := s.sm.LoadLatestVersion(); err != nil {
+		panic(err)
 	}
 
 	return s

diff --git a/mod/engine-primitives/pkg/engine-primitives/mocks/blobs_bundle.mock.go b/mod/engine-primitives/pkg/engine-primitives/mocks/blobs_bundle.mock.go
diff --git a/mod/engine-primitives/pkg/engine-primitives/mocks/built_execution_payload_env.mock.go b/mod/engine-primitives/pkg/engine-primitives/mocks/built_execution_payload_env.mock.go
diff --git a/mod/engine-primitives/pkg/engine-primitives/mocks/payload_attributer.mock.go b/mod/engine-primitives/pkg/engine-primitives/mocks/payload_attributer.mock.go
diff --git a/mod/node-api/backend/mocks/availability_store.mock.go b/mod/node-api/backend/mocks/availability_store.mock.go
diff --git a/mod/node-api/backend/mocks/beacon_block_header.mock.go b/mod/node-api/backend/mocks/beacon_block_header.mock.go