@agoric/inter-protocol 0.13.2-dev-bf35d83.0 → 0.13.2-dev-58d36fb.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/inter-protocol",
-  "version": "0.13.2-dev-bf35d83.0+bf35d83",
+  "version": "0.13.2-dev-58d36fb.0+58d36fb",
   "description": "Core cryptoeconomy contracts",
   "type": "module",
   "main": "src/index.js",
@@ -29,16 +29,16 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "0.5.2-dev-bf35d83.0+bf35d83",
-    "@agoric/ertp": "0.15.4-dev-bf35d83.0+bf35d83",
-    "@agoric/governance": "0.9.2-dev-bf35d83.0+bf35d83",
-    "@agoric/internal": "0.2.2-dev-bf35d83.0+bf35d83",
-    "@agoric/notifier": "0.5.2-dev-bf35d83.0+bf35d83",
-    "@agoric/store": "0.8.4-dev-bf35d83.0+bf35d83",
-    "@agoric/time": "0.2.2-dev-bf35d83.0+bf35d83",
-    "@agoric/vat-data": "0.4.4-dev-bf35d83.0+bf35d83",
-    "@agoric/vats": "0.13.1-dev-bf35d83.0+bf35d83",
-    "@agoric/zoe": "0.25.4-dev-bf35d83.0+bf35d83",
+    "@agoric/assert": "0.5.2-dev-58d36fb.0+58d36fb",
+    "@agoric/ertp": "0.15.4-dev-58d36fb.0+58d36fb",
+    "@agoric/governance": "0.9.2-dev-58d36fb.0+58d36fb",
+    "@agoric/internal": "0.2.2-dev-58d36fb.0+58d36fb",
+    "@agoric/notifier": "0.5.2-dev-58d36fb.0+58d36fb",
+    "@agoric/store": "0.8.4-dev-58d36fb.0+58d36fb",
+    "@agoric/time": "0.2.2-dev-58d36fb.0+58d36fb",
+    "@agoric/vat-data": "0.4.4-dev-58d36fb.0+58d36fb",
+    "@agoric/vats": "0.13.1-dev-58d36fb.0+58d36fb",
+    "@agoric/zoe": "0.25.4-dev-58d36fb.0+58d36fb",
     "@endo/captp": "^2.0.18",
     "@endo/eventual-send": "^0.16.8",
     "@endo/far": "^0.2.14",
@@ -46,10 +46,10 @@
     "@endo/nat": "^4.1.23"
   },
   "devDependencies": {
-    "@agoric/deploy-script-support": "0.9.5-dev-bf35d83.0+bf35d83",
-    "@agoric/smart-wallet": "0.4.3-dev-bf35d83.0+bf35d83",
-    "@agoric/swingset-liveslots": "0.9.1-dev-bf35d83.0+bf35d83",
-    "@agoric/swingset-vat": "0.30.3-dev-bf35d83.0+bf35d83",
+    "@agoric/deploy-script-support": "0.9.5-dev-58d36fb.0+58d36fb",
+    "@agoric/smart-wallet": "0.4.3-dev-58d36fb.0+58d36fb",
+    "@agoric/swingset-liveslots": "0.9.1-dev-58d36fb.0+58d36fb",
+    "@agoric/swingset-vat": "0.30.3-dev-58d36fb.0+58d36fb",
     "@endo/bundle-source": "^2.4.2",
     "@endo/init": "^0.5.52",
     "@endo/promise-kit": "^0.2.52",
@@ -75,5 +75,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "bf35d8366bf5b8e69278746ecafee20d0a024756"
+  "gitHead": "58d36fb9dfaaad0c0a962ba2940b6fcba2ea8b25"
 }

package/src/auction/auctionBook.js

@@ -54,10 +54,12 @@ const trace = makeTracer('AucBook', false);
 /**
  * @typedef {{
  * want: Amount<'nat'>
+ * } & {
+ *   exitAfterBuy?: boolean,
  * } & ({
- * offerPrice: Ratio,
+ *   offerPrice: Ratio,
  * } | {
- * offerBidScaling: Ratio,
+ *    offerBidScaling: Ratio,
  * })} BidSpec
  */
 /**
@@ -71,6 +73,7 @@ export const makeBidSpecShape = (currencyBrand, collateralBrand) => {
   return M.splitRecord(
     { want: collateralAmountShape },
     {
+      exitAfterBuy: M.boolean(),
       // xxx should have exactly one of these properties
       offerPrice: makeBrandedRatioPattern(
         currencyAmountShape,
@@ -266,9 +269,16 @@ export const prepareAuctionBook = (baggage, zcf) => {
          *  @param {ZCFSeat} seat
          *  @param {Ratio} price
          *  @param {Amount<'nat'>} want
-         *  @param {boolean} trySettle
+         *  @param {object} opts
+         *  @param {boolean} opts.trySettle
+         *  @param {boolean} [opts.exitAfterBuy]
          */
