feat(SwingSet): support more managers with consensusMode

Agoric · Jul 14, 2021 · ea3280e · ea3280e
1 parent 4eff4ff
commit ea3280e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/packages/SwingSet/src/kernel/vatManager/manager-local.js b/packages/SwingSet/src/kernel/vatManager/manager-local.js
@@ -7,6 +7,7 @@ import {
   makeSupervisorDispatch,
   makeMeteredDispatch,
   makeSupervisorSyscall,
+  makeVatConsole,
 } from './supervisor-helper.js';
 
 export function makeLocalVatManagerFactory(tools) {
@@ -91,6 +92,7 @@ export function makeLocalVatManagerFactory(tools) {
     vatSyscallHandler,
   ) {
     const {
+      consensusMode,
       metered = false,
       enableDisavow = false,
       enableSetup = false,
@@ -148,7 +150,7 @@ export function makeLocalVatManagerFactory(tools) {
     const endowments = harden({
       ...vatEndowments,
       ...ls.vatGlobals,
-      console: vatConsole,
+      console: makeVatConsole(vatConsole, !consensusMode),
       assert,
     });
     const inescapableTransforms = [];

diff --git a/packages/SwingSet/src/kernel/vatManager/manager-nodeworker.js b/packages/SwingSet/src/kernel/vatManager/manager-nodeworker.js
@@ -37,6 +37,7 @@ export function makeNodeWorkerVatManagerFactory(tools) {
 
   function createFromBundle(vatID, bundle, managerOptions, vatSyscallHandler) {
     const {
+      consensusMode,
       vatParameters,
       virtualObjectCacheSize,
       enableDisavow,
@@ -116,6 +117,7 @@ export function makeNodeWorkerVatManagerFactory(tools) {
       virtualObjectCacheSize,
       enableDisavow,
       enableVatstore,
+      consensusMode,
     ]);
 
     function deliverToWorker(delivery) {

diff --git a/packages/SwingSet/src/kernel/vatManager/manager-subprocess-node.js b/packages/SwingSet/src/kernel/vatManager/manager-subprocess-node.js
@@ -17,6 +17,7 @@ export function makeNodeSubprocessFactory(tools) {
 
   function createFromBundle(vatID, bundle, managerOptions, vatSyscallHandler) {
     const {
+      consensusMode,
       vatParameters,
       virtualObjectCacheSize,
       enableDisavow,
@@ -111,6 +112,7 @@ export function makeNodeSubprocessFactory(tools) {
       virtualObjectCacheSize,
       enableDisavow,
       enableVatstore,
+      consensusMode,
     ]);
 
     function shutdown() {