@agoric/cosmic-swingset 0.42.0-upgrade-17-dev-a1453b2.0 → 0.42.0-upgrade-18-dev-bf39b10.0

package/CHANGELOG.md

@@ -3,7 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [0.42.0-u17.0](https://github.com/Agoric/agoric-sdk/compare/@agoric/cosmic-swingset@0.41.3...@agoric/cosmic-swingset@0.42.0-u17.0) (2024-09-17)
+## [0.42.0-u18.0](https://github.com/Agoric/agoric-sdk/compare/@agoric/cosmic-swingset@0.41.3...@agoric/cosmic-swingset@0.42.0-u18.0) (2024-10-31)
 
 
 ### ⚠ BREAKING CHANGES
@@ -24,6 +24,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 * **cosmic-swingset:** Accept slogfile configuration in AG_COSMOS_INIT messages ([1c72193](https://github.com/Agoric/agoric-sdk/commit/1c72193c54126cff8a35f36b094743a415ab19aa))
 * **cosmic-swingset:** add begin block check and transaction ([#8432](https://github.com/Agoric/agoric-sdk/issues/8432)) ([a9d113a](https://github.com/Agoric/agoric-sdk/commit/a9d113a09dfd93889ae985533535df53fdc771e7))
 * **cosmic-swingset:** add JS upgrade plan handler stub ([655133e](https://github.com/Agoric/agoric-sdk/commit/655133ed909b5d632dc033e992214a7b6a1b5ab1))
+* **cosmic-swingset:** add missing trigger events ([92f8dfd](https://github.com/Agoric/agoric-sdk/commit/92f8dfd9d204eedd3d999f732fc5779f47aa97a9))
 * **cosmic-swingset:** add repair-metadata snapshot restore option ([4fc0113](https://github.com/Agoric/agoric-sdk/commit/4fc01134fab9402d5916f0593728acce4697da9e))
 * **cosmic-swingset:** implement `ENACTED_UPGRADE` blocking send ([3825c17](https://github.com/Agoric/agoric-sdk/commit/3825c171f3528cd3c4e63e8aeb3363a3e88b75fc))
 * **cosmic-swingset:** replace import/export options ([0f01712](https://github.com/Agoric/agoric-sdk/commit/0f01712cadef12784afa547d568a6e77b9a83344))
@@ -50,6 +51,8 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 * **cosmic-swingset:** backwards param compat in import/export ([bd49484](https://github.com/Agoric/agoric-sdk/commit/bd49484e5777b8675ed3be5e78e46f6a5d89b7db))
 * **cosmic-swingset:** call upgradeSwingset at startup ([c769606](https://github.com/Agoric/agoric-sdk/commit/c7696069d0bebaf039a2f3e1a45ebdd8dc5198a2))
 * **cosmic-swingset:** Exclude non-consensus configuration from bootstrap vat arguments ([08b3abb](https://github.com/Agoric/agoric-sdk/commit/08b3abb4d5ba183a45e84353406e67bbcc00a076)), closes [#9946](https://github.com/Agoric/agoric-sdk/issues/9946)
+* **cosmic-swingset:** inject kernel upgrade events at a safe time ([5789fb6](https://github.com/Agoric/agoric-sdk/commit/5789fb68d316643906bc30506059a0a8c8874154))
+* **cosmic-swingset:** installation publisher uses remotable storage messenger ([4f07d1c](https://github.com/Agoric/agoric-sdk/commit/4f07d1c82709b4572cc5e883679a30d57c827803))
 * **cosmic-swingset:** log level for swing-store export ([33c4a51](https://github.com/Agoric/agoric-sdk/commit/33c4a517f079c4ad17c30f9d1d13f181b06f112f))
 * **cosmic-swingset:** merge `coreProposals` from bootstrap and upgrade plan ([2b38ebc](https://github.com/Agoric/agoric-sdk/commit/2b38ebc378847a878725419db37580405df0a28e))
 * **cosmic-swingset:** only require vatconfig if uninitialized ([cfb72f3](https://github.com/Agoric/agoric-sdk/commit/cfb72f337cf650f303adfebaeffb1ee9ad0c0a92))

package/check-validator.cjs

@@ -1,7 +1,7 @@
 #! /usr/bin/env node
+/* eslint-env node */
 // @jessie-check
 
-/* global process require Buffer */
 // check-validator - Find if there is a validator that matches the current ag-chain-cosmos
 // Michael FIG <mfig@agoric.com>, 2021-06-25
 const oper = process.argv[2];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/cosmic-swingset",
-  "version": "0.42.0-upgrade-17-dev-a1453b2.0+a1453b2",
+  "version": "0.42.0-upgrade-18-dev-bf39b10.0+bf39b10",
   "description": "Agoric's Cosmos blockchain integration",
   "type": "module",
   "bin": {
@@ -22,25 +22,25 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/builders": "0.2.0-upgrade-17-dev-a1453b2.0+a1453b2",
-    "@agoric/cosmos": "0.35.0-upgrade-17-dev-a1453b2.0+a1453b2",
-    "@agoric/deploy-script-support": "0.10.4-upgrade-17-dev-a1453b2.0+a1453b2",
-    "@agoric/internal": "0.4.0-upgrade-17-dev-a1453b2.0+a1453b2",
-    "@agoric/store": "0.9.3-upgrade-17-dev-a1453b2.0+a1453b2",
-    "@agoric/swing-store": "0.9.2-upgrade-17-dev-a1453b2.0+a1453b2",
-    "@agoric/swingset-vat": "0.33.0-upgrade-17-dev-a1453b2.0+a1453b2",
-    "@agoric/telemetry": "0.6.3-upgrade-17-dev-a1453b2.0+a1453b2",
-    "@agoric/vm-config": "0.1.1-upgrade-17-dev-a1453b2.0+a1453b2",
-    "@endo/bundle-source": "^3.4.0",
-    "@endo/env-options": "^1.1.6",
-    "@endo/errors": "^1.2.5",
-    "@endo/far": "^1.1.5",
-    "@endo/import-bundle": "^1.2.2",
-    "@endo/init": "^1.1.4",
-    "@endo/marshal": "^1.5.3",
-    "@endo/nat": "^5.0.10",
-    "@endo/patterns": "^1.4.3",
-    "@endo/promise-kit": "^1.1.5",
+    "@agoric/builders": "0.2.0-upgrade-18-dev-bf39b10.0+bf39b10",
+    "@agoric/cosmos": "0.35.0-upgrade-18-dev-bf39b10.0+bf39b10",
+    "@agoric/deploy-script-support": "0.10.4-upgrade-18-dev-bf39b10.0+bf39b10",
+    "@agoric/internal": "0.4.0-upgrade-18-dev-bf39b10.0+bf39b10",
+    "@agoric/store": "0.9.3-upgrade-18-dev-bf39b10.0+bf39b10",
+    "@agoric/swing-store": "0.10.0-upgrade-18-dev-bf39b10.0+bf39b10",
+    "@agoric/swingset-vat": "0.33.0-upgrade-18-dev-bf39b10.0+bf39b10",
+    "@agoric/telemetry": "0.6.3-upgrade-18-dev-bf39b10.0+bf39b10",
+    "@agoric/vm-config": "0.1.1-upgrade-18-dev-bf39b10.0+bf39b10",
+    "@endo/bundle-source": "^3.4.2",
+    "@endo/env-options": "^1.1.7",
+    "@endo/errors": "^1.2.7",
+    "@endo/far": "^1.1.8",
+    "@endo/import-bundle": "^1.3.1",
+    "@endo/init": "^1.1.6",
+    "@endo/marshal": "^1.6.1",
+    "@endo/nat": "^5.0.12",
+    "@endo/patterns": "^1.4.6",
+    "@endo/promise-kit": "^1.1.7",
     "@iarna/toml": "^2.2.3",
     "@opentelemetry/api": "~1.3.0",
     "@opentelemetry/sdk-metrics": "~1.9.0",
@@ -69,7 +69,7 @@
     "timeout": "20m"
   },
   "typeCoverage": {
-    "atLeast": 80.53
+    "atLeast": 80.55
   },
-  "gitHead": "a1453b2877b017a7f5b43a92364067d001901953"
+  "gitHead": "bf39b100f0da4380bab0ce2464aaca1988f0b76a"
 }

package/src/anylogger-agoric.js

@@ -1,3 +1,4 @@
+/* eslint-env node */
 import {
   getEnvironmentOptionsList,
   getEnvironmentOption,

package/src/chain-main.js

@@ -11,7 +11,7 @@ import { resolve as importMetaResolve } from 'import-meta-resolve';
 import tmp from 'tmp';
 
 import { Fail, q } from '@endo/errors';
-import { E } from '@endo/far';
+import { E, Far } from '@endo/far';
 import { makeMarshal } from '@endo/marshal';
 import { isNat } from '@endo/nat';
 import { M, mustMatch } from '@endo/patterns';
@@ -432,9 +432,9 @@ export default async function main(progname, args, { env, homedir, agcc }) {
       }
     }
 
-    const toStorage = message => {
+    const toStorage = Far('BridgeStorageHandler', message => {
       return doOutboundBridge(BridgeId.STORAGE, message);
-    };
+    });
 
     const makeInstallationPublisher = () => {
       const installationStorageNode = makeChainStorageRoot(

package/src/launch-chain.js

@@ -1,5 +1,5 @@
 // @ts-check
-/* global process */
+/* eslint-env node */
 
 // XXX the JSON configs specify that launching the chain requires @agoric/builders,
 // so let the JS tooling know about it by importing it here.
@@ -52,7 +52,8 @@ import { makeQueue, makeQueueStorageMock } from './helpers/make-queue.js';
 import { exportStorage } from './export-storage.js';
 import { parseLocatedJson } from './helpers/json.js';
 
-/** @import {RunPolicy} from '@agoric/swingset-vat' */
+/** @import { Mailbox, RunPolicy, SwingSetConfig } from '@agoric/swingset-vat' */
+/** @import { KVStore } from './helpers/bufferedStorage.js' */
 
 const console = anylogger('launch-chain');
 const blockManagerConsole = anylogger('block-manager');
@@ -74,8 +75,6 @@ const parseUpgradePlanInfo = (upgradePlan, prefix = '') => {
   return harden(upgradePlanInfo || {});
 };
 
-/** @import {SwingSetConfig} from '@agoric/swingset-vat' */
-
 /**
  * @typedef {object} CosmicSwingsetConfig
  * @property {import('@agoric/deploy-script-support/src/extract-proposal.js').ConfigProposal[]} [coreProposals]
@@ -96,7 +95,7 @@ const parseUpgradePlanInfo = (upgradePlan, prefix = '') => {
 const getHostKey = path => `host.${path}`;
 
 /**
- * @param {Map<*, *>} mailboxStorage
+ * @param {KVStore<Mailbox>} mailboxStorage
  * @param {((dstID: string, obj: any) => any)} bridgeOutbound
  * @param {SwingStoreKernelStorage} kernelStorage
  * @param {string | (() => string | Promise<string>)} vatconfig absolute path or thunk
@@ -216,7 +215,7 @@ export async function buildSwingset(
   }
 
   const pendingCoreProposals = await ensureSwingsetInitialized();
-  upgradeSwingset(kernelStorage);
+  const { modified } = upgradeSwingset(kernelStorage);
   const controller = await makeSwingsetController(
     kernelStorage,
     deviceEndowments,
@@ -237,6 +236,7 @@ export async function buildSwingset(
   return {
     coreProposals: pendingCoreProposals,
     controller,
+    kernelHasUpgradeEvents: modified,
     mb: mailboxDevice,
     bridgeInbound: bridgeDevice.deliverInbound,
     timer: timerDevice,
@@ -409,6 +409,7 @@ export async function launch({
   const {
     coreProposals: bootstrapCoreProposals,
     controller,
+    kernelHasUpgradeEvents,
     mb,
     bridgeInbound,
     timer,
@@ -511,6 +512,14 @@ export async function launch({
     await commit();
   }
 
+  async function doKernelUpgradeEvents(inboundNum) {
+    controller.writeSlogObject({
+      type: 'cosmic-swingset-inject-kernel-upgrade-events',
+      inboundNum,
+    });
+    controller.injectQueuedUpgradeEvents();
+  }
+
   async function deliverInbound(sender, messages, ack, inboundNum) {
     Array.isArray(messages) || Fail`inbound given non-Array: ${messages}`;
     controller.writeSlogObject({
@@ -518,6 +527,8 @@ export async function launch({
       inboundNum,
       sender,
       count: messages.length,
+      messages,
+      ack,
     });
     if (!mb.deliverInbound(sender, messages, ack)) {
       return;
@@ -530,6 +541,7 @@ export async function launch({
       type: 'cosmic-swingset-bridge-inbound',
       inboundNum,
       source,
+      body,
     });
     if (!bridgeInbound) throw Fail`bridgeInbound undefined`;
     // console.log(`doBridgeInbound`);
@@ -538,7 +550,7 @@ export async function launch({
     bridgeInbound(source, body);
   }
 
-  async function installBundle(bundleJson) {
+  async function installBundle(bundleJson, inboundNum) {
     let bundle;
     try {
       bundle = JSON.parse(bundleJson);
@@ -555,6 +567,13 @@ export async function launch({
 
     const { endoZipBase64Sha512 } = bundle;
 
+    controller.writeSlogObject({
+      type: 'cosmic-swingset-install-bundle',
+      inboundNum,
+      endoZipBase64Sha512,
+      error,
+    });
+
     if (installationPublisher === undefined) {
       return;
     }
@@ -630,8 +649,13 @@ export async function launch({
         break;
       }
 
+      case ActionType.KERNEL_UPGRADE_EVENTS: {
+        p = doKernelUpgradeEvents(inboundNum);
+        break;
+      }
+
       case ActionType.INSTALL_BUNDLE: {
-        p = installBundle(action.bundle);
+        p = installBundle(action.bundle, inboundNum);
         break;
       }
 
@@ -700,6 +724,12 @@ export async function launch({
     // 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);
+    controller.writeSlogObject({
+      type: 'cosmic-swingset-timer-poll',
+      blockHeight,
+      blockTime,
+      added: addedToQueue,
+    });
     console.debug(
       `polled; blockTime:${blockTime}, h:${blockHeight}; ADDED =`,
       addedToQueue,
@@ -935,6 +965,22 @@ export async function launch({
           await doBootstrap(action);
         }
 
+        // The reboot-time upgradeSwingset() may have generated some
+        // remediation events that need to be injected at the right
+        // time (after catchup, before proposals). Push them onto
+        // runThisBlock before anything else goes there.
+        if (kernelHasUpgradeEvents) {
+          isBootstrap ||
+            upgradeDetails ||
+            Fail`Unexpected kernel upgrade events outside of consensus start`;
+          const txHash = 'x/kernel-upgrade-events';
+          const context = { blockHeight, txHash, msgIdx: 0 };
+          runThisBlock.push({
+            action: { type: ActionType.KERNEL_UPGRADE_EVENTS },
+            context,
+          });
+        }
+
         // Concatenate together any pending core proposals from chain bootstrap
         // with any from this inbound init action, then execute them all.
         const coreProposals = mergeCoreProposals(

package/src/sim-chain.js

@@ -1,4 +1,4 @@
-/* global process setTimeout clearTimeout */
+/* eslint-env node */
 import path from 'path';
 import fs from 'fs';
 import { Fail } from '@endo/errors';