-        acceptPriceOffer(seat, price, want, trySettle) {
+        acceptPriceOffer(
+          seat,
+          price,
+          want,
+          { trySettle, exitAfterBuy = false },
+        ) {
           const { priceBook, curAuctionPrice } = this.state;
           const { helper } = this.facets;
           trace('acceptPrice');
@@ -281,13 +291,14 @@ export const prepareAuctionBook = (baggage, zcf) => {
 
           const stillWant = AmountMath.subtract(want, collateralSold);
           if (
+            (exitAfterBuy && !AmountMath.isEmpty(collateralSold)) ||
             AmountMath.isEmpty(stillWant) ||
             AmountMath.isEmpty(seat.getCurrentAllocation().Currency)
           ) {
             seat.exit();
           } else {
             trace('added Offer ', price, stillWant.value);
-            priceBook.add(seat, price, stillWant);
+            priceBook.add(seat, price, stillWant, exitAfterBuy);
           }
         },
 
@@ -299,9 +310,16 @@ export const prepareAuctionBook = (baggage, zcf) => {
          *  @param {ZCFSeat} seat
          *  @param {Ratio} bidScaling
          *  @param {Amount<'nat'>} want
-         *  @param {boolean} trySettle
+         *  @param {object} opts
+         *  @param {boolean} opts.trySettle
+         *  @param {boolean} [opts.exitAfterBuy]
          */
-        acceptScaledBidOffer(seat, bidScaling, want, trySettle) {
+        acceptScaledBidOffer(
+          seat,
+          bidScaling,
+          want,
+          { trySettle, exitAfterBuy = false },
+        ) {
           trace('accept scaled bid offer');
           const { curAuctionPrice, lockedPriceForRound, scaledBidBook } =
             this.state;
@@ -318,12 +336,13 @@ export const prepareAuctionBook = (baggage, zcf) => {
 
           const stillWant = AmountMath.subtract(want, collateralSold);
           if (
+            (exitAfterBuy && !AmountMath.isEmpty(collateralSold)) ||
             AmountMath.isEmpty(stillWant) ||
             AmountMath.isEmpty(seat.getCurrentAllocation().Currency)
           ) {
             seat.exit();
           } else {
-            scaledBidBook.add(seat, bidScaling, stillWant);
+            scaledBidBook.add(seat, bidScaling, stillWant, exitAfterBuy);
           }
         },
       },
@@ -418,7 +437,8 @@ export const prepareAuctionBook = (baggage, zcf) => {
 
           const { totalProceedsGoal } = this.state;
           const { helper } = this.facets;
-          for (const [key, { seat, price: p, wanted }] of prioritizedOffers) {
+          for (const [key, seatRecord] of prioritizedOffers) {
+            const { seat, price: p, wanted, exitAfterBuy } = seatRecord;
             if (totalProceedsGoal && AmountMath.isEmpty(totalProceedsGoal)) {
               break;
             } else if (seat.hasExited()) {
@@ -428,6 +448,7 @@ export const prepareAuctionBook = (baggage, zcf) => {
 
               const alloc = seat.getCurrentAllocation();
               if (
+                (exitAfterBuy && !AmountMath.isEmpty(collateralSold)) ||
                 AmountMath.isEmpty(alloc.Currency) ||
                 ('Collateral' in alloc &&
                   AmountMath.isGTE(alloc.Collateral, wanted))
@@ -462,32 +483,17 @@ export const prepareAuctionBook = (baggage, zcf) => {
           );
         },
         /**
-         *
          * @param {BidSpec} bidSpec
          * @param {ZCFSeat} seat
          * @param {boolean} trySettle
          */
         addOffer(bidSpec, seat, trySettle) {
-          const { collateralAmountShape, currencyAmountShape } = this.state;
-          const BidSpecShape = M.or(
-            {
-              want: collateralAmountShape,
-              offerPrice: makeBrandedRatioPattern(
-                currencyAmountShape,
-                collateralAmountShape,
-              ),
-            },
-            {
-              want: collateralAmountShape,
-              offerBidScaling: makeBrandedRatioPattern(
-                currencyAmountShape,
-                currencyAmountShape,
-              ),
-            },
-          );
+          const { currencyBrand, collateralBrand } = this.state;
+          const BidSpecShape = makeBidSpecShape(currencyBrand, collateralBrand);
 
           mustMatch(bidSpec, BidSpecShape);
           const { give } = seat.getProposal();
+          const { currencyAmountShape } = this.state;
           mustMatch(
             give.Currency,
             currencyAmountShape,
@@ -495,19 +501,26 @@ export const prepareAuctionBook = (baggage, zcf) => {
           );
 
           const { helper } = this.facets;
+          const { exitAfterBuy } = bidSpec;
           if ('offerPrice' in bidSpec) {
             return helper.acceptPriceOffer(
               seat,
               bidSpec.offerPrice,
               bidSpec.want,
-              trySettle,
+              {
+                trySettle,
+                exitAfterBuy,
+              },
             );
           } else if ('offerBidScaling' in bidSpec) {
             return helper.acceptScaledBidOffer(
               seat,
               bidSpec.offerBidScaling,
               bidSpec.want,
-              trySettle,
+              {
+                trySettle,
+                exitAfterBuy,
+              },
             );
           } else {
             throw Fail`Offer was neither a price nor a scaled bid`;

package/src/auction/auctioneer.js

@@ -420,7 +420,9 @@ export const start = async (zcf, privateArgs, baggage) => {
         deposits.set(brand, []);
       } else if (depositsForBrand.length > 1) {
         const collProceeds = collateralSeat.getCurrentAllocation().Collateral;
-        const currProceeds = currencySeat.getCurrentAllocation().Currency;
+        const currProceeds =
+          currencySeat.getCurrentAllocation().Currency ||
+          AmountMath.makeEmpty(brands.Currency);
         const transfers = distributeProportionalSharesWithLimits(
           collProceeds,
           currProceeds,

package/src/auction/offerBook.js

@@ -29,7 +29,7 @@ const nextSequenceNumber = () => {
  * wanted: Amount<'nat'>,
  * seqNum: NatValue,
  * received: Amount<'nat'>,
- * } & ({ bidScaling: Pattern, price: undefined } | { bidScaling: undefined, price: Ratio})
+ * } &  {exitAfterBuy: boolean} & ({ bidScaling: Pattern, price: undefined } | { bidScaling: undefined, price: Ratio})
  * } BidderRecord
  */
 
@@ -60,8 +60,9 @@ export const prepareScaledBidBook = baggage =>
        * @param {ZCFSeat} seat
        * @param {Ratio} bidScaling
        * @param {Amount<'nat'>} wanted
+       * @param {boolean} exitAfterBuy
        */
-      add(seat, bidScaling, wanted) {
+      add(seat, bidScaling, wanted, exitAfterBuy) {
         const { bidScalingPattern, collateralBrand, records } = this.state;
         mustMatch(bidScaling, bidScalingPattern);
 
@@ -76,6 +77,7 @@ export const prepareScaledBidBook = baggage =>
           seat,
           seqNum,
           wanted,
+          exitAfterBuy,
         };
         records.init(key, harden(bidderRecord));
         return key;
@@ -139,7 +141,13 @@ export const preparePriceBook = baggage =>
       records: makeScalarBigMapStore('scaledBidRecords', { durable: true }),
     }),
     {
-      add(seat, price, wanted) {
+      /**
+       * @param {ZCFSeat} seat
+       * @param {Ratio} price
+       * @param {Amount<'nat'>} wanted
+       * @param {boolean} exitAfterBuy
+       */
+      add(seat, price, wanted, exitAfterBuy) {
         const { priceRatioPattern, collateralBrand, records } = this.state;
         mustMatch(price, priceRatioPattern);
 
@@ -154,6 +162,7 @@ export const preparePriceBook = baggage =>
           seat,
           seqNum,
           wanted,
+          exitAfterBuy,
         };
         records.init(key, harden(bidderRecord));
         return key;