@agoric/cosmic-swingset 0.41.4-dev-a1dd248.0 → 0.41.4-dev-a9d113a.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/cosmic-swingset",
-  "version": "0.41.4-dev-a1dd248.0+a1dd248",
+  "version": "0.41.4-dev-a9d113a.0+a9d113a",
   "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-a1dd248.0+a1dd248",
-    "@agoric/builders": "0.1.1-dev-a1dd248.0+a1dd248",
-    "@agoric/cosmos": "0.34.2-dev-a1dd248.0+a1dd248",
-    "@agoric/deploy-script-support": "0.10.4-dev-a1dd248.0+a1dd248",
-    "@agoric/internal": "0.3.3-dev-a1dd248.0+a1dd248",
-    "@agoric/store": "0.9.3-dev-a1dd248.0+a1dd248",
-    "@agoric/swing-store": "0.9.2-dev-a1dd248.0+a1dd248",
-    "@agoric/swingset-vat": "0.32.3-dev-a1dd248.0+a1dd248",
-    "@agoric/telemetry": "0.6.3-dev-a1dd248.0+a1dd248",
-    "@agoric/vm-config": "0.1.1-dev-a1dd248.0+a1dd248",
+    "@agoric/assert": "0.6.1-dev-a9d113a.0+a9d113a",
+    "@agoric/builders": "0.1.1-dev-a9d113a.0+a9d113a",
+    "@agoric/cosmos": "0.34.2-dev-a9d113a.0+a9d113a",
+    "@agoric/deploy-script-support": "0.10.4-dev-a9d113a.0+a9d113a",
+    "@agoric/internal": "0.3.3-dev-a9d113a.0+a9d113a",
+    "@agoric/store": "0.9.3-dev-a9d113a.0+a9d113a",
+    "@agoric/swing-store": "0.9.2-dev-a9d113a.0+a9d113a",
+    "@agoric/swingset-vat": "0.32.3-dev-a9d113a.0+a9d113a",
+    "@agoric/telemetry": "0.6.3-dev-a9d113a.0+a9d113a",
+    "@agoric/vm-config": "0.1.1-dev-a9d113a.0+a9d113a",
     "@endo/bundle-source": "^2.7.0",
     "@endo/far": "^0.2.21",
     "@endo/import-bundle": "^0.4.1",
@@ -69,5 +69,5 @@
   "typeCoverage": {
     "atLeast": 79.4
   },
-  "gitHead": "a1dd248f1dc5a770760e7520660ca9d4d7f442aa"
+  "gitHead": "a9d113a09dfd93889ae985533535df53fdc771e7"
 }

package/src/launch-chain.js

@@ -497,6 +497,9 @@ export async function launch({
   }
 
   let savedHeight = Number(kvStore.get(getHostKey('height')) || 0);
+  let savedBeginHeight = Number(
+    kvStore.get(getHostKey('beginHeight')) || savedHeight,
+  );
   let runTime = 0;
   let chainTime;
   let saveTime = 0;
@@ -711,6 +714,11 @@ export async function launch({
     throw decohered;
   }
 
+  function saveBeginHeight(blockHeight) {
+    savedBeginHeight = blockHeight;
+    kvStore.set(getHostKey('beginHeight'), `${savedBeginHeight}`);
+  }
+
   async function afterCommit(blockHeight, blockTime) {
     await waitUntilQuiescent()
       .then(afterCommitCallback)
@@ -741,7 +749,7 @@ export async function launch({
         // This only runs for the very first block on the chain.
         if (isBootstrap) {
           verboseBlocks && blockManagerConsole.info('block bootstrap');
-          savedHeight === 0 ||
+          (savedHeight === 0 && savedBeginHeight === 0) ||
             Fail`Cannot run a bootstrap block at height ${savedHeight}`;
           const bootstrapBlockParams = parseParams(params);
           const blockHeight = 0;
@@ -749,6 +757,9 @@ export async function launch({
             type: 'cosmic-swingset-bootstrap-block-start',
             blockTime,
           });
+          // Start a block transaction, but without changing state
+          // for the upcoming begin block check
+          saveBeginHeight(savedBeginHeight);
           await processAction(action.type, async () =>
             bootstrapBlock(blockHeight, blockTime, bootstrapBlockParams),
           );
@@ -780,6 +791,10 @@ export async function launch({
           return undefined;
         }
 
+        // Start a block transaction, but without changing state
+        // for the upcoming begin block check
+        saveBeginHeight(savedBeginHeight);
+
         controller.writeSlogObject({
           type: 'cosmic-swingset-upgrade-start',
           blockHeight,
@@ -910,6 +925,17 @@ export async function launch({
           blockManagerConsole.info('block', blockHeight, 'begin');
         runTime = 0;
 
+        if (blockNeedsExecution(blockHeight)) {
+          if (savedBeginHeight === blockHeight) {
+            decohered = Error(
+              `Inconsistent committed state. Block ${blockHeight} had already began execution`,
+            );
+            throw decohered;
+          }
+          // Start a block transaction, recording which block height is executed
+          saveBeginHeight(blockHeight);
+        }
+
         controller.writeSlogObject({
           type: 'cosmic-swingset-begin-block',
           blockHeight,
@@ -947,6 +973,13 @@ export async function launch({
             throw e;
           }
         } else {
+          if (blockHeight !== savedBeginHeight) {
+            decohered = Error(
+              `Inconsistent committed state. Trying to end block ${blockHeight}, expected began block ${savedBeginHeight}`,
+            );
+            throw decohered;
+          }
+
           // And now we actually process the queued actions down here, during
           // END_BLOCK, but still reentrancy-protected.