@agoric/inter-protocol 0.13.2-dev-65d3f14.0 → 0.13.2-pismo-dev-12e97f1.0

package/src/interest-math.js

@@ -1,3 +1,5 @@
+// @ts-check
+
 import {
   divideBy,
   multiplyBy,

package/src/interest.js

@@ -1,3 +1,5 @@
+// @ts-check
+
 import { AmountMath } from '@agoric/ertp';
 import { natSafeMath } from '@agoric/zoe/src/contractSupport/index.js';
 import {
@@ -5,7 +7,7 @@ import {
   multiplyRatios,
   quantize,
 } from '@agoric/zoe/src/contractSupport/ratio.js';
-import { Fail } from '@agoric/assert';
+import { assert, details as X } from '@agoric/assert';
 import { TimeMath } from '@agoric/swingset-vat/src/vats/timer/timeMath.js';
 
 export const SECONDS_PER_YEAR = 60n * 60n * 24n * 365n;
@@ -125,15 +127,17 @@ export const calculateCompoundedInterest = (
 
 /**
  *
- * @template {AssetKind} K
- * @param {ZCFMint<K>} mint
- * @param {Amount<K>} debt
+ *
+ * @param {ZCFMint} mint
+ * @param {Amount} debt
  */
 const validatedBrand = (mint, debt) => {
   const { brand: debtBrand } = debt;
   const { brand: issuerBrand } = mint.getIssuerRecord();
   debtBrand === issuerBrand ||
-    Fail`Debt and issuer brands differ: ${debtBrand} != ${issuerBrand}`;
+    assert.fail(
+      X`Debt and issuer brands differ: ${debtBrand} != ${issuerBrand}`,
+    );
   return issuerBrand;
 };
 
@@ -141,7 +145,7 @@ const validatedBrand = (mint, debt) => {
  * Charge interest accrued between `latestInterestUpdate` and `accruedUntil`.
  *
  * @param {{
- *  mint: ZCFMint<'nat'>,
+ *  mint: ZCFMint,
  *  mintAndReallocateWithFee: MintAndReallocate,
  *  poolIncrementSeat: ZCFSeat,
  *  seatAllocationKeyword: Keyword }} powers

package/src/makeTracer.js

@@ -1,10 +1,5 @@
 let debugInstance = 1;
 
-/**
- *
- * @param {string} name
- * @param {boolean | 'verbose'} enable
- */
 const makeTracer = (name, enable = true) => {
   debugInstance += 1;
   let debugCount = 1;

package/src/my-lien.js

@@ -1,7 +1,8 @@
+// @ts-check
 import { AmountMath } from '@agoric/ertp';
 import { E, Far } from '@endo/far';
 
-const { Fail } = assert;
+const { details: X } = assert;
 
 /**
  * per golang/cosmos/x/lien/lien.go
@@ -20,13 +21,14 @@ const XLien = /** @type { const } */ ({
  */
 
 /**
- * @param {ERef<import('@agoric/vats').BridgeManager>} bridgeManager
+ * @param {ERef<BridgeManager>} bridgeManager
  * @param {Brand<'nat'>} brand
  * @param {string} [denom]
  * @returns {StakingAuthority}
  */
 export const makeStakeReporter = (bridgeManager, brand, denom = 'ubld') => {
   const { make: makeAmt } = AmountMath;
+  /** @param {string} numeral */
   const toStake = numeral => makeAmt(brand, BigInt(numeral));
   /**
    * @param {string} address
@@ -56,7 +58,9 @@ export const makeStakeReporter = (bridgeManager, brand, denom = 'ubld') => {
     },
     getAccountState: async (address, wantedBrand) => {
       wantedBrand === brand ||
-        Fail`Cannot getAccountState for ${wantedBrand}. Expected ${brand}.`;
+        assert.fail(
+          X`Cannot getAccountState for ${wantedBrand}. Expected ${brand}.`,
+        );
       /** @type { AccountState<string> } */
       const { currentTime, bonded, liened, locked, total, unbonding } = await E(
         bridgeManager,

package/src/proposals/addAssetToVault.js

@@ -1,3 +1,4 @@
+// @ts-check
 import { AmountMath, AssetKind } from '@agoric/ertp';
 import { makeRatio } from '@agoric/zoe/src/contractSupport/index.js';
 import { deeplyFulfilledObject } from '@agoric/internal';
@@ -244,7 +245,7 @@ export const registerScaledPriceAuthority = async (
  */
 export const addAssetToVault = async (
   {
-    consume: { vaultFactoryKit, agoricNamesAdmin },
+    consume: { vaultFactoryCreator, agoricNamesAdmin },
     brand: {
       consume: { [Stable.symbol]: stableP },
     },
@@ -260,7 +261,6 @@ export const addAssetToVault = async (
   );
 
   const stable = await stableP;
-  const vaultFactoryCreator = E.get(vaultFactoryKit).creatorFacet;
   await E(vaultFactoryCreator).addVaultType(interchainIssuer, oracleBrand, {
     debtLimit: AmountMath.make(stable, 0n),
     // the rest of these are arbitrary, TBD by gov cttee
@@ -320,7 +320,9 @@ export const getManifestForAddAssetToVault = (
       },
       [addAssetToVault.name]: {
         consume: {
-          vaultFactoryKit: true,
+          vaultFactoryCreator: true,
+          ammCreatorFacet: true,
+          reserveCreatorFacet: true,
           agoricNamesAdmin: true,
         },
         brand: {

package/src/proposals/committee-proposal.js

@@ -1,3 +1,4 @@
+// @ts-check
 import { deeplyFulfilledObject } from '@agoric/internal';
 import { E } from '@endo/far';
 import { reserveThenDeposit } from './utils.js';
@@ -12,9 +13,41 @@ const zip = (xs, ys) => xs.map((x, i) => [x, ys[i]]);
  * @param {{ options: { voterAddresses: Record<string, string> }}} param1
  */
 export const inviteCommitteeMembers = async (
-  { consume: { namesByAddressAdmin, economicCommitteeCreatorFacet } },
+  {
+    consume: {
+      zoe,
+      agoricNames,
+      namesByAddressAdmin,
+      economicCommitteeCreatorFacet,
+      reserveGovernorCreatorFacet,
+      ammGovernorCreatorFacet,
+      vaultFactoryGovernorCreator,
+    },
+    installation: {
+      consume: { binaryVoteCounter: counterP },
+    },
+  },
   { options: { voterAddresses } },
 ) => {
+  /** @type {[Installation, Installation]} */
+  const [charterInstall, counterInstall] = await Promise.all([
+    E(agoricNames).lookup('installation', 'econCommitteeCharter'),
+    counterP,
+  ]);
+  const terms = await deeplyFulfilledObject(
+    harden({
+      binaryVoteCounterInstallation: counterInstall,
+    }),
+  );
+  const privateFacets = {
+    reserve: reserveGovernorCreatorFacet,
+    amm: ammGovernorCreatorFacet,
+    vaults: vaultFactoryGovernorCreator,
+  };
+  const { publicFacet: votingAPI } = E.get(
+    E(zoe).startInstance(charterInstall, undefined, terms, privateFacets),
+  );
+
   const invitations = await E(
     economicCommitteeCreatorFacet,
   ).getVoterInvitations();
@@ -26,11 +59,15 @@ export const inviteCommitteeMembers = async (
   const distributeInvitations = async addrInvitations => {
     await Promise.all(
       addrInvitations.map(async ([addr, invitationP]) => {
+        const [voterInvitation, nullInvitation] = await Promise.all([
+          invitationP,
+          E(votingAPI).makeNullInvitation(),
+        ]);
         await reserveThenDeposit(
           `econ committee member ${addr}`,
           namesByAddressAdmin,
           addr,
-          [invitationP],
+          [voterInvitation, nullInvitation],
         );
       }),
     );
@@ -41,90 +78,6 @@ export const inviteCommitteeMembers = async (
 
 harden(inviteCommitteeMembers);
 
-/**
- * @param {import('./econ-behaviors').EconomyBootstrapPowers} powers
- */
-export const startEconCharter = async ({
-  consume: { zoe },
-  produce: { econCharterKit },
-  installation: {
-    consume: { binaryVoteCounter: counterP, econCommitteeCharter: installP },
-  },
-  instance: {
-    produce: { econCommitteeCharter: instanceP },
-  },
-}) => {
-  const [charterInstall, counterInstall] = await Promise.all([
-    installP,
-    counterP,
-  ]);
-  const terms = await deeplyFulfilledObject(
-    harden({
-      binaryVoteCounterInstallation: counterInstall,
-    }),
-  );
-
-  /** @type {Promise<import('./econ-behaviors').EconCharterStartResult>} */
-  const startResult = E(zoe).startInstance(charterInstall, undefined, terms);
-  instanceP.resolve(E.get(startResult).instance);
-  econCharterKit.resolve(startResult);
-};
-harden(startEconCharter);
-
-/**
- * @param {import('./econ-behaviors').EconomyBootstrapPowers} powers
- */
-export const addGovernorsToEconCharter = async ({
-  consume: { reserveKit, ammKit, vaultFactoryKit, econCharterKit },
-  instance: {
-    consume: { amm, reserve, VaultFactory },
-  },
-}) => {
-  const { creatorFacet } = E.get(econCharterKit);
-
-  // Introduce charter to governed creator facets.
-  await Promise.all(
-    [
-      { instanceP: amm, facetP: E.get(ammKit).governorCreatorFacet },
-      { instanceP: reserve, facetP: E.get(reserveKit).governorCreatorFacet },
-      {
-        instanceP: VaultFactory,
-        facetP: E.get(vaultFactoryKit).governorCreatorFacet,
-      },
-    ].map(async ({ instanceP, facetP }) => {
-      const [instance, govFacet] = await Promise.all([instanceP, facetP]);
-
-      return E(creatorFacet).addInstance(instance, govFacet);
-    }),
-  );
-};
-
-harden(addGovernorsToEconCharter);
-
-/**
- * @param {import('./econ-behaviors').EconomyBootstrapPowers} powers
- * @param {{ options: { voterAddresses: Record<string, string> }}} param1
- */
-export const inviteToEconCharter = async (
-  { consume: { namesByAddressAdmin, econCharterKit } },
-  { options: { voterAddresses } },
-) => {
-  const { creatorFacet } = E.get(econCharterKit);
-
-  await Promise.all(
-    values(voterAddresses).map(async addr =>
-      reserveThenDeposit(
-        `econ charter member ${addr}`,
-        namesByAddressAdmin,
-        addr,
-        [E(creatorFacet).makeCharterMemberInvitation()],
-      ),
-    ),
-  );
-};
-
-harden(inviteToEconCharter);
-
 export const getManifestForInviteCommittee = async (
   { restoreRef },
   { voterAddresses, econCommitteeCharterRef },
@@ -133,41 +86,18 @@ export const getManifestForInviteCommittee = async (
   return {
     manifest: {
       [inviteCommitteeMembers.name]: {
-        consume: { namesByAddressAdmin: t, economicCommitteeCreatorFacet: t },
-      },
-      [startEconCharter.name]: {
-        consume: { zoe: t },
-        produce: { econCharterKit: t },
-        installation: {
-          consume: { binaryVoteCounter: t, econCommitteeCharter: t },
-        },
-        instance: {
-          produce: { econCommitteeCharter: t },
-        },
-      },
-      [addGovernorsToEconCharter.name]: {
         consume: {
-          reserveGovernorCreatorFacet: t,
-          ammGovernorCreatorFacet: t,
-          vaultFactoryGovernorCreator: t,
-          econCharterKit: t,
           zoe: t,
           agoricNames: t,
           namesByAddressAdmin: t,
           economicCommitteeCreatorFacet: t,
-          reserveKit: t,
-          ammKit: t,
-          vaultFactoryKit: t,
+          reserveGovernorCreatorFacet: t,
+          ammGovernorCreatorFacet: t,
+          vaultFactoryGovernorCreator: t,
         },
         installation: {
           consume: { binaryVoteCounter: t },
         },
-        instance: {
-          consume: { amm: t, reserve: t, VaultFactory: t },
-        },
-      },
-      [inviteToEconCharter.name]: {
-        consume: { namesByAddressAdmin: t, econCharterKit: t },
       },
     },
     installations: {

package/src/proposals/core-proposal.js

@@ -1,3 +1,4 @@
+// @ts-check
 import { Stable } from '@agoric/vats/src/tokens.js';
 import * as econBehaviors from './econ-behaviors.js';
 import { ECON_COMMITTEE_MANIFEST } from './startEconCommittee.js';
@@ -7,12 +8,10 @@ export * from './econ-behaviors.js';
 export * from './sim-behaviors.js';
 // @ts-expect-error Module './econ-behaviors.js' has already exported a member
 // named 'EconomyBootstrapPowers'.
-export * from './startPSM.js'; // eslint-disable-line import/export
-export * from './startEconCommittee.js'; // eslint-disable-line import/export
+export * from './startPSM.js';
+export * from './startEconCommittee.js';
 
-/** @type {import('@agoric/vats/src/core/manifest.js').BootstrapManifest} */
 const SHARED_MAIN_MANIFEST = harden({
-  /** @type {import('@agoric/vats/src/core/manifest.js').BootstrapManifestPermit} */
   [econBehaviors.setupAmm.name]: {
     consume: {
       board: 'board',
@@ -21,7 +20,11 @@ const SHARED_MAIN_MANIFEST = harden({
       zoe: 'zoe',
       economicCommitteeCreatorFacet: 'economicCommittee',
     },
-    produce: { ammKit: 'amm' },
+    produce: {
+      ammCreatorFacet: 'amm',
+      ammInstanceWithoutReserve: 'amm',
+      ammGovernorCreatorFacet: 'amm',
+    },
     issuer: { consume: { [Stable.symbol]: 'zoe' } },
     brand: { consume: { [Stable.symbol]: 'zoe' } },
     installation: {
@@ -56,9 +59,13 @@ const SHARED_MAIN_MANIFEST = harden({
       zoe: 'zoe',
       priceAuthority: 'priceAuthority',
       economicCommitteeCreatorFacet: 'economicCommittee',
-      reserveKit: 'reserve',
+      reserveCreatorFacet: 'reserve',
+    },
+    produce: {
+      vaultFactoryCreator: 'VaultFactory',
+      vaultFactoryGovernorCreator: 'VaultFactory',
+      vaultFactoryVoteCreator: 'VaultFactory',
     },
-    produce: { vaultFactoryKit: 'VaultFactory' },
     brand: { consume: { [Stable.symbol]: 'zoe' } },
     oracleBrand: { consume: { USD: true } },
     installation: {
@@ -84,13 +91,14 @@ const SHARED_MAIN_MANIFEST = harden({
     consume: {
       client: 'provisioning',
       priceAuthorityAdmin: 'priceAuthority',
-      vaultFactoryKit: 'VaultFactory',
+      vaultFactoryCreator: 'VaultFactory',
     },
   },
 
   [econBehaviors.setupReserve.name]: {
     consume: {
-      ammKit: 'amm',
+      ammCreatorFacet: 'amm',
+      ammInstanceWithoutReserve: 'amm',
       board: 'board',
       chainStorage: true,
       feeMintAccess: 'zoe',
@@ -98,7 +106,11 @@ const SHARED_MAIN_MANIFEST = harden({
       zoe: 'zoe',
       economicCommitteeCreatorFacet: 'economicCommittee',
     },
-    produce: { reserveKit: 'reserve' },
+    produce: {
+      reserveCreatorFacet: 'reserve',
+      reserveGovernorCreatorFacet: 'reserve',
+      reservePublicFacet: 'reserve',
+    },
     issuer: { consume: { [Stable.symbol]: 'zoe' } },
     brand: { consume: { [Stable.symbol]: 'zoe' } },
     installation: {
@@ -142,14 +154,14 @@ const REWARD_MANIFEST = harden({
     consume: {
       chainTimerService: true,
       bankManager: true,
-      vaultFactoryKit: true,
+      vaultFactoryCreator: true,
       periodicFeeCollectors: true,
-      ammKit: true,
-      stakeFactoryKit: true,
-      reserveKit: true,
+      ammCreatorFacet: true,
+      stakeFactoryCreatorFacet: true,
+      reservePublicFacet: true,
       zoe: true,
     },
-    produce: { feeDistributorKit: true, periodicFeeCollectors: true },
+    produce: { feeDistributorCreatorFacet: true, periodicFeeCollectors: true },
     instance: { produce: { feeDistributor: true } },
     installation: { consume: { feeDistributor: true } },
     issuer: { consume: { [Stable.symbol]: 'zoe' } },
@@ -177,7 +189,8 @@ const STAKE_FACTORY_MANIFEST = harden({
       economicCommitteeCreatorFacet: 'economicCommittee',
     },
     produce: {
-      stakeFactoryKit: 'stakeFactory',
+      stakeFactoryCreatorFacet: 'stakeFactory',
+      stakeFactoryGovernorCreatorFacet: 'stakeFactory',
     },
     installation: {
       consume: { contractGovernor: 'zoe', stakeFactory: 'zoe' },
@@ -208,7 +221,7 @@ export const SIM_CHAIN_MANIFEST = harden({
       mints: 'mints',
       priceAuthorityVat: 'priceAuthority',
       priceAuthorityAdmin: 'priceAuthority',
-      vaultFactoryKit: 'VaultFactory',
+      vaultFactoryCreator: 'VaultFactory',
       zoe: true,
     },
     installation: {

package/src/proposals/demoIssuers.js

@@ -1,3 +1,5 @@
+// @ts-check
+
 import { AmountMath, AssetKind } from '@agoric/ertp';
 import { objectMap } from '@agoric/internal';
 import {
@@ -9,7 +11,7 @@ import { Stake, Stable } from '@agoric/vats/src/tokens.js';
 import { Nat } from '@endo/nat';
 import * as Collect from '../collect.js';
 
-const { Fail, quote: q } = assert;
+const { details: X, quote: q } = assert;
 const { multiply, floorDivide } = natSafeMath;
 const { entries, fromEntries, keys, values } = Object;
 
@@ -77,7 +79,7 @@ export const showBrand = b =>
   `${b}`.replace(/.object Alleged: (.*) brand./, '$1');
 export const showAmount = ({ brand, value }) => {
   const b = `${showBrand(brand)}`;
-  b in DecimalPlaces || Fail`unknown brand name: ${q(b)}`;
+  assert(b in DecimalPlaces, X`unknown brand name: ${q(b)}`);
   return `${decimal(value, DecimalPlaces[b])} ${b}`;
 };
 
@@ -185,7 +187,7 @@ const run2places = f =>
  *   feeMintAccess: ERef<FeeMintAccess>,
  *   zoe: ERef<ZoeService>,
  * }} powers
- * @returns {Promise<Payment<'nat'>>}
+ * @returns {Promise<Payment>}
  */
 const mintRunPayment = async (
   value,
@@ -417,7 +419,7 @@ export const splitAllCentralPayments = async (
  * @param {string} issuerName
  * @param {typeof AMMDemoState['ATOM']} record
  * @param {Record<string, { issuer: ERef<Issuer>, brand: Brand }>} kits
- * @param {{ issuer: ERef<Issuer<'nat'>>, brand: Brand<'nat'> }} central
+ * @param {{ issuer: ERef<Issuer>, brand: Brand }} central
  */
 export const poolRates = (issuerName, record, kits, central) => {
   /** @param {bigint} n */
@@ -464,7 +466,7 @@ export const fundAMM = async ({
     mints,
     priceAuthorityVat,
     priceAuthorityAdmin,
-    vaultFactoryKit,
+    vaultFactoryCreator,
     zoe,
   },
   installation: {
@@ -505,10 +507,7 @@ export const fundAMM = async ({
       },
     ),
   );
-
-  const central = /** @type {Pick<IssuerKit<'nat'>, 'issuer' | 'brand'>} */ (
-    kits[Stable.symbol]
-  );
+  const central = kits[Stable.symbol];
 
   /** @type {[ XYKAMMPublicFacet, TimerService]} */
   const [ammPublicFacet, timer] = await Promise.all([
@@ -542,17 +541,17 @@ export const fundAMM = async ({
         );
 
         const kit = kits[issuerName];
-        if (!kit.mint) {
-          throw Fail`no mint for ${q(issuerName)}`;
-        }
+        assert(kit.mint, X`no mint for ${q(issuerName)}`);
         // @@ doesn't work for BLD?
         const secondaryPayment = await E(kit.mint).mintPayment(
           AmountMath.make(kit.brand, initialValue),
         );
-        secondaryPayment || Fail`no payment for ${q(issuerName)}`;
-        kit.issuer || Fail`No issuer for ${q(issuerName)}`;
-        const liquidityIssuer = /** @type {Promise<Issuer<'nat'>>} */ (
-          E(ammPublicFacet).addIssuer(kit.issuer, issuerName)
+        assert(secondaryPayment, X`no payment for ${q(issuerName)}`);
+
+        assert(kit.issuer, X`No issuer for ${q(issuerName)}`);
+        const liquidityIssuer = E(ammPublicFacet).addIssuer(
+          kit.issuer,
+          issuerName,
         );
         const [secondaryAmount, liquidityBrand] = await Promise.all([
           // Error: (an undefined) was not a live payment for brand
@@ -576,7 +575,7 @@ export const fundAMM = async ({
         );
 
         const issuerPresence = await kit.issuer;
-        return E(E.get(vaultFactoryKit).creatorFacet).addVaultType(
+        return E(vaultFactoryCreator).addVaultType(
           issuerPresence,
           issuerName,
           rates,