feat(cosmic-swingset): remove unnecessary explicit activityhash

The activityhash is now part of the swingstore export
Agoric · Apr 19, 2023 · 5dcc44d · 5dcc44d
1 parent be68431
commit 5dcc44d
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 61 deletions.
diff --git a/golang/cosmos/x/swingset/keeper/keeper.go b/golang/cosmos/x/swingset/keeper/keeper.go
@@ -25,14 +25,13 @@ import (
 // Top-level paths for chain storage should remain synchronized with
 // packages/internal/src/chain-storage-paths.js
 const (
-	StoragePathActionQueue  = "actionQueue"
-	StoragePathActivityhash = "activityhash"
-	StoragePathBeansOwing   = "beansOwing"
-	StoragePathEgress       = "egress"
-	StoragePathMailbox      = "mailbox"
-	StoragePathCustom       = "published"
-	StoragePathBundles      = "bundles"
-	StoragePathSwingStore   = "swingStore"
+	StoragePathActionQueue = "actionQueue"
+	StoragePathBeansOwing  = "beansOwing"
+	StoragePathEgress      = "egress"
+	StoragePathMailbox     = "mailbox"
+	StoragePathCustom      = "published"
+	StoragePathBundles     = "bundles"
+	StoragePathSwingStore  = "swingStore"
 )
 
 // 2 ** 256 - 1

diff --git a/packages/cosmic-swingset/src/chain-main.js b/packages/cosmic-swingset/src/chain-main.js
@@ -279,14 +279,6 @@ export default async function main(progname, args, { env, homedir, agcc }) {
         }),
       );
     };
-    function setActivityhash(activityhash) {
-      const entry = [STORAGE_PATH.ACTIVITYHASH, activityhash];
-      const msg = stringify({
-        method: 'set',
-        args: [entry],
-      });
-      chainSend(portNums.storage, msg);
-    }
     function doOutboundBridge(dstID, msg) {
       const portNum = portNums[dstID];
       if (portNum === undefined) {
@@ -427,7 +419,6 @@ export default async function main(progname, args, { env, homedir, agcc }) {
       mailboxStorage,
       clearChainSends,
       replayChainSends,
-      setActivityhash,
       bridgeOutbound: doOutboundBridge,
       vatconfig,
       argv,

diff --git a/packages/cosmic-swingset/src/launch-chain.js b/packages/cosmic-swingset/src/launch-chain.js
@@ -216,7 +216,6 @@ export async function launch({
   mailboxStorage,
   clearChainSends,
   replayChainSends,
-  setActivityhash,
   bridgeOutbound,
   makeInstallationPublisher,
   vatconfig,
@@ -303,9 +302,6 @@ export async function launch({
     // entire bootstrap before opening for business.
     const policy = neverStop();
     await crankScheduler(policy);
-    if (setActivityhash) {
-      setActivityhash(controller.getActivityhash());
-    }
   }
 
   async function saveChainState() {
@@ -482,47 +478,39 @@ export async function launch({
       return runPolicy.shouldRun();
     }
 
-    async function doRunKernel() {
-      // First, complete leftover work, if any
-      let keepGoing = await runSwingset();
-      if (!keepGoing) return;
-
-      // Then, update the timer device with the new external time, which might
-      // push work onto the kernel run-queue (if any timers were ready to wake).
-      const addedToQueue = timer.poll(blockTime);
-      console.debug(
-        `polled; blockTime:${blockTime}, h:${blockHeight}; ADDED =`,
-        addedToQueue,
-      );
-      // We must run the kernel even if nothing was added since the kernel
-      // only notes state exports and updates consistency hashes when attempting
-      // to perform a crank.
+    // First, complete leftover work, if any
+    let keepGoing = await runSwingset();
+    if (!keepGoing) return;
+
+    // Then, update the timer device with the new external time, which might
+    // push work onto the kernel run-queue (if any timers were ready to wake).
+    const addedToQueue = timer.poll(blockTime);
+    console.debug(
+      `polled; blockTime:${blockTime}, h:${blockHeight}; ADDED =`,
+      addedToQueue,
+    );
+    // We must run the kernel even if nothing was added since the kernel
+    // only notes state exports and updates consistency hashes when attempting
+    // to perform a crank.
+    keepGoing = await runSwingset();
+    if (!keepGoing) return;
+
+    // Finally, process as much as we can from the actionQueue, which contains
+    // first the old actions followed by the newActions, running the
+    // kernel to completion after each.
+    for (const { action, context } of actionQueue.consumeAll()) {
+      const inboundNum = `${context.blockHeight}-${context.txHash}-${context.msgIdx}`;
+      inboundQueueMetrics.decStat();
+      // eslint-disable-next-line no-await-in-loop
+      await performAction(action, inboundNum);
+      // eslint-disable-next-line no-await-in-loop
       keepGoing = await runSwingset();
-      if (!keepGoing) return;
-
-      // Finally, process as much as we can from the actionQueue, which contains
-      // first the old actions followed by the newActions, running the
-      // kernel to completion after each.
-      for (const { action, context } of actionQueue.consumeAll()) {
-        const inboundNum = `${context.blockHeight}-${context.txHash}-${context.msgIdx}`;
-        inboundQueueMetrics.decStat();
-        // eslint-disable-next-line no-await-in-loop
-        await performAction(action, inboundNum);
-        // eslint-disable-next-line no-await-in-loop
-        keepGoing = await runSwingset();
-        if (!keepGoing) {
-          // any leftover actions will remain on the actionQueue for possible
-          // processing in the next block
-          return;
-        }
+      if (!keepGoing) {
+        // any leftover actions will remain on the actionQueue for possible
+        // processing in the next block
+        return;
       }
     }
-
-    await doRunKernel();
-
-    if (setActivityhash) {
-      setActivityhash(controller.getActivityhash());
-    }
   }
 
   async function endBlock(blockHeight, blockTime, params) {

diff --git a/packages/internal/src/chain-storage-paths.js b/packages/internal/src/chain-storage-paths.js
@@ -1,11 +1,10 @@
 /**
  * These identify top-level paths for SwingSet chain storage
- * (and serve as prefixes, with the exception of ACTIVITYHASH).
+ * (and serve as prefixes).
  * To avoid collisions, they should remain synchronized with
  * golang/cosmos/x/swingset/keeper/keeper.go
  */
 export const ACTION_QUEUE = 'actionQueue';
-export const ACTIVITYHASH = 'activityhash';
 export const BEANSOWING = 'beansOwing';
 export const EGRESS = 'egress';
 export const MAILBOX = 'mailbox';