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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/inter-protocol",
-  "version": "0.13.2-dev-65d3f14.0+65d3f14",
+  "version": "0.13.2-pismo-dev-12e97f1.0+12e97f1",
   "description": "Core cryptoeconomy contracts",
   "type": "module",
   "main": "src/index.js",
@@ -16,7 +16,7 @@
     "lint-fix": "yarn lint:eslint --fix",
     "lint": "run-s --continue-on-error lint:*",
     "lint:eslint": "eslint .",
-    "lint:types": "tsc -p jsconfig.json"
+    "lint:types": "tsc --maxNodeModuleJsDepth 5 -p jsconfig.json"
   },
   "repository": {
     "type": "git",
@@ -29,32 +29,30 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "0.5.2-dev-65d3f14.0+65d3f14",
-    "@agoric/ertp": "0.15.4-dev-65d3f14.0+65d3f14",
-    "@agoric/governance": "0.9.2-dev-65d3f14.0+65d3f14",
-    "@agoric/internal": "0.2.2-dev-65d3f14.0+65d3f14",
+    "@agoric/assert": "0.5.2-pismo-dev-12e97f1.0+12e97f1",
+    "@agoric/ertp": "0.15.4-pismo-dev-12e97f1.0+12e97f1",
+    "@agoric/governance": "0.9.2-pismo-dev-12e97f1.0+12e97f1",
+    "@agoric/internal": "0.2.2-pismo-dev-12e97f1.0+12e97f1",
     "@agoric/nat": "^4.1.0",
-    "@agoric/notifier": "0.5.2-dev-65d3f14.0+65d3f14",
-    "@agoric/store": "0.8.4-dev-65d3f14.0+65d3f14",
-    "@agoric/swingset-vat": "0.30.3-dev-65d3f14.0+65d3f14",
-    "@agoric/vat-data": "0.4.4-dev-65d3f14.0+65d3f14",
-    "@agoric/vats": "0.13.1-dev-65d3f14.0+65d3f14",
-    "@agoric/zoe": "0.25.4-dev-65d3f14.0+65d3f14",
-    "@endo/bundle-source": "^2.4.2",
-    "@endo/captp": "^2.0.18",
-    "@endo/eventual-send": "^0.16.8",
-    "@endo/far": "^0.2.14",
-    "@endo/marshal": "^0.8.1",
-    "@endo/nat": "^4.1.23",
-    "@endo/promise-kit": "^0.2.52"
+    "@agoric/notifier": "0.5.2-pismo-dev-12e97f1.0+12e97f1",
+    "@agoric/store": "0.8.4-pismo-dev-12e97f1.0+12e97f1",
+    "@agoric/swingset-vat": "0.30.3-pismo-dev-12e97f1.0+12e97f1",
+    "@agoric/vat-data": "0.4.4-pismo-dev-12e97f1.0+12e97f1",
+    "@agoric/vats": "0.13.1-pismo-dev-12e97f1.0+12e97f1",
+    "@agoric/zoe": "0.25.4-pismo-dev-12e97f1.0+12e97f1",
+    "@endo/bundle-source": "^2.3.1",
+    "@endo/captp": "^2.0.15",
+    "@endo/eventual-send": "^0.16.5",
+    "@endo/far": "^0.2.11",
+    "@endo/marshal": "^0.7.5",
+    "@endo/nat": "^4.1.20",
+    "@endo/promise-kit": "^0.2.49"
   },
   "devDependencies": {
-    "@agoric/cosmic-swingset": "0.39.3-dev-65d3f14.0+65d3f14",
-    "@agoric/deploy-script-support": "0.9.5-dev-65d3f14.0+65d3f14",
-    "@agoric/smart-wallet": "0.4.3-dev-65d3f14.0+65d3f14",
-    "@endo/init": "^0.5.52",
+    "@agoric/deploy-script-support": "0.9.5-pismo-dev-12e97f1.0+12e97f1",
+    "@endo/init": "^0.5.49",
     "@fast-check/ava": "^1.0.1",
-    "ava": "^5.0.1",
+    "ava": "^4.3.1",
     "c8": "^7.11.0",
     "deep-object-diff": "^1.1.7",
     "import-meta-resolve": "^1.1.1"
@@ -78,5 +76,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "65d3f14c8102993168d2568eed5e6acbcba0c48a"
+  "gitHead": "12e97f1e7d384c11c76b61de67ee0de30de00fe6"
 }

