@agoric/cosmic-swingset 0.41.4-dev-57db88d.0.57db88d → 0.41.4-dev-acbc12e.0.acbc12e

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/cosmic-swingset",
-  "version": "0.41.4-dev-57db88d.0.57db88d",
+  "version": "0.41.4-dev-acbc12e.0.acbc12e",
   "description": "Agoric's Cosmos blockchain integration",
   "type": "module",
   "bin": {
@@ -22,15 +22,15 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/builders": "0.1.1-dev-57db88d.0.57db88d",
-    "@agoric/cosmos": "0.34.2-dev-57db88d.0.57db88d",
-    "@agoric/deploy-script-support": "0.10.4-dev-57db88d.0.57db88d",
-    "@agoric/internal": "0.3.3-dev-57db88d.0.57db88d",
-    "@agoric/store": "0.9.3-dev-57db88d.0.57db88d",
-    "@agoric/swing-store": "0.9.2-dev-57db88d.0.57db88d",
-    "@agoric/swingset-vat": "0.32.3-dev-57db88d.0.57db88d",
-    "@agoric/telemetry": "0.6.3-dev-57db88d.0.57db88d",
-    "@agoric/vm-config": "0.1.1-dev-57db88d.0.57db88d",
+    "@agoric/builders": "0.1.1-dev-acbc12e.0.acbc12e",
+    "@agoric/cosmos": "0.34.2-dev-acbc12e.0.acbc12e",
+    "@agoric/deploy-script-support": "0.10.4-dev-acbc12e.0.acbc12e",
+    "@agoric/internal": "0.3.3-dev-acbc12e.0.acbc12e",
+    "@agoric/store": "0.9.3-dev-acbc12e.0.acbc12e",
+    "@agoric/swing-store": "0.9.2-dev-acbc12e.0.acbc12e",
+    "@agoric/swingset-vat": "0.32.3-dev-acbc12e.0.acbc12e",
+    "@agoric/telemetry": "0.6.3-dev-acbc12e.0.acbc12e",
+    "@agoric/vm-config": "0.1.1-dev-acbc12e.0.acbc12e",
     "@endo/bundle-source": "^4.3.2",
     "@endo/env-options": "^1.1.11",
     "@endo/errors": "^1.3.1",
@@ -51,7 +51,7 @@
     "tmp": "^0.2.1"
   },
   "devDependencies": {
-    "@agoric/kmarshal": "0.1.1-dev-57db88d.0.57db88d",
+    "@agoric/kmarshal": "0.1.1-dev-acbc12e.0.acbc12e",
     "ava": "^8.0.1",
     "better-sqlite3": "^12.10.0",
     "c8": "^10.1.3",
@@ -84,5 +84,5 @@
   "typeCoverage": {
     "atLeast": 87.02
   },
-  "gitHead": "57db88d91b0e5c85c85f58ce77cd471131b44c48"
+  "gitHead": "acbc12e3724691dcaa8798b7b59cdf1ad06bfe8c"
 }

package/src/launch-chain.js

@@ -22,6 +22,7 @@ import {
   loadSwingsetConfigFile,
   normalizeConfig,
   upgradeSwingset,
+  applyVatOptionUpdates,
 } from '@agoric/swingset-vat';
 import { openSwingStore } from '@agoric/swing-store';
 import { attenuate, BridgeId as BRIDGE_ID } from '@agoric/internal';
@@ -1166,8 +1167,37 @@ export async function launchAndShareInternals({
 
         const softwareUpgradeCoreProposals = upgradeDetails?.coreProposals;
 
-        const { coreProposals: upgradeInfoCoreProposals } =
-          parseUpgradePlanInfo(upgradeDetails?.plan, ActionType.AG_COSMOS_INIT);
+        const {
+          coreProposals: upgradeInfoCoreProposals,
+          vatOptionUpdates: upgradeInfoVatOptionUpdates,
+        } = parseUpgradePlanInfo(
+          upgradeDetails?.plan,
+          ActionType.AG_COSMOS_INIT,
+        );
+
+        // Apply any host-injected in-place vat option updates for this
+        // software upgrade. This mirrors coreProposals handling: two
+        // channels, merged and applied at the upgrade block —
+        //   * upgradeDetails.vatOptionUpdates: hard-coded per chain in the
+        //     cosmos upgrade handler (golang/cosmos/app/upgrade.go), for
+        //     chains known there; and
+        //   * upgradePlan.info.vatOptionUpdates: proposer-supplied via the
+        //     upgrade proposal's info JSON.
+        // All chain selection is done cosmos-side; cosmic-swingset makes no
+        // chainID decision. Applying it here — before core proposals run and
+        // before COMMIT_BLOCK — gets it applied and recorded in consensus for
+        // every later block.
+        const vatOptionUpdates = [
+          ...(upgradeDetails?.vatOptionUpdates || []),
+          ...(upgradeInfoVatOptionUpdates || []),
+        ];
+        if (vatOptionUpdates.length) {
+          // Just for a clearer error if this were ever reached during
+          // bootstrap.
+          (upgradeDetails && !isBootstrap) ||
+            Fail`vat option updates are only supported during a software upgrade, not chain bootstrap`;
+          applyVatOptionUpdates(kernelStorage.kvStore, vatOptionUpdates);
+        }
 
         if (isBootstrap) {
           // This only runs for the very first block on the chain.