@agoric/zoe 0.26.3-upgrade-18a-dev-4ee0508.0 → 0.26.3-upgrade-20-dev-086463b.0

package/src/contractFacet/vatRoot.d.ts

@@ -1,14 +1,20 @@
 /**
- * @param {VatPowers & { testJigSetter: TestJigSetter }} powers
+ * @import {ZoeService} from '@agoric/zoe';
+ */
+/**
+ * @param {VatPowers & { testJigSetter: ( {zcf}: {zcf: ZCF} ) => void }} powers
  * @param {{contractBundleCap: BundleCap, zoeService: ZoeService, invitationIssuer: Issuer<'set'>, privateArgs?: any}} vatParameters
  * @param {import('@agoric/vat-data').Baggage} baggage
  */
 export function buildRootObject(powers: VatPowers & {
-    testJigSetter: TestJigSetter;
+    testJigSetter: ({ zcf }: {
+        zcf: ZCF;
+    }) => void;
 }, vatParameters: {
     contractBundleCap: BundleCap;
     zoeService: ZoeService;
     invitationIssuer: Issuer<"set">;
     privateArgs?: any;
 }, baggage: import("@agoric/vat-data").Baggage): Promise<import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {}>>;
+import type { ZoeService } from '@agoric/zoe';
 //# sourceMappingURL=vatRoot.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"vatRoot.d.ts","sourceRoot":"","sources":["vatRoot.js"],"names":[],"mappings":"AAiBA;;;;GAIG;AACH,wCAJW,SAAS,GAAG;IAAE,aAAa,EAAE,aAAa,CAAA;CAAE,iBAC5C;IAAC,iBAAiB,EAAE,SAAS,CAAC;IAAC,UAAU,EAAE,UAAU,CAAC;IAAC,gBAAgB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAAC,WAAW,CAAC,EAAE,GAAG,CAAA;CAAC,WAC1G,OAAO,kBAAkB,EAAE,OAAO,oIA+D5C"}
+{"version":3,"file":"vatRoot.d.ts","sourceRoot":"","sources":["vatRoot.js"],"names":[],"mappings":"AAeA;;GAEG;AAEH;;;;GAIG;AACH,wCAJW,SAAS,GAAG;IAAE,aAAa,EAAE,CAAE,EAAC,GAAG,EAAC,EAAE;QAAC,GAAG,EAAE,GAAG,CAAA;KAAC,KAAM,IAAI,CAAA;CAAE,iBAC5D;IAAC,iBAAiB,EAAE,SAAS,CAAC;IAAC,UAAU,EAAE,UAAU,CAAC;IAAC,gBAAgB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAAC,WAAW,CAAC,EAAE,GAAG,CAAA;CAAC,WAC1G,OAAO,kBAAkB,EAAE,OAAO,oIA8D5C;gCApE4B,aAAa"}

package/src/contractFacet/vatRoot.js

@@ -11,12 +11,14 @@ import { Fail } from '@endo/errors';
 import { Far } from '@endo/marshal';
 import { E } from '@endo/far';
 
-import '../internal-types.js';
-
 import { makeZCFZygote } from './zcfZygote.js';
 
 /**
- * @param {VatPowers & { testJigSetter: TestJigSetter }} powers
+ * @import {ZoeService} from '@agoric/zoe';
+ */
+
+/**
+ * @param {VatPowers & { testJigSetter: ( {zcf}: {zcf: ZCF} ) => void }} powers
  * @param {{contractBundleCap: BundleCap, zoeService: ZoeService, invitationIssuer: Issuer<'set'>, privateArgs?: any}} vatParameters
  * @param {import('@agoric/vat-data').Baggage} baggage
  */
