@agoric/zoe 0.26.3-u15.0 → 0.26.3-u16.1

package/src/contracts/auction/index.js

@@ -1,3 +1,4 @@
+/* eslint @typescript-eslint/no-floating-promises: "warn" */
 import { E } from '@endo/eventual-send';
 import { mustMatch } from '@endo/patterns';
 import { Far } from '@endo/marshal';
@@ -36,7 +37,7 @@ const SECOND_PRICE = 'second-price';
  * null } want: { Asset: null } }.
  *
  * @param {ZCF<{
- * timeAuthority: import('@agoric/time/src/types').TimerService,
+ * timeAuthority: import('@agoric/time').TimerService,
  * winnerPriceOption?: FIRST_PRICE | SECOND_PRICE,
  * bidDuration: bigint,
  * }>} zcf
@@ -126,8 +127,7 @@ const start = zcf => {
       });
       assertBidSeat(zcf, sellSeat, seat);
 
-      // XXX await make function hanging
-      startWakeupTimerIfNeeded();
+      void startWakeupTimerIfNeeded();
 
       bidSeats.push(seat);
       return defaultAcceptanceMsg;

package/src/contracts/auction/secondPriceLogic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"secondPriceLogic.d.ts","sourceRoot":"","sources":["secondPriceLogic.js"],"names":[],"mappings":"AAQO,wCAJI,GAAG,YACH,OAAO,YACP,MAAM,OAAO,CAAC,QAgExB"}
+{"version":3,"file":"secondPriceLogic.d.ts","sourceRoot":"","sources":["secondPriceLogic.js"],"names":[],"mappings":"AAOO,wCAJI,GAAG,YACH,OAAO,YACP,KAAK,CAAC,OAAO,CAAC,QA8DxB"}

package/src/contracts/auction/secondPriceLogic.js

@@ -1,5 +1,4 @@
 import { AmountMath } from '@agoric/ertp';
