Merge pull request #5944 from oasisprotocol/peternose/trivial/improve…

…-multi-host

go/runtime/host/multi: Support adding runtimes on the fly

go/worker/common/committee/node.go

@@ -425,11 +425,10 @@ func (n *Node) updateHostedRuntimeVersionLocked() {
 
 	// Update the runtime version based on the currently active deployment.
 	activeDeploy := n.CurrentDescriptor.ActiveDeployment(epoch)
-	// NOTE: If there is no active deployment this will activate the all-zero version which may
-	//       result in the runtime stopping.
-	var activeVersion version.Version
+	var activeVersion *version.Version
 	if activeDeploy != nil {
-		activeVersion = activeDeploy.Version
+		activeVersion = new(version.Version)
+		*activeVersion = activeDeploy.Version
 	}
 
 	// For compute nodes, determine if there is a next version and activate it early.
@@ -444,7 +443,9 @@ func (n *Node) updateHostedRuntimeVersionLocked() {
 		}
 	}
 
-	if err := n.SetHostedRuntimeVersion(activeVersion, nextVersion); err != nil {
+	_ = n.SetHostedRuntimeVersion(activeVersion, nextVersion)
+
+	if _, err := n.GetHostedRuntimeActiveVersion(); err != nil {
 		n.logger.Error("failed to activate runtime version(s)",
 			"err", err,
 			"version", activeVersion,
@@ -680,7 +681,7 @@ func (n *Node) worker() {
 	defer blocksSub.Close()
 
 	// Provision the hosted runtime.
-	hrt, hrtNotifier, err := n.ProvisionHostedRuntime(n.ctx)
+	hrt, hrtNotifier, err := n.ProvisionHostedRuntime()
 	if err != nil {
 		n.logger.Error("failed to provision hosted runtime",
 			"err", err,

go/worker/common/committee/runtime_host.go

@@ -1,7 +1,6 @@
 package committee
 
 import (
-	"context"
 	"fmt"
 
 	"github.com/oasisprotocol/oasis-core/go/common/identity"
@@ -19,8 +18,8 @@ func (n *Node) GetRuntime() runtimeRegistry.Runtime {
 }
 
 // NewRuntimeHostNotifier implements RuntimeHostHandlerFactory.
-func (n *Node) NewRuntimeHostNotifier(ctx context.Context, host host.Runtime) protocol.Notifier {
-	return runtimeRegistry.NewRuntimeHostNotifier(ctx, n.Runtime, host, n.Consensus)
+func (n *Node) NewRuntimeHostNotifier(host host.Runtime) protocol.Notifier {
+	return runtimeRegistry.NewRuntimeHostNotifier(n.Runtime, host, n.Consensus)
 }
 
 type nodeEnvironment struct {

go/worker/keymanager/handler.go

@@ -1,7 +1,6 @@
 package keymanager
 
 import (
-	"context"
 	"fmt"
 
 	"github.com/oasisprotocol/oasis-core/go/common/identity"
@@ -20,8 +19,8 @@ func (w *Worker) GetRuntime() runtimeRegistry.Runtime {
 }
 
 // NewRuntimeHostNotifier implements workerCommon.RuntimeHostHandlerFactory.
-func (w *Worker) NewRuntimeHostNotifier(ctx context.Context, host host.Runtime) protocol.Notifier {
-	return runtimeRegistry.NewRuntimeHostNotifier(ctx, w.runtime, host, w.commonWorker.Consensus)
+func (w *Worker) NewRuntimeHostNotifier(host host.Runtime) protocol.Notifier {
+	return runtimeRegistry.NewRuntimeHostNotifier(w.runtime, host, w.commonWorker.Consensus)
 }
 
 type workerEnvironment struct {

go/worker/keymanager/worker.go

@@ -386,7 +386,7 @@ func (w *Worker) worker() {
 	// Provision the hosted runtime.
 	w.logger.Info("provisioning key manager runtime")
 
-	hrt, hrtNotifier, err := w.ProvisionHostedRuntime(w.ctx)
+	hrt, hrtNotifier, err := w.ProvisionHostedRuntime()
 	if err != nil {
 		w.logger.Error("failed to provision key manager runtime",
 			"err", err,
@@ -406,7 +406,9 @@ func (w *Worker) worker() {
 	// Key managers always need to use the enclave version given to them in the bundle
 	// as they need to make sure that replication is possible during upgrades.
 	activeVersion := w.runtime.HostVersions()[0] // Init made sure we have exactly one.
-	if err = w.SetHostedRuntimeVersion(activeVersion, nil); err != nil {
+	_ = w.SetHostedRuntimeVersion(&activeVersion, nil)
+
+	if _, err := w.GetHostedRuntimeActiveVersion(); err != nil {
 		w.logger.Error("failed to activate key manager runtime version",
 			"err", err,
 			"version", activeVersion,