@agoric/cosmic-swingset 0.41.4-dev-7386420.0 → 0.41.4-dev-7bf5870.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/cosmic-swingset",
-  "version": "0.41.4-dev-7386420.0+7386420",
+  "version": "0.41.4-dev-7bf5870.0+7bf5870",
   "description": "Agoric's Cosmos blockchain integration",
   "type": "module",
   "bin": {
@@ -22,16 +22,16 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-7386420.0+7386420",
-    "@agoric/builders": "0.1.1-dev-7386420.0+7386420",
-    "@agoric/cosmos": "0.34.2-dev-7386420.0+7386420",
-    "@agoric/deploy-script-support": "0.10.4-dev-7386420.0+7386420",
-    "@agoric/internal": "0.3.3-dev-7386420.0+7386420",
-    "@agoric/store": "0.9.3-dev-7386420.0+7386420",
-    "@agoric/swing-store": "0.9.2-dev-7386420.0+7386420",
-    "@agoric/swingset-vat": "0.32.3-dev-7386420.0+7386420",
-    "@agoric/telemetry": "0.6.3-dev-7386420.0+7386420",
-    "@agoric/vm-config": "0.1.1-dev-7386420.0+7386420",
+    "@agoric/assert": "0.6.1-dev-7bf5870.0+7bf5870",
+    "@agoric/builders": "0.1.1-dev-7bf5870.0+7bf5870",
+    "@agoric/cosmos": "0.34.2-dev-7bf5870.0+7bf5870",
+    "@agoric/deploy-script-support": "0.10.4-dev-7bf5870.0+7bf5870",
+    "@agoric/internal": "0.3.3-dev-7bf5870.0+7bf5870",
+    "@agoric/store": "0.9.3-dev-7bf5870.0+7bf5870",
+    "@agoric/swing-store": "0.9.2-dev-7bf5870.0+7bf5870",
+    "@agoric/swingset-vat": "0.32.3-dev-7bf5870.0+7bf5870",
+    "@agoric/telemetry": "0.6.3-dev-7bf5870.0+7bf5870",
+    "@agoric/vm-config": "0.1.1-dev-7bf5870.0+7bf5870",
     "@endo/bundle-source": "^3.0.2",
     "@endo/far": "^1.0.2",
     "@endo/import-bundle": "^1.0.2",
@@ -69,5 +69,5 @@
   "typeCoverage": {
     "atLeast": 79.32
   },
-  "gitHead": "738642095d444795a16ee23c6e34e97f0f8e37ba"
+  "gitHead": "7bf587060268281ef4b53ed89cefccfd9cd3f8ea"
 }

package/src/launch-chain.js

@@ -884,30 +884,34 @@ export async function launch({
     // );
     switch (action.type) {
       case ActionType.AG_COSMOS_INIT: {
-        const { blockHeight, isBootstrap, upgradePlan } = action;
+        const { blockHeight, isBootstrap, upgradeDetails } = action;
 
         if (!blockNeedsExecution(blockHeight)) {
           return true;
         }
 
-        let { coreProposals } = parseUpgradePlanInfo(
-          upgradePlan,
-          ActionType.AG_COSMOS_INIT,
-        );
+        const softwareUpgradeCoreProposals = upgradeDetails?.coreProposals;
+
+        const { coreProposals: upgradeInfoCoreProposals } =
+          parseUpgradePlanInfo(upgradeDetails?.plan, ActionType.AG_COSMOS_INIT);
 
         if (isBootstrap) {
           // This only runs for the very first block on the chain.
           await doBootstrap(action);
-
-          // Merge the core proposals from the bootstrap block with the
-          // ones from the upgrade plan.
-          coreProposals = mergeCoreProposals(
-            bootstrapCoreProposals,
-            coreProposals,
-          );
         }
 
-        if (coreProposals) {
+        // Merge the core proposals from the bootstrap block with the
+        // ones from the upgrade.
+        const coreProposals = mergeCoreProposals(
+          bootstrapCoreProposals,
+          softwareUpgradeCoreProposals,
+          upgradeInfoCoreProposals,
+        );
+
+        if (coreProposals.steps.length) {
+          upgradeDetails ||
+            isBootstrap ||
+            Fail`Unexpected core proposals outside of consensus start`;
           await doCoreProposals(action, coreProposals);
         }
         return true;