@agoric/zoe 0.26.3-upgrade-18a-dev-4ee0508.0 → 0.27.0-u19.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/zoe",
-  "version": "0.26.3-upgrade-18a-dev-4ee0508.0+4ee0508",
+  "version": "0.27.0-u19.1",
   "description": "Zoe: the Smart Contract Framework for Offer Enforcement",
   "type": "module",
   "main": "./src/zoeService/zoe.js",
@@ -43,38 +43,38 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/base-zone": "0.1.1-upgrade-18a-dev-4ee0508.0+4ee0508",
-    "@agoric/ertp": "0.16.3-upgrade-18a-dev-4ee0508.0+4ee0508",
-    "@agoric/internal": "0.4.0-upgrade-18a-dev-4ee0508.0+4ee0508",
-    "@agoric/notifier": "0.7.0-upgrade-18a-dev-4ee0508.0+4ee0508",
-    "@agoric/store": "0.9.3-upgrade-18a-dev-4ee0508.0+4ee0508",
-    "@agoric/swingset-liveslots": "0.10.3-upgrade-18a-dev-4ee0508.0+4ee0508",
-    "@agoric/swingset-vat": "0.33.0-upgrade-18a-dev-4ee0508.0+4ee0508",
-    "@agoric/time": "0.3.3-upgrade-18a-dev-4ee0508.0+4ee0508",
-    "@agoric/vat-data": "0.5.3-upgrade-18a-dev-4ee0508.0+4ee0508",
-    "@agoric/vow": "0.2.0-upgrade-18a-dev-4ee0508.0+4ee0508",
-    "@agoric/zone": "0.3.0-upgrade-18a-dev-4ee0508.0+4ee0508",
-    "@endo/bundle-source": "^3.5.0",
-    "@endo/captp": "^4.4.3",
-    "@endo/common": "^1.2.8",
-    "@endo/errors": "^1.2.8",
-    "@endo/eventual-send": "^1.2.8",
-    "@endo/exo": "^1.5.7",
-    "@endo/far": "^1.1.9",
-    "@endo/import-bundle": "^1.3.2",
-    "@endo/marshal": "^1.6.2",
-    "@endo/nat": "^5.0.13",
-    "@endo/pass-style": "^1.4.7",
-    "@endo/patterns": "^1.4.7",
-    "@endo/promise-kit": "^1.1.8",
+    "@agoric/base-zone": "^0.1.1-u19.0",
+    "@agoric/ertp": "^0.16.3-u19.1",
+    "@agoric/internal": "^0.4.0-u19.1",
+    "@agoric/notifier": "^0.7.0-u19.1",
+    "@agoric/store": "^0.9.3-u19.0",
+    "@agoric/swingset-liveslots": "^0.10.3-u19.1",
+    "@agoric/swingset-vat": "^0.33.0-u19.1",
+    "@agoric/time": "^0.3.3-u19.0",
+    "@agoric/vat-data": "^0.5.3-u19.1",
+    "@agoric/vow": "^0.2.0-u19.1",
+    "@agoric/zone": "^0.3.0-u19.1",
+    "@endo/bundle-source": "^3.5.1",
+    "@endo/captp": "^4.4.4",
+    "@endo/common": "^1.2.9",
+    "@endo/errors": "^1.2.9",
+    "@endo/eventual-send": "^1.3.0",
+    "@endo/exo": "^1.5.8",
+    "@endo/far": "^1.1.10",
+    "@endo/import-bundle": "^1.3.3",
+    "@endo/marshal": "^1.6.3",
+    "@endo/nat": "^5.0.14",
+    "@endo/pass-style": "^1.4.8",
+    "@endo/patterns": "^1.4.8",
+    "@endo/promise-kit": "^1.1.9",
     "yargs-parser": "^21.1.1"
   },
   "devDependencies": {
-    "@agoric/kmarshal": "0.1.1-upgrade-18a-dev-4ee0508.0+4ee0508",
-    "@endo/init": "^1.1.7",
+    "@agoric/kmarshal": "^0.1.1-u19.0",
+    "@endo/init": "^1.1.8",
     "ava": "^5.3.0",
     "c8": "^10.1.2",
-    "import-meta-resolve": "^2.2.1",
+    "import-meta-resolve": "^4.1.0",
     "tsd": "^0.31.1"
   },
   "files": [
@@ -98,7 +98,7 @@
     "access": "public"
   },
   "typeCoverage": {
-    "atLeast": 85.06
+    "atLeast": 85.11
   },
