chore: uprade 18 cherrypicks round 5

a3p-integration/proposals/z:acceptance/.gitignore

@@ -2,3 +2,4 @@
 restart-valueVow
 start-valueVow
 localchaintest-submission
+recorded-instances-submission

a3p-integration/proposals/z:acceptance/package.json

@@ -3,6 +3,7 @@
     "type": "/agoric.swingset.CoreEvalProposal",
     "sdk-generate": [
       "testing/start-valueVow.js start-valueVow",
+      "testing/recorded-retired-instances.js recorded-instances-submission",
       "vats/test-localchain.js localchaintest-submission",
       "testing/restart-valueVow.js restart-valueVow"
     ]

a3p-integration/proposals/z:acceptance/recorded-retired.test.js

@@ -0,0 +1,11 @@
+import test from 'ava';
+
+import { evalBundles } from '@agoric/synthetic-chain';
+
+const SUBMISSION_DIR = 'recorded-instances-submission';
+
+test(`recorded instances in u18`, async t => {
+  const result = await evalBundles(SUBMISSION_DIR);
+  console.log('recorded retired instance result:', result);
+  t.pass('checked names');
+});

a3p-integration/proposals/z:acceptance/test.sh

@@ -13,6 +13,9 @@ yarn ava core-eval.test.js
 npm install -g tsx
 scripts/test-vaults.mts
 
+echo ACCEPTANCE TESTING recorded instances
+yarn ava recorded-retired.test.js
+
 echo ACCEPTANCE TESTING kread
 ./create-kread-item-test.sh
 

packages/boot/test/bootstrapTests/price-feed-replace.test.ts

