@agoric/zoe 0.26.3-dev-ecf2d8e.0 → 0.26.3-other-dev-70beeb7.0

package/src/contractFacet/zcfSeat.js

@@ -1,11 +1,10 @@
-/* eslint @typescript-eslint/no-floating-promises: "warn" */
 import {
   makeScalarBigWeakMapStore,
-  prepareExoClass,
-  prepareExoClassKit,
-  provide,
   provideDurableMapStore,
   provideDurableWeakMapStore,
+  prepareExoClassKit,
+  provide,
+  prepareExoClass,
 } from '@agoric/vat-data';
 import { E } from '@endo/eventual-send';
 import { AmountMath } from '@agoric/ertp';
@@ -20,8 +19,6 @@ import {
   SeatDataShape,
   SeatShape,
 } from '../typeGuards.js';
-import { makeAllocationMap } from './reallocate.js';
-import { TransferPartShape } from '../contractSupport/atomicTransfer.js';
 
 const { Fail } = assert;
 
@@ -217,10 +214,6 @@ export const createSeatManager = (
 
         return isOfferSafe(state.proposal, reallocation);
       },
-      /**
-       * @deprecated switch to zcf.atomicRearrange()
-       * @param {AmountKeywordRecord} amountKeywordRecord
-       */
       incrementBy(amountKeywordRecord) {
         const { self } = this;
         assertActive(self);
@@ -234,10 +227,6 @@ export const createSeatManager = (
         );
         return amountKeywordRecord;
       },