@@ -72,7 +74,6 @@ export async function buildRootObject(powers, vatParameters, baggage) {
       issuerStorageFromZoe,
       privateArgs = undefined,
     ) => {
-      /** @type {ZCFZygote} */
       return E(zcfZygote).startContract(
         zoeInstanceAdmin,
         instanceRecordFromZoe,

package/src/contractFacet/zcfMint.d.ts

@@ -1,8 +1,9 @@
-export function sumAmountKeywordRecord(amr: AmountKeywordRecord, issuerRecord: IssuerRecord): Amount;
+export function sumAmountKeywordRecord(amr: AmountKeywordRecord, issuerRecord: ZoeIssuerRecord): Amount;
 export function prepareZcMint(zcfBaggage: import("@agoric/vat-data").Baggage, recordIssuer: {
-    (keyword: string, issuerRecord: IssuerRecord): void;
+    (keyword: string, issuerRecord: ZoeIssuerRecord): void;
 }, 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>>;
+import type { ZCFMint } from '@agoric/zoe';
 //# 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,eAAe,GACb,MAAM,CAYlB;AASM,0CANI,OAAO,kBAAkB,EAAE,OAAO,gBAClC;IAAE,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,eAAe,GAAG,IAAI,CAAA;CAAE,uBAC1D,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,QAAQ,CAAC,CAAC,CAAC,CAWjC;6BA5IkC,aAAa"}

package/src/contractFacet/zcfMint.js

@@ -6,15 +6,15 @@ import { prepareExoClass } from '@agoric/vat-data';
 import { coerceAmountKeywordRecord } from '../cleanProposal.js';
 import { assertFullIssuerRecord, makeIssuerRecord } from '../issuerRecord.js';
 import { addToAllocation, subtractFromAllocation } from './allocationMath.js';
-
-import '../internal-types.js';
 import { ZcfMintI } from './typeGuards.js';
-import './internal-types.js';
-import './types-ambient.js';
+
+/**
+ * @import {ZCFMint, ZCFSeat} from '@agoric/zoe';
+ */
 
 /**
  * @param {AmountKeywordRecord} amr
- * @param {IssuerRecord} issuerRecord
+ * @param {ZoeIssuerRecord} issuerRecord
  * @returns {Amount}
  */
 export const sumAmountKeywordRecord = (amr, issuerRecord) => {
@@ -31,7 +31,7 @@ export const sumAmountKeywordRecord = (amr, issuerRecord) => {
 
 /**
  * @param {import('@agoric/vat-data').Baggage} zcfBaggage
- * @param {{ (keyword: string, issuerRecord: IssuerRecord): void }} recordIssuer
+ * @param {{ (keyword: string, issuerRecord: ZoeIssuerRecord): void }} recordIssuer
  * @param {GetAssetKindByBrand} getAssetKindByBrand
  * @param {(exit?: undefined) => { zcfSeat: any; userSeat: Promise<UserSeat> }} makeEmptySeatKit
  * @param {ZcfMintReallocator} reallocator
@@ -51,7 +51,7 @@ export const prepareZcMint = (
      * @template {AssetKind} [K=AssetKind]
      * @param {string} keyword
      * @param {ZoeMint<K>} zoeMint
-     * @param {Required<IssuerRecord<K>>} issuerRecord
+     * @param {Required<ZoeIssuerRecord<K>>} issuerRecord
      */
     (keyword, zoeMint, issuerRecord) => {
       const {
@@ -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 {WeakMapStore} from '@agoric/store';
+ * @import {TransferPart, ZCFSeat} from '@agoric/zoe';
+ */
+
 /**
  * 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

@@ -1,2 +1,10 @@
-export function makeZCFZygote(powers: VatPowers, zoeService: ERef<ZoeService>, invitationIssuer: Issuer<"set">, testJigSetter: TestJigSetter, contractBundleCap: BundleCap, zcfBaggage?: import("@agoric/vat-data").Baggage): Promise<ZCFZygote>;
+export function makeZCFZygote(powers: VatPowers, zoeService: ERef<ZoeService>, invitationIssuer: Issuer<"set">, testJigSetter: ({ zcf }: {
+    zcf: ZCF;
+}) => void, contractBundleCap: BundleCap, zcfBaggage?: import("@agoric/vat-data").Baggage): Promise<ZCFZygote>;
+export type ZCFZygote = {
+    startContract: (instanceAdminFromZoe: ERef<ZoeInstanceAdmin>, instanceRecordFromZoe: InstanceRecord, issuerStorageFromZoe: IssuerRecords, privateArgs?: object) => Promise<ExecuteContractResult>;
+    restartContract: (privateArgs?: object) => void;
+};
+import type { ZoeService } from '@agoric/zoe';
+import type { ZCF } from '@agoric/zoe';
 //# 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":"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":"AA6DO,sCARI,SAAS,cACT,IAAI,CAAC,UAAU,CAAC,oBAChB,MAAM,CAAC,KAAK,CAAC,iBACb,CAAE,EAAC,GAAG,EAAC,EAAE;IAAC,GAAG,EAAE,GAAG,CAAA;CAAC,KAAM,IAAI,qBAC7B,SAAS,eACT,OAAO,kBAAkB,EAAE,OAAO,GAChC,OAAO,CAAC,SAAS,CAAC,CAod9B;;mBAvea,CAAC,oBAAoB,EAAE,IAAI,CAAC,gBAAgB,CAAC,EACpD,qBAAqB,EAAE,cAAc,EACrC,oBAAoB,EAAE,aAAa,EACnC,WAAW,CAAC,EAAE,MAAM,KACnB,OAAO,CAAC,qBAAqB,CAAC;qBACxB,CAAC,WAAW,CAAC,EAAE,MAAM,KAAK,IAAI;;gCAV8D,aAAa;yBAAb,aAAa"}

package/src/contractFacet/zcfZygote.js

@@ -30,9 +30,21 @@ import { prepareZcMint } from './zcfMint.js';
 import { ZcfI } from './typeGuards.js';
 
 /// <reference path="../internal-types.js" />
-/// <reference path="./internal-types.js" />
 
-/** @import {IssuerOptionsRecord} from '@agoric/ertp' */
+/**
+ * @import {IssuerOptionsRecord} from '@agoric/ertp';
+ * @import {ContractMeta, ContractStartFn, SetTestJig, ZCF, ZCFMint, ZCFRegisterFeeMint, ZoeService} from '@agoric/zoe';
+ */
+
+/**
+ * @typedef ZCFZygote
+ * @property {(instanceAdminFromZoe: ERef<ZoeInstanceAdmin>,
+ *     instanceRecordFromZoe: InstanceRecord,
+ *     issuerStorageFromZoe: IssuerRecords,
+ *     privateArgs?: object,
+ * ) => Promise<ExecuteContractResult>} startContract
+ * @property {(privateArgs?: object) => void} restartContract
+ */
 
 /**
  * Make the ZCF vat in zygote-usable form. First, a generic ZCF is
@@ -42,7 +54,7 @@ import { ZcfI } from './typeGuards.js';
  * @param {VatPowers} powers
  * @param {ERef<ZoeService>} zoeService
  * @param {Issuer<'set'>} invitationIssuer
- * @param {TestJigSetter} testJigSetter
+ * @param {( {zcf}: {zcf: ZCF} ) => void} testJigSetter
  * @param {BundleCap} contractBundleCap
  * @param {import('@agoric/vat-data').Baggage} zcfBaggage
  * @returns {Promise<ZCFZygote>}
@@ -92,7 +104,7 @@ export const makeZCFZygote = async (
 
   /**
    * @param {string} keyword
-   * @param {IssuerRecord} issuerRecord
+   * @param {ZoeIssuerRecord} issuerRecord
    */
   const recordIssuer = (keyword, issuerRecord) => {
     getInstanceRecHolder().addIssuer(keyword, issuerRecord);
@@ -238,7 +250,7 @@ export const makeZCFZygote = async (
     } else {
       bundle = contractBundleCap;
     }
-    return evalContractBundle(bundle);
+    return /** @type {any} */ (evalContractBundle(bundle));
   };
   // evaluate the contract (either the first version, or an upgrade)
   const bundleResult = await evaluateContract();
@@ -283,7 +295,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 +499,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/atomicTransfer.d.ts

@@ -1,6 +1,12 @@
+/**
+ * @import {TransferPart, ZCF, ZCFSeat} from '@agoric/zoe';
+ */
 export const TransferPartShape: import("@endo/patterns").Matcher;
 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, toSeat?: ZCFSeat, fromAmounts?: AmountKeywordRecord, toAmounts?: AmountKeywordRecord): void;
+import type { ZCF } from '@agoric/zoe';
+import type { TransferPart } from '@agoric/zoe';
+import type { ZCFSeat } from '@agoric/zoe';
 //# 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,YAAY,EAAE,QAIxB;AAcM,mCAJI,OAAO,eACP,mBAAmB,GACjB,YAAY,CAGmB;AAcrC,+BAJI,OAAO,aACP,mBAAmB,GACjB,YAAY,CAG0B;AAW5C,oCANI,GAAG,aACH,OAAO,WACP,OAAO,gBACP,mBAAmB,cACnB,mBAAmB,QAQgD"}
+{"version":3,"file":"atomicTransfer.d.ts","sourceRoot":"","sources":["atomicTransfer.js"],"names":[],"mappings":"AAGA;;GAEG;AAEH,iEAGE;AAyCK,qCAHI,GAAG,aACH,YAAY,EAAE,QAIxB;AAcM,mCAJI,OAAO,eACP,mBAAmB,GACjB,YAAY,CAGmB;AAcrC,+BAJI,OAAO,aACP,mBAAmB,GACjB,YAAY,CAG0B;AAW5C,oCANI,GAAG,aACH,OAAO,WACP,OAAO,gBACP,mBAAmB,cACnB,mBAAmB,QAQgD;yBAhGjC,aAAa;kCAAb,aAAa;6BAAb,aAAa"}

package/src/contractSupport/atomicTransfer.js

@@ -1,6 +1,10 @@
 import { M } from '@agoric/store';
 import { AmountKeywordRecordShape, SeatShape } from '../typeGuards.js';
 
+/**
+ * @import {TransferPart, ZCF, ZCFSeat} from '@agoric/zoe';
+ */
+
 export const TransferPartShape = M.splitArray(
   harden([M.opt(SeatShape), M.opt(SeatShape), M.opt(AmountKeywordRecordShape)]),
   harden([M.opt(AmountKeywordRecordShape)]),

package/src/contractSupport/bondingCurves.js

@@ -2,7 +2,7 @@
 
 import { Nat } from '@endo/nat';
 import { Fail } from '@endo/errors';
-import { natSafeMath } from './safeMath.js';
+import { natSafeMath } from '@agoric/ertp/src/safeMath.js';
 
 const { subtract, add, multiply, floorDivide } = natSafeMath;
 

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/index.d.ts

@@ -1,5 +1,6 @@
-export { natSafeMath } from "./safeMath.js";
+export { natSafeMath } from "@agoric/ertp/src/safeMath.js";
 export { makeStateMachine } from "./stateMachine.js";
+export * from "@agoric/ertp/src/ratio.js";
 export * from "./durability.js";
 export * from "./prepare-ownable.js";
 export * from "./priceAuthority.js";
@@ -10,5 +11,4 @@ export * from "./topics.js";
 export { getInputPrice, getOutputPrice, calcLiqValueToMint, calcValueToRemove, calcSecondaryRequired } from "./bondingCurves.js";
 export { atomicRearrange, atomicTransfer, fromOnly, toOnly } from "./atomicTransfer.js";
 export { defaultAcceptanceMsg, swap, fitProposalShape, assertProposalShape, assertIssuerKeywords, satisfies, assertNatAssetKind, swapExact, depositToSeat, withdrawFromSeat, saveAllIssuers, offerTo } from "./zoeHelpers.js";
-export { makeRatio, makeRatioFromAmounts, floorMultiplyBy, floorDivideBy, ceilMultiplyBy, ceilDivideBy, assertIsRatio, invertRatio, oneMinus, addRatios, multiplyRatios, ratiosSame, quantize, ratioGTE, subtractRatios, ratioToNumber } from "./ratio.js";
 //# sourceMappingURL=index.d.ts.map

package/src/contractSupport/index.js

@@ -8,7 +8,7 @@ export {
   calcSecondaryRequired,
 } from './bondingCurves.js';
 
-export { natSafeMath } from './safeMath.js';
+export { natSafeMath } from '@agoric/ertp/src/safeMath.js';
 
 export { makeStateMachine } from './stateMachine.js';
 
@@ -34,24 +34,7 @@ export {
   offerTo,
 } from './zoeHelpers.js';
 
-export {
-  makeRatio,
-  makeRatioFromAmounts,
-  floorMultiplyBy,
-  floorDivideBy,
-  ceilMultiplyBy,
-  ceilDivideBy,
-  assertIsRatio,
-  invertRatio,
-  oneMinus,
-  addRatios,
-  multiplyRatios,
-  ratiosSame,
-  quantize,
-  ratioGTE,
-  subtractRatios,
-  ratioToNumber,
-} from './ratio.js';
+export * from '@agoric/ertp/src/ratio.js';
 
 export * from './durability.js';
 export * from './prepare-ownable.js';

package/src/contractSupport/priceAuthorityInitial.d.ts

@@ -1,4 +1,6 @@
 export function makeInitialTransform(priceOutPerIn: Ratio, priceAuthority: PriceAuthority, quoteMint: ERef<Mint<"set", PriceDescription>>, brandIn: Brand<"nat">, brandOut: Brand<"nat">): PriceAuthority;
 import type { PriceAuthority } from '@agoric/zoe/tools/types.js';
 import type { PriceDescription } from '@agoric/zoe/tools/types.js';
+import type { Mint } from '@agoric/ertp';
+import type { Brand } from '@agoric/ertp';
 //# sourceMappingURL=priceAuthorityInitial.d.ts.map