@agoric/inter-protocol 0.16.2-dev-b9f5667.0 → 0.16.2-dev-74a89a7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/inter-protocol",
-  "version": "0.16.2-dev-b9f5667.0+b9f5667",
+  "version": "0.16.2-dev-74a89a7.0+74a89a7",
   "description": "Core cryptoeconomy contracts",
   "type": "module",
   "main": "src/index.js",
@@ -31,15 +31,15 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/ertp": "0.16.3-dev-b9f5667.0+b9f5667",
-    "@agoric/governance": "0.10.4-dev-b9f5667.0+b9f5667",
-    "@agoric/internal": "0.3.3-dev-b9f5667.0+b9f5667",
-    "@agoric/notifier": "0.6.3-dev-b9f5667.0+b9f5667",
-    "@agoric/store": "0.9.3-dev-b9f5667.0+b9f5667",
-    "@agoric/time": "0.3.3-dev-b9f5667.0+b9f5667",
-    "@agoric/vat-data": "0.5.3-dev-b9f5667.0+b9f5667",
-    "@agoric/vats": "0.15.2-dev-b9f5667.0+b9f5667",
-    "@agoric/zoe": "0.26.3-dev-b9f5667.0+b9f5667",
+    "@agoric/ertp": "0.16.3-dev-74a89a7.0+74a89a7",
+    "@agoric/governance": "0.10.4-dev-74a89a7.0+74a89a7",
+    "@agoric/internal": "0.3.3-dev-74a89a7.0+74a89a7",
+    "@agoric/notifier": "0.6.3-dev-74a89a7.0+74a89a7",
+    "@agoric/store": "0.9.3-dev-74a89a7.0+74a89a7",
+    "@agoric/time": "0.3.3-dev-74a89a7.0+74a89a7",
+    "@agoric/vat-data": "0.5.3-dev-74a89a7.0+74a89a7",
+    "@agoric/vats": "0.15.2-dev-74a89a7.0+74a89a7",
+    "@agoric/zoe": "0.26.3-dev-74a89a7.0+74a89a7",
     "@endo/captp": "^4.2.2",
     "@endo/errors": "^1.2.4",
     "@endo/eventual-send": "^1.2.4",
@@ -50,10 +50,10 @@
     "jessie.js": "^0.3.4"
   },
   "devDependencies": {
-    "@agoric/smart-wallet": "0.5.4-dev-b9f5667.0+b9f5667",
-    "@agoric/swingset-liveslots": "0.10.3-dev-b9f5667.0+b9f5667",
-    "@agoric/swingset-vat": "0.32.3-dev-b9f5667.0+b9f5667",
-    "@agoric/zone": "0.2.3-dev-b9f5667.0+b9f5667",
+    "@agoric/smart-wallet": "0.5.4-dev-74a89a7.0+74a89a7",
+    "@agoric/swingset-liveslots": "0.10.3-dev-74a89a7.0+74a89a7",
+    "@agoric/swingset-vat": "0.32.3-dev-74a89a7.0+74a89a7",
+    "@agoric/zone": "0.2.3-dev-74a89a7.0+74a89a7",
     "@endo/bundle-source": "^3.3.0",
     "@endo/init": "^1.1.3",
     "@endo/promise-kit": "^1.1.4",
@@ -84,5 +84,5 @@
   "typeCoverage": {
     "atLeast": 95.81
   },
-  "gitHead": "b9f5667ddb39267445c232e24e62cde12685a42a"
+  "gitHead": "74a89a7af2190b538bd8221486566e02e29dfe20"
 }

