@agoric/cosmic-swingset 0.41.4-dev-91f5e93.0 → 0.41.4-dev-e28392f.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/cosmic-swingset",
-  "version": "0.41.4-dev-91f5e93.0+91f5e93",
+  "version": "0.41.4-dev-e28392f.0+e28392f",
   "description": "Agoric's Cosmos blockchain integration",
   "type": "module",
   "bin": {
@@ -22,14 +22,14 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-91f5e93.0+91f5e93",
-    "@agoric/cosmos": "0.34.2-dev-91f5e93.0+91f5e93",
-    "@agoric/deploy-script-support": "0.10.4-dev-91f5e93.0+91f5e93",
-    "@agoric/internal": "0.3.3-dev-91f5e93.0+91f5e93",
-    "@agoric/store": "0.9.3-dev-91f5e93.0+91f5e93",
-    "@agoric/swing-store": "0.9.2-dev-91f5e93.0+91f5e93",
-    "@agoric/swingset-vat": "0.32.3-dev-91f5e93.0+91f5e93",
-    "@agoric/telemetry": "0.6.3-dev-91f5e93.0+91f5e93",
+    "@agoric/assert": "0.6.1-dev-e28392f.0+e28392f",
+    "@agoric/cosmos": "0.34.2-dev-e28392f.0+e28392f",
+    "@agoric/deploy-script-support": "0.10.4-dev-e28392f.0+e28392f",
+    "@agoric/internal": "0.3.3-dev-e28392f.0+e28392f",
+    "@agoric/store": "0.9.3-dev-e28392f.0+e28392f",
+    "@agoric/swing-store": "0.9.2-dev-e28392f.0+e28392f",
+    "@agoric/swingset-vat": "0.32.3-dev-e28392f.0+e28392f",
+    "@agoric/telemetry": "0.6.3-dev-e28392f.0+e28392f",
     "@endo/far": "^0.2.19",
     "@endo/import-bundle": "^0.3.5",
     "@endo/init": "^0.5.57",
@@ -60,5 +60,5 @@
     ],
     "timeout": "20m"
   },
-  "gitHead": "91f5e93d5818c9c52a6035aeaec47a803a6d7363"
+  "gitHead": "e28392f880293ee3398c739aeb0e6887feb897ec"
 }

package/src/chain-main.js

@@ -45,8 +45,6 @@ import { performStateSyncImport } from './import-kernel-db.js';
 // eslint-disable-next-line no-unused-vars
 let whenHellFreezesOver = null;
 
