feat: use debugName to differentiate sim-chain instances

packages/SwingSet/src/controller.js

@@ -35,11 +35,6 @@ function makeConsole(tag) {
 }
 const console = makeConsole('SwingSet:controller');
 
-// FIXME: Put this somewhere better.
-process.on('unhandledRejection', e =>
-  console.error('UnhandledPromiseRejectionWarning:', e),
-);
-
 const ADMIN_DEVICE_PATH = require.resolve('./kernel/vatAdmin/vatAdmin-src');
 const ADMIN_VAT_PATH = require.resolve('./kernel/vatAdmin/vatAdminWrapper');
 const KERNEL_SOURCE_PATH = require.resolve('./kernel/kernel.js');
@@ -135,10 +130,19 @@ export async function buildVatController(
   argv = [],
   runtimeOptions = {},
 ) {
+  const { debugPrefix = '' } = runtimeOptions;
   if (typeof Compartment === 'undefined') {
     throw Error('SES must be installed before calling buildVatController');
   }
 
+  // eslint-disable-next-line no-shadow
+  const console = makeConsole(`${debugPrefix}SwingSet:controller`);
+
+  // FIXME: Put this somewhere better.
+  process.on('unhandledRejection', e =>
+    console.error('UnhandledPromiseRejectionWarning:', e),
+  );
+
   // https://github.com/Agoric/SES-shim/issues/292
   harden(Object.getPrototypeOf(console));
   harden(console);
@@ -168,7 +172,7 @@ export async function buildVatController(
   const kernelNS = await importBundle(kernelSource, {
     filePrefix: 'kernel',
     endowments: {
-      console: makeConsole('SwingSet:kernel'),
+      console: makeConsole(`${debugPrefix}SwingSet:kernel`),
       require: kernelRequire,
       HandledPromise,
     },
@@ -203,7 +207,7 @@ export async function buildVatController(
 
   function makeVatEndowments(consoleTag) {
     return harden({
-      console: makeConsole(`SwingSet:${consoleTag}`),
+      console: makeConsole(`${debugPrefix}SwingSet:${consoleTag}`),
       HandledPromise,
       // re2 is a RegExp work-a-like that disables backtracking expressions for
       // safer memory consumption

packages/cosmic-swingset/app/app.go

@@ -1,6 +1,7 @@
 package app
 
 import (
+	"encoding/json"
 	"fmt"
 	"io"
 	"os"
@@ -418,6 +419,13 @@ func NewAgoricApp(
 	return app
 }
 
+type cosmosInitAction struct {
+	Type        string `json:"type"`
+	IBCPort     int    `json:"ibcPort"`
+	StoragePort int    `json:"storagePort"`
+	ChainID     string `json:"chainID"`
+}
+
 // Name returns the name of the App
 func (app *AgoricApp) Name() string { return app.BaseApp.Name() }
 
@@ -428,8 +436,16 @@ func (app *AgoricApp) MustInitController(ctx sdk.Context) {
 	app.controllerInited = true
 
 	// Begin initializing the controller here.
-	msg := fmt.Sprintf(`{"type":"AG_COSMOS_INIT","ibcPort":%d,"storagePort":%d}`, app.IBCPort, swingset.GetPort("storage"))
-	_, err := app.swingSetKeeper.CallToController(ctx, msg)
+	action := &cosmosInitAction{
+		Type:        "AG_COSMOS_INIT",
+		IBCPort:     app.IBCPort,
+		StoragePort: swingset.GetPort("storage"),
+		ChainID:     ctx.ChainID(),
+	}
+	bz, err := json.Marshal(action)
+	if err == nil {
+		_, err = app.swingSetKeeper.CallToController(ctx, string(bz))
+	}
 	if err != nil {
 		fmt.Fprintln(os.Stderr, "Cannot initialize Controller", err)
 		os.Exit(1)

packages/cosmic-swingset/lib/ag-solo/fake-chain.js

@@ -62,6 +62,7 @@ export async function connectToFakeChain(basedir, GCI, role, delay, inbound) {
     flushChainSends,
     vatsdir,
     argv,
+    GCI, // debugName
   );
 
   const blockManager = makeBlockManager(s);

packages/cosmic-swingset/lib/launch-chain.js

@@ -22,7 +22,9 @@ async function buildSwingset(
   storage,
   vatsDir,
   argv,
+  debugName = undefined,
 ) {
+  const debugPrefix = debugName === undefined ? '' : `${debugName}:`;
   const config = {};
   const mbs = buildMailboxStateMap();
   mbs.populateFromData(mailboxState);
@@ -50,6 +52,7 @@ async function buildSwingset(
 
   const controller = await buildVatController(config, argv, {
     hostStorage: storage,
+    debugPrefix,
   });
   await controller.run();
 
@@ -64,6 +67,7 @@ export async function launch(
   flushChainSends,
   vatsDir,
   argv,
+  debugName = undefined,
 ) {
   log.info('Launching SwingSet kernel');
 
@@ -87,6 +91,7 @@ export async function launch(
     storage,
     vatsDir,
     argv,
+    debugName,
   );
 
   function saveChainState() {

packages/cosmic-swingset/x/swingset/blockers.go

@@ -13,6 +13,7 @@ type beginBlockAction struct {
 	StoragePort int    `json:"storagePort"`
 	BlockHeight int64  `json:"blockHeight"`
 	BlockTime   int64  `json:"blockTime"`
+	ChainID     string `json:"chainID"`
 }
 
 type endBlockAction struct {
@@ -34,6 +35,7 @@ func BeginBlock(ctx sdk.Context, req abci.RequestBeginBlock, keeper Keeper) erro
 		StoragePort: GetPort("storage"),
 		BlockHeight: ctx.BlockHeight(),
 		BlockTime:   ctx.BlockTime().Unix(),
+		ChainID:     ctx.ChainID(),
 	}
 	b, err := json.Marshal(action)
 	if err != nil {