@@ -101,7 +101,7 @@ test.serial('setupVaults; run updatePriceFeeds proposals', async t => {
 
   t.log('building all relevant CoreEvals');
   const coreEvals = await Promise.all([
-    buildProposal(priceFeedBuilder, ['MAINNET']),
+    buildProposal(priceFeedBuilder, ['BOOT_TEST']),
     buildProposal('@agoric/builders/scripts/vats/upgradeVaults.js'),
     buildProposal('@agoric/builders/scripts/vats/add-auction.js'),
   ]);

packages/boot/test/bootstrapTests/updateGovernedParams.test.ts

@@ -134,7 +134,7 @@ test('modify manager & director params; update vats, check', async t => {
   const priceFeedBuilder =
     '@agoric/builders/scripts/inter-protocol/updatePriceFeeds.js';
   const coreEvals = await Promise.all([
-    buildProposal(priceFeedBuilder, ['MAINNET']),
+    buildProposal(priceFeedBuilder, ['BOOT_TEST']),
     buildProposal('@agoric/builders/scripts/vats/upgradeVaults.js'),
     buildProposal('@agoric/builders/scripts/vats/add-auction.js'),
   ]);

packages/builders/scripts/inter-protocol/updatePriceFeeds.js

@@ -41,6 +41,16 @@ const configurations = {
     ],
     inBrandNames: ['ATOM', 'stATOM', 'stOSMO', 'stTIA', 'stkATOM'],
   },
+  BOOT_TEST: {
+    oracleAddresses: [
+      'agoric144rrhh4m09mh7aaffhm6xy223ym76gve2x7y78', // DSRV
+      'agoric19d6gnr9fyp6hev4tlrg87zjrzsd5gzr5qlfq2p', // Stakin
+      'agoric19uscwxdac6cf6z7d5e26e0jm0lgwstc47cpll8', // 01node
+      'agoric1krunjcqfrf7la48zrvdfeeqtls5r00ep68mzkr', // Simply Staking
+      'agoric1n4fcxsnkxe4gj6e24naec99hzmc4pjfdccy5nj', // P2P
+    ],
+    inBrandNames: ['ATOM'],
+  },
 };
 
 const { keys } = Object;

packages/builders/scripts/testing/recorded-retired-instances.js

@@ -0,0 +1,73 @@
+import { makeTracer } from '@agoric/internal';
+import { E } from '@endo/far';
+
+const trace = makeTracer('RecordedRetired', true);
+
+/**
+ * @param {BootstrapPowers &
+ *   PromiseSpaceOf<{ retiredContractInstances: MapStore<string, Instance>;
+ *   }>
+ * } powers
+ */
+export const testRecordedRetiredInstances = async ({
+  consume: {
+    contractKits,
+    // governedContractKits,
+    retiredContractInstances: retiredContractInstancesP,
+  },
+}) => {
+  trace('Start');
+  const retiredContractInstances = await retiredContractInstancesP;
+
+  const auctionIDs = Array.from(retiredContractInstances.keys()).filter(k =>
+    k.startsWith('auction'),
+  );
+  assert(auctionIDs);
+  assert(auctionIDs.length === 1);
+  const auctionInstance = retiredContractInstances.get(auctionIDs[0]);
+  trace({ auctionInstance });
+  // I don't know why it's neither in governedContractKits nor contractKits
+  // assert(await E(governedContractKits).get(auctionInstance));
+
+  const committeeIDs = Array.from(retiredContractInstances.keys()).filter(k =>
+    k.startsWith('economicCommittee'),
+  );
+  assert(committeeIDs);
+  assert(committeeIDs.length === 1);
+  const committeeInstance = retiredContractInstances.get(committeeIDs[0]);
+  assert(await E(contractKits).get(committeeInstance));
+
+  trace('done');
+};
+harden(testRecordedRetiredInstances);
+
+export const getManifestForRecordedRetiredInstances = () => {
+  return {
+    manifest: {
+      [testRecordedRetiredInstances.name]: {
+        consume: {
+          contractKits: true,
+          // governedContractKits: true,
+          retiredContractInstances: true,
+        },
+      },
+    },
+  };
+};
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+export const defaultProposalBuilder = async () =>
+  harden({
+    sourceSpec:
+      '@agoric/builders/scripts/testing/recorded-retired-instances.js',
+    getManifestCall: ['getManifestForRecordedRetiredInstances', {}],
+  });
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+export default async (homeP, endowments) => {
+  // import dynamically so the module can work in CoreEval environment
+  const dspModule = await import('@agoric/deploy-script-support');
+  const { makeHelpers } = dspModule;
+  const { writeCoreEval } = await makeHelpers(homeP, endowments);
+  await writeCoreEval('recorded-retired', defaultProposalBuilder);
+};

packages/inter-protocol/src/proposals/add-auction.js

@@ -1,8 +1,9 @@
 import { deeplyFulfilledObject, makeTracer } from '@agoric/internal';
 import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
-import { E } from '@endo/far';
 import { Stable } from '@agoric/internal/src/tokens.js';
+import { E } from '@endo/far';
 import { makeGovernedTerms as makeGovernedATerms } from '../auction/params.js';
+import { provideRetiredInstances } from './utils.js';
 
 const trace = makeTracer('NewAuction', true);
 
@@ -11,6 +12,7 @@ const trace = makeTracer('NewAuction', true);
  *   auctionUpgradeNewInstance: Instance;
  *   auctionUpgradeNewGovCreator: any;
  *   newContractGovBundleId: string;
+ *   retiredContractInstances: MapStore<string, Instance>;
  * }>} interlockPowers
  */
 
@@ -35,13 +37,15 @@ export const addAuction = async (
       economicCommitteeCreatorFacet: electorateCreatorFacet,
       governedContractKits: governedContractKitsP,
       priceAuthority8400,
+      retiredContractInstances: retiredContractInstancesP,
       zoe,
     },
     produce: {
       auctioneerKit: produceAuctioneerKit,
       auctionUpgradeNewInstance,
       auctionUpgradeNewGovCreator,
       newContractGovBundleId,
+      retiredContractInstances: produceRetiredInstances,
     },
     instance: {
       consume: { reserve: reserveInstance },
@@ -79,6 +83,16 @@ export const addAuction = async (
     auctioneerInstallationP,
   ]);
 
+  const retiredInstances = await provideRetiredInstances(
+    retiredContractInstancesP,
+    produceRetiredInstances,
+  );
+
+  // save the auctioneer instance so we can manage it later
+  const boardID = await E(board).getId(legacyKit.instance);
+  const identifier = `auctioneer-${boardID}`;
+  retiredInstances.init(identifier, legacyKit.instance);
+
   // Each field has an extra layer of type +  value:
   // AuctionStartDelay: { type: 'relativeTime', value: { relValue: 2n, timerBrand: Object [Alleged: timerBrand] {} } }
   /** @type {any} */
@@ -210,13 +224,15 @@ export const ADD_AUCTION_MANIFEST = harden({
       economicCommitteeCreatorFacet: true,
       governedContractKits: true,
       priceAuthority8400: true,
+      retiredContractInstances: true,
       zoe: true,
     },
     produce: {
       auctioneerKit: true,
       auctionUpgradeNewInstance: true,
       auctionUpgradeNewGovCreator: true,
       newContractGovBundleId: true,
+      retiredContractInstances: true,
     },
     instance: {
       consume: { reserve: true },

packages/inter-protocol/src/proposals/deploy-price-feeds.js

@@ -5,6 +5,7 @@ import { E } from '@endo/far';
 import { unitAmount } from '@agoric/zoe/src/contractSupport/priceQuote.js';
 import {
   oracleBrandFeedName,
+  provideRetiredInstances,
   reserveThenDeposit,
   sanitizePathSegment,
 } from './utils.js';
@@ -84,7 +85,8 @@ export const ensureOracleBrand = async (
 };
 
 /**
- * @param {EconomyBootstrapPowers} powers
+ * @param {EconomyBootstrapPowers &
+ *   PromiseSpaceOf<{ retiredContractInstances: MapStore<string, Instance> }>} powers
  * @param {{
  *   AGORIC_INSTANCE_NAME: string;
  *   contractTerms: import('@agoric/inter-protocol/src/price/fluxAggregatorKit.js').ChainlinkConfig;
@@ -96,15 +98,18 @@ export const ensureOracleBrand = async (
 const startPriceAggregatorInstance = async (
   {
     consume: {
+      agoricNames,
       board,
       chainStorage,
       chainTimerService,
       econCharterKit,
       highPrioritySendersManager,
       namesByAddressAdmin,
       startGovernedUpgradable,
+      retiredContractInstances: retiredContractInstancesP,
     },
     instance: { produce: produceInstance },
+    produce: { retiredContractInstances: produceRetiredInstances },
   },
   { AGORIC_INSTANCE_NAME, contractTerms, brandIn, brandOut },
   installation,
@@ -139,6 +144,22 @@ const startPriceAggregatorInstance = async (
     // @ts-expect-error GovernableStartFn vs. fluxAggregatorContract.js start
     installation,
   });
+  const retiredContractInstances = await provideRetiredInstances(
+    retiredContractInstancesP,
+    produceRetiredInstances,
+  );
+
+  // save the instance so we can manage it later
+  const retiringInstance = await E(agoricNames).lookup(
+    'instance',
+    AGORIC_INSTANCE_NAME,
+  );
+  const boardID = await E(board).getId(retiringInstance);
+  retiredContractInstances.init(
+    `priceFeed-${AGORIC_INSTANCE_NAME}-${boardID}`,
+    retiringInstance,
+  );
+
   produceInstance[AGORIC_INSTANCE_NAME].reset();
   produceInstance[AGORIC_INSTANCE_NAME].resolve(governedKit.instance);
   trace(
@@ -191,7 +212,9 @@ const distributeInvitations = async (
 };
 
 /**
- * @param {EconomyBootstrapPowers & NamedVatPowers} powers
+ * @param {EconomyBootstrapPowers &
+ *   NamedVatPowers &
+ *   PromiseSpaceOf<{ retiredContractInstances: MapStore<string, Instance> }>} powers
  * @param {{
  *   options: PriceFeedConfig & {
  *     priceAggregatorRef: { bundleID: string };
@@ -300,16 +323,18 @@ export const getManifestForPriceFeeds = async (
         namesByAddressAdmin: t,
         priceAuthority: t,
         priceAuthorityAdmin: t,
+        retiredContractInstances: t,
         startGovernedUpgradable: t,
         startUpgradable: t,
         zoe: t,
       },
       installation: { produce: { priceAggregator: t } },
       instance: {
         produce: t,
+        consume: t,
       },
       oracleBrand: { produce: t },
-      produce: { priceAuthority8400: t },
+      produce: { priceAuthority8400: t, retiredContractInstances: t },
     },
   },
   options: { ...priceFeedOptions },