package/scripts/add-collateral-core.js

@@ -1,11 +1,9 @@
 /* global process */
+// @ts-check
 import { makeHelpers } from '@agoric/deploy-script-support';
 
 import { getManifestForAddAssetToVault } from '../src/proposals/addAssetToVault.js';
-import {
-  getManifestForPsm,
-  getManifestForPsmGovernance,
-} from '../src/proposals/startPSM.js';
+import { getManifestForPsm } from '../src/proposals/startPSM.js';
 import { makeInstallCache } from '../src/proposals/utils.js';
 
 export const defaultProposalBuilder = async (
@@ -54,52 +52,6 @@ export const defaultProposalBuilder = async (
   });
 };
 
-export const psmGovernanceBuilder = async ({
-  publishRef,
-  install: install0,
-  wrapInstall,
-}) => {
-  const install = wrapInstall ? wrapInstall(install0) : install0;
-
-  return harden({
-    sourceSpec: '../src/proposals/startPSM.js',
-    getManifestCall: [
-      getManifestForPsmGovernance.name,
-      {
-        installKeys: {
-          psm: publishRef(
-            install('../src/psm/psm.js', '../bundles/bundle-psm.js'),
-          ),
-          econCommitteeCharter: publishRef(
-            install(
-              '../src/econCommitteeCharter.js',
-              '../bundles/bundle-econCommitteeCharter.js',
-            ),
-          ),
-          contractGovernor: publishRef(
-            install(
-              '@agoric/governance/src/contractGovernor.js',
-              '../../governance/bundles/bundle-contractGovernor.js',
-            ),
-          ),
-          committee: publishRef(
-            install(
-              '@agoric/governance/src/committee.js',
-              '../../governance/bundles/bundle-committee.js',
-            ),
-          ),
-          binaryVoteCounter: publishRef(
-            install(
-              '@agoric/governance/src/binaryVoteCounter.js',
-              '../../governance/bundles/bundle-binaryVoteCounter.js',
-            ),
-          ),
-        },
-      },
-    ],
-  });
-};
-
 export const psmProposalBuilder = async (
   { publishRef, install: install0, wrapInstall },
   { anchorOptions = /** @type {object} */ ({}) } = {},
@@ -112,12 +64,11 @@ export const psmProposalBuilder = async (
   const install = wrapInstall ? wrapInstall(install0) : install0;
 
   return harden({
-    sourceSpec: '../src/proposals/startPSM.js',
+    sourceSpec: '../src/proposals/addAssetToVault.js',
     getManifestCall: [
       getManifestForPsm.name,
       {
         anchorOptions: {
-          ...anchorOptions,
           denom,
           decimalPlaces,
         },

package/scripts/add-initial-liquidity.js

@@ -1,3 +1,4 @@
+// @ts-check
 import { AmountMath } from '@agoric/ertp';
 import { makeNotifierFromAsyncIterable } from '@agoric/notifier';
 import { E } from '@endo/far';

package/scripts/build-bundles.js

@@ -25,10 +25,7 @@ await extractProposalBundles(
 await createBundles(
   [
     ['../src/psm/psm.js', '../bundles/bundle-psm.js'],
-    [
-      '../src/econCommitteeCharter.js',
-      '../bundles/bundle-econCommitteeCharter.js',
-    ],
+    ['../src/psm/psmCharter.js', '../bundles/bundle-psmCharter.js'],
   ],
   dirname,
 );

package/scripts/deploy-contracts.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+// @ts-check
 import url from 'url';
 import { makeHelpers } from '@agoric/deploy-script-support';
 import { E } from '@endo/eventual-send';

package/scripts/init-core.js

@@ -1,8 +1,5 @@
 /* global process */
-/**
- * @file can be run with `agoric deploy` after a chain is running (depends on chain state)
- * Only works with "local" chain and not sim-chain b/c it needs governance votes (n/a on sim-chain).
- */
+// @ts-check
 import { makeHelpers } from '@agoric/deploy-script-support';
 import { objectMap } from '@agoric/internal';
 
@@ -71,15 +68,16 @@ const installKeyGroups = {
  * @param {(m: string, b: string, opts?: any) => I} opts.install
  * @param {<T>(f: T) => T} [opts.wrapInstall]
  *
- * @param {object} [options]
- * @param {{ committeeName?: string, committeeSize?: number}} [options.econCommitteeOptions]
  * @template I
  * @template R
  */
-export const committeeProposalBuilder = async (
-  { publishRef, install: install0, wrapInstall },
-  { econCommitteeOptions } = {},
-) => {
+export const committeeProposalBuilder = async ({
+  publishRef,
+  install: install0,
+  wrapInstall,
+}) => {
+  const { ROLE = 'chain' } = process.env;
+
   const install = wrapInstall ? wrapInstall(install0) : install0;
 
   /** @param {Record<string, [string, string]>} group */
@@ -92,7 +90,7 @@ export const committeeProposalBuilder = async (
     getManifestCall: [
       getManifestForEconCommittee.name,
       {
-        econCommitteeOptions,
+        ROLE,
         installKeys: {
           ...publishGroup(installKeyGroups.econCommittee),
         },

package/scripts/invite-committee-core.js

@@ -1,4 +1,5 @@
 /* global process */
+// @ts-check
 import { makeHelpers } from '@agoric/deploy-script-support';
 
 import { getManifestForInviteCommittee } from '../src/proposals/committee-proposal.js';

package/scripts/manual-price-feed.js

@@ -21,7 +21,7 @@ import process from 'process';
  * E(oa).pushResult('19.37')
  * E(qn).getUpdateSince()
  *
- * @typedef {{ board: import('@agoric/vats').Board, chainTimerService, scratch, zoe }} Home
+ * @typedef {{ board: Board, chainTimerService, scratch, zoe }} Home
  * @param {Promise<Home>} homePromise
  * @param {object} root0
  * @param {(...path: string[]) => Promise<any>} root0.lookup

package/scripts/price-feed-core.js

@@ -71,9 +71,9 @@ export const createGov = async (homeP, endowments) => {
 
   const {
     AGORIC_INSTANCE_NAME,
-    IN_BRAND_DECIMALS = '6',
+    IN_BRAND_DECIMALS,
     IN_BRAND_LOOKUP = JSON.stringify(['wallet', 'brand', 'BLD']),
-    OUT_BRAND_DECIMALS = '6',
+    OUT_BRAND_DECIMALS,
     OUT_BRAND_LOOKUP = JSON.stringify(['agoricNames', 'oracleBrand', 'USD']),
     ORACLE_ADDRESSES,
   } = process.env;

package/src/collect.js

@@ -1,3 +1,5 @@
+// @ts-check
+
 const { fromEntries, keys, values } = Object;
 
 /** @type { <X, Y>(xs: X[], ys: Y[]) => [X, Y][]} */

package/src/collectFees.js

@@ -1,5 +1,4 @@
-import { atomicTransfer } from '@agoric/zoe/src/contractSupport';
-
+// @ts-check
 /**
  * Provide shared support for providing access to fees from a service contract.
  *
@@ -16,7 +15,9 @@ export const makeMakeCollectFeesInvitation = (
 ) => {
   const collectFees = seat => {
     const amount = feeSeat.getAmountAllocated(keyword, feeBrand);
-    atomicTransfer(zcf, feeSeat, seat, { [keyword]: amount }, { Fee: amount });
+    feeSeat.decrementBy(harden({ [keyword]: amount }));
+    seat.incrementBy(harden({ Fee: amount }));
+    zcf.reallocate(seat, feeSeat);
 
     seat.exit();
     return `paid out ${amount.value}`;

package/src/contractSupport.js

@@ -1,9 +1,10 @@
+// @ts-check
 import { AmountMath } from '@agoric/ertp';
 import { makeStoredPublisherKit, makeStoredPublishKit } from '@agoric/notifier';
 import { M } from '@agoric/store';
 import { E } from '@endo/eventual-send';
 
-const { Fail, quote: q } = assert;
+const { details: X, quote: q } = assert;
 
 export const amountPattern = harden({ brand: M.remotable(), value: M.any() });
 export const ratioPattern = harden({
@@ -18,11 +19,10 @@ export const ratioPattern = harden({
  * on a proposal. We use two Amounts because an Amount cannot represent
  * a negative number (so we use a "loss" that will be subtracted).
  *
- * @template {AssetKind} K
- * @param {Amount<K>} base
- * @param {Amount<K>} gain
- * @param {Amount<K>} loss
- * @returns {Amount<K>}
+ * @param {Amount} base
+ * @param {Amount} gain
+ * @param {Amount} loss
+ * @returns {Amount}
  */
 export const addSubtract = (base, gain, loss) =>
   AmountMath.subtract(AmountMath.add(base, gain), loss);
@@ -37,8 +37,10 @@ export const assertOnlyKeys = (proposal, keys) => {
   /** @param {AmountKeywordRecord} clause */
   const onlyKeys = clause =>
     Object.getOwnPropertyNames(clause).every(c => keys.includes(c));
-  onlyKeys(proposal.give) || Fail`extraneous terms in give: ${proposal.give}`;
-  onlyKeys(proposal.want) || Fail`extraneous terms in want: ${proposal.want}`;
+  onlyKeys(proposal.give) ||
+    assert.fail(X`extraneous terms in give: ${proposal.give}`);
+  onlyKeys(proposal.want) ||
+    assert.fail(X`extraneous terms in want: ${proposal.want}`);
 };
 
 /**
@@ -46,7 +48,6 @@ export const assertOnlyKeys = (proposal, keys) => {
  * the gain and a loss on the `fromSeat`. The gain/loss are typically from the
  * give/want respectively of a proposal. The `key` is the allocation keyword.
  *
- * @deprecated Use atomicRearrange instead
  * @param {ZCFSeat} fromSeat
  * @param {ZCFSeat} toSeat
  * @param {Amount} fromLoses
@@ -71,10 +72,12 @@ export const stageDelta = (fromSeat, toSeat, fromLoses, fromGains, key) => {
  */
 export const checkDebtLimit = (debtLimit, totalDebt, toMint) => {
   const debtPost = AmountMath.add(totalDebt, toMint);
-  !AmountMath.isGTE(debtPost, debtLimit) ||
-    Fail`Minting ${q(toMint)} past ${q(
-      totalDebt,
-    )} would hit total debt limit ${q(debtLimit)}`;
+  assert(
+    !AmountMath.isGTE(debtPost, debtLimit),
+    X`Minting ${q(toMint)} past ${q(totalDebt)} would hit total debt limit ${q(
+      debtLimit,
+    )}`,
+  );
 };
 
 /**
@@ -158,3 +161,14 @@ export const makeEphemeraProvider = init => {
   };
 };
 harden(makeEphemeraProvider);
+
+/**
+ * @template {Record<string, unknown>} T
+ * @param {T} specimen
+ * @param {Array<keyof T>} keyList
+ */
+export const assertKeysDefined = (specimen, keyList) => {
+  for (const key of keyList) {
+    assert(specimen[key], X`Missing ${q(key)}`);
+  }
+};

package/src/econCommitteeCharter.js

@@ -1,132 +1,102 @@
-import '@agoric/governance/exported.js';
-import { makeScalarMapStore, M, makeHeapFarInstance, fit } from '@agoric/store';
+// @ts-check
+
+import '@agoric/governance/src/exported.js';
 import '@agoric/zoe/exported.js';
 import '@agoric/zoe/src/contracts/exported.js';
-import { InstanceHandleShape } from '@agoric/zoe/src/typeGuards.js';
-import { TimestampShape } from '@agoric/swingset-vat/src/vats/timer/typeGuards.js';
-import { E } from '@endo/far';
+
+import { E, Far } from '@endo/far';
 
 /**
  * @file
  *
- * This contract makes it possible for those who govern contracts to call for
- * votes on changes. A more complete implementation would validate parameters,
- * constrain deadlines and possibly split the ability to call for votes into
- * separate capabilities for finer grain encapsulation.
+ * This extremely quick and dirty contract simplifies the process of
+ * calling for votes on changes to the economy by gathering the governor creator
+ * facets in one place and invokes `voteOnParamChanges` and
+ * `voteOnApiInvocation` on each when requested. A cleaner version would
+ * validate parameters, constrain deadlines and probably split the ability to
+ * call for vote into separate capabilities for finer grain encapsulation.
  */
 
-export const INVITATION_MAKERS_DESC = 'charter member invitation';
-
-/**
- * @typedef {object} ParamChangesOfferArgs
- * @property {bigint} deadline
- * @property {Instance} instance
- * @property {Record<string, unknown>} params
- * @property {{paramPath: { key: string }}} [path]
- */
-const ParamChangesOfferArgsShape = harden(
-  M.split(
-    {
-      deadline: TimestampShape,
-      instance: InstanceHandleShape,
-      params: M.recordOf(M.string(), M.any()),
-    },
-    M.partial({
-      path: { paramPath: { key: M.any() } },
-    }),
-  ),
-);
-
 /**
  * @param {ZCF<{binaryVoteCounterInstallation:Installation}>} zcf
+ * @param {{reserve:GovernedContractFacetAccess<{},{}>, amm:GovernedCreatorFacet<{}>, vaults:GovernedCreatorFacet<{}>}} privateArgs
  */
-export const start = async zcf => {
+export const start = async (zcf, privateArgs) => {
   const { binaryVoteCounterInstallation: counter } = zcf.getTerms();
-  /** @type {MapStore<Instance,GovernedContractFacetAccess<{},{}>>} */
-  const instanceToGovernor = makeScalarMapStore();
+  const { reserve, amm, vaults } = privateArgs;
 
-  const makeParamInvitation = () => {
-    /**
-     * @param {ZCFSeat} seat
-     * @param {ParamChangesOfferArgs} args
-     */
-    const voteOnParamChanges = (seat, args) => {
-      fit(args, ParamChangesOfferArgsShape);
-      seat.exit();
-
-      const {
-        params,
-        instance,
-        deadline,
-        path = { paramPath: { key: 'governedApi' } },
-      } = args;
-      const governor = instanceToGovernor.get(instance);
-      return E(governor).voteOnParamChanges(counter, deadline, {
-        ...path,
-        changes: params,
-      });
-    };
-
-    return zcf.makeInvitation(voteOnParamChanges, 'vote on param changes');
+  /**
+   * @param {*} target
+   * @param {Record<string, unknown>} params
+   * @param {bigint} deadline
+   * @param {{paramPath: { key: unknown }}} [path]
+   */
+  const voteOnParamChanges = (
+    target,
+    params,
+    deadline,
+    path = { paramPath: { key: 'governedApi' } },
+  ) => {
+    return E(target).voteOnParamChanges(counter, deadline, {
+      ...path,
+      changes: params,
+    });
   };
 
-  const makeOfferFilterInvitation = (instance, strings, deadline) => {
-    const voteOnOfferFilterHandler = seat => {
-      seat.exit();
-
-      const governor = instanceToGovernor.get(instance);
-      return E(governor).voteOnOfferFilter(counter, deadline, strings);
-    };
-
-    return zcf.makeInvitation(voteOnOfferFilterHandler, 'vote on offer filter');
+  /**
+   * @param {*} target
+   * @param {string} method
+   * @param {unknown[]} args
+   * @param {bigint} deadline
+   */
+  const voteOnApiInvocation = (target, method, args, deadline) => {
+    return E(target).voteOnApiInvocation(method, args, counter, deadline);
   };
 
-  const MakerShape = M.interface('Charter InvitationMakers', {
-    VoteOnParamChange: M.call().returns(M.promise()),
-    VoteOnPauseOffers: M.call(
-      InstanceHandleShape,
-      M.arrayOf(M.string()),
-      TimestampShape,
-    ).returns(M.promise()),
-  });
-  const invitationMakers = makeHeapFarInstance(
-    'Charter Invitation Makers',
-    MakerShape,
-    {
-      VoteOnParamChange: makeParamInvitation,
-      VoteOnPauseOffers: makeOfferFilterInvitation,
-    },
-  );
-
-  const charterMemberHandler = seat => {
-    seat.exit();
-    return harden({ invitationMakers });
+  const makeNullInvitation = () => {
+    return zcf.makeInvitation(() => {}, 'econCommitteeCharter noop');
   };
 
-  const charterCreatorI = M.interface('Charter creatorFacet', {
-    addInstance: M.call(InstanceHandleShape, M.any())
-      .optional(M.string())
-      .returns(),
-    makeCharterMemberInvitation: M.call().returns(M.promise()),
+  const publicFacet = Far('votingAPI', {
+    /**
+     * @param {Record<string, unknown>} params
+     * @param {bigint} deadline
+     */
+    voteOnAmmParamChanges: (params, deadline) =>
+      voteOnParamChanges(amm, params, deadline),
+    /**
+     * @param {Record<string, unknown>} params
+     * @param {bigint} deadline
+     */
+    voteOnReserveParamChanges: (params, deadline) =>
+      voteOnParamChanges(reserve, params, deadline),
+    /**
+     * vote on param changes for a vaultManager
+     *
+     * @param {Record<string, unknown>} params
+     * @param {{collateralBrand: Brand}} brand
+     * @param {bigint} deadline
+     */
+    voteOnVaultParamChanges: (params, brand, deadline) =>
+      voteOnParamChanges(vaults, params, deadline, {
+        paramPath: { key: brand },
+      }),
+    /**
+     * vote on param changes across the vaultFactory
+     *
+     * @param {Record<string, unknown>} params
+     * @param {bigint} deadline
+     */
+    voteOnVaultFactoryParamChanges: (params, deadline) =>
+      voteOnParamChanges(vaults, params, deadline),
+    /**
+     * @param {Amount[]} amounts
+     * @param {bigint} deadline
+     */
+    voteOnReserveApiInvocation: (amounts, deadline) =>
+      voteOnApiInvocation(reserve, 'addLiquidityToAmmPool', amounts, deadline),
+    makeNullInvitation,
   });
 
-  const creatorFacet = makeHeapFarInstance(
-    'Charter creatorFacet',
-    charterCreatorI,
-    {
-      /**
-       * @param {Instance} governedInstance
-       * @param {GovernedContractFacetAccess<{},{}>} governorFacet
-       * @param {string} [label] for diagnostic use only
-       */
-      addInstance: (governedInstance, governorFacet, label) => {
-        console.log('charter: adding instance', label);
-        instanceToGovernor.init(governedInstance, governorFacet);
-      },
-      makeCharterMemberInvitation: () =>
-        zcf.makeInvitation(charterMemberHandler, INVITATION_MAKERS_DESC),
-    },
-  );
-
-  return harden({ creatorFacet });
+  return harden({ publicFacet });
 };

package/src/feeDistributor.js

@@ -1,3 +1,5 @@
+// @ts-check
+
 import { AmountMath } from '@agoric/ertp';
 import { E, Far } from '@endo/far';
 import { observeNotifier } from '@agoric/notifier';
@@ -8,7 +10,7 @@ const { details: X } = assert;
 /**
  * @typedef {object} FeeCollector
  *
- * @property {() => ERef<Payment<'nat'>>} collectFees
+ * @property {() => ERef<Payment>} collectFees
  */
 
 /**
@@ -107,8 +109,8 @@ export const makeShareConfig = (destinations = {}, keywordShares = {}) => {
 /**
  * Split and deposit a payment given a share configuration.
  *
- * @param {Payment<'nat'>} payment
- * @param {ERef<Issuer<'nat'>>} issuer
+ * @param {Payment} payment
+ * @param {ERef<Issuer>} issuer
  * @param {ShareConfig} shareConfig
  */
 export const sharePayment = async (
@@ -158,7 +160,7 @@ export const sharePayment = async (
 };
 
 /**
- * @param {ERef<Issuer<'nat'>>} feeIssuer
+ * @param {ERef<Issuer>} feeIssuer
  * @param {{ keywordShares: Record<Keyword, bigint>, timerService: ERef<TimerService>, collectionInterval: RelativeTime}} terms
  */
 export const makeFeeDistributor = (feeIssuer, terms) => {
@@ -171,7 +173,7 @@ export const makeFeeDistributor = (feeIssuer, terms) => {
   /** @type {SetStore<FeeCollector>} */
   const collectors = makeScalarSetStore();
 
-  /** @param {Payment<'nat'>} payment */
+  /** @param {Payment} payment */
   const distributeFees = payment =>
     sharePayment(payment, feeIssuer, shareConfig);
 
@@ -226,7 +228,7 @@ export const makeFeeDistributor = (feeIssuer, terms) => {
     },
 
     /**
-     * @param {import('@endo/far').EOnly<DepositFacet>} depositFacet
+     * @param {EOnly<DepositFacet>} depositFacet
      */
     makeDepositFacetDestination: depositFacet => {
       return Far(`DepositFacetDestination`, {

package/src/interchainPool.js

@@ -1,12 +1,10 @@
+// @ts-check
 import { E, Far } from '@endo/far';
 import { AmountMath, AssetKind, makeIssuerKit } from '@agoric/ertp';
-import {
-  offerTo,
-  atomicTransfer,
-} from '@agoric/zoe/src/contractSupport/index.js';
+import { offerTo } from '@agoric/zoe/src/contractSupport/index.js';
 import { MIN_INITIAL_POOL_LIQUIDITY_KEY } from './vpool-xyk-amm/params.js';
 
-const { Fail, quote: q } = assert;
+const { details: X, quote: q } = assert;
 
 const COSMOS_DECIMALS = 6;
 
@@ -59,7 +57,9 @@ export const start = (zcf, { bankManager }) => {
       give: { Central: centralAmt },
     } = seat.getProposal();
     AmountMath.isGTE(centralAmt, minimumCentral) ||
-      Fail`at least ${q(minimumCentral)} required; only ${q(centralAmt)} given`;
+      assert.fail(
+        X`at least ${q(minimumCentral)} required; only ${q(centralAmt)} given`,
+      );
 
     const interAsset = makeIssuerKit(
       denom,
@@ -90,7 +90,8 @@ export const start = (zcf, { bankManager }) => {
         },
       });
 
-      atomicTransfer(zcf, seat, seat2, { Central: centralAmt });
+      seat2.incrementBy(seat.decrementBy(harden({ Central: centralAmt })));
+      zcf.reallocate(seat, seat2);
 
       const invitation = await E(ammPub).addPoolInvitation();
       const { userSeatPromise, deposited } = await offerTo(