-  "gitHead": "4ee05088e5ada989a866a11ff65838d395505ce6"
+  "gitHead": "a04d2bf43a9753d123954b52c6ba8d35083a3c8f"
 }

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

@@ -1 +1 @@
-{"version":3,"file":"offerHandlerStorage.d.ts","sourceRoot":"","sources":["offerHandlerStorage.js"],"names":[],"mappings":"AA6BO;;yCAgCwB,gBAAgB,YAAY,OAAO,KAAK,YAAY;EAsBlF;;;;sBAlEY,MAAM,GAAG,EAAE;mCASX,2BAAiB,eAAe,GAAG,YAAY;oCAL3B,qBAAqB;qCACpB,kBAAkB"}
+{"version":3,"file":"offerHandlerStorage.d.ts","sourceRoot":"","sources":["offerHandlerStorage.js"],"names":[],"mappings":"AAkCO;;yCAgCwB,gBAAgB,YAAY,OAAO,KAAK,YAAY;EAsBlF;;;;sBAlEY,MAAM,GAAG,EAAE;mCASX,2BAAiB,eAAe,GAAG,YAAY;oCAL3B,qBAAqB;qCACpB,kBAAkB"}

package/src/contractFacet/offerHandlerStorage.js

@@ -6,6 +6,11 @@ import { canBeDurable, provideDurableWeakMapStore } from '@agoric/vat-data';
 
 import { defineDurableHandle } from '../makeHandle.js';
 
+/**
+ * @import {LegacyWeakMap, WeakMapStore} from '@agoric/store';
+ * @import {MapStore} from '@agoric/swingset-liveslots';
+ */
+
 /**
  * The following should work. But for some reason, @endo/errors does
  * not export the type `Details`.

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

@@ -1 +1 @@
-{"version":3,"file":"reallocate.d.ts","sourceRoot":"","sources":["reallocate.js"],"names":[],"mappings":"AAgBO,6CAHI,KAAK,CAAC,YAAY,CAAC,GACjB,CAAC,OAAO,EAAE,mBAAmB,CAAC,EAAE,CA8E5C;8BAtFa,KAAK,CAAC,mBAAmB,CAAC"}
+{"version":3,"file":"reallocate.d.ts","sourceRoot":"","sources":["reallocate.js"],"names":[],"mappings":"AAoBO,6CAHI,KAAK,CAAC,YAAY,CAAC,GACjB,CAAC,OAAO,EAAE,mBAAmB,CAAC,EAAE,CA8E5C;8BAtFa,KAAK,CAAC,mBAAmB,CAAC"}

package/src/contractFacet/reallocate.js

@@ -4,6 +4,10 @@ import { makeScalarMapStore } from '@agoric/vat-data';
 import { assertRightsConserved } from './rightsConservation.js';
 import { addToAllocation, subtractFromAllocation } from './allocationMath.js';
 
+/**
+ * @import {MapStore} from '@agoric/swingset-liveslots';
+ */
+
 /** @typedef {Array<AmountKeywordRecord>} TransactionList */
 
 /**

package/src/contractFacet/types-ambient.d.ts

@@ -19,16 +19,11 @@ type InvitationAmount = Amount<'set', InvitationDetails>;
  * synchronously from within the contract, and usually is referred to
  * in code as zcf.
  */