-const AG_COSMOS_INIT = 'AG_COSMOS_INIT';
-
 const TELEMETRY_SERVICE_NAME = 'agd-cosmos';
 
 const toNumber = specimen => {
@@ -619,7 +617,7 @@ export default async function main(progname, args, { env, homedir, agcc }) {
     await null;
 
     switch (action.type) {
-      case AG_COSMOS_INIT: {
+      case ActionType.AG_COSMOS_INIT: {
         // console.error('got AG_COSMOS_INIT', action);
 
         !blockingSend || Fail`Swingset already initialized`;
@@ -644,7 +642,7 @@ export default async function main(progname, args, { env, homedir, agcc }) {
         // Ensure that initialization has completed.
         blockingSend = await launchAndInitializeSwingSet(action);
 
-        return true;
+        return blockingSend(action);
       }
 
       // Snapshot actions are specific to cosmos chains and handled here

package/src/launch-chain.js

@@ -672,14 +672,9 @@ export async function launch({
 
   // Handle block related actions
   // Some actions that are integration specific may be handled by the caller
-  // For example COSMOS_SNAPSHOT and AG_COSMOS_INIT are handled in chain-main.js
-  async function blockingSend(action) {
-    if (decohered) {
-      throw decohered;
-    }
-
-    await afterCommitWorkDone;
-
+  // For example COSMOS_SNAPSHOT is handled in chain-main.js
+  async function doBlockingSend(action) {
+    await null;
     // blockManagerConsole.warn(
     //   'FIGME: blockHeight',
     //   action.blockHeight,
@@ -687,38 +682,55 @@ export async function launch({
     //   action.type,
     // );
     switch (action.type) {
-      case ActionType.BOOTSTRAP_BLOCK: {
+      case ActionType.AG_COSMOS_INIT: {
+        const { isBootstrap, upgradePlan, blockTime } = action;
         // This only runs for the very first block on the chain.
-        const { blockTime } = action;
-        verboseBlocks && blockManagerConsole.info('block bootstrap');
-        if (savedHeight !== 0) {
-          throw Error(`Cannot run a bootstrap block at height ${savedHeight}`);
+        if (isBootstrap) {
+          verboseBlocks && blockManagerConsole.info('block bootstrap');
+          savedHeight === 0 ||
+            Fail`Cannot run a bootstrap block at height ${savedHeight}`;
+          const blockHeight = 0;
+          const runNum = 0;
+          controller.writeSlogObject({
+            type: 'cosmic-swingset-bootstrap-block-start',
+            blockTime,
+          });
+          controller.writeSlogObject({
+            type: 'cosmic-swingset-run-start',
+            blockHeight,
+            runNum,
+          });
+          await processAction(action.type, async () =>
+            bootstrapBlock(blockHeight, blockTime),
+          );
+          controller.writeSlogObject({
+            type: 'cosmic-swingset-run-finish',
+            blockHeight,
+            runNum,
+          });
+          controller.writeSlogObject({
+            type: 'cosmic-swingset-bootstrap-block-finish',
+            blockTime,
+          });
         }
-        const blockHeight = 0;
-        const runNum = 0;
-        controller.writeSlogObject({
-          type: 'cosmic-swingset-bootstrap-block-start',
-          blockTime,
-        });
-        controller.writeSlogObject({
-          type: 'cosmic-swingset-run-start',
-          blockHeight,
-          runNum,
-        });
-        await processAction(action.type, async () =>
-          bootstrapBlock(blockHeight, blockTime),
-        );
-        controller.writeSlogObject({
-          type: 'cosmic-swingset-run-finish',
-          blockHeight,
-          runNum,
-        });
-        await pendingSwingStoreExport;
-        controller.writeSlogObject({
-          type: 'cosmic-swingset-bootstrap-block-finish',
-          blockTime,
-        });
-        return undefined;
+        if (upgradePlan) {
+          const blockHeight = upgradePlan.height;
+          if (blockNeedsExecution(blockHeight)) {
+            controller.writeSlogObject({
+              type: 'cosmic-swingset-upgrade-start',
+              blockHeight,
+              blockTime,
+              upgradePlan,
+            });
+            // TODO: Process upgrade plan
+            controller.writeSlogObject({
+              type: 'cosmic-swingset-upgrade-finish',
+              blockHeight,
+              blockTime,
+            });
+          }
+        }
+        return true;
       }
 
       case ActionType.COMMIT_BLOCK: {
@@ -825,7 +837,7 @@ export async function launch({
 
           // We write out our on-chain state as a number of chainSends.
           const start = Date.now();
-          await Promise.all([saveChainState(), pendingSwingStoreExport]);
+          await saveChainState();
           chainTime = Date.now() - start;
 
           // Advance our saved state variables.
@@ -848,6 +860,15 @@ export async function launch({
       }
     }
   }
+  async function blockingSend(action) {
+    if (decohered) {
+      throw decohered;
+    }
+
+    await afterCommitWorkDone;
+
+    return doBlockingSend(action).finally(() => pendingSwingStoreExport);
+  }
 
   async function shutdown() {
     return controller.shutdown();

package/src/sim-chain.js

@@ -201,11 +201,12 @@ export async function connectToFakeChain(basedir, GCI, delay, inbound) {
       return;
     }
     // The before-first-block is special... do it now.
-    // This emulates what x/swingset does to run a BOOTSTRAP_BLOCK
+    // This emulates what x/swingset does when bootstrapping
     // before continuing with the real initialHeight.
     await blockingSend({
-      type: 'BOOTSTRAP_BLOCK',
+      type: 'AG_COSMOS_INIT',
       blockTime: scaleBlockTime(Date.now()),
+      isBootstrap: true,
     });
     blockHeight = initialHeight;
   };