fix: accommodate initial_height == "1" as well as > "1"

Author: michaelfig

packages/cosmic-swingset/Makefile

@@ -1,6 +1,8 @@
 REPOSITORY = agoric/cosmic-swingset
 CHAIN_ID = agoric
 INITIAL_TOKENS = 1000000000000uag
+INITIAL_HEIGHT = 17
+GENESIS_TIME = $(shell TZ=UTC date +%Y-%m-%dT%H:%M:%SZ)
 
 GOSRC = ../../golang/cosmos
 
@@ -65,7 +67,7 @@ scenario2-setup-nobuild:
 	$(AGCH) --home=t1/n0 validate-genesis
 	../agoric-cli/bin/agoric set-defaults --export-metrics ag-chain-cosmos t1/n0/config
 	# Set the chain address in all the ag-solos.
-	jq '. + { initial_height: "17" }' t1/n0/config/genesis.json > t1/n0/config/genesis2.json
+	jq '. + { genesis_time: "$(GENESIS_TIME)", initial_height: "$(INITIAL_HEIGHT)" }' t1/n0/config/genesis.json > t1/n0/config/genesis2.json
 	mv t1/n0/config/genesis2.json t1/n0/config/genesis.json
 	$(MAKE) set-local-gci-ingress
 

packages/cosmic-swingset/lib/block-manager.js

@@ -21,9 +21,10 @@ export default function makeBlockManager({
   saveOutsideState,
   savedActions,
   savedHeight,
+  bootstrapBlock,
   verboseBlocks = false,
 }) {
-  let computedHeight = savedHeight === 0 ? undefined : savedHeight;
+  let computedHeight = bootstrapBlock ? undefined : savedHeight;
   let runTime = 0;
 
   async function kernelPerformAction(action) {
@@ -172,7 +173,7 @@ export default function makeBlockManager({
 
           // Advance our saved state variables.
           savedActions = currentActions;
-          if (computedHeight === undefined) {
+          if (computedHeight === undefined && action.blockHeight > 1) {
             // Genesis height is the same as the first block, so we
             // need to adjust.
             computedHeight = action.blockHeight - 1;

packages/cosmic-swingset/lib/launch-chain.js

@@ -152,14 +152,14 @@ export async function launch(
     schedulerBlockTimeHistogram.record((now - blockStart) / 1000);
   }
 
-  let firstBlock;
+  let bootstrapBlock;
   async function endBlock(_blockHeight, _blockTime) {
     let numCranks = FIXME_MAX_CRANKS_PER_BLOCK;
-    if (firstBlock) {
+    if (bootstrapBlock) {
       // This is the initial block, we need to finish processing the entire
       // bootstrap before opening for business.
       numCranks = Infinity;
-      firstBlock = false;
+      bootstrapBlock = false;
     }
     await crankScheduler(numCranks);
   }
@@ -201,9 +201,9 @@ export async function launch(
   }
 
   const [savedHeight, savedActions, savedChainSends] = JSON.parse(
-    storage.get(SWING_STORE_META_KEY) || '[0, [], []]',
+    storage.get(SWING_STORE_META_KEY) || '[-1, [], []]',
   );
-  firstBlock = savedHeight === 0;
+  bootstrapBlock = savedHeight < 0;
 
   return {
     deliverInbound,
@@ -214,6 +214,7 @@ export async function launch(
     saveChainState,
     saveOutsideState,
     savedHeight,
+    bootstrapBlock,
     savedActions,
     savedChainSends,
   };