package/src/auction/auctionBook.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auctionBook.d.ts","sourceRoot":"","sources":["auctionBook.js"],"names":[],"mappings":"AA+EO,6CAHI,KAAK,CAAC,KAAK,CAAC,mBACZ,KAAK,CAAC,KAAK,CAAC,oCAiBtB;AAwBM,4CAJI,OAAO,OACP,GAAG,mBACH,OAAO,6CAA6C,EAAE,eAAe,8IA8pBtE,UAAU,mJA5jBZ,WAAQ;;QAqBR;;;;;;WAMG;+BAFQ,MAAM,SACN,KAAK,GAAG,SAAS;QAW5B;;;;;;;WAOG;2BAHQ,MAAM,kBACN,MAAM,SACN,KAAK,GAAG,SAAS;QAW5B;;;;;;WAMG;qBAFQ,OAAO,oBACP,MAAM,CAAC,KAAK,CAAC;QAyExB;;;;;;;;;;;WAWG;+BANQ,OAAO,SACP,KAAK,UACL,MAAM,CAAC,KAAK,CAAC,+BAErB;YAAsB,SAAS,EAAvB,OAAO;YACQ,YAAY;SAAC;QAsCvC;;;;;;;;;;;WAWG;mCANQ,OAAO,cACP,KAAK,UACL,MAAM,CAAC,KAAK,CAAC,+BAErB;YAAsB,SAAS,EAAvB,OAAO;YACQ,YAAY;SAAC;;;;;QA2GvC;;;;;;;;WAQG;+BAPQ,MAAM,CAAC,KAAK,CAAC,cACb,OAAO;QA6ElB,yCAAyC;mCAAlB,KAAK,GAAK,IAAI;;;;;QA4GrC;;;;WAIG;4BAHQ,SAAS,QACT,OAAO,aACP,OAAO;;;;;;;;;;;;GAqFqB,CAAC,MAAM,CAAC,CAItD;wBAxtBY;IACZ,MAAU,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;CACvB,GAAG;IACN,YAAgB,CAAC,EAAE,OAAO,CAAC;CACxB,GAAG,CACE;IACR,UAAoB,EAAE,KAAK,CAAC;CACnB,GACD;IACR,eAAyB,EAAE,KAAK,CAAC;CACxB,CACJ;;;;;gBAyBQ,KAAK,GAAG,IAAI;;;;;uBACZ,KAAK,GAAG,IAAI;;;;;uBAEZ,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI;;;;;2BAEpB,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI;;;;;oBAEpB,MAAM,CAAC,KAAK,CAAC,GAAG,SAAS;;;;;qBAEzB,MAAM,CAAC,KAAK,CAAC;;;;;yBAEb,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI;;0BA4qBpB,UAAU,CAAC,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC;6BA1vBrC,kBAAkB;oCACiD,4BAA4B"}
+{"version":3,"file":"auctionBook.d.ts","sourceRoot":"","sources":["auctionBook.js"],"names":[],"mappings":"AA+EO,6CAHI,KAAK,CAAC,KAAK,CAAC,mBACZ,KAAK,CAAC,KAAK,CAAC,oCAiBtB;AAwBM,4CAJI,OAAO,OACP,GAAG,mBACH,OAAO,6CAA6C,EAAE,eAAe,8IA+oBtE,UAAU,mJA/iBN,WAAW;;QAuBjB;;;;;;WAMG;+BAFQ,MAAM,SACN,KAAK,GAAG,SAAS;QAW5B;;;;;;;WAOG;2BAHQ,MAAM,kBACN,MAAM,SACN,KAAK,GAAG,SAAS;QAW5B;;;;;;WAMG;qBAFQ,OAAO,oBACP,MAAM,CAAC,KAAK,CAAC;QAgExB;;;;;;;;;;;WAWG;+BANQ,OAAO,SACP,KAAK,UACL,MAAM,CAAC,KAAK,CAAC,+BAErB;YAAsB,SAAS,EAAvB,OAAO;YACQ,YAAY;SAAC;QAsCvC;;;;;;;;;;;WAWG;mCANQ,OAAO,cACP,KAAK,UACL,MAAM,CAAC,KAAK,CAAC,+BAErB;YAAsB,SAAS,EAAvB,OAAO;YACQ,YAAY;SAAC;;;;;QA2GvC;;;;;;;;WAQG;+BAPQ,MAAM,CAAC,KAAK,CAAC,cACb,OAAO;QA6ElB,yCAAyC;mCAAlB,KAAK,GAAK,IAAI;;;;;QAsGrC;;;;WAIG;4BAHQ,SAAS,QACT,OAAO,aACP,OAAO;;;;;;;;;;;;GAqFqB,CAAC,MAAM,CAAC,CAItD;wBAzsBY;IACZ,MAAU,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;CACvB,GAAG;IACN,YAAgB,CAAC,EAAE,OAAO,CAAC;CACxB,GAAG,CACE;IACR,UAAoB,EAAE,KAAK,CAAC;CACnB,GACD;IACR,eAAyB,EAAE,KAAK,CAAC;CACxB,CACJ;;;;;gBAyBQ,KAAK,GAAG,IAAI;;;;;uBACZ,KAAK,GAAG,IAAI;;;;;uBAEZ,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI;;;;;2BAEpB,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI;;;;;oBAEpB,MAAM,CAAC,KAAK,CAAC,GAAG,SAAS;;;;;qBAEzB,MAAM,CAAC,KAAK,CAAC;;;;;yBAEb,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI;;0BA6pBpB,UAAU,CAAC,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC;6BA3uBrC,kBAAkB;oCACiD,4BAA4B"}

