@agoric/inter-protocol 0.13.2-dev-52d161b.0 → 0.13.2-dev-470ca41.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/inter-protocol",
-  "version": "0.13.2-dev-52d161b.0+52d161b",
+  "version": "0.13.2-dev-470ca41.0+470ca41",
   "description": "Core cryptoeconomy contracts",
   "type": "module",
   "main": "src/index.js",
@@ -29,28 +29,28 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "0.5.2-dev-52d161b.0+52d161b",
-    "@agoric/ertp": "0.15.4-dev-52d161b.0+52d161b",
-    "@agoric/governance": "0.9.2-dev-52d161b.0+52d161b",
-    "@agoric/internal": "0.2.2-dev-52d161b.0+52d161b",
-    "@agoric/notifier": "0.5.2-dev-52d161b.0+52d161b",
-    "@agoric/store": "0.8.4-dev-52d161b.0+52d161b",
-    "@agoric/time": "0.2.2-dev-52d161b.0+52d161b",
-    "@agoric/vat-data": "0.4.4-dev-52d161b.0+52d161b",
-    "@agoric/vats": "0.13.1-dev-52d161b.0+52d161b",
-    "@agoric/zoe": "0.25.4-dev-52d161b.0+52d161b",
+    "@agoric/assert": "0.5.2-dev-470ca41.0+470ca41",
+    "@agoric/ertp": "0.15.4-dev-470ca41.0+470ca41",
+    "@agoric/governance": "0.9.2-dev-470ca41.0+470ca41",
+    "@agoric/internal": "0.2.2-dev-470ca41.0+470ca41",
+    "@agoric/notifier": "0.5.2-dev-470ca41.0+470ca41",
+    "@agoric/store": "0.8.4-dev-470ca41.0+470ca41",
+    "@agoric/time": "0.2.2-dev-470ca41.0+470ca41",
+    "@agoric/vat-data": "0.4.4-dev-470ca41.0+470ca41",
+    "@agoric/vats": "0.13.1-dev-470ca41.0+470ca41",
+    "@agoric/zoe": "0.25.4-dev-470ca41.0+470ca41",
     "@endo/captp": "^3.1.0",
     "@endo/eventual-send": "^0.17.1",
     "@endo/far": "^0.2.17",
     "@endo/marshal": "^0.8.4",
     "@endo/nat": "^4.1.26",
-    "agoric": "0.18.3-dev-52d161b.0+52d161b"
+    "agoric": "0.18.3-dev-470ca41.0+470ca41"
   },
   "devDependencies": {
-    "@agoric/deploy-script-support": "0.9.5-dev-52d161b.0+52d161b",
-    "@agoric/smart-wallet": "0.4.3-dev-52d161b.0+52d161b",
-    "@agoric/swingset-liveslots": "0.9.1-dev-52d161b.0+52d161b",
-    "@agoric/swingset-vat": "0.30.3-dev-52d161b.0+52d161b",
+    "@agoric/deploy-script-support": "0.9.5-dev-470ca41.0+470ca41",
+    "@agoric/smart-wallet": "0.4.3-dev-470ca41.0+470ca41",
+    "@agoric/swingset-liveslots": "0.9.1-dev-470ca41.0+470ca41",
+    "@agoric/swingset-vat": "0.30.3-dev-470ca41.0+470ca41",
     "@endo/bundle-source": "^2.5.0",
     "@endo/init": "^0.5.55",
     "@endo/promise-kit": "^0.2.55",
@@ -76,5 +76,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "52d161bb8fb927137acd234f07917180ff9dd6d0"
+  "gitHead": "470ca4121d46170665958cd713ec9d22dac5eb9a"
 }

package/src/auction/auctionBook.js