-type ZCF<CT extends unknown = Record<string, unknown>> = {
+type ZCF<CT = Record<string, unknown>> = {
   /**
    * - atomically reallocate amounts among seats.
    */
   atomicRearrange: (transfers: TransferPart[]) => void;
-  /**
-   * - reallocate amounts among seats.
-   * @deprecated Use atomicRearrange instead.
-   */
-  reallocate: Reallocate;
   /**
    * - check
    * whether a keyword is valid and unique and could be added in
@@ -86,34 +81,6 @@ type ZCF<CT extends unknown = Record<string, unknown>> = {
   getInstance: () => Instance;
 };
 
-/**
- * @deprecated Use atomicRearrange instead
- *
- * The contract can reallocate over seats, which commits the staged
- * allocation for each seat. On commit, the staged allocation becomes
- * the current allocation and the staged allocation is deleted.
- *
- * The reallocation will only succeed if the reallocation 1) conserves
- * rights (the amounts specified have the same total value as the
- * current total amount), and 2) is 'offer-safe' for all parties
- * involved. All seats that have staged allocations must be included
- * as arguments to `reallocate`, or an error is thrown. Additionally,
- * an error is thrown if any seats included in `reallocate` do not
- * have a staged allocation.
- *
- * The reallocation is partial, meaning that it applies only to the
- * seats passed in as arguments. By induction, if rights conservation
- * and offer safety hold before, they will hold after a safe
- * reallocation, even though we only re-validate for the seats whose
- * allocations will change. Since rights are conserved for the change,
- * overall rights will be unchanged, and a reallocation can only
- * effect offer safety for seats whose allocations change.
- */
-type Reallocate = (
-  seat1: ZCFSeat,
-  seat2: ZCFSeat,
-  ...seatRest: Array<ZCFSeat>
-) => void;
 type TransferPart = [
   fromSeat?: ZCFSeat,
   toSeat?: ZCFSeat,
@@ -184,38 +151,14 @@ type ZCFSeat = import('@endo/pass-style').RemotableObject & {
     brand?: B,
   ) => B extends Brand<infer K> ? Amount<K> : Amount;
   getCurrentAllocation: () => Allocation;
-  /**
-   * @deprecated Use atomicRearrange instead
-   */
-  getStagedAllocation: () => Allocation;
-  /**
-   * @deprecated Use atomicRearrange instead
-   */
-  hasStagedAllocation: () => boolean;
   isOfferSafe: (newAllocation: Allocation) => boolean;
-  /**
-   * @deprecated Use atomicRearrange instead
-   */
-  incrementBy: (
-    amountKeywordRecord: AmountKeywordRecord,
-  ) => AmountKeywordRecord;
-  /**
-   * @deprecated Use atomicRearrange instead
-   */
-  decrementBy: (
-    amountKeywordRecord: AmountKeywordRecord,
-  ) => AmountKeywordRecord;
-  /**
-   * @deprecated Use atomicRearrange instead
-   */
-  clear: () => void;
 };
 type ZcfSeatKit = {
   zcfSeat: ZCFSeat;
   userSeat: Promise<UserSeat>;
 };
-type HandleOffer<OR extends unknown, OA> = (seat: ZCFSeat, offerArgs: OA) => OR;
-type OfferHandler<OR extends unknown = unknown, OA = never> =
+type HandleOffer<OR, OA> = (seat: ZCFSeat, offerArgs: OA) => OR;
+type OfferHandler<OR = unknown, OA = never> =
   | HandleOffer<OR, OA>
   | {
       handle: HandleOffer<OR, OA>;
@@ -241,12 +184,7 @@ type ContractMeta<
  *
  * CAVEAT: assumes synchronous
  */
-type ContractStartFn<
-  PF extends unknown = any,
-  CF extends unknown = any,
-  CT extends unknown = any,
-  PA extends unknown = any,
-> = (
+type ContractStartFn<PF = any, CF = any, CT = any, PA = any> = (
   zcf: ZCF<CT>,
   privateArgs: PA,
   baggage: import('@agoric/vat-data').Baggage,

package/src/contractFacet/zcfMint.d.ts

@@ -4,5 +4,5 @@ export function prepareZcMint(zcfBaggage: import("@agoric/vat-data").Baggage, re
 }, getAssetKindByBrand: GetAssetKindByBrand, makeEmptySeatKit: (exit?: undefined) => {
     zcfSeat: any;
     userSeat: Promise<UserSeat>;
-}, reallocator: ZcfMintReallocator): <K extends AssetKind>(keyword: string, zoeMintP: ERef<ZoeMint<K>>) => Promise<ZCFMint<K>>;
+}, reallocator: ZcfMintReallocator): (keyword: string, zoeMintP: ERef<ZoeMint<K>>) => Promise<ZCFMint<K>>;
 //# sourceMappingURL=zcfMint.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"zcfMint.d.ts","sourceRoot":"","sources":["zcfMint.js"],"names":[],"mappings":"AAmBO,4CAJI,mBAAmB,gBACnB,YAAY,GACV,MAAM,CAYlB;AASM,0CANI,OAAO,kBAAkB,EAAE,OAAO,gBAClC;IAAE,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,GAAG,IAAI,CAAA;CAAE,uBACvD,mBAAmB,oBACnB,CAAC,IAAI,CAAC,EAAE,SAAS,KAAK;IAAE,OAAO,EAAE,GAAG,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAA;CAAE,eACnE,kBAAkB,IAiHF,CAAC,SAAZ,SAAU,WACb,MAAM,YACN,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KACd,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAWjC"}
+{"version":3,"file":"zcfMint.d.ts","sourceRoot":"","sources":["zcfMint.js"],"names":[],"mappings":"AAmBO,4CAJI,mBAAmB,gBACnB,YAAY,GACV,MAAM,CAYlB;AASM,0CANI,OAAO,kBAAkB,EAAE,OAAO,gBAClC;IAAE,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,GAAG,IAAI,CAAA;CAAE,uBACvD,mBAAmB,oBACnB,CAAC,IAAI,CAAC,EAAE,SAAS,KAAK;IAAE,OAAO,EAAE,GAAG,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAA;CAAE,eACnE,kBAAkB,IA0Gb,SAJH,MAIU,EAAE,UAHZ,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAGK,KAFlB,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAWjC"}

package/src/contractFacet/zcfMint.js

@@ -87,19 +87,13 @@ export const prepareZcMint = (
           gains,
         );
 
-        // Increment the stagedAllocation if it exists so that the
-        // stagedAllocation is kept up to the currentAllocation
-        if (zcfSeat.hasStagedAllocation()) {
-          zcfSeat.incrementBy(gains);
-        }
-
         // Offer safety should never be able to be violated here, as
         // we are adding assets. However, we keep this check so that
         // all reallocations are covered by offer safety checks, and
         // that any bug within Zoe that may affect this is caught.
         zcfSeat.isOfferSafe(allocationPlusGains) ||
           Fail`The allocation after minting gains ${allocationPlusGains} for the zcfSeat was not offer safe`;
-        // No effects above, apart from incrementBy. Note COMMIT POINT within
+        // No effects above, Note COMMIT POINT within
         // reallocator.reallocate(). The following two steps *should* be
         // committed atomically, but it is not a disaster if they are
         // not. If we minted only, no one would ever get those
@@ -129,13 +123,7 @@ export const prepareZcMint = (
         zcfSeat.isOfferSafe(allocationMinusLosses) ||
           Fail`The allocation after burning losses ${allocationMinusLosses} for the zcfSeat was not offer safe`;
 
-        // Decrement the stagedAllocation if it exists so that the
-        // stagedAllocation is kept up to the currentAllocation
-        if (zcfSeat.hasStagedAllocation()) {
-          zcfSeat.decrementBy(losses);
-        }
-
-        // No effects above, apart from decrementBy. Note COMMIT POINT within
+        // No effects above, Note COMMIT POINT within
         // reallocator.reallocate(). The following two steps *should* be
         // committed atomically, but it is not a disaster if they are
         // not. If we only commit the allocationMinusLosses no one would

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

@@ -1 +1 @@
-{"version":3,"file":"zcfSeat.d.ts","sourceRoot":"","sources":["zcfSeat.js"],"names":[],"mappings":"AAmCO,oDANI,IAAI,CAAC,gBAAgB,CAAC,uBACtB,mBAAmB,uBACnB,OAAO,sBAAsB,EAAE,mBAAmB,cAClD,OAAO,kBAAkB,EAAE,OAAO,GAChC;IAAE,WAAW,EAAE,cAAc,CAAC;IAAC,kBAAkB,EAAE,kBAAkB,CAAA;CAAE,CAyenF"}
+{"version":3,"file":"zcfSeat.d.ts","sourceRoot":"","sources":["zcfSeat.js"],"names":[],"mappings":"AAqCO,oDANI,IAAI,CAAC,gBAAgB,CAAC,uBACtB,mBAAmB,uBACnB,OAAO,sBAAsB,EAAE,mBAAmB,cAClD,OAAO,kBAAkB,EAAE,OAAO,GAChC;IAAE,WAAW,EAAE,cAAc,CAAC;IAAC,kBAAkB,EAAE,kBAAkB,CAAA;CAAE,CAuTnF"}

package/src/contractFacet/zcfSeat.js

@@ -5,7 +5,6 @@ import {
   prepareExoClass,
   prepareExoClassKit,
   provide,
-  provideDurableMapStore,
   provideDurableWeakMapStore,
 } from '@agoric/vat-data';
 import { AmountMath } from '@agoric/ertp';
@@ -13,8 +12,6 @@ import { initEmpty, M } from '@agoric/store';
 
 import { isOfferSafe } from './offerSafety.js';
 import { assertRightsConserved } from './rightsConservation.js';
-import { addToAllocation, subtractFromAllocation } from './allocationMath.js';
-import { coerceAmountKeywordRecord } from '../cleanProposal.js';
 import {
   AmountKeywordRecordShape,
   SeatDataShape,
@@ -23,6 +20,11 @@ import {
 import { makeAllocationMap } from './reallocate.js';
 import { TransferPartShape } from '../contractSupport/atomicTransfer.js';
 
+/**
+ * @import {LegacyWeakMap, WeakMapStore} from '@agoric/store';
+ * @import {MapStore} from '@agoric/swingset-liveslots';
+ */
+
 /**
  * The SeatManager holds the active zcfSeats and can reallocate and
  * make new zcfSeats.
@@ -41,11 +43,11 @@ export const createSeatManager = (
 ) => {
   /** @type {WeakMapStore<ZCFSeat, Allocation>}  */
   let activeZCFSeats = provideDurableWeakMapStore(zcfBaggage, 'activeZCFSeats');
-  /** @type {MapStore<ZCFSeat, Allocation>} */
-  const zcfSeatToStagedAllocations = provideDurableMapStore(
-    zcfBaggage,
-    'zcfSeatToStagedAllocations',
-  );
+
+  // Removed.  See #6679
+  if (zcfBaggage.has('zcfSeatToStagedAllocations')) {
+    zcfBaggage.delete('zcfSeatToStagedAllocations');
+  }
 
   /** @type {WeakMapStore<ZCFSeat, SeatHandle>} */
   let zcfSeatToSeatHandle = provideDurableWeakMapStore(
@@ -84,64 +86,6 @@ export const createSeatManager = (
     return activeZCFSeats.get(zcfSeat);
   };
 
-  /**
-   * @param {ZCFSeat} zcfSeat
-   * @returns {void}
-   */
-  const commitStagedAllocation = zcfSeat => {
-    // By this point, we have checked that the zcfSeat is a key in
-    // activeZCFSeats and in zcfSeatToStagedAllocations.
-    activeZCFSeats.set(zcfSeat, zcfSeat.getStagedAllocation());
-    zcfSeatToStagedAllocations.delete(zcfSeat);
-  };
-
-  /**
-   * @param {ZCFSeat} zcfSeat
-   * @returns {Allocation}
-   */
-  const hasStagedAllocation = zcfSeatToStagedAllocations.has;
-
-  /**
-   * Get the stagedAllocation. If one does not exist, return the
-   * currentAllocation. We return the currentAllocation in this case
-   * so that downstream users do not have to check whether the
-   * stagedAllocation is defined before adding to it or subtracting
-   * from it. To check whether a stagedAllocation exists, use
-   * `hasStagedAllocation`
-   *
-   * @param {ZCFSeat} zcfSeat
-   * @returns {Allocation}
-   */
-  const getStagedAllocation = zcfSeat => {
-    if (zcfSeatToStagedAllocations.has(zcfSeat)) {
-      return zcfSeatToStagedAllocations.get(zcfSeat);
-    } else {
-      return activeZCFSeats.get(zcfSeat);
-    }
-  };
-
-  const assertStagedAllocation = zcfSeat => {
-    hasStagedAllocation(zcfSeat) ||
-      Fail`Reallocate failed because a seat had no staged allocation. Please add or subtract from the seat and then reallocate.`;
-  };
-
-  const setStagedAllocation = (zcfSeat, newStagedAllocation) => {
-    if (zcfSeatToStagedAllocations.has(zcfSeat)) {
-      zcfSeatToStagedAllocations.set(zcfSeat, newStagedAllocation);
-    } else {
-      zcfSeatToStagedAllocations.init(zcfSeat, newStagedAllocation);
-    }
-  };
-
-  /** @param {ZCFSeat} zcfSeat */
-  const assertNoStagedAllocation = zcfSeat => {
-    if (hasStagedAllocation(zcfSeat)) {
-      Fail`The seat could not be exited with a staged but uncommitted allocation: ${getStagedAllocation(
-        zcfSeat,
-      )}. Please reallocate over this seat or clear the staged allocation.`;
-    }
-  };
-
   const ZCFSeatI = M.interface('ZCFSeat', {}, { sloppy: true });
 
   const makeZCFSeatInternal = prepareExoClass(
@@ -163,7 +107,6 @@ export const createSeatManager = (
       exit(completion) {
         const { self } = this;
         assertActive(self);
-        assertNoStagedAllocation(self);
         doExitSeat(self);
         void E(zoeInstanceAdmin).exitSeat(
           zcfSeatToSeatHandle.get(self),
@@ -221,10 +164,6 @@ export const createSeatManager = (
         const { self } = this;
         return getCurrentAllocation(self);
       },
-      getStagedAllocation() {
-        const { self } = this;
-        return getStagedAllocation(self);
-      },
       isOfferSafe(newAllocation) {
         const { state, self } = this;
         assertActive(self);
@@ -236,53 +175,6 @@ export const createSeatManager = (
 
         return isOfferSafe(state.proposal, reallocation);
       },
-      /**
-       * @deprecated switch to zcf.atomicRearrange()
-       * @param {AmountKeywordRecord} amountKeywordRecord
-       */
-      incrementBy(amountKeywordRecord) {
-        const { self } = this;
-        assertActive(self);
-        amountKeywordRecord = coerceAmountKeywordRecord(
-          amountKeywordRecord,
-          getAssetKindByBrand,
-        );
-        setStagedAllocation(
-          self,
-          addToAllocation(getStagedAllocation(self), amountKeywordRecord),
-        );
-        return amountKeywordRecord;
-      },
-      /**
-       * @deprecated switch to zcf.atomicRearrange()
-       * @param {AmountKeywordRecord} amountKeywordRecord
-       */
-      decrementBy(amountKeywordRecord) {
-        const { self } = this;
-        assertActive(self);
-        amountKeywordRecord = coerceAmountKeywordRecord(
-          amountKeywordRecord,
-          getAssetKindByBrand,
-        );
-        setStagedAllocation(
-          self,
-          subtractFromAllocation(
-            getStagedAllocation(self),
-            amountKeywordRecord,
-          ),
-        );
-        return amountKeywordRecord;
-      },
-      clear() {
-        const { self } = this;
-        if (zcfSeatToStagedAllocations.has(self)) {
-          zcfSeatToStagedAllocations.delete(self);
-        }
-      },
-      hasStagedAllocation() {
-        const { self } = this;
-        return hasStagedAllocation(self);
-      },
     },
   );
 
@@ -296,9 +188,6 @@ export const createSeatManager = (
     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(),
       dropAllReferences: M.call().returns(),
     }),
     zcfMintReallocator: M.interface('MintReallocator', {
@@ -350,8 +239,6 @@ export const createSeatManager = (
           // ////// 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`;
           }
@@ -410,69 +297,6 @@ export const createSeatManager = (
             throw err;
           }
         },
-        reallocate(/** @type {ZCFSeat[]} */ ...seats) {
-          for (const seat of seats) {
-            assertActive(seat);
-            assertStagedAllocation(seat);
-          }
-
-          // Ensure that rights are conserved overall.
-          const flattenAllocations = allocations =>
-            allocations.flatMap(Object.values);
-          const previousAllocations = seats.map(seat =>
-            seat.getCurrentAllocation(),
-          );
-          const previousAmounts = flattenAllocations(previousAllocations);
-          const newAllocations = seats.map(seat => seat.getStagedAllocation());
-          const newAmounts = flattenAllocations(newAllocations);
-
-          assertRightsConserved(previousAmounts, newAmounts);
-
-          // Ensure that offer safety holds.
-          for (const seat of seats) {
-            isOfferSafe(seat.getProposal(), seat.getStagedAllocation()) ||
-              Fail`Offer safety was violated by the proposed allocation: ${seat.getStagedAllocation()}. Proposal was ${seat.getProposal()}`;
-          }
-
-          // Keep track of seats used so far in this call, to prevent aliasing.
-          const zcfSeatsSoFar = new Set();
-
-          for (const seat of seats) {
-            zcfSeatToSeatHandle.has(seat) ||
-              Fail`The seat ${seat} was not recognized`;
-            !zcfSeatsSoFar.has(seat) ||
-              Fail`Seat (${seat}) was already an argument to reallocate`;
-            zcfSeatsSoFar.add(seat);
-          }
-
-          try {
-            // No side effects above. All conditions checked which could have
-            // caused us to reject this reallocation.
-            // COMMIT POINT
-            // All the effects below must succeed "atomically". Scare quotes because
-            // the eventual send at the bottom is part of this "atomicity" even
-            // though its effects happen later. The send occurs in the order of
-            // updates from zcf to zoe, its effects must occur immediately in zoe
-            // on reception, and must not fail.
-            //
-            // Commit the staged allocations (currentAllocation is replaced
-            // for each of the seats) and inform Zoe of the
-            // newAllocation.
-
-            for (const seat of seats) {
-              commitStagedAllocation(seat);
-            }
-            const seatHandleAllocations = seats.map(seat => {
-              const seatHandle = zcfSeatToSeatHandle.get(seat);
-              return { seatHandle, allocation: seat.getCurrentAllocation() };
-            });
-
-            E(zoeInstanceAdmin).replaceAllocations(seatHandleAllocations);
-          } catch (err) {
-            shutdownWithFailure(err);
-            throw err;
-          }
-        },
         dropAllReferences() {
           activeZCFSeats = replaceDurableWeakMapStore(
             zcfBaggage,
@@ -485,9 +309,9 @@ export const createSeatManager = (
         },
       },
       zcfMintReallocator: {
-        // Unlike the zcf.reallocate method, this one does not check
+        // Unlike the zcf.atomicRearrange method, this one does not check
         // conservation, and so can be used internally for reallocations that
-        // violate conservation.
+        // violate conservation, like minting and burning.
         reallocate(zcfSeat, newAllocation) {
           try {
             // COMMIT POINT

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

@@ -1 +1 @@
-{"version":3,"file":"zcfZygote.d.ts","sourceRoot":"","sources":["zcfZygote.js"],"names":[],"mappings":"AAiDO,sCARI,SAAS,cACT,IAAI,CAAC,UAAU,CAAC,oBAChB,MAAM,CAAC,KAAK,CAAC,iBACb,aAAa,qBACb,SAAS,eACT,OAAO,kBAAkB,EAAE,OAAO,GAChC,OAAO,CAAC,SAAS,CAAC,CA8c9B"}
+{"version":3,"file":"zcfZygote.d.ts","sourceRoot":"","sources":["zcfZygote.js"],"names":[],"mappings":"AAiDO,sCARI,SAAS,cACT,IAAI,CAAC,UAAU,CAAC,oBAChB,MAAM,CAAC,KAAK,CAAC,iBACb,aAAa,qBACb,SAAS,eACT,OAAO,kBAAkB,EAAE,OAAO,GAChC,OAAO,CAAC,SAAS,CAAC,CAod9B"}

package/src/contractFacet/zcfZygote.js

@@ -283,7 +283,6 @@ export const makeZCFZygote = async (
   /** @type {ZCF} */
   const zcf = prepareExo(zcfBaggage, 'zcf', ZcfI, {
     atomicRearrange: transfers => seatManager.atomicRearrange(transfers),
-    reallocate: (...seats) => seatManager.reallocate(...seats),
     assertUniqueKeyword: kwd => getInstanceRecHolder().assertUniqueKeyword(kwd),
     saveIssuer: async (issuerP, keyword) => {
       // TODO: The checks of the keyword for uniqueness are
@@ -488,9 +487,16 @@ export const makeZCFZygote = async (
           publicFacet = undefined,
           creatorInvitation = undefined,
         }) => {
-          const priorCreatorFacet = zcfBaggage.get('creatorFacet');
-          const priorPublicFacet = zcfBaggage.get('publicFacet');
-          const priorCreatorInvitation = zcfBaggage.get('creatorInvitation');
+          let priorCreatorFacet;
+          let priorPublicFacet;
+          let priorCreatorInvitation;
+          try {
+            priorCreatorFacet = zcfBaggage.get('creatorFacet');
+            priorPublicFacet = zcfBaggage.get('publicFacet');
+            priorCreatorInvitation = zcfBaggage.get('creatorInvitation');
+          } catch (e) {
+            Fail`restartContract failed: original contract facets were not durable (${e})`;
+          }
 
           (priorCreatorFacet === creatorFacet &&
             priorPublicFacet === publicFacet &&

package/src/contractSupport/durability.d.ts

@@ -2,4 +2,5 @@ export function makeEphemeraProvider<E extends {}, K extends WeakKey>(init: (key
 export function provideEmptySeat(zcf: ZCF, baggage: import("@agoric/swingset-liveslots").Baggage, 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: import("@agoric/vat-data").Baggage, key: string, makeValue: T, withValue?: (value: Awaited<ReturnType<T>>) => void): Promise<Awaited<ReturnType<T>>>;
+import type { MapStore } from '@agoric/swingset-liveslots';
 //# 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,qCAJW,CAAC,SAAN,EAAI,EACM,CAAC,SAAV,OAAQ,QACX,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,eASA,CAAC,CAWxB;AAWM,sCALI,GAAG,WACH,OAAO,4BAA4B,EAAE,OAAO,QAC5C,MAAM,GACJ,OAAO,CAInB;AAiCM,2BALwC,CAAC,SAAlC,MAAM,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC,GAAG,CAAC,CAAE,WACnC,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,UACrB,CAAC,GACC,OAAO,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAE,CAAC,CAuBlE;AAgBM,iCAPwB,CAAC,SAAnB,MAAO,IAAI,CAAC,GAAG,CAAE,YACnB,OAAO,kBAAkB,EAAE,OAAO,OAClC,MAAM,aACN,CAAC,cACD,CAAC,KAAK,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,GACrC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAc3C"}
+{"version":3,"file":"durability.d.ts","sourceRoot":"","sources":["durability.js"],"names":[],"mappings":"AAiBO,qCAJW,CAAC,SAAN,EAAI,EACM,CAAC,SAAV,OAAQ,QACX,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,eASA,CAAC,CAWxB;AAWM,sCALI,GAAG,WACH,OAAO,4BAA4B,EAAE,OAAO,QAC5C,MAAM,GACJ,OAAO,CAInB;AAiCM,2BALwC,CAAC,SAAlC,MAAM,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC,GAAG,CAAC,CAAE,WACnC,SAAS,MAAM,EAAE,GAAG,CAAC,UACrB,CAAC,GACC,OAAO,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAE,CAAC,CAuBlE;AAgBM,iCAPwB,CAAC,SAAnB,MAAO,IAAI,CAAC,GAAG,CAAE,YACnB,OAAO,kBAAkB,EAAE,OAAO,OAClC,MAAM,aACN,CAAC,cACD,CAAC,KAAK,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,GACrC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAc3C;8BA7H0B,4BAA4B"}

package/src/contractSupport/durability.js

@@ -2,6 +2,10 @@ import { allValues, objectMap } from '@agoric/internal';
 import { provide } from '@agoric/vat-data';
 import { E } from '@endo/eventual-send';
 
+/**
+ * @import {MapStore} from '@agoric/swingset-liveslots';
+ */
+
 /**
  * SCALE: Only for low cardinality provisioning. Every value from init() will
  * remain in the map for the lifetime of the heap. If a key object is GCed, its

package/src/contractSupport/priceQuote.d.ts

@@ -4,6 +4,7 @@ export function getAmountOut(quote: PriceQuote): import("@agoric/ertp").NatAmoun
 /** @type {(quote: PriceQuote) => import('@agoric/time').Timestamp} */
 export const getTimestamp: (quote: PriceQuote) => import("@agoric/time").Timestamp;
 export function unitAmount(brand: Brand<"nat">): Promise<import("@agoric/ertp").NatAmount>;
+export function makePriceQuoteIssuer(): IssuerKit<"set", PriceDescription>;
 import type { PriceQuote } from '@agoric/zoe/tools/types.js';
 import type { PriceDescription } from '@agoric/zoe/tools/types.js';
 //# sourceMappingURL=priceQuote.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"priceQuote.d.ts","sourceRoot":"","sources":["priceQuote.js"],"names":[],"mappings":"AAoBO,2CAHI,UAAU,GACR,gBAAgB,CAM5B;AAGM,mCADK,UAAU,oCACiD;AAEhE,oCADK,UAAU,oCACmD;AACzE,sEAAsE;AACtE,2BADW,CAAC,KAAK,EAAE,UAAU,KAAK,OAAO,cAAc,EAAE,SAAS,CACQ;AAGnE,kCADK,KAAK,CAAC,KAAK,CAAC,6CAMvB;gCA/B4F,4BAA4B;sCAA5B,4BAA4B"}
+{"version":3,"file":"priceQuote.d.ts","sourceRoot":"","sources":["priceQuote.js"],"names":[],"mappings":"AAoBO,2CAHI,UAAU,GACR,gBAAgB,CAM5B;AAGM,mCADK,UAAU,oCACiD;AAEhE,oCADK,UAAU,oCACmD;AACzE,sEAAsE;AACtE,2BADW,CAAC,KAAK,EAAE,UAAU,KAAK,OAAO,cAAc,EAAE,SAAS,CACQ;AAGnE,kCADK,KAAK,CAAC,KAAK,CAAC,6CAMvB;AAGM,wCACM,SAAS,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAE5C;gCArC0F,4BAA4B;sCAA5B,4BAA4B"}

package/src/contractSupport/priceQuote.js

@@ -3,7 +3,7 @@
 import { Fail } from '@endo/errors';
 import { Nat } from '@endo/nat';
 import { E } from '@endo/eventual-send';
-import { AmountMath } from '@agoric/ertp';
+import { AmountMath, AssetKind, makeIssuerKit } from '@agoric/ertp';
 
 /**
  * @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js';
@@ -39,3 +39,8 @@ export const unitAmount = async brand => {
   return AmountMath.make(brand, 10n ** Nat(decimalPlaces));
 };
 harden(unitAmount);
+
+export const makePriceQuoteIssuer = () =>
+  /** @type {IssuerKit<'set', PriceDescription>} */ (
+    makeIssuerKit('quote', AssetKind.SET)
+  );