package/src/auction/auctionBook.js

@@ -12,7 +12,6 @@ import { assertAllDefined, makeTracer } from '@agoric/internal';
 import {
   atomicRearrange,
   ceilMultiplyBy,
-  floorDivideBy,
   makeRatioFromAmounts,
   makeRecorderTopic,
   multiplyRatios,
@@ -21,6 +20,7 @@ import {
 import { observeNotifier } from '@agoric/notifier';
 
 import { makeNatAmountShape } from '../contractSupport.js';
+import { amountsToSettle } from './auctionMath.js';
 import { preparePriceBook, prepareScaledBidBook } from './offerBook.js';
 import {
   isScaledBidPriceHigher,
@@ -282,39 +282,30 @@ export const prepareAuctionBook = (baggage, zcf, makeRecorderKit) => {
             return makeEmpty(collateralBrand);
           }
 
-          /** @type {Amount<'nat'>} */
-          const initialCollateralTarget = AmountMath.min(
-            collateralWanted,
-            collateralAvailable,
-          );
-
           const { curAuctionPrice, bidHoldingSeat, remainingProceedsGoal } =
             this.state;
           curAuctionPrice !== null ||
             Fail`auctionPrice must be set before each round`;
           assert(curAuctionPrice);
 
-          const proceedsNeeded = ceilMultiplyBy(
-            initialCollateralTarget,
-            curAuctionPrice,
-          );
-          if (AmountMath.isEmpty(proceedsNeeded)) {
+          const { proceedsExpected, proceedsTarget, collateralTarget } =
+            amountsToSettle(
+              {
+                bidAlloc,
+                collateralWanted,
+                collateralAvailable,
+                curAuctionPrice,
+                remainingProceedsGoal,
+              },
+              trace,
+            );
+
+          if (proceedsExpected === null) {
             seat.fail(Error('price fell to zero'));
             return makeEmpty(collateralBrand);
           }
 
-          const minProceedsTarget = AmountMath.min(proceedsNeeded, bidAlloc);
-          const proceedsLimit = remainingProceedsGoal
-            ? AmountMath.min(remainingProceedsGoal, minProceedsTarget)
-            : minProceedsTarget;
-          const isRaiseLimited =
-            remainingProceedsGoal ||
-            !AmountMath.isGTE(proceedsLimit, proceedsNeeded);
-
-          const [proceedsTarget, collateralTarget] = isRaiseLimited
-            ? [proceedsLimit, floorDivideBy(proceedsLimit, curAuctionPrice)]
-            : [minProceedsTarget, initialCollateralTarget];
-
+          // check that the requested amount could be satisfied
           const { Collateral } = seat.getProposal().want;
           if (Collateral && AmountMath.isGTE(Collateral, collateralTarget)) {
             seat.exit('unable to satisfy want');
@@ -335,7 +326,7 @@ export const prepareAuctionBook = (baggage, zcf, makeRecorderKit) => {
             );
           }
 
-          trace('settle', {
+          trace('settled', {
             collateralTarget,
             proceedsTarget,
             remainingProceedsGoal: this.state.remainingProceedsGoal,
@@ -611,20 +602,14 @@ export const prepareAuctionBook = (baggage, zcf, makeRecorderKit) => {
           const pricedOffers = priceBook.offersAbove(curAuctionPrice);
           const scaledBidOffers = scaledBidBook.offersAbove(reduction);
 
-          const compareValues = (v1, v2) => {
-            if (v1 < v2) {
-              return -1;
-            } else if (v1 === v2) {
-              return 0;
-            } else {
-              return 1;
-            }
-          };
-          trace(`settling`, pricedOffers.length, scaledBidOffers.length);
           // requested price or BidScaling gives no priority beyond specifying which
           // round the order will be serviced in.
           const prioritizedOffers = [...pricedOffers, ...scaledBidOffers].sort(
-            (a, b) => compareValues(a[1].seqNum, b[1].seqNum),
+            (a, b) => Number(a[1].seqNum - b[1].seqNum),
+          );
+
+          trace(
+            `settling ${prioritizedOffers.length} offers at ${curAuctionPrice} (priced ${pricedOffers.length}, scaled ${scaledBidOffers.length}) `,
           );
 
           const { remainingProceedsGoal } = state;

package/src/auction/auctionMath.d.ts

@@ -0,0 +1,17 @@
+export function amountsToSettle({ bidAlloc, collateralWanted, collateralAvailable, curAuctionPrice, remainingProceedsGoal, }: {
+    bidAlloc: Amount<"nat">;
+    collateralWanted: Amount<"nat">;
+    collateralAvailable: Amount<"nat">;
+    curAuctionPrice: Ratio;
+    remainingProceedsGoal: Amount<"nat"> | null;
+}, log?: ((...msgs: any[]) => void) | undefined): {
+    proceedsExpected: null;
+    proceedsTarget?: undefined;
+    collateralTarget?: undefined;
+} | {
+    proceedsExpected: import("@agoric/ertp/src/types.js").NatAmount;
+    proceedsTarget: import("@agoric/ertp/src/types.js").NatAmount;
+    collateralTarget: import("@agoric/ertp/src/types.js").NatAmount;
+};
+import type { Amount } from '@agoric/ertp/src/types.js';
+//# sourceMappingURL=auctionMath.d.ts.map

package/src/auction/auctionMath.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"auctionMath.d.ts","sourceRoot":"","sources":["auctionMath.js"],"names":[],"mappings":"AAoBO,8HARJ;IAAyB,QAAQ,EAAzB,OAAO,KAAK,CAAC;IACI,gBAAgB,EAAjC,OAAO,KAAK,CAAC;IACI,mBAAmB,EAApC,OAAO,KAAK,CAAC;IACJ,eAAe,EAAxB,KAAK;IACmB,qBAAqB,EAA7C,OAAO,KAAK,CAAC,GAAG,IAAI;CAE5B,mBAAkB,GAAG,EAAE,KAAK,IAAI;;;;;;;;EA6DlC;4BAxEwB,2BAA2B"}

package/src/auction/auctionMath.js

@@ -0,0 +1,81 @@
+import { AmountMath } from '@agoric/ertp';
+import {
+  ceilMultiplyBy,
+  floorDivideBy,
+} from '@agoric/zoe/src/contractSupport/index.js';
+
+/**
+ * @import {Amount} from '@agoric/ertp/src/types.js';
+ */
+
+/**
+ * @param {object} p
+ * @param {Amount<'nat'>} p.bidAlloc current allocation of the bidding seat
+ * @param {Amount<'nat'>} p.collateralWanted want of the offer
+ * @param {Amount<'nat'>} p.collateralAvailable available to auction
+ * @param {Ratio} p.curAuctionPrice current auction price
+ * @param {Amount<'nat'> | null} p.remainingProceedsGoal amount still needing
+ *   liquidating over multiple rounds; null indicates no limit
+ * @param {(...msgs: any[]) => void} [log]
+ */
+export const amountsToSettle = (
+  {
+    bidAlloc,
+    collateralWanted,
+    collateralAvailable,
+    curAuctionPrice,
+    remainingProceedsGoal,
+  },
+  log = () => {},
+) => {
+  log('amountsToSettle', {
+    bidAlloc,
+    collateralWanted,
+    collateralAvailable,
+    curAuctionPrice,
+    remainingProceedsGoal,
+  });
+  const initialCollateralTarget = AmountMath.min(
+    collateralWanted,
+    collateralAvailable,
+  );
+
+  const proceedsExpected = ceilMultiplyBy(
+    initialCollateralTarget,
+    curAuctionPrice,
+  );
+  if (AmountMath.isEmpty(proceedsExpected)) {
+    return { proceedsExpected: null };
+  }
+
+  const targetByProceeds = proceedsLimit =>
+    AmountMath.min(
+      collateralAvailable,
+      floorDivideBy(proceedsLimit, curAuctionPrice),
+    );
+
+  const [proceedsTarget, collateralTarget] = (() => {
+    // proceeds cannot exceed what is needed or being offered
+    const proceedsBidded = AmountMath.min(proceedsExpected, bidAlloc);
+    if (remainingProceedsGoal) {
+      const goalProceeds = AmountMath.min(
+        remainingProceedsGoal,
+        proceedsBidded,
+      );
+      return [goalProceeds, targetByProceeds(goalProceeds)];
+    } else if (AmountMath.isGTE(proceedsBidded, proceedsExpected)) {
+      // initial collateral suffices
+      return [proceedsBidded, initialCollateralTarget];
+    } else {
+      return [proceedsBidded, targetByProceeds(proceedsBidded)];
+    }
+  })();
+
+  assert(
+    AmountMath.isGTE(collateralAvailable, collateralTarget),
+    'target cannot exceed available',
+  );
+
+  return { proceedsExpected, proceedsTarget, collateralTarget };
+};
+harden(amountsToSettle);