-import { atomicRearrange } from '../../contractSupport/index.js';
 
 /**
  * @param {ZCF} zcf
@@ -24,7 +23,6 @@ export const calcWinnerAndClose = (zcf, sellSeat, bidSeats) => {
   bidSeats.forEach(bidSeat => {
     if (!bidSeat.hasExited()) {
       activeBidsCount += 1n;
-      /** @type {Amount<'nat'>} */
       const bid = bidSeat.getAmountAllocated('Bid', bidBrand);
       // If the bid is greater than the highestBid, it's the new highestBid
       if (AmountMath.isGTE(bid, highestBid, bidBrand)) {
@@ -48,8 +46,7 @@ export const calcWinnerAndClose = (zcf, sellSeat, bidSeats) => {
   }
 
   // Everyone else gets a refund so their values remain the same.
-  atomicRearrange(
-    zcf,
+  zcf.atomicRearrange(
     harden([
       [
         highestBidSeat,

package/src/contracts/automaticRefund.d.ts

@@ -17,7 +17,7 @@ export function start(zcf: ZCF<{}>): {
     publicFacet: {
         getOffersCount: () => bigint;
         makeInvitation: () => Promise<Invitation<unknown, never>>;
-    } & import("@endo/eventual-send").RemotableBrand<{}, {
+    } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
         getOffersCount: () => bigint;
         makeInvitation: () => Promise<Invitation<unknown, never>>;
     }>;

package/src/contracts/automaticRefund.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"automaticRefund.d.ts","sourceRoot":"","sources":["automaticRefund.js"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;GAaG;AACH,2BAFW,IAAI,EAAE,CAAC;;;;;;;;;EAqBjB"}
+{"version":3,"file":"automaticRefund.d.ts","sourceRoot":"","sources":["automaticRefund.js"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;GAaG;AACH,2BAFW,GAAG,CAAC,EAAE,CAAC;;;;;;;;;EAqBjB"}

package/src/contracts/autoswap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"autoswap.d.ts","sourceRoot":"","sources":["autoswap.js"],"names":[],"mappings":"AAgBA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,2BAFW,GAAG;;GAsVb"}
+{"version":3,"file":"autoswap.d.ts","sourceRoot":"","sources":["autoswap.js"],"names":[],"mappings":"AAeA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,2BAFW,GAAG;;GAsVb"}

package/src/contracts/autoswap.js

@@ -11,7 +11,6 @@ import {
   assertProposalShape,
   assertNatAssetKind,
   calcSecondaryRequired,
-  atomicRearrange,
 } from '../contractSupport/index.js';
 
 /**
@@ -88,8 +87,7 @@ const start = async zcf => {
   };
 
   function consummate(tradeAmountIn, tradeAmountOut, swapSeat) {
-    atomicRearrange(
-      zcf,
+    zcf.atomicRearrange(
       harden([
         [
           swapSeat,
@@ -167,6 +165,7 @@ const start = async zcf => {
     } = swapSeat.getProposal();
 
     assert(isNatValue(wantedAmountOut.value));
+    assert.typeof(amountIn.value, 'bigint');
 
     const tradePrice = getOutputPrice(
       wantedAmountOut.value,
@@ -204,8 +203,7 @@ const start = async zcf => {
       Central: AmountMath.make(brands.Central, centralIn),
       Secondary: secondaryAmount,
     };
-    atomicRearrange(
-      zcf,
+    zcf.atomicRearrange(
       harden([
         [seat, poolSeat, liquidityDeposited],
         [poolSeat, seat, { Liquidity: liquidityAmountOut }],
@@ -276,8 +274,10 @@ const start = async zcf => {
     });
 
     // TODO (hibbert) should we burn tokens?
-    const userAllocation = removeLiqSeat.getCurrentAllocation();
-    /** @type {Amount<'nat'>} */
+
+    const userAllocation = /** @type {{Liquidity: Amount<'nat'>}} */ (
+      removeLiqSeat.getCurrentAllocation()
+    );
     const liquidityIn = userAllocation.Liquidity;
     assert(!AmountMath.isEmpty(liquidityIn), 'Pool is empty');
     const liquidityValueIn = liquidityIn.value;
@@ -307,8 +307,7 @@ const start = async zcf => {
       Secondary: newUserSecondaryAmount,
     };
 
-    atomicRearrange(
-      zcf,
+    zcf.atomicRearrange(
       harden([
         [removeLiqSeat, poolSeat, { Liquidity: userAllocation.Liquidity }],
         [poolSeat, removeLiqSeat, liquidityRemoved],

package/src/contracts/barterExchange.d.ts

@@ -15,7 +15,7 @@
 export function start(zcf: ZCF): {
     publicFacet: {
         makeInvitation: () => Promise<Invitation<unknown, never>>;
-    } & import("@endo/eventual-send").RemotableBrand<{}, {
+    } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
         makeInvitation: () => Promise<Invitation<unknown, never>>;
     }>;
 };

package/src/contracts/barterExchange.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"barterExchange.d.ts","sourceRoot":"","sources":["barterExchange.js"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;GAaG;AACH,2BAFW,GAAG;;;;;;EAgHb"}
+{"version":3,"file":"barterExchange.d.ts","sourceRoot":"","sources":["barterExchange.js"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;GAaG;AACH,2BAFW,GAAG;;;;;;EA+Gb"}

package/src/contracts/barterExchange.js

@@ -1,7 +1,7 @@
 import { Far } from '@endo/marshal';
 import { makeLegacyMap } from '@agoric/store';
 // Eventually will be importable from '@agoric/zoe-contract-support'
-import { satisfies, atomicRearrange } from '../contractSupport/index.js';
+import { satisfies } from '../contractSupport/index.js';
 
 /**
  * This Barter Exchange accepts offers to trade arbitrary goods for other
@@ -63,8 +63,7 @@ const start = zcf => {
     const matchingTrade = findMatchingTrade(offerDetails, orders);
     if (matchingTrade) {
       // reallocate by giving each side what it wants
-      atomicRearrange(
-        zcf,
+      zcf.atomicRearrange(
         harden([
           [
             offerDetails.seat,

package/src/contracts/callSpread/calculateShares.d.ts

@@ -1,9 +1,2 @@
-/**
- * Calculate the portion (as a Ratio) of the collateral that should be
- * allocated to the long side of a call spread contract. price gives the value
- * of the underlying asset at closing that determines the payouts to the parties
- *
- * @type {CalculateShares}
- */
-export function calculateShares(collateralBrand: Brand<AssetKind>, price: Amount<"nat">, strikePrice1: Amount<"nat">, strikePrice2: Amount<"nat">): CalculateSharesReturn;
+export function calculateShares(collateralBrand: Brand, price: Amount<"nat">, strikePrice1: Amount<"nat">, strikePrice2: Amount<"nat">): CalculateSharesReturn;
 //# sourceMappingURL=calculateShares.d.ts.map

package/src/contracts/callSpread/calculateShares.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"calculateShares.d.ts","sourceRoot":"","sources":["calculateShares.js"],"names":[],"mappings":"AAOA;;;;;;GAMG;AACH,0KAuBC"}
+{"version":3,"file":"calculateShares.d.ts","sourceRoot":"","sources":["calculateShares.js"],"names":[],"mappings":""}

package/src/contracts/callSpread/calculateShares.js

@@ -1,4 +1,4 @@
-import './types.js';
+/// <reference path="./types-ambient.js" />
 
 import { AmountMath, isNatValue } from '@agoric/ertp';
 import { assert } from '@agoric/assert';

package/src/contracts/callSpread/fundedCallSpread.d.ts

@@ -1,3 +1,6 @@
+/**
+ * @import {PriceAuthority} from '@agoric/zoe/tools/types.js';
+ */
 /**
  * This contract implements a fully collateralized call spread. This is a
  * combination of a call option bought at one strike price and a second call
@@ -57,4 +60,5 @@ export function start(zcf: ZCF<{
 }>): Promise<{
     creatorInvitation: Promise<Invitation<unknown, never>>;
 }>;
+import type { PriceAuthority } from '@agoric/zoe/tools/types.js';
 //# sourceMappingURL=fundedCallSpread.d.ts.map

package/src/contracts/callSpread/fundedCallSpread.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fundedCallSpread.d.ts","sourceRoot":"","sources":["fundedCallSpread.js"],"names":[],"mappings":"AAcA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AAEH;;;;;;;;;GASG;AACH;kBARiB,MAAM;kBACN,MAAM;sBACF,MAAM;oBACR,cAAc;gBAClB,MAAM;sBACA,MAAM;;;GA+E1B"}
+{"version":3,"file":"fundedCallSpread.d.ts","sourceRoot":"","sources":["fundedCallSpread.js"],"names":[],"mappings":"AAaA;;GAEG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AAEH;;;;;;;;;GASG;AACH,2BATW,GAAG,CAAC;IACd,YAAc,EAAE,MAAM,CAAC;IACvB,YAAc,EAAE,MAAM,CAAC;IACvB,gBAAkB,EAAE,MAAM,CAAC;IAC3B,cAAgB,EAAE,cAAc,CAAC;IACjC,UAAY,EAAE,MAAM,CAAC;IACrB,gBAAkB,EAAE,MAAM,CAAC;CACxB,CAAC;;GA6EJ;oCAhIgC,4BAA4B"}

package/src/contracts/callSpread/fundedCallSpread.js

@@ -1,4 +1,4 @@
-import './types.js';
+/// <reference path="./types-ambient.js" />
 
 import { makePromiseKit } from '@endo/promise-kit';
 import { E } from '@endo/eventual-send';
@@ -7,11 +7,14 @@ import {
   assertProposalShape,
   depositToSeat,
   assertNatAssetKind,
-  atomicRearrange,
 } from '../../contractSupport/index.js';
 import { makePayoffHandler } from './payoffHandler.js';
 import { Position } from './position.js';
 
+/**
+ * @import {PriceAuthority} from '@agoric/zoe/tools/types.js';
+ */
+
 /**
  * This contract implements a fully collateralized call spread. This is a
  * combination of a call option bought at one strike price and a second call
@@ -112,8 +115,7 @@ const start = async zcf => {
         give: { Collateral: null },
         want: { LongOption: null, ShortOption: null },
       });
-      atomicRearrange(
-        zcf,
+      zcf.atomicRearrange(
         harden([
           [creatorSeat, collateralSeat, { Collateral: settlementAmount }],
           [

package/src/contracts/callSpread/payoffHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"payoffHandler.d.ts","sourceRoot":"","sources":["payoffHandler.js"],"names":[],"mappings":"AAYA;;;;;;;;GAQG;AACH,uCALW,IAAI,OAAO,MAAM,EAAE,GAAG,CAAC,CAAC,mBACxB,OAAO,YAAY,EAAC,cAAc,OAAO,CAAC,CAAC,kBAC3C,OAAO,GACL,aAAa,CAgEzB"}
+{"version":3,"file":"payoffHandler.d.ts","sourceRoot":"","sources":["payoffHandler.js"],"names":[],"mappings":"AAaA;;;;;;;;GAQG;AACH,uCALW,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,mBACxB,MAAM,CAAC,YAAY,EAAC,aAAa,CAAC,OAAO,CAAC,CAAC,kBAC3C,OAAO,GACL,aAAa,CAgEzB"}

package/src/contracts/callSpread/payoffHandler.js

@@ -1,4 +1,5 @@
-import './types.js';
+/* eslint @typescript-eslint/no-floating-promises: "warn" */
+/// <reference path="./types-ambient.js" />
 
 import { E } from '@endo/eventual-send';
 import { AmountMath } from '@agoric/ertp';
@@ -39,7 +40,7 @@ function makePayoffHandler(zcf, seatPromiseKits, collateralSeat) {
   }
 
   function reallocateToSeat(seatPromise, seatPortion) {
-    E.when(seatPromise, seat => {
+    void E.when(seatPromise, seat => {
       atomicTransfer(zcf, collateralSeat, seat, { Collateral: seatPortion });
       seat.exit();
       seatsExited += 1;

package/src/contracts/callSpread/percent.d.ts

@@ -1,5 +1,3 @@
-/** @type {Make100Percent} */
-export function make100Percent(brand: Brand<AssetKind>): Ratio;
-/** @type {Make0Percent} */
-export function make0Percent(brand: Brand<AssetKind>): Ratio;
+export function make100Percent(brand: Brand): Ratio;
+export function make0Percent(brand: Brand): Ratio;
 //# sourceMappingURL=percent.d.ts.map

package/src/contracts/callSpread/percent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"percent.d.ts","sourceRoot":"","sources":["percent.js"],"names":[],"mappings":"AAMA,6BAA6B;AAC7B,+DAEC;AAED,2BAA2B;AAC3B,6DAEC"}
+{"version":3,"file":"percent.d.ts","sourceRoot":"","sources":["percent.js"],"names":[],"mappings":""}

package/src/contracts/callSpread/position.d.ts

@@ -4,7 +4,7 @@
  * @type {{ LONG: 'long', SHORT: 'short' }}
  */
 export const Position: {
-    LONG: 'long';
-    SHORT: 'short';
+    LONG: "long";
+    SHORT: "short";
 };
 //# sourceMappingURL=position.d.ts.map

package/src/contracts/callSpread/pricedCallSpread.d.ts

@@ -44,23 +44,24 @@
  * }>} zcf
  */
 export function start(zcf: ZCF<{
-    strikePrice1: Amount<'nat'>;
-    strikePrice2: Amount<'nat'>;
-    settlementAmount: Amount<'nat'>;
+    strikePrice1: Amount<"nat">;
+    strikePrice2: Amount<"nat">;
+    settlementAmount: Amount<"nat">;
     priceAuthority: PriceAuthority;
     expiration: bigint;
-    underlyingAmount: Amount<'nat'>;
+    underlyingAmount: Amount<"nat">;
 }>): {
     creatorFacet: {
         makeInvitationPair: (longCollateralShare: any) => {
             longInvitation: Promise<Invitation<unknown, never>>;
             shortInvitation: Promise<Invitation<unknown, never>>;
         };
-    } & import("@endo/eventual-send").RemotableBrand<{}, {
+    } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
         makeInvitationPair: (longCollateralShare: any) => {
             longInvitation: Promise<Invitation<unknown, never>>;
             shortInvitation: Promise<Invitation<unknown, never>>;
         };
     }>;
 };
+import type { PriceAuthority } from '@agoric/zoe/tools/types.js';
 //# sourceMappingURL=pricedCallSpread.d.ts.map

package/src/contracts/callSpread/pricedCallSpread.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pricedCallSpread.d.ts","sourceRoot":"","sources":["pricedCallSpread.js"],"names":[],"mappings":"AAsBA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4CG;AACH;kBARiB,OAAO,KAAK,CAAC;kBACb,OAAO,KAAK,CAAC;sBACT,OAAO,KAAK,CAAC;oBACf,cAAc;gBAClB,MAAM;sBACA,OAAO,KAAK,CAAC;;;;;;;;;;;;;EA2GjC"}
+{"version":3,"file":"pricedCallSpread.d.ts","sourceRoot":"","sources":["pricedCallSpread.js"],"names":[],"mappings":"AA0BA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4CG;AACH,2BATW,GAAG,CAAC;IACd,YAAc,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,YAAc,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,gBAAkB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAClC,cAAgB,EAAE,cAAc,CAAC;IACjC,UAAY,EAAE,MAAM,CAAC;IACrB,gBAAkB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;CAC/B,CAAC;;;;;;;;;;;;EA0GJ;oCA7J4F,4BAA4B"}

package/src/contracts/callSpread/pricedCallSpread.js

@@ -1,4 +1,5 @@
-import './types.js';
+/* eslint @typescript-eslint/no-floating-promises: "warn" */
+/// <reference path="./types-ambient.js" />
 
 import { makePromiseKit } from '@endo/promise-kit';
 import { E } from '@endo/eventual-send';
@@ -10,11 +11,14 @@ import {
   assertNatAssetKind,
   makeRatio,
   ceilMultiplyBy,
-  atomicRearrange,
 } from '../../contractSupport/index.js';
 import { makePayoffHandler } from './payoffHandler.js';
 import { Position } from './position.js';
 
+/**
+ * @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js';
+ */
+
 const { Fail } = assert;
 
 const PERCENT_BASE = 100n;
@@ -77,7 +81,7 @@ const start = zcf => {
     'strikePrice2 must be greater than strikePrice1',
   );
 
-  zcf.saveIssuer(zcf.getInvitationIssuer(), 'Options');
+  void zcf.saveIssuer(zcf.getInvitationIssuer(), 'Options');
 
   // We will create the two options early and allocate them to this seat.
   const { zcfSeat: collateralSeat } = zcf.makeEmptySeatKit();
@@ -100,6 +104,7 @@ const start = zcf => {
     const invitationIssuer = zcf.getInvitationIssuer();
     const payment = harden({ Option: option });
     const Option = await E(invitationIssuer).getAmountOf(option);
+    /** @type {any} */
     const spreadAmount = harden({
       Option,
     });
@@ -132,8 +137,7 @@ const start = zcf => {
         'wanted option not a match',
       );
 
-      atomicRearrange(
-        zcf,
+      zcf.atomicRearrange(
         harden([
           [collateralSeat, depositSeat, spreadAmount],
           [depositSeat, collateralSeat, { Collateral: newCollateral }],

package/src/contracts/callSpread/{types.d.ts → types-ambient.d.ts}

@@ -1,4 +1,4 @@
-type PositionKind = 'long' | 'short';
+type PositionKind = "long" | "short";
 type MakeOptionInvitation = (positionKind: PositionKind) => Promise<Invitation>;
 type PayoffHandler = {
     schedulePayoffs: () => void;
@@ -24,7 +24,7 @@ type CalculateSharesReturn = {
  * 100% reflecting the position of the price in the range from strikePrice1 to
  * strikePrice2.
  */
-type CalculateShares = (collateralBrand: Brand, price: Amount<'nat'>, strikePrice1: Amount<'nat'>, strikePrice2: Amount<'nat'>) => CalculateSharesReturn;
+type CalculateShares = (collateralBrand: Brand, price: Amount<"nat">, strikePrice1: Amount<"nat">, strikePrice2: Amount<"nat">) => CalculateSharesReturn;
 type Make100Percent = (brand: Brand) => Ratio;
 type Make0Percent = (brand: Brand) => Ratio;
-//# sourceMappingURL=types.d.ts.map
+//# sourceMappingURL=types-ambient.d.ts.map

package/src/contracts/callSpread/types-ambient.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types-ambient.d.ts","sourceRoot":"","sources":["types-ambient.js"],"names":[],"mappings":"oBACa,MAAM,GAAG,OAAO;2CAKlB,YAAY,KACV,OAAO,CAAC,UAAU,CAAC;;qBAKlB,MAAM,IAAI;0BACT,oBAAoB;;;;;;;;eAQrB,KAAK;gBACL,KAAK;;;;;;;;;;;;;yCAcR,KAAK,SACL,MAAM,CAAC,KAAK,CAAC,gBACb,MAAM,CAAC,KAAK,CAAC,gBACb,MAAM,CAAC,KAAK,CAAC,KACX,qBAAqB;8BAKvB,KAAK,KACH,KAAK;4BAKP,KAAK,KACH,KAAK"}

package/src/contracts/coveredCall-durable.d.ts

@@ -13,10 +13,8 @@
  * @param {unknown} _privateArgs
  * @param {import('@agoric/vat-data').Baggage} instanceBaggage
  */
-export function start(zcf: ZCF, _privateArgs: unknown, instanceBaggage: MapStore<string, unknown>): Promise<{
-    creatorFacet: {
-        makeInvitation(): Promise<Invitation<unknown, never>>;
-    } & import("@endo/eventual-send").RemotableBrand<{}, {
+export function start(zcf: ZCF, _privateArgs: unknown, instanceBaggage: import("@agoric/vat-data").Baggage): Promise<{
+    creatorFacet: import("@endo/exo").Guarded<{
         makeInvitation(): Promise<Invitation<unknown, never>>;
     }>;
 }>;

package/src/contracts/coveredCall-durable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"coveredCall-durable.d.ts","sourceRoot":"","sources":["coveredCall-durable.js"],"names":[],"mappings":"AASA;;;;;;;;;;;;;;GAcG;AACH,2BAJW,GAAG,gBACH,OAAO;;;;;;GA8EjB"}
+{"version":3,"file":"coveredCall-durable.d.ts","sourceRoot":"","sources":["coveredCall-durable.js"],"names":[],"mappings":"AASA;;;;;;;;;;;;;;GAcG;AACH,2BAJW,GAAG,gBACH,OAAO,mBACP,OAAO,kBAAkB,EAAE,OAAO;;;;GA6E5C"}

package/src/contracts/exported.js

@@ -1,4 +1,4 @@
-import './types.js';
+/// <reference path="./types-ambient.js" />
 // eslint-disable-next-line no-restricted-syntax
-import './loan/types.js';
-import './callSpread/types.js';
+import './loan/types-ambient.js';
+import './callSpread/types-ambient.js';

package/src/contracts/loan/borrow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"borrow.d.ts","sourceRoot":"","sources":["borrow.js"],"names":[],"mappings":"AAmBA,mCAAmC;AACnC,mCADW,oBAAoB,CAkI7B"}
+{"version":3,"file":"borrow.d.ts","sourceRoot":"","sources":["borrow.js"],"names":[],"mappings":"AAkBA,mCAAmC;AACnC,mCADW,oBAAoB,CAsI7B"}

package/src/contracts/loan/borrow.js

@@ -9,7 +9,6 @@ import {
   getAmountOut,
   ceilMultiplyBy,
   getTimestamp,
-  atomicRearrange,
 } from '../../contractSupport/index.js';
 
 import { scheduleLiquidation } from './scheduleLiquidation.js';
@@ -38,7 +37,12 @@ export const makeBorrowInvitation = (zcf, config) => {
       want: { Loan: null },
     });
 
-    const collateralGiven = borrowerSeat.getAmountAllocated('Collateral');
+    const collateralGiven = borrowerSeat.getAmountAllocated(
+      'Collateral',
+      /** @type {Brand<'nat'>} */ (
+        borrowerSeat.getProposal().give.Collateral.brand
+      ),
+    );
     const loanWanted = borrowerSeat.getProposal().want.Loan;
     const loanBrand = zcf.getTerms().brands.Loan;
 
@@ -72,8 +76,7 @@ export const makeBorrowInvitation = (zcf, config) => {
 
     const { zcfSeat: collateralSeat } = zcf.makeEmptySeatKit();
 
-    atomicRearrange(
-      zcf,
+    zcf.atomicRearrange(
       harden([
         // Transfer the wanted Loan amount to the borrower
         [lenderSeat, borrowerSeat, { Loan: loanWanted }],

package/src/contracts/loan/close.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"close.d.ts","sourceRoot":"","sources":["close.js"],"names":[],"mappings":"AAeA,sCAAsC;AACtC,sCADW,uBAAuB,CAkDhC"}
+{"version":3,"file":"close.d.ts","sourceRoot":"","sources":["close.js"],"names":[],"mappings":"AAYA,sCAAsC;AACtC,sCADW,uBAAuB,CAiDhC"}

package/src/contracts/loan/close.js

@@ -1,12 +1,9 @@
-import './types.js';
+/// <reference path="./types-ambient.js" />
 
 import { Fail } from '@agoric/assert';
 import { AmountMath } from '@agoric/ertp';
 
-import {
-  assertProposalShape,
-  atomicRearrange,
-} from '../../contractSupport/index.js';
+import { assertProposalShape } from '../../contractSupport/index.js';
 
 // The debt, the amount which must be repaid, is just the amount
 // loaned plus interest (aka stability fee). All debt must be repaid
@@ -44,8 +41,7 @@ export const makeCloseLoanInvitation = (zcf, config) => {
       'Collateral',
       collateralBrand,
     );
-    atomicRearrange(
-      zcf,
+    zcf.atomicRearrange(
       harden([
         [collateralSeat, repaySeat, { Collateral: collateralAmount }],
         [repaySeat, lenderSeat, { Loan: debt }],

package/src/contracts/loan/index.d.ts

@@ -1,3 +1,6 @@
+/**
+ * @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js';
+ */
 /**
  * Add collateral of a particular brand and get a loan of another
  * brand. Collateral (also known as margin) must be greater than the
@@ -59,6 +62,7 @@ export function start(zcf: ZCF<{
     interestRate: Ratio;
     interestPeriod: bigint;
 }>): Promise<{
-    creatorInvitation: Promise<Invitation<unknown, never>>;
+    creatorInvitation: Promise<Invitation<unknown, undefined>>;
 }>;
+import type { PriceAuthority } from '@agoric/zoe/tools/types.js';
 //# sourceMappingURL=index.d.ts.map

package/src/contracts/loan/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.js"],"names":[],"mappings":"AAQA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoDG;AACH;SARU,KAAK;sBACQ,QAAQ;oBACV,cAAc;oBACd,cAAc;kBAChB,KAAK;oBACH,MAAM;;;GAuC1B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.js"],"names":[],"mappings":"AAQA;;GAEG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoDG;AACH,2BATW,GAAG,CAAC;IACd,GAAO,EAAE,KAAK,CAAC;IACf,gBAAoB,EAAE,QAAQ,CAAC;IAC/B,cAAkB,EAAE,cAAc,CAAC;IACnC,cAAkB,EAAE,cAAc,CAAC;IACnC,YAAgB,EAAE,KAAK,CAAC;IACxB,cAAkB,EAAE,MAAM,CAAC;CACxB,CAAC;;GAsCJ;oCA5F4F,4BAA4B"}

package/src/contracts/loan/index.js

@@ -6,6 +6,10 @@ import {
 } from '../../contractSupport/index.js';
 import { makeLendInvitation } from './lend.js';
 
+/**
+ * @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js';
+ */
+
 /**
  * Add collateral of a particular brand and get a loan of another
  * brand. Collateral (also known as margin) must be greater than the

package/src/contracts/loan/liquidate.d.ts

@@ -1,14 +1,3 @@
 export function doLiquidation(zcf: any, collateralSeat: any, autoswapPublicFacetP: any, lenderSeat: any, loanBrand: any): Promise<void>;
-/**
- * This function is triggered by the priceAuthority when the value of the
- * collateral is below the mmr. The function performs the
- * liquidation and then shuts down the contract. Note that if a
- * liquidation occurs, the borrower gets nothing and they can take no
- * further action.
- *
- * For simplicity, we will sell all collateral.
- *
- * @type {Liquidate}
- */
-export const liquidate: Liquidate;
+export function liquidate(zcf: ZCF, config: LoanConfigWithBorrower): Promise<void>;
 //# sourceMappingURL=liquidate.d.ts.map

package/src/contracts/loan/liquidate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"liquidate.d.ts","sourceRoot":"","sources":["liquidate.js"],"names":[],"mappings":"AAKO,wIA6CN;AAED;;;;;;;;;;GAUG;AACH,wBAFU,SAAS,CAiBjB"}
+{"version":3,"file":"liquidate.d.ts","sourceRoot":"","sources":["liquidate.js"],"names":[],"mappings":"AAKO,wIA6CN;AAeM,+BAJI,GAAG,UACH,sBAAsB,GACpB,OAAO,CAAC,IAAI,CAAC,CAiBzB"}

package/src/contracts/loan/liquidate.js

@@ -37,7 +37,7 @@ export const doLiquidation = async (
     zcf.shutdown('your loan had to be liquidated');
   };
 
-  /** @type {ShutdownWithFailure} */
+  /** @type {import('@agoric/swingset-vat').ShutdownWithFailure} */
   const closeWithFailure = err => {
     lenderSeat.fail(err);
     collateralSeat.fail(err);
@@ -59,7 +59,9 @@ export const doLiquidation = async (
  *
  * For simplicity, we will sell all collateral.
  *
- * @type {Liquidate}
+ * @param {ZCF} zcf
+ * @param {LoanConfigWithBorrower} config
+ * @returns {Promise<void>}
  */
 export const liquidate = async (zcf, config) => {
   const { collateralSeat, autoswapInstance, lenderSeat, loanBrand } = config;

package/src/contracts/loan/scheduleLiquidation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scheduleLiquidation.d.ts","sourceRoot":"","sources":["scheduleLiquidation.js"],"names":[],"mappings":"AAUA,kCAAkC;AAClC,kCADW,mBAAmB,CAsD5B"}
+{"version":3,"file":"scheduleLiquidation.d.ts","sourceRoot":"","sources":["scheduleLiquidation.js"],"names":[],"mappings":"AAWA,kCAAkC;AAClC,kCADW,mBAAmB,CAsD5B"}

package/src/contracts/loan/scheduleLiquidation.js

@@ -1,3 +1,4 @@
+/* eslint @typescript-eslint/no-floating-promises: "warn" */
 import { E } from '@endo/eventual-send';
 import { AmountMath } from '@agoric/ertp';
 
@@ -43,7 +44,7 @@ export const scheduleLiquidation = (zcf, configWithBorrower) => {
       const currentCollateral = collateralSeat.getAmountAllocated('Collateral');
       if (AmountMath.isEqual(amountIn, currentCollateral)) {
         liquidationPromiseKit.resolve(priceQuote);
-        liquidate(zcf, configWithBorrower);
+        void liquidate(zcf, configWithBorrower);
       }
     })
     .catch(err => {