@agoric/cosmic-swingset 0.41.4-dev-5c932ce.0 → 0.41.4-dev-9c73ae4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/cosmic-swingset",
-  "version": "0.41.4-dev-5c932ce.0+5c932ce",
+  "version": "0.41.4-dev-9c73ae4.0+9c73ae4",
   "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-5c932ce.0+5c932ce",
-    "@agoric/cosmos": "0.34.2-dev-5c932ce.0+5c932ce",
-    "@agoric/deploy-script-support": "0.10.4-dev-5c932ce.0+5c932ce",
-    "@agoric/internal": "0.3.3-dev-5c932ce.0+5c932ce",
-    "@agoric/store": "0.9.3-dev-5c932ce.0+5c932ce",
-    "@agoric/swing-store": "0.9.2-dev-5c932ce.0+5c932ce",
-    "@agoric/swingset-vat": "0.32.3-dev-5c932ce.0+5c932ce",
-    "@agoric/telemetry": "0.6.3-dev-5c932ce.0+5c932ce",
-    "@agoric/vm-config": "0.1.1-dev-5c932ce.0+5c932ce",
+    "@agoric/builders": "0.1.1-dev-9c73ae4.0+9c73ae4",
+    "@agoric/cosmos": "0.34.2-dev-9c73ae4.0+9c73ae4",
+    "@agoric/deploy-script-support": "0.10.4-dev-9c73ae4.0+9c73ae4",
+    "@agoric/internal": "0.3.3-dev-9c73ae4.0+9c73ae4",
+    "@agoric/store": "0.9.3-dev-9c73ae4.0+9c73ae4",
+    "@agoric/swing-store": "0.9.2-dev-9c73ae4.0+9c73ae4",
+    "@agoric/swingset-vat": "0.32.3-dev-9c73ae4.0+9c73ae4",
+    "@agoric/telemetry": "0.6.3-dev-9c73ae4.0+9c73ae4",
+    "@agoric/vm-config": "0.1.1-dev-9c73ae4.0+9c73ae4",
     "@endo/bundle-source": "^3.4.2",
     "@endo/env-options": "^1.1.7",
     "@endo/errors": "^1.2.7",
@@ -71,5 +71,5 @@
   "typeCoverage": {
     "atLeast": 80.55
   },
-  "gitHead": "5c932ce0135a574d0fd8cac810ba677c92769525"
+  "gitHead": "9c73ae4bfa7d48114690e694b065ee0a1ce99e30"
 }

package/src/launch-chain.js

@@ -215,7 +215,7 @@ export async function buildSwingset(
   }
 
   const pendingCoreProposals = await ensureSwingsetInitialized();
-  upgradeSwingset(kernelStorage);
+  const { modified } = upgradeSwingset(kernelStorage);
   const controller = await makeSwingsetController(
     kernelStorage,
     deviceEndowments,
@@ -236,6 +236,7 @@ export async function buildSwingset(
   return {
     coreProposals: pendingCoreProposals,
     controller,
+    kernelHasUpgradeEvents: modified,
     mb: mailboxDevice,
     bridgeInbound: bridgeDevice.deliverInbound,
     timer: timerDevice,
@@ -408,6 +409,7 @@ export async function launch({
   const {
     coreProposals: bootstrapCoreProposals,
     controller,
+    kernelHasUpgradeEvents,
     mb,
     bridgeInbound,
     timer,
@@ -510,6 +512,14 @@ export async function launch({
     await commit();
   }
 
+  async function doKernelUpgradeEvents(inboundNum) {
+    controller.writeSlogObject({
+      type: 'cosmic-swingset-inject-kernel-upgrade-events',
+      inboundNum,
+    });
+    controller.injectQueuedUpgradeEvents();
+  }
+
   async function deliverInbound(sender, messages, ack, inboundNum) {
     Array.isArray(messages) || Fail`inbound given non-Array: ${messages}`;
     controller.writeSlogObject({
@@ -629,6 +639,11 @@ export async function launch({
         break;
       }
 
+      case ActionType.KERNEL_UPGRADE_EVENTS: {
+        p = doKernelUpgradeEvents(inboundNum);
+        break;
+      }
+
       case ActionType.INSTALL_BUNDLE: {
         p = installBundle(action.bundle);
         break;
@@ -934,6 +949,22 @@ export async function launch({
           await doBootstrap(action);
         }
 
+        // The reboot-time upgradeSwingset() may have generated some
+        // remediation events that need to be injected at the right
+        // time (after catchup, before proposals). Push them onto
+        // runThisBlock before anything else goes there.
+        if (kernelHasUpgradeEvents) {
+          isBootstrap ||
+            upgradeDetails ||
+            Fail`Unexpected kernel upgrade events outside of consensus start`;
+          const txHash = 'x/kernel-upgrade-events';
+          const context = { blockHeight, txHash, msgIdx: 0 };
+          runThisBlock.push({
+            action: { type: ActionType.KERNEL_UPGRADE_EVENTS },
+            context,
+          });
+        }
+
         // Concatenate together any pending core proposals from chain bootstrap
         // with any from this inbound init action, then execute them all.
         const coreProposals = mergeCoreProposals(