Merge pull request #5394 from oasisprotocol/kostko/fix/storage-worker…

…-nort

go/worker/storage: Disable storage worker when no runtimes configured

.changelog/5394.bugfix.2.md

@@ -0,0 +1 @@
+go/oasis-net-runner: Fix SkipPolicy flag in default fixture

.changelog/5394.bugfix.md

@@ -0,0 +1 @@
+go/worker/storage: Disable storage worker when no runtimes configured

go/config/config.go

@@ -56,7 +56,7 @@ func (m NodeMode) IsClientOnly() bool {
 // HasLocalStorage returns true iff the mode is one that has local storage.
 func (m NodeMode) HasLocalStorage() bool {
 	switch m {
-	case ModeClient, ModeCompute:
+	case ModeClient, ModeCompute, ModeArchive:
 		return true
 	}
 	return false

go/consensus/cometbft/apps/beacon/beacon.go

@@ -10,6 +10,7 @@ import (
 	"golang.org/x/crypto/sha3"
 
 	beacon "github.com/oasisprotocol/oasis-core/go/beacon/api"
+	consensus "github.com/oasisprotocol/oasis-core/go/consensus/api"
 	"github.com/oasisprotocol/oasis-core/go/consensus/api/transaction"
 	"github.com/oasisprotocol/oasis-core/go/consensus/cometbft/api"
 	beaconState "github.com/oasisprotocol/oasis-core/go/consensus/cometbft/apps/beacon/state"
@@ -74,6 +75,12 @@ func (app *beaconApplication) ExecuteMessage(*api.Context, interface{}, interfac
 }
 
 func (app *beaconApplication) ExecuteTx(ctx *api.Context, tx *transaction.Transaction) error {
+	if app.backend == nil {
+		// Executing a transaction before BeginBlock -- likely during transaction simulation or
+		// checks. Fail the transaction, it may be retried.
+		return consensus.ErrNoCommittedBlocks
+	}
+
 	state := beaconState.NewMutableState(ctx.State())
 
 	params, err := state.ConsensusParameters(ctx)

go/oasis-net-runner/fixtures/default.go

@@ -162,7 +162,7 @@ func newDefaultFixture() (*oasis.NetworkFixture, error) {
 					Runtime:            0,
 					Entity:             1,
 					Policy:             0,
-					SkipPolicy:         tee != node.TEEHardwareInvalid,
+					SkipPolicy:         tee != node.TEEHardwareIntelSGX,
 					RuntimeProvisioner: runtimeProvisioner,
 				},
 			}

go/oasis-test-runner/scenario/e2e/upgrade.go

@@ -440,6 +440,12 @@ func (sc *nodeUpgradeImpl) Run(ctx context.Context, childEnv *env.Env) error { /
 		return err
 	}
 
+	// Wait for some blocks after the upgrade to make sure we don't query too fast.
+	_, err = sc.WaitBlocks(ctx, 2)
+	if err != nil {
+		return fmt.Errorf("failed to wait for blocks: %w", err)
+	}
+
 	// Run post-upgrade checker.
 	if err = sc.upgradeChecker.PostUpgradeFn(ctx, sc.Net.Controller()); err != nil {
 		return err

go/worker/storage/worker.go

@@ -38,10 +38,7 @@ func New(
 	commonWorker *workerCommon.Worker,
 	registration *registration.Worker,
 ) (*Worker, error) {
-	enabled := config.GlobalConfig.Mode.HasLocalStorage()
-	if config.GlobalConfig.Mode == config.ModeArchive && len(commonWorker.GetRuntimes()) > 0 {
-		enabled = true
-	}
+	enabled := config.GlobalConfig.Mode.HasLocalStorage() && len(commonWorker.GetRuntimes()) > 0
 
 	s := &Worker{
 		enabled:      enabled,