@agoric/cosmic-swingset 0.41.4-dev-ad1e50e.0 → 0.41.4-dev-0eaf7cc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/cosmic-swingset",
-  "version": "0.41.4-dev-ad1e50e.0+ad1e50e",
+  "version": "0.41.4-dev-0eaf7cc.0+0eaf7cc",
   "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-ad1e50e.0+ad1e50e",
-    "@agoric/cosmos": "0.34.2-dev-ad1e50e.0+ad1e50e",
-    "@agoric/deploy-script-support": "0.10.4-dev-ad1e50e.0+ad1e50e",
-    "@agoric/internal": "0.3.3-dev-ad1e50e.0+ad1e50e",
-    "@agoric/store": "0.9.3-dev-ad1e50e.0+ad1e50e",
-    "@agoric/swing-store": "0.9.2-dev-ad1e50e.0+ad1e50e",
-    "@agoric/swingset-vat": "0.32.3-dev-ad1e50e.0+ad1e50e",
-    "@agoric/telemetry": "0.6.3-dev-ad1e50e.0+ad1e50e",
-    "@agoric/vm-config": "0.1.1-dev-ad1e50e.0+ad1e50e",
+    "@agoric/builders": "0.1.1-dev-0eaf7cc.0+0eaf7cc",
+    "@agoric/cosmos": "0.34.2-dev-0eaf7cc.0+0eaf7cc",
+    "@agoric/deploy-script-support": "0.10.4-dev-0eaf7cc.0+0eaf7cc",
+    "@agoric/internal": "0.3.3-dev-0eaf7cc.0+0eaf7cc",
+    "@agoric/store": "0.9.3-dev-0eaf7cc.0+0eaf7cc",
+    "@agoric/swing-store": "0.9.2-dev-0eaf7cc.0+0eaf7cc",
+    "@agoric/swingset-vat": "0.32.3-dev-0eaf7cc.0+0eaf7cc",
+    "@agoric/telemetry": "0.6.3-dev-0eaf7cc.0+0eaf7cc",
+    "@agoric/vm-config": "0.1.1-dev-0eaf7cc.0+0eaf7cc",
     "@endo/bundle-source": "^3.3.0",
     "@endo/env-options": "^1.1.5",
     "@endo/errors": "^1.2.4",
@@ -70,5 +70,5 @@
   "typeCoverage": {
     "atLeast": 80.6
   },
-  "gitHead": "ad1e50e1abf378cc5421da7144c7f11fb3fde45f"
+  "gitHead": "0eaf7cc8151b4e1966f3f33e43362d3d021457aa"
 }

package/src/launch-chain.js

@@ -21,6 +21,7 @@ import {
   makeSwingsetController,
   loadBasedir,
   loadSwingsetConfigFile,
+  upgradeSwingset,
 } from '@agoric/swingset-vat';
 import { waitUntilQuiescent } from '@agoric/internal/src/lib-nodejs/waitUntilQuiescent.js';
 import { openSwingStore } from '@agoric/swing-store';
@@ -214,6 +215,7 @@ export async function buildSwingset(
   }
 
   const coreProposals = await ensureSwingsetInitialized();
+  upgradeSwingset(kernelStorage);
   const controller = await makeSwingsetController(
     kernelStorage,
     deviceEndowments,
@@ -331,6 +333,25 @@ export async function launch({
 }) {
   console.info('Launching SwingSet kernel');
 
+  // The swingstore export-data callback gives us export-data records,
+  // which must be written into IAVL by sending them over to the
+  // golang side with swingStoreExportCallback . However, that
+  // callback isn't ready right away, so if e.g. openSwingStore() were
+  // to invoke it, we might lose those records. Likewise
+  // saveOutsideState() gathers the chainSends just before calling
+  // commit, so if the callback were invoked during commit(), those
+  // records would be left for a subsequent block, which would break
+  // consensus if the node crashed before the next commit. So this
+  // `allowExportCallback` flag serves to catch these two cases.
+  //
+  // Note that swingstore is within its rights to call exportCallback
+  // during openSwingStore() or commit(), it just happens to not do so
+  // right now. If that changes under maintenance, this guard should
+  // turn a corruption bug into a crash bug. See
+  // https://github.com/Agoric/agoric-sdk/issues/9655 for details
+
+  let allowExportCallback = false;
+
   // The swingStore's exportCallback is synchronous, however we allow the
   // callback provided to launch-chain to be asynchronous. The callbacks are
   // invoked sequentially like if they were awaited, and the block manager
@@ -341,6 +362,7 @@ export async function launch({
   const swingStoreExportSyncCallback =
     swingStoreExportCallback &&
     (updates => {
+      assert(allowExportCallback, 'export-data callback called at bad time');
       pendingSwingStoreExport = swingStoreExportCallbackWithQueue(updates);
     });
 
@@ -468,6 +490,7 @@ export async function launch({
   }
 
   async function saveOutsideState(blockHeight) {
+    allowExportCallback = false;
     const chainSends = await clearChainSends();
     kvStore.set(getHostKey('height'), `${blockHeight}`);
     kvStore.set(getHostKey('chainSends'), JSON.stringify(chainSends));
@@ -887,6 +910,7 @@ export async function launch({
     // );
     switch (action.type) {
       case ActionType.AG_COSMOS_INIT: {
+        allowExportCallback = true; // cleared by saveOutsideState in COMMIT_BLOCK
         const { blockHeight, isBootstrap, upgradeDetails } = action;
 
         if (!blockNeedsExecution(blockHeight)) {
@@ -973,6 +997,7 @@ export async function launch({
       }
 
       case ActionType.BEGIN_BLOCK: {
+        allowExportCallback = true; // cleared by saveOutsideState in COMMIT_BLOCK
         const { blockHeight, blockTime, params } = action;
         blockParams = parseParams(params);
         verboseBlocks &&