@@ -54,7 +54,7 @@ const trace = makeTracer('AucBook', false);
 
 /**
  * @typedef {{
- *   want: Amount<'nat'>
+ *   maxBuy: Amount<'nat'>
  * } & {
  *   exitAfterBuy?: boolean,
  * } & ({
@@ -72,7 +72,7 @@ export const makeBidSpecShape = (currencyBrand, collateralBrand) => {
   const currencyAmountShape = makeNatAmountShape(currencyBrand);
   const collateralAmountShape = makeNatAmountShape(collateralBrand);
   return M.splitRecord(
-    { want: collateralAmountShape },
+    { maxBuy: collateralAmountShape },
     {
       exitAfterBuy: M.boolean(),
       // xxx should have exactly one of these properties
@@ -352,7 +352,7 @@ export const prepareAuctionBook = (baggage, zcf, makeRecorderKit) => {
          *
          *  @param {ZCFSeat} seat
          *  @param {Ratio} price
-         *  @param {Amount<'nat'>} want
+         *  @param {Amount<'nat'>} maxBuy
          *  @param {object} opts
          *  @param {boolean} opts.trySettle
          *  @param {boolean} [opts.exitAfterBuy]
@@ -360,7 +360,7 @@ export const prepareAuctionBook = (baggage, zcf, makeRecorderKit) => {
         acceptPriceOffer(
           seat,
           price,
-          want,
+          maxBuy,
           { trySettle, exitAfterBuy = false },
         ) {
           const { priceBook, curAuctionPrice } = this.state;
@@ -370,15 +370,15 @@ export const prepareAuctionBook = (baggage, zcf, makeRecorderKit) => {
           const settleIfPriceExists = () => {
             if (curAuctionPrice !== null) {
               return trySettle && ratioGTE(price, curAuctionPrice)
-                ? helper.settle(seat, want)
-                : AmountMath.makeEmptyFromAmount(want);
+                ? helper.settle(seat, maxBuy)
+                : AmountMath.makeEmptyFromAmount(maxBuy);
             } else {
-              return AmountMath.makeEmptyFromAmount(want);
+              return AmountMath.makeEmptyFromAmount(maxBuy);
             }
           };
           const collateralSold = settleIfPriceExists();
 
-          const stillWant = AmountMath.subtract(want, collateralSold);
+          const stillWant = AmountMath.subtract(maxBuy, collateralSold);
           if (
             (exitAfterBuy && !AmountMath.isEmpty(collateralSold)) ||
             AmountMath.isEmpty(stillWant) ||
@@ -400,7 +400,7 @@ export const prepareAuctionBook = (baggage, zcf, makeRecorderKit) => {
          *
          *  @param {ZCFSeat} seat
          *  @param {Ratio} bidScaling
-         *  @param {Amount<'nat'>} want
+         *  @param {Amount<'nat'>} maxBuy
          *  @param {object} opts
          *  @param {boolean} opts.trySettle
          *  @param {boolean} [opts.exitAfterBuy]
@@ -408,7 +408,7 @@ export const prepareAuctionBook = (baggage, zcf, makeRecorderKit) => {
         acceptScaledBidOffer(
           seat,
           bidScaling,
-          want,
+          maxBuy,
           { trySettle, exitAfterBuy = false },
         ) {
           trace('accept scaled bid offer');
@@ -427,13 +427,13 @@ export const prepareAuctionBook = (baggage, zcf, makeRecorderKit) => {
                 lockedPriceForRound,
               )
             ) {
-              return helper.settle(seat, want);
+              return helper.settle(seat, maxBuy);
             }
-            return AmountMath.makeEmptyFromAmount(want);
+            return AmountMath.makeEmptyFromAmount(maxBuy);
           };
           const collateralSold = settleIfPricesDefined();
 
-          const stillWant = AmountMath.subtract(want, collateralSold);
+          const stillWant = AmountMath.subtract(maxBuy, collateralSold);
           if (
             (exitAfterBuy && !AmountMath.isEmpty(collateralSold)) ||
             AmountMath.isEmpty(stillWant) ||
@@ -664,7 +664,7 @@ export const prepareAuctionBook = (baggage, zcf, makeRecorderKit) => {
             return helper.acceptPriceOffer(
               seat,
               bidSpec.offerPrice,
-              bidSpec.want,
+              bidSpec.maxBuy,
               {
                 trySettle,
                 exitAfterBuy,
@@ -674,7 +674,7 @@ export const prepareAuctionBook = (baggage, zcf, makeRecorderKit) => {
             return helper.acceptScaledBidOffer(
               seat,
               bidSpec.offerBidScaling,
-              bidSpec.want,
+              bidSpec.maxBuy,
               {
                 trySettle,
                 exitAfterBuy,

package/src/auction/auctioneer.js

@@ -602,7 +602,7 @@ export const start = async (zcf, privateArgs, baggage) => {
       },
     },
     {
-      want: M.or({ Collateral: AmountShape }, {}),
+      maxBuy: M.or({ Collateral: AmountShape }, {}),
       exit: FullProposalShape.exit,
     },
   );

package/src/clientSupport.js

@@ -209,7 +209,7 @@ const makePsmSwapOffer = (instance, brands, opts) => {
  * @param {{
  *   offerId: string,
  *   give: string,
- *   desiredBuy: string,
+ *   maxBuy: string,
  *   wantMinimum?: string,
  *   parseAmount: (x: string) => Amount<'nat'>,
  * } & ({
@@ -224,7 +224,7 @@ const makeBidOffer = (_brands, opts) => {
   assertAllDefined({
     offerId: opts.offerId,
     give: opts.give,
-    desiredBuy: opts.desiredBuy,
+    maxBuy: opts.maxBuy,
   });
   const { parseAmount } = opts;
   const proposal = {
@@ -234,7 +234,7 @@ const makeBidOffer = (_brands, opts) => {
       : {}),
   };
   const istBrand = proposal.give.Currency.brand;
-  const desiredBuy = parseAmount(opts.desiredBuy);
+  const maxBuy = parseAmount(opts.maxBuy);
 
   const bounds = (x, lo, hi) => {
     assert(x >= lo && x <= hi);
@@ -249,12 +249,11 @@ const makeBidOffer = (_brands, opts) => {
   const offerArgs =
     'price' in opts
       ? {
-          // TODO: update when contract uses "desiredBuy"
-          want: parseAmount(opts.desiredBuy),
-          offerPrice: parseRatio(opts.price, istBrand, desiredBuy.brand),
+          maxBuy: parseAmount(opts.maxBuy),
+          offerPrice: parseRatio(opts.price, istBrand, maxBuy.brand),
         }
       : {
-          want: desiredBuy,
+          maxBuy,
           offerBidScaling: parseRatio(
             (1 - bounds(opts.discount, -1, 1)).toFixed(2),
             istBrand,
@@ -268,7 +267,7 @@ const makeBidOffer = (_brands, opts) => {
     invitationSpec: {
       source: 'agoricContract',
       instancePath: ['auctioneer'],
-      callPipe: [['makeBidInvitation', [desiredBuy.brand]]],
+      callPipe: [['makeBidInvitation', [maxBuy.brand]]],
     },
     proposal,
     offerArgs,

package/src/feeDistributor.js

@@ -316,7 +316,7 @@ export const makeFeeDistributor = (feeIssuer, terms) => {
     },
 
     /**
-     * @param {Record<Keyword, FeeDestination>} newDestinations
+     * @param {Record<Keyword, ERef<FeeDestination>>} newDestinations
      */
     setDestinations: async newDestinations => {
       destinations = newDestinations;

package/src/proposals/econ-behaviors.js

@@ -396,7 +396,7 @@ export const startRewardDistributor = async ({
       timerService,
       collectionInterval: 60n * 60n, // 1 hour
       keywordShares: {
-        RewardDistributor: 1n,
+        RewardDistributor: 0n,
         Reserve: 1n,
       },
     }),
@@ -417,6 +417,12 @@ export const startRewardDistributor = async ({
       return undefined;
     });
 
+  /**
+   * @type {Awaited<
+   *   ReturnType<typeof import('../feeDistributor.js').makeFeeDistributor>>
+   *   & { adminFacet: AdminFacet, instance: Instance }
+   * }
+   */
   const instanceKit = await E(zoe).startInstance(
     feeDistributor,
     { Fee: centralIssuer },
@@ -424,13 +430,15 @@ export const startRewardDistributor = async ({
     undefined,
     'feeDistributor',
   );
+  /** @type {ERef<import('../feeDistributor.js').FeeDestination>} */
   await E(instanceKit.creatorFacet).setDestinations({
-    RewardDistributor:
-      rewardDistributorDepositFacet &&
-      E(instanceKit.creatorFacet).makeDepositFacetDestination(
-        rewardDistributorDepositFacet,
-      ),
+    ...(rewardDistributorDepositFacet && {
+      RewardDistributor: E(
+        instanceKit.creatorFacet,
+      ).makeDepositFacetDestination(rewardDistributorDepositFacet),
+    }),
     Reserve: E(instanceKit.creatorFacet).makeOfferDestination(
+      zoe,
       'Collateral',
       E.get(reserveKit).publicFacet,
       'makeAddCollateralInvitation',