-      /**
-       * @deprecated switch to zcf.atomicRearrange()
-       * @param {AmountKeywordRecord} amountKeywordRecord
-       */
       decrementBy(amountKeywordRecord) {
         const { self } = this;
         assertActive(self);
@@ -276,7 +265,6 @@ export const createSeatManager = (
   const ZcfSeatManagerIKit = harden({
     seatManager: M.interface('ZcfSeatManager', {
       makeZCFSeat: M.call(SeatDataShape).returns(M.remotable('zcfSeat')),
-      atomicRearrange: M.call(M.arrayOf(TransferPartShape)).returns(),
       reallocate: M.call(M.remotable('zcfSeat'), M.remotable('zcfSeat'))
         .rest(M.arrayOf(M.remotable('zcfSeat')))
         .returns(),
@@ -301,96 +289,6 @@ export const createSeatManager = (
           return zcfSeat;
         },
 
-        /**
-         * Rearrange the allocations according to the transfer descriptions.
-         * This is a set of changes to allocations that must satisfy several
-         * constraints. If these constraints are all met, then the reallocation
-         * happens atomically. Otherwise, it does not happen at all.
-         *
-         * The conditions
-         *    * All the mentioned seats are still live,
-         *    * No outstanding stagings for any of the mentioned seats. Stagings
-         *      have been deprecated in favor or atomicRearrange. To prevent
-         *      confusion, for each reallocation, it can only be expressed in
-         *      the old way or the new way, but not a mixture.
-         *    * Offer safety
-         *    * Overall conservation
-         *
-         * The overall transfer is expressed as an array of `TransferPart`. Each
-         * individual `TransferPart` is one of
-         * - A transfer from a `fromSeat` to a `toSeat`. Specify both toAmount
-         *     and fromAmount to change keywords, otherwise only fromAmount is required.
-         * - A taking from a `fromSeat`'s allocation. See the `fromOnly` helper.
-         * - A giving into a `toSeat`'s allocation. See the `toOnly` helper.
-         *
-         * @param {TransferPart[]} transfers
-         */
-        atomicRearrange(transfers) {
-          const newAllocations = makeAllocationMap(transfers);
-
-          // ////// All Seats are active /////////////////////////////////
-          for (const [seat] of newAllocations) {
-            assertActive(seat);
-            !seat.hasStagedAllocation() ||
-              Fail`Cannot mix atomicRearrange with seat stagings: ${seat}`;
-            zcfSeatToSeatHandle.has(seat) ||
-              Fail`The seat ${seat} was not recognized`;
-          }
-
-          // ////// Ensure that rights are conserved overall /////////////
-
-          // convert array of keywordAmountRecords to 1-level array of Amounts
-          const flattenAmounts = allocations =>
-            allocations.flatMap(Object.values);
-          const previousAmounts = flattenAmounts(
-            newAllocations.map(([seat]) => seat.getCurrentAllocation()),
-          );
-          const newAmounts = flattenAmounts(
-            newAllocations.map(([_, allocation]) => allocation),
-          );
-          assertRightsConserved(previousAmounts, newAmounts);
-
-          // ////// Ensure that offer safety holds ///////////////////////
-          for (const [seat, allocation] of newAllocations) {
-            isOfferSafe(seat.getProposal(), allocation) ||
-              Fail`Offer safety was violated by the proposed allocation: ${allocation}. Proposal was ${seat.getProposal()}`;
-          }
-
-          const seatHandleAllocations = newAllocations.map(
-            ([seat, allocation]) => {
-              const seatHandle = zcfSeatToSeatHandle.get(seat);
-              return { allocation, seatHandle };
-            },
-          );
-          try {
-            // No side effects above. All conditions checked which could have
-            // caused us to reject this reallocation. Notice that the current
-            // allocations are captured in seatHandleAllocations, so there must
-            // be no awaits between that assignment and here.
-            //
-            // COMMIT POINT
-            //
-            // The effects must succeed atomically. The call to
-            // replaceAllocations() will be processed in the order of updates
-            // from ZCF to Zoe. Its effects must occur immediately in Zoe on
-            // reception, and must not fail.
-            //
-            // Commit the new allocations (currentAllocation is replaced
-            // for each of the seats) and inform Zoe of the new allocation.
-
-            for (const [seat, allocation] of newAllocations) {
-              activeZCFSeats.set(seat, allocation);
-            }
-
-            // we don't wait for the results here. As described in
-            // docs/zoe-zcf.md, The initial allocation to a seat originates with
-            // Zoe, but *all subsequent updates come from ZCF to Zoe*.
-            void E(zoeInstanceAdmin).replaceAllocations(seatHandleAllocations);
-          } catch (err) {
-            shutdownWithFailure(err);
-            throw err;
-          }
-        },
         reallocate(/** @type {ZCFSeat[]} */ ...seats) {
           seats.forEach(assertActive);
           seats.forEach(assertStagedAllocation);

package/src/contractFacet/zcfZygote.d.ts

@@ -1,3 +1,3 @@
-export function makeZCFZygote(powers: VatPowers, zoeService: ERef<ZoeService>, invitationIssuer: Issuer<'set'>, testJigSetter: TestJigSetter, contractBundleCap: BundleCap, zcfBaggage?: MapStore<string, any>): Promise<ZCFZygote>;
+export function makeZCFZygote(powers: VatPowers, zoeService: ERef<ZoeService>, invitationIssuer: Issuer<'set'>, testJigSetter: TestJigSetter, contractBundleCap: BundleCap, zcfBaggage?: MapStore<string, unknown>): Promise<ZCFZygote>;
 export type IssuerOptionsRecord = import('@agoric/ertp').IssuerOptionsRecord;
 //# sourceMappingURL=zcfZygote.d.ts.map

package/src/contractFacet/zcfZygote.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zcfZygote.d.ts","sourceRoot":"","sources":["zcfZygote.js"],"names":[],"mappings":"AAkDO,sCARI,SAAS,cACT,KAAK,UAAU,CAAC,oBAChB,OAAO,KAAK,CAAC,iBACb,aAAa,qBACb,SAAS,uCAEP,QAAQ,SAAS,CAAC,CAqc9B;kCApda,OAAO,cAAc,EAAE,mBAAmB"}
+{"version":3,"file":"zcfZygote.d.ts","sourceRoot":"","sources":["zcfZygote.js"],"names":[],"mappings":"AAiDO,sCARI,SAAS,cACT,KAAK,UAAU,CAAC,oBAChB,OAAO,KAAK,CAAC,iBACb,aAAa,qBACb,SAAS,2CAEP,QAAQ,SAAS,CAAC,CAyZ9B;kCAxaa,OAAO,cAAc,EAAE,mBAAmB"}

package/src/contractFacet/zcfZygote.js

@@ -1,28 +1,27 @@
-/* eslint @typescript-eslint/no-floating-promises: "warn" */
+import { E } from '@endo/eventual-send';
+import { passStyleOf, Remotable } from '@endo/marshal';
 import { AssetKind } from '@agoric/ertp';
+import { makePromiseKit } from '@endo/promise-kit';
 import { assertPattern, mustMatch } from '@agoric/store';
 import {
   canBeDurable,
   M,
   makeScalarBigMapStore,
+  provideDurableMapStore,
   prepareExo,
   prepareExoClass,
-  provideDurableMapStore,
 } from '@agoric/vat-data';
-import { E } from '@endo/eventual-send';
-import { passStyleOf, Remotable } from '@endo/marshal';
-import { makePromiseKit } from '@endo/promise-kit';
 
 import { objectMap } from '@agoric/internal';
 import { cleanProposal } from '../cleanProposal.js';
-import { handlePKitWarning } from '../handleWarning.js';
-import { makeInstanceRecordStorage } from '../instanceRecordStorage.js';
-import { provideIssuerStorage } from '../issuerStorage.js';
-import { defineDurableHandle } from '../makeHandle.js';
 import { evalContractBundle } from './evalContractCode.js';
 import { makeMakeExiter } from './exit.js';
-import { makeOfferHandlerStorage } from './offerHandlerStorage.js';
+import { defineDurableHandle } from '../makeHandle.js';
+import { provideIssuerStorage } from '../issuerStorage.js';
 import { createSeatManager } from './zcfSeat.js';
+import { makeInstanceRecordStorage } from '../instanceRecordStorage.js';
+import { handlePKitWarning } from '../handleWarning.js';
+import { makeOfferHandlerStorage } from './offerHandlerStorage.js';
 
 import '../internal-types.js';
 import './internal-types.js';
@@ -211,25 +210,6 @@ export const makeZCFZygote = async (
   });
   const handleOfferObj = makeHandleOfferObj(taker);
 
-  /**
-   * @type {() => Promise<
-   *   | {
-   *       buildRootObject: any;
-   *       start: undefined;
-   *       meta: undefined;
-   *     }
-   *   | {
-   *       prepare: ContractStartFn;
-   *       customTermsShape?: Pick<ContractMeta, 'customTermsShape'>,
-   *       privateArgsShape?: Pick<ContractMeta, 'privateArgsShape'>,
-   *     }
-   *   | {
-   *       buildRootObject: undefined;
-   *       start: ContractStartFn;
-   *       meta?: ContractMeta;
-   *     }
-   * >}
-   */
   const evaluateContract = () => {
     let bundle;
     if (passStyleOf(contractBundleCap) === 'remotable') {
@@ -242,44 +222,22 @@ export const makeZCFZygote = async (
     return evalContractBundle(bundle);
   };
   // evaluate the contract (either the first version, or an upgrade)
-  const bundleResult = await evaluateContract();
-
-  //#region backwards compatibility with prepare()
-  const { start, meta = {} } = (() => {
-    if ('prepare' in bundleResult) {
-      if ('start' in bundleResult) {
-        Fail`contract must provide exactly one of "start" and "prepare"`;
-      }
-      // A contract must have one expression of upgradability
-      if (/** @type {any} */ (bundleResult).meta?.upgradability) {
-        Fail`prepare() is deprecated and incompatible with the 'upgradability' indicator`;
-      }
-      return {
-        start: bundleResult.prepare,
-        meta: {
-          upgradability: 'canUpgrade',
-          customTermsShape: bundleResult.customTermsShape,
-          privateArgsShape: bundleResult.privateArgsShape,
-        },
-      };
-    }
-    // normal behavior
-    return bundleResult;
-  })();
-  //#endregion
-
-  if (start === undefined) {
-    if ('buildRootObject' in bundleResult) {
-      // diagnose a common mistake
-      throw Fail`Did you provide a vat bundle instead of a contract bundle?`;
-    }
-    throw Fail`contract exports missing start`;
+  const {
+    start,
+    buildRootObject,
+    privateArgsShape,
+    customTermsShape,
+    prepare,
+  } = await evaluateContract();
+
+  if (start === undefined && prepare === undefined) {
+    buildRootObject === undefined ||
+      Fail`Did you provide a vat bundle instead of a contract bundle?`;
+    Fail`contract exports missing start/prepare`;
   }
-
-  start.length <= 3 || Fail`invalid start parameters`;
-  const durabilityRequired =
-    meta.upgradability &&
-    ['canBeUpgraded', 'canUpgrade'].includes(meta.upgradability);
+  !start ||
+    !prepare ||
+    Fail`contract must provide exactly one of "start" and "prepare"`;
 
   /** @type {ZCF} */
   // Using Remotable rather than Far because there are too many complications
@@ -287,7 +245,6 @@ export const makeZCFZygote = async (
   // accept raw functions. assert cannot be a valid passable! (It's a function
   // and has members.)
   const zcf = Remotable('Alleged: zcf', undefined, {
-    atomicRearrange: transfers => seatManager.atomicRearrange(transfers),
     reallocate: (...seats) => seatManager.reallocate(...seats),
     assertUniqueKeyword: kwd => getInstanceRecHolder().assertUniqueKeyword(kwd),
     saveIssuer: async (issuerP, keyword) => {
@@ -343,7 +300,6 @@ export const makeZCFZygote = async (
       const terms = getInstanceRecHolder().getTerms();
 
       // If the contract provided customTermsShape, validate the customTerms.
-      const { customTermsShape } = meta;
       if (customTermsShape) {
         const { brands: _b, issuers: _i, ...customTerms } = terms;
         mustMatch(harden(customTerms), customTermsShape, 'customTerms');
@@ -416,13 +372,13 @@ export const makeZCFZygote = async (
       instantiateIssuerStorage(issuerStorageFromZoe);
       zcfBaggage.init('instanceRecHolder', instanceRecHolder);
 
-      const { privateArgsShape } = meta;
+      const startFn = start || prepare;
       if (privateArgsShape) {
         mustMatch(privateArgs, privateArgsShape, 'privateArgs');
       }
       // start a contract for the first time
       return E.when(
-        start(zcf, privateArgs, contractBaggage),
+        startFn(zcf, privateArgs, contractBaggage),
         ({
           creatorFacet = undefined,
           publicFacet = undefined,
@@ -431,16 +387,18 @@ export const makeZCFZygote = async (
         }) => {
           const unexpectedKeys = Object.keys(unexpected);
           unexpectedKeys.length === 0 ||
-            Fail`contract "start" returned unrecognized properties ${unexpectedKeys}`;
+            Fail`contract ${
+              prepare ? 'prepare' : 'start'
+            } returned unrecognized properties ${unexpectedKeys}`;
 
           const areDurable = objectMap(
             { creatorFacet, publicFacet, creatorInvitation },
             canBeDurable,
           );
           const allDurable = Object.values(areDurable).every(Boolean);
-          if (durabilityRequired) {
+          if (prepare) {
             allDurable ||
-              Fail`with ${meta.upgradability}, values from start() must be durable ${areDurable}`;
+              Fail`values from prepare() must be durable ${areDurable}`;
           }
 
           if (allDurable) {
@@ -460,21 +418,18 @@ export const makeZCFZygote = async (
     },
 
     restartContract: async (privateArgs = undefined) => {
-      if (meta.upgradability) {
-        meta.upgradability === 'canUpgrade' || Fail`contract cannot upgrade`;
-      }
+      prepare || Fail`prepare must be defined to upgrade a contract`;
       zoeInstanceAdmin = zcfBaggage.get('zcfInstanceAdmin');
       instanceRecHolder = zcfBaggage.get('instanceRecHolder');
       initSeatMgrAndMintKind();
 
-      const { privateArgsShape } = meta;
       if (privateArgsShape) {
         mustMatch(privateArgs, privateArgsShape, 'privateArgs');
       }
 
       // restart an upgradeable contract
       return E.when(
-        start(zcf, privateArgs, contractBaggage),
+        prepare(zcf, privateArgs, contractBaggage),
         ({
           creatorFacet = undefined,
           publicFacet = undefined,

package/src/contractSupport/atomicTransfer.d.ts

@@ -3,4 +3,10 @@ export function atomicRearrange(zcf: ZCF, transfers: TransferPart[]): void;
 export function fromOnly(fromSeat: ZCFSeat, fromAmounts: AmountKeywordRecord): TransferPart;
 export function toOnly(toSeat: ZCFSeat, toAmounts: AmountKeywordRecord): TransferPart;
 export function atomicTransfer(zcf: ZCF, fromSeat?: ZCFSeat | undefined, toSeat?: ZCFSeat | undefined, fromAmounts?: AmountKeywordRecord | undefined, toAmounts?: AmountKeywordRecord | undefined): void;
+export type TransferPart = [
+    fromSeat?: ZCFSeat,
+    toSeat?: ZCFSeat,
+    fromAmounts?: AmountKeywordRecord,
+    toAmounts?: AmountKeywordRecord
+];
 //# sourceMappingURL=atomicTransfer.d.ts.map

package/src/contractSupport/atomicTransfer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"atomicTransfer.d.ts","sourceRoot":"","sources":["atomicTransfer.js"],"names":[],"mappings":"AAGA,iEAGE;AAyCK,qCAHI,GAAG,aACH,cAAc,QAIxB;AAcM,mCAJI,OAAO,eACP,mBAAmB,gBAIc;AAcrC,+BAJI,OAAO,aACP,mBAAmB,gBAIqB;AAW5C,oCANI,GAAG,kKAYgE"}
+{"version":3,"file":"atomicTransfer.d.ts","sourceRoot":"","sources":["atomicTransfer.js"],"names":[],"mappings":"AAMA,iEAGE;AAgDK,qCAHI,GAAG,aACH,cAAc,QA+ExB;AAcM,mCAJI,OAAO,eACP,mBAAmB,gBAIc;AAcrC,+BAJI,OAAO,aACP,mBAAmB,gBAIqB;AAW5C,oCANI,GAAG,kKAYiE;2BAzKlE;IACZ,QAAY,CAAC,EAAE,OAAO;IACtB,MAAU,CAAC,EAAE,OAAO;IACpB,WAAe,CAAC,EAAE,mBAAmB;IACrC,SAAa,CAAC,EAAE,mBAAmB;CAChC"}

package/src/contractSupport/atomicTransfer.js

@@ -1,11 +1,23 @@
-import { M } from '@agoric/store';
+import { mustMatch, M } from '@agoric/store';
+import { assertRightsConserved } from '../contractFacet/rightsConservation.js';
 import { AmountKeywordRecordShape, SeatShape } from '../typeGuards.js';
 
+const { Fail, quote: q } = assert;
+
 export const TransferPartShape = M.splitArray(
   harden([M.opt(SeatShape), M.opt(SeatShape), M.opt(AmountKeywordRecordShape)]),
   harden([M.opt(AmountKeywordRecordShape)]),
 );
 
+/**
+ * @typedef {[
+ *   fromSeat?: ZCFSeat,
+ *   toSeat?: ZCFSeat,
+ *   fromAmounts?: AmountKeywordRecord,
+ *   toAmounts?: AmountKeywordRecord
+ * ]} TransferPart
+ */
+
 /**
  * Asks Zoe (via zcf) to rearrange the allocations among the seats
  * mentioned. This is a set of changes to allocations that must satisfy
@@ -40,13 +52,86 @@ export const TransferPartShape = M.splitArray(
  * which will remain helpers. These helper are for convenience
  * in expressing atomic rearrangements clearly.
  *
- * @deprecated use the zcf builtin instead
- *
  * @param {ZCF} zcf
  * @param {TransferPart[]} transfers
  */
 export const atomicRearrange = (zcf, transfers) => {
-  zcf.atomicRearrange(transfers);
+  mustMatch(transfers, M.arrayOf(M.array()), 'transfers');
+  const uniqueSeatSet = new Set();
+  for (const [
+    fromSeat = undefined,
+    toSeat = undefined,
+    fromAmounts = undefined,
+    toAmounts = undefined,
+  ] of transfers) {
+    if (fromSeat) {
+      if (!fromAmounts) {
+        throw Fail`Transfer from ${fromSeat} must say how much`;
+      }
+      uniqueSeatSet.add(fromSeat);
+      if (toSeat) {
+        // Conserved transfer between seats
+        if (toAmounts) {
+          // distinct amounts, so we check conservation.
+          assertRightsConserved(
+            Object.values(fromAmounts),
+            Object.values(toAmounts),
+          );
+        } // else fromAmounts will be used as toAmounts
+        uniqueSeatSet.add(toSeat);
+      } else {
+        // Transfer only from fromSeat
+        !toAmounts ||
+          Fail`Transfer without toSeat cannot have toAmounts ${toAmounts}`;
+      }
+    } else {
+      toSeat || Fail`Transfer must have at least one of fromSeat or toSeat`;
+      // Transfer only to toSeat
+      !fromAmounts ||
+        Fail`Transfer without fromSeat cannot have fromAmounts ${fromAmounts}`;
+      toAmounts || Fail`Transfer to ${toSeat} must say how much`;
+      uniqueSeatSet.add(toSeat);
+    }
+  }
+
+  const uniqueSeats = harden([...uniqueSeatSet.keys()]);
+  for (const seat of uniqueSeats) {
+    !seat.hasStagedAllocation() ||
+      Fail`Cannot mix atomicRearrange with seat stagings: ${seat}`;
+  }
+
+  // At this point the basic shape has been validated
+
+  try {
+    for (const [
+      fromSeat = undefined,
+      toSeat = undefined,
+      fromAmounts = undefined,
+      toAmounts = toSeat && fromAmounts,
+    ] of transfers) {
+      if (fromSeat && fromAmounts) {
+        // testing both just to satisfy the type checker
+        fromSeat.decrementBy(fromAmounts);
+      }
+      if (toSeat && toAmounts) {
+        // testing both just to satisfy the type checker
+        toSeat.incrementBy(toAmounts);
+      }
+    }
+
+    // Perhaps deprecate this >= 2 restriction?
+    uniqueSeats.length >= 2 ||
+      Fail`Can only commit a reallocation among at least 2 seats: ${q(
+        uniqueSeats.length,
+      )}`;
+    // Take it apart and put it back together to satisfy the type checker
+    const [seat0, seat1, ...restSeats] = uniqueSeats;
+    zcf.reallocate(seat0, seat1, ...restSeats);
+  } finally {
+    for (const seat of uniqueSeats) {
+      seat.clear();
+    }
+  }
 };
 
 /**
@@ -94,4 +179,4 @@ export const atomicTransfer = (
   toSeat = undefined,
   fromAmounts = undefined,
   toAmounts = undefined,
-) => zcf.atomicRearrange(harden([[fromSeat, toSeat, fromAmounts, toAmounts]]));
+) => atomicRearrange(zcf, harden([[fromSeat, toSeat, fromAmounts, toAmounts]]));

package/src/contractSupport/bondingCurves.js

@@ -27,7 +27,7 @@ const BASIS_POINTS = 10000n; // TODO change to 10_000n once tooling copes.
  * pool of the kind of asset sent in
  * @param {any} outputReserve - the value in the liquidity
  * pool of the kind of asset to be sent out
- * @param {bigint} [feeBasisPoints] - the fee taken in
+ * @param {bigint} [feeBasisPoints=30n] - the fee taken in
  * basis points. The default is 0.3% or 30 basis points. The fee
  * is taken from inputValue
  * @returns {NatValue} outputValue - the current price, in value form
@@ -66,7 +66,7 @@ export const getInputPrice = (
  * pool of the asset being spent
  * @param {any} outputReserve - the value in the liquidity
  * pool of the kind of asset to be sent out
- * @param {bigint} [feeBasisPoints] - the fee taken in
+ * @param {bigint} [feeBasisPoints=30n] - the fee taken in
  * basis points. The default is 0.3% or 30 basis points. The fee is taken from
  * outputValue
  * @returns {NatValue} inputValue - the value of input required to purchase output

package/src/contractSupport/durability.d.ts

@@ -1,5 +1,5 @@
 export function makeEphemeraProvider<E extends {}, K extends {} = any>(init: (key: K) => E): (key: K) => E;
-export function provideEmptySeat(zcf: ZCF, baggage: MapStore<string, any>, name: string): ZCFSeat;
+export function provideEmptySeat(zcf: ZCF, baggage: MapStore<string, unknown>, name: string): ZCFSeat;
 export function provideAll<T extends Record<string, () => ERef<any>>>(baggage: MapStore<string, any>, thunks: T): Promise<{ [K in keyof T]: Awaited<ReturnType<T[K]>>; }>;
-export function provideSingleton<T extends () => ERef<any>>(mapStore: MapStore<string, any>, key: string, makeValue: T, withValue?: ((value: Awaited<ReturnType<T>>) => void) | undefined): Promise<Awaited<ReturnType<T>>>;
+export function provideSingleton<T extends () => ERef<any>>(mapStore: MapStore<string, unknown>, key: string, makeValue: T, withValue?: ((value: Awaited<ReturnType<T>>) => void) | undefined): Promise<Awaited<ReturnType<T>>>;
 //# sourceMappingURL=durability.d.ts.map

package/src/contractSupport/durability.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"durability.d.ts","sourceRoot":"","sources":["durability.js"],"names":[],"mappings":"AAaO,2GAkBN;AAWM,sCALI,GAAG,wCAEH,MAAM,GACJ,OAAO,CAInB;AAiCM,0DAL4B,KAAK,GAAG,CAAC,YACjC,SAAS,MAAM,EAAE,GAAG,CAAC,sEAyB/B;AAgBM,iDAPa,KAAK,GAAG,CAAC,wCAElB,MAAM,gEAE6B,IAAI,gDAejD"}
+{"version":3,"file":"durability.d.ts","sourceRoot":"","sources":["durability.js"],"names":[],"mappings":"AAaO,2GAkBN;AAWM,sCALI,GAAG,4CAEH,MAAM,GACJ,OAAO,CAInB;AAiCM,0DAL4B,KAAK,GAAG,CAAC,YACjC,SAAS,MAAM,EAAE,GAAG,CAAC,sEAyB/B;AAgBM,iDAPa,KAAK,GAAG,CAAC,4CAElB,MAAM,gEAE6B,IAAI,gDAejD"}

package/src/contractSupport/durability.js

@@ -113,9 +113,9 @@ harden(provideAll);
  * @returns {Promise<Awaited<ReturnType<T>>>}
  */
 export const provideSingleton = (mapStore, key, makeValue, withValue) => {
-  const stored = mapStore.has(key)
-    ? undefined
-    : E.when(makeValue(), v => mapStore.init(key, harden(v)));
+  const stored =
+    mapStore.has(key) ||
+    E.when(makeValue(), v => mapStore.init(key, harden(v)));
 
   return E.when(stored, () => {
     const value = mapStore.get(key);

package/src/contractSupport/priceAuthority.d.ts

@@ -16,22 +16,7 @@ export function makeOnewayPriceAuthorityKit(opts: {
     actualBrandIn: Brand<'nat'>;
     actualBrandOut: Brand<'nat'>;
 }): PriceAuthorityKit;
-export const PriceAuthorityI: import("@endo/patterns").InterfaceGuard<{
-    getQuoteIssuer: import("@endo/patterns").MethodGuard;
-    getTimerService: import("@endo/patterns").MethodGuard;
-    quoteGiven: import("@endo/patterns").MethodGuard;
-    quoteWanted: import("@endo/patterns").MethodGuard;
-    makeQuoteNotifier: import("@endo/patterns").MethodGuard;
-    quoteAtTime: import("@endo/patterns").MethodGuard;
-    quoteWhenLT: import("@endo/patterns").MethodGuard;
-    quoteWhenLTE: import("@endo/patterns").MethodGuard;
-    quoteWhenGTE: import("@endo/patterns").MethodGuard;
-    quoteWhenGT: import("@endo/patterns").MethodGuard;
-    mutableQuoteWhenLT: import("@endo/patterns").MethodGuard;
-    mutableQuoteWhenLTE: import("@endo/patterns").MethodGuard;
-    mutableQuoteWhenGTE: import("@endo/patterns").MethodGuard;
-    mutableQuoteWhenGT: import("@endo/patterns").MethodGuard;
-}>;
+export const PriceAuthorityI: import("@endo/patterns").InterfaceGuard;
 export type CompareAmount = (amount: Amount, amountLimit: Amount) => boolean;
 export type Trigger = (createInstantQuote: PriceQuoteCreate) => Promise<void>;
 //# sourceMappingURL=priceAuthority.d.ts.map

package/src/contractSupport/priceAuthority.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"priceAuthority.d.ts","sourceRoot":"","sources":["priceAuthority.js"],"names":[],"mappings":"AA8DA;;;;;;;;;GASG;AACH;IAR+B,WAAW,EAA/B,OAAO,KAAK,CAAC;IACiB,QAAQ,EAAtC,KAAK,SAAS,OAAO,CAAC,CAAC;IACmC,KAAK,EAA/D,KAAK,OAAO,wBAAwB,EAAE,YAAY,CAAC;IAC5B,WAAW,EAAlC,gBAAgB;IACG,aAAa,EAAhC,MAAM,KAAK,CAAC;IACO,cAAc,EAAjC,MAAM,KAAK,CAAC;IACV,iBAAiB,CA8S7B;AAzUD;;;;;;;;;;;;;;;GAiBG;qCA3CQ,MAAM,eACN,MAAM,KACJ,OAAO;2CAiBT,gBAAgB,KACd,QAAQ,IAAI,CAAC"}
+{"version":3,"file":"priceAuthority.d.ts","sourceRoot":"","sources":["priceAuthority.js"],"names":[],"mappings":"AA6DA;;;;;;;;;GASG;AACH;IAR+B,WAAW,EAA/B,OAAO,KAAK,CAAC;IACiB,QAAQ,EAAtC,KAAK,SAAS,OAAO,CAAC,CAAC;IACmC,KAAK,EAA/D,KAAK,OAAO,wBAAwB,EAAE,YAAY,CAAC;IAC5B,WAAW,EAAlC,gBAAgB;IACG,aAAa,EAAhC,MAAM,KAAK,CAAC;IACO,cAAc,EAAjC,MAAM,KAAK,CAAC;IACV,iBAAiB,CA6S7B;AAxUD,sEAiBG;qCA3CQ,MAAM,eACN,MAAM,KACJ,OAAO;2CAiBT,gBAAgB,KACd,QAAQ,IAAI,CAAC"}

package/src/contractSupport/priceAuthority.js

@@ -1,5 +1,4 @@
-/* eslint @typescript-eslint/no-floating-promises: "warn" */
-/// <reference types="@agoric/time/src/types.d.ts" />
+/// <reference path="../../../time/src/types.d.ts" />
 
 import { E } from '@endo/eventual-send';
 import { Far } from '@endo/marshal';
@@ -337,7 +336,6 @@ export function makeOnewayPriceAuthorityKit(opts) {
         deadline,
         Far('wakeObj', {
           async wake(timestamp) {
-            await null;
             try {
               const quoteP = createQuote(calcAmountOut => ({
                 amountIn,

package/src/contractSupport/priceAuthorityInitial.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"priceAuthorityInitial.d.ts","sourceRoot":"","sources":["priceAuthorityInitial.js"],"names":[],"mappings":"AA4BO,oDAPI,KAAK,kBACL,cAAc,aACd,KAAK,KAAK,KAAK,CAAC,CAAC,WACjB,MAAM,KAAK,CAAC,YACZ,MAAM,KAAK,CAAC,GACV,cAAc,CAyF1B;uBAtGyB,OAAO,qBAAqB,EAAE,KAAK,CAAC,CAAC,CAAC"}
+{"version":3,"file":"priceAuthorityInitial.d.ts","sourceRoot":"","sources":["priceAuthorityInitial.js"],"names":[],"mappings":"AA2BO,oDAPI,KAAK,kBACL,cAAc,aACd,KAAK,KAAK,KAAK,CAAC,CAAC,WACjB,MAAM,KAAK,CAAC,YACZ,MAAM,KAAK,CAAC,GACV,cAAc,CAyF1B;uBAtGyB,OAAO,qBAAqB,EAAE,KAAK,CAAC,CAAC,CAAC"}

package/src/contractSupport/priceAuthorityInitial.js

@@ -1,6 +1,5 @@
 // @ts-check
 // @jessie-check
-/* eslint @typescript-eslint/no-floating-promises: "warn" */
 
 import { E } from '@endo/far';
 import { Far } from '@endo/marshal';

package/src/contractSupport/priceAuthorityQuoteMint.d.ts

@@ -1,2 +1,2 @@
-export function provideQuoteMint(baggage: MapStore<string, any>): Mint<"set">;
+export function provideQuoteMint(baggage: MapStore<string, unknown>): Mint<"set">;
 //# sourceMappingURL=priceAuthorityQuoteMint.d.ts.map

package/src/contractSupport/priceAuthorityQuoteMint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"priceAuthorityQuoteMint.d.ts","sourceRoot":"","sources":["priceAuthorityQuoteMint.js"],"names":[],"mappings":"AAWO,8EAsBN"}
+{"version":3,"file":"priceAuthorityQuoteMint.d.ts","sourceRoot":"","sources":["priceAuthorityQuoteMint.js"],"names":[],"mappings":"AAWO,kFAsBN"}

package/src/contractSupport/priceAuthorityTransform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"priceAuthorityTransform.d.ts","sourceRoot":"","sources":["priceAuthorityTransform.js"],"names":[],"mappings":"AAiBO,sCARI,MAAM,KAAK,CAAC,YACZ,OAAO,KAAK,CAAC,aACb,OAAO,KAAK,CAAC,SACb,KAAK,OAAO,wBAAwB,EAAE,YAAY,CAAC,aACnD,OAAO,cAAc,EAAE,SAAS,aAChC,KAAK,KAAK,KAAK,CAAC,CAAC,GACf,QAAQ,UAAU,CAAC,CAmB/B;AAeM;IAX4B,SAAS,EAAjC,KAAK,KAAK,KAAK,CAAC,CAAC;IACU,oBAAoB,EAA/C,KAAK,cAAc,CAAC;IACD,aAAa,EAAhC,MAAM,KAAK,CAAC;IACO,cAAc,EAAjC,MAAM,KAAK,CAAC;IACQ,aAAa;IACb,cAAc;IACgB,kBAAkB,eAAzD,OAAO,KAAK,CAAC,KAAK,OAAO,KAAK,CAAC;IACS,mBAAmB,gBAA1D,OAAO,KAAK,CAAC,KAAK,OAAO,KAAK,CAAC;IACa,uBAAuB,qBAA9D,OAAO,KAAK,CAAC,KAAK,OAAO,KAAK,CAAC;IACS,wBAAwB,sBAA/D,OAAO,KAAK,CAAC,KAAK,OAAO,KAAK,CAAC;4BA4N3D;uBArQyB,OAAO,qBAAqB,EAAE,KAAK,CAAC,CAAC,CAAC"}
+{"version":3,"file":"priceAuthorityTransform.d.ts","sourceRoot":"","sources":["priceAuthorityTransform.js"],"names":[],"mappings":"AAiBO,sCARI,MAAM,KAAK,CAAC,YACZ,OAAO,KAAK,CAAC,aACb,OAAO,KAAK,CAAC,SACb,KAAK,OAAO,wBAAwB,EAAE,YAAY,CAAC,aACnD,OAAO,cAAc,EAAE,SAAS,aAChC,KAAK,KAAK,KAAK,CAAC,CAAC,GACf,QAAQ,UAAU,CAAC,CAmB/B;AAeM;IAX4B,SAAS,EAAjC,KAAK,KAAK,KAAK,CAAC,CAAC;IACU,oBAAoB,EAA/C,KAAK,cAAc,CAAC;IACD,aAAa,EAAhC,MAAM,KAAK,CAAC;IACO,cAAc,EAAjC,MAAM,KAAK,CAAC;IACQ,aAAa;IACb,cAAc;IACgB,kBAAkB,eAAzD,OAAO,KAAK,CAAC,KAAK,OAAO,KAAK,CAAC;IACS,mBAAmB,gBAA1D,OAAO,KAAK,CAAC,KAAK,OAAO,KAAK,CAAC;IACa,uBAAuB,qBAA9D,OAAO,KAAK,CAAC,KAAK,OAAO,KAAK,CAAC;IACS,wBAAwB,sBAA/D,OAAO,KAAK,CAAC,KAAK,OAAO,KAAK,CAAC;4BA6N3D;uBAtQyB,OAAO,qBAAqB,EAAE,KAAK,CAAC,CAAC,CAAC"}

package/src/contractSupport/priceAuthorityTransform.js

@@ -87,8 +87,9 @@ export const makePriceAuthorityTransform = async ({
       sourceBrandOut,
     );
 
-    const { value: sourceQuoteValue } =
-      await E(sourceQuoteIssuer).getAmountOf(sourceQuotePayment);
+    const { value: sourceQuoteValue } = await E(sourceQuoteIssuer).getAmountOf(
+      sourceQuotePayment,
+    );
 
     sourceQuoteValue.length === 1 ||
       Fail`sourceQuoteValue.length ${sourceQuoteValue.length} is not 1`;