Repair u19 tests in a3p-integration

a3p-integration/proposals/n:upgrade-next/.gitignore

@@ -1,9 +1,6 @@
-replaceFeeDistributor/
+addCollateral/
 addUsdLemons/
-addUsdOlives/
-upgradeProvisionPool/
-upgradeAgoricNames/
-publishTestInfo/
-upgrade-mintHolder/
-upgradeAssetReserve/
-upgradePSM/
+agoricNamesCoreEvals/
+depositUSD-LEMONS/
+nullUpgradePP/
+swapAnchorForMintedSeat/

a3p-integration/proposals/n:upgrade-next/agoricNames.test.js

@@ -69,7 +69,6 @@
 import { getBalances, listVaults } from './test-lib/utils.js';
 import { walletUtils } from './test-lib/index.js';
 
-const AGORIC_NAMES_UPGRADE_DIR = 'agoricNamesCoreEvals/upgradeAgoricNames';
 const WRITE_AGORIC_NAMES_DIR = 'agoricNamesCoreEvals/writeToAgoricNames';
 const ADD_USD_OLIVES_DIR = 'agoricNamesCoreEvals/addUsdOlives';
 const DEPOSIT_USD_OLIVES_DIR = 'agoricNamesCoreEvals/depositUsdOlives';
@@ -118,9 +117,7 @@
   });
 });
 
-test.serial('upgrade agoricNames', async t => {
-  await evalBundles(AGORIC_NAMES_UPGRADE_DIR);
-
+test.serial('verify incarnation', async t => {
   const incarnation = await getIncarnation('agoricNames');
   t.is(incarnation, 1, 'incorrect incarnation');
 });
@@ -155,7 +152,7 @@
   const agoricNamesAfter = await getAgoricNames();
   t.like(agoricNamesAfter, agoricNamesBefore);
 
   agoricNamesChildren.forEach(child =>
     assert(
       agoricNamesAfter[child][`test${child}`],
       'we should be able to add new value',

a3p-integration/proposals/n:upgrade-next/assetReserve.test.js

@@ -22,8 +22,6 @@ import {
   waitUntilContractDeployed,
 } from '@agoric/client-utils';
 
-const ADD_PSM_DIR = 'addUsdLemons';
-const UPGRADE_AR_DIR = 'upgradeAssetReserve';
 const ADD_COLLATERAL = 'addCollateral';
 
 const ambientAuthority = {
@@ -51,12 +49,12 @@ test.before(async t => {
   };
 });
 
-test.serial('add collatoral to reserve', async t => {
+test.serial('add Collateral to reserve', async t => {
   // @ts-expect-error casting
   const { vstorageKit } = t.context;
 
-  // Introduce USD_LEMONS
-  await evalBundles(ADD_PSM_DIR);
+  // USD_LEMONS introduced in provisionPool test
+  // await evalBundles(ADD_PSM_DIR);
   await waitUntilContractDeployed('psm-IST-USD_LEMONS', ambientAuthority, {
     errorMessage: 'psm-IST-USD_LEMONS instance not observed.',
   });
@@ -75,8 +73,6 @@ test.serial('upgrade', async t => {
   // @ts-expect-error casting
   const { vstorageKit } = t.context;
 
-  await evalBundles(UPGRADE_AR_DIR);
-
   const vatDetailsAfter = await getDetailsMatchingVats('reserve');
   const { incarnation } = vatDetailsAfter.find(vat => vat.vatID === 'v36'); // assetReserve is v36
 

a3p-integration/proposals/n:upgrade-next/eval.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -euo pipefail
+
 # evaluate the proposals in the /submission/ directory
 
 echo "UPGRADE-19  Running proposal declared in package.json"

a3p-integration/proposals/n:upgrade-next/initial.test.js

@@ -10,7 +10,7 @@ const vats = {
   orchestration: { incarnation: 1 },
   transfer: { incarnation: 2 },
   walletFactory: { incarnation: 6 },
-  zoe: { incarnation: 4 },
+  zoe: { incarnation: 3 },
   // Terminated in a future proposal.
   '-ATOM-USD_price_feed-governor': { incarnation: 0 },
 };

a3p-integration/proposals/n:upgrade-next/mint-payment/send-script.tjs

@@ -24,8 +24,6 @@ const sendBankAsset = async powers => {
   const valueStr = '{{VALUE}}';
   const value = BigInt(valueStr)
 
-  console.log(`Start sendBankAsset for ${label}`);
-
   const contractKits = await contractKitsP;
   const mintHolderKit = Array.from(contractKits.values()).filter(
     kit => kit.label && kit.label === label,
@@ -49,8 +47,6 @@ const sendBankAsset = async powers => {
   );
 
   await E(receiverDepositFacet).receive(payment);
-
-  console.log(`Finished sendBankAsset for ${label}`);
 };
 
 sendBankAsset;

a3p-integration/proposals/n:upgrade-next/mintHolder.test.js

@@ -8,18 +8,18 @@ import {
   getAssetList,
   swap,
   getPSMChildren,
-  upgradeMintHolder,
 } from './test-lib/mintHolder-helpers.js';
 import { networkConfig } from './test-lib/index.js';
 
-test('mintHolder contract is upgraded', async t => {
+test('verify mintHolder contract upgrade', async t => {
   const receiver = await addUser('receiver');
   await provisionSmartWallet(receiver, `20000000ubld`);
 
   let assetList = await getAssetList();
   t.log('List of mintHolder vats being upgraded: ', assetList);
-  await upgradeMintHolder(`upgrade-mintHolder`, assetList);
-  await mintPayment(t, receiver, assetList, 10);
+  // FastUSDC doesn't have a contractKit indexed by its label
+  const assetListNoFastUSDC = assetList.filter(x => x.label !== 'FastLP');
+  await mintPayment(t, receiver, assetListNoFastUSDC, 10);
 
   const psmLabelList = await getPSMChildren(fetch, networkConfig);
   assetList = await getAssetList(psmLabelList);

a3p-integration/proposals/n:upgrade-next/nullUpgradePP/null-upgrade-pp.js

@@ -9,24 +9,15 @@ const nullUpgradePP = async powers => {
     },
   } = powers;
 
-  console.log('awaiting powers');
   const { adminFacet, instance } = await provisionPoolStartResultP;
   const instancePrivateArgs = await instancePrivateArgsP;
 
-  console.log('get privateArgs');
   const privateArgs = instancePrivateArgs.get(instance);
   const [poolBank, poserInvitation] = await Promise.all([
     privateArgs.poolBank,
     E(economicCommitteeCreatorFacet).getPoserInvitation(),
   ]);
 
-  console.log('DEBUG', {
-    adminFacet,
-    instance,
-    privateArgs,
-    poserInvitation,
-  });
-
   await E(adminFacet).restartContract({
     ...privateArgs,
     poolBank,

a3p-integration/proposals/n:upgrade-next/package.json

@@ -8,16 +8,9 @@
     },
     "type": "Software Upgrade Proposal",
     "sdk-generate": [
-      "testing/replace-feeDistributor-short.js replaceFeeDistributor",
       "testing/add-USD-LEMONS.js addUsdLemons",
-      "vats/upgrade-provisionPool.js upgradeProvisionPool",
-      "vats/upgrade-asset-reserve.js upgradeAssetReserve",
-      "vats/upgrade-psm.js upgradePSM",
-      "vats/upgrade-paRegistry.js",
-      "vats/upgrade-agoricNames.js agoricNamesCoreEvals/upgradeAgoricNames",
       "testing/add-USD-OLIVES.js agoricNamesCoreEvals/addUsdOlives",
-      "testing/publish-test-info.js agoricNamesCoreEvals/publishTestInfo",
-      "vats/upgrade-mintHolder.js upgrade-mintHolder A3P_INTEGRATION"
+      "testing/publish-test-info.js agoricNamesCoreEvals/publishTestInfo"
     ]
   },
   "type": "module",

a3p-integration/proposals/n:upgrade-next/provisionPool.test.js

@@ -6,7 +6,8 @@
  * - https://github.com/Agoric/agoric-sdk/issues/8724
  *
  * The test scenario is as follows;
- * 1. Upgrade provisionPool. This upgrade overrides provisionWalletBridgerManager with a durable one
+ * 1. Upgrade provisionPool in upgrade.go. This upgrade overrides
+ *    provisionWalletBridgerManager with a durable one
  * 2. Add a new account and successfully provision it
  *   - Observe new account's address under `published.wallet.${address}`
  * 3. Send some USDC_axl to provisionPoolAddress and observe its IST balances increases accordingly
@@ -56,7 +57,6 @@ const PROVISIONING_POOL_ADDR = 'agoric1megzytg65cyrgzs6fvzxgrcqvwwl7ugpt62346';
 
 const ADD_PSM_DIR = 'addUsdLemons';
 const DEPOSIT_USD_LEMONS_DIR = 'depositUSD-LEMONS';
-const UPGRADE_PP_DIR = 'upgradeProvisionPool';
 const NULL_UPGRADE_PP_DIR = 'nullUpgradePP';
 
 const USDC_DENOM = NonNullish(process.env.USDC_DENOM);
@@ -87,24 +87,6 @@ test.before(async t => {
   };
 });
 
-test.serial('upgrade provisionPool', async t => {
-  // @ts-expect-error casting
-  const { currentVatIncarnations } = t.context;
-  console.log(currentVatIncarnations);
-  await evalBundles(UPGRADE_PP_DIR);
-
-  for await (const vatName of upgradedVats) {
-    const incarnationAfterUpgrade = await getIncarnationFromDetails(vatName);
-    const previousIncarnation = currentVatIncarnations[vatName];
-
-    t.is(
-      incarnationAfterUpgrade,
-      previousIncarnation + 1,
-      `${vatName} does not meet the expected incarnation number`,
-    );
-  }
-});
-
 test.serial(
   `check provisionPool can recover purse and asset subscribers after upgrade`,
   async t => {

a3p-integration/proposals/n:upgrade-next/psm.test.js

@@ -1,21 +1,19 @@
 /* eslint-env node */
 /**
- * @file The goal of this file is to make sure all the PSM contacts are upgrade. Each set of vats are different
- * per chain, but for mainnet, we expect this to be: V37-V42, V73, V76
+ * @file The goal of this file is to make sure all the PSM contacts were
+ * upgraded. Each set of vats are different per chain, but for mainnet, we
+ * expect this to be: V37-V42, V73, V76
  *
  * The test scenario is as follows;
- * 1. Simulate trade of IST and USDC
- * 2. Upgrade all PSMs
- * 3. Verify metrics are the same after the upgrade
- * 4. Verify trading is still possible after the upgrade
+ * 1. Verify metrics before the upgrade
+ * 2. Verify trading is possible after the upgrade
  */
 
 import '@endo/init';
 import test from 'ava';
 import { evalBundles } from '@agoric/synthetic-chain';
 import { makeVstorageKit } from '@agoric/client-utils';
 
-const UPGRADE_PSM_DIR = 'upgradePSM';
 const SWAP_ANCHOR = 'swapAnchorForMintedSeat';
 
 test.before(async t => {
@@ -29,38 +27,19 @@ test.before(async t => {
   };
 });
 
-test.serial('simulate trade of IST and USDC', async t => {
+test.serial('check stats pre-swap', async t => {
   // @ts-expect-error casting
   const { vstorageKit } = t.context;
 
-  await evalBundles(SWAP_ANCHOR);
-
-  const metrics = await vstorageKit.readLatestHead(
-    'published.psm.IST.USDC.metrics',
-  );
-
-  t.is(metrics.anchorPoolBalance.value, 500000n);
-  t.is(metrics.feePoolBalance.value, 0n);
-  t.is(metrics.mintedPoolBalance.value, 500000n);
-  t.is(metrics.totalAnchorProvided.value, 0n);
-  t.is(metrics.totalMintedProvided.value, 500000n);
-});
-
-test.serial('upgrade PSMs', async t => {
-  // @ts-expect-error casting
-  const { vstorageKit } = t.context;
-
-  await evalBundles(UPGRADE_PSM_DIR);
-
   const metrics = await vstorageKit.readLatestHead(
     'published.psm.IST.USDC.metrics',
   );
 
-  t.is(metrics.anchorPoolBalance.value, 500000n);
-  t.is(metrics.feePoolBalance.value, 0n);
-  t.is(metrics.mintedPoolBalance.value, 500000n);
-  t.is(metrics.totalAnchorProvided.value, 0n);
-  t.is(metrics.totalMintedProvided.value, 500000n);
+  t.is(metrics.anchorPoolBalance.value, 0n, 'anchorPool empty');
+  t.is(metrics.feePoolBalance.value, 0n, 'feePool empty');
+  t.is(metrics.mintedPoolBalance.value, 0n, 'mintedPool 500K');
+  t.is(metrics.totalAnchorProvided.value, 0n, 'totalAnchor empty');
+  t.is(metrics.totalMintedProvided.value, 0n, 'totalMinted 500K');
 });
 
 test.serial('verify trading after upgrade', async t => {
@@ -73,9 +52,9 @@ test.serial('verify trading after upgrade', async t => {
     'published.psm.IST.USDC.metrics',
   );
 
-  t.is(metrics.anchorPoolBalance.value, 1000000n);
-  t.is(metrics.feePoolBalance.value, 0n);
-  t.is(metrics.mintedPoolBalance.value, 1000000n);
-  t.is(metrics.totalAnchorProvided.value, 0n);
-  t.is(metrics.totalMintedProvided.value, 1000000n);
+  t.is(metrics.anchorPoolBalance.value, 500_000n, 'AnchorPool +500K');
+  t.is(metrics.feePoolBalance.value, 0n, 'feePool empty');
+  t.is(metrics.mintedPoolBalance.value, 500_000n, 'mintedPool +500K');
+  t.is(metrics.totalAnchorProvided.value, 0n, 'totalAnchor empty');
+  t.is(metrics.totalMintedProvided.value, 500_000n, 'totalMinted +500K');
 });

a3p-integration/proposals/n:upgrade-next/replaceFeeDistributor.test.js

@@ -18,15 +18,10 @@
 
 import '@endo/init/debug.js';
 import test from 'ava';
-import {
-  retryUntilCondition,
-  makeVstorageKit,
-  sleep,
-} from '@agoric/client-utils';
+import { retryUntilCondition, makeVstorageKit } from '@agoric/client-utils';
 import {
   ATOM_DENOM,
   bankSend,
-  evalBundles,
   openVault,
   USER1ADDR,
 } from '@agoric/synthetic-chain';
@@ -50,7 +45,6 @@ import { floorMultiplyBy } from '@agoric/zoe/src/contractSupport/ratio.js';
  */
 
 const config = {
-  coreEvalDir: 'replaceFeeDistributor',
   mintValue: '100.0',
   collateralValue: '200.0',
   managerIndex: 0,
@@ -85,6 +79,7 @@ const produceFeesAndWait = async (vstorage, feeAmount) => {
   const metricsBefore = /** @type {ReserveAllocations} */ (
     await vstorage.readLatestHead('published.reserve.metrics')
   );
+
   // XXX Probably better to not rely on synthetic-chain for opening a vault as per https://github.com/Agoric/agoric-sdk/pull/10396.
   // But to make the switch also requires either copying z:acceptance/test-lib here (which is not wanted) or creating a root level
   // lib and link it here which requires an all around work across all proposals. Probably a better idea to do it as a separate work.
@@ -96,6 +91,7 @@ const produceFeesAndWait = async (vstorage, feeAmount) => {
     () => vstorage.readLatestHead('published.reserve.metrics'),
     metrics =>
       AmountMath.isEqual(
+        // @ts-expect-error metrics has these fields.
         metrics.allocations.Fee,
         AmountMath.add(metricsBefore.allocations.Fee, feeAmount),
       ),
@@ -142,7 +138,6 @@ test.before(async t => {
   );
   const vstorage = await makeVstorageKit({ fetch }, config.networkConfig);
   const toAmount = (value, brandKeyword) =>
-    // @ts-expect-error casting
     AmountMath.make(vstorage.agoricNames.brand[brandKeyword], value);
 
   t.context = {
@@ -151,14 +146,10 @@ test.before(async t => {
   };
 });
 
-test('replace feeDistributor', async t => {
+test('test feeDistributor', async t => {
   // @ts-expect-error type
   const { vstorage, toAmount } = t.context;
-  const { collectionInterval, vaultCount, coreEvalDir } = config;
-
-  await evalBundles(coreEvalDir);
-  // Wait for a round to give the new feeDistributor time to clear out outstanding fees, if any.
-  await sleep(collectionInterval + 5000, { log: console.log, setTimeout });
+  const { vaultCount } = config;
 
   const feeAmount = await calculateFee(
     config.managerIndex,