@agoric/zoe 0.26.3-dev-5eb596e.0 → 0.26.3-dev-e6e23eb.0

package/src/contracts/barterExchange.js

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

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

@@ -1 +1 @@
-{"version":3,"file":"fundedCallSpread.d.ts","sourceRoot":"","sources":["fundedCallSpread.js"],"names":[],"mappings":"AAcA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AAEH;;;;;;;;;GASG;AACH;kBARiB,MAAM;kBACN,MAAM;sBACF,MAAM;oBACR,cAAc;gBAClB,MAAM;sBACA,MAAM;;;GA+E1B"}
+{"version":3,"file":"fundedCallSpread.d.ts","sourceRoot":"","sources":["fundedCallSpread.js"],"names":[],"mappings":"AAaA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AAEH;;;;;;;;;GASG;AACH;kBARiB,MAAM;kBACN,MAAM;sBACF,MAAM;oBACR,cAAc;gBAClB,MAAM;sBACA,MAAM;;;GA8E1B"}

package/src/contracts/callSpread/fundedCallSpread.js

@@ -7,7 +7,6 @@ import {
   assertProposalShape,
   depositToSeat,
   assertNatAssetKind,
-  atomicRearrange,
 } from '../../contractSupport/index.js';
 import { makePayoffHandler } from './payoffHandler.js';
 import { Position } from './position.js';
@@ -112,8 +111,7 @@ const start = async zcf => {
         give: { Collateral: null },
         want: { LongOption: null, ShortOption: null },
       });
-      atomicRearrange(
-        zcf,
+      zcf.atomicRearrange(
         harden([
           [creatorSeat, collateralSeat, { Collateral: settlementAmount }],
           [

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

@@ -1 +1 @@
-{"version":3,"file":"pricedCallSpread.d.ts","sourceRoot":"","sources":["pricedCallSpread.js"],"names":[],"mappings":"AAsBA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4CG;AACH;kBARiB,OAAO,KAAK,CAAC;kBACb,OAAO,KAAK,CAAC;sBACT,OAAO,KAAK,CAAC;oBACf,cAAc;gBAClB,MAAM;sBACA,OAAO,KAAK,CAAC;;;;;;;;;;;;;EA2GjC"}
+{"version":3,"file":"pricedCallSpread.d.ts","sourceRoot":"","sources":["pricedCallSpread.js"],"names":[],"mappings":"AAqBA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4CG;AACH;kBARiB,OAAO,KAAK,CAAC;kBACb,OAAO,KAAK,CAAC;sBACT,OAAO,KAAK,CAAC;oBACf,cAAc;gBAClB,MAAM;sBACA,OAAO,KAAK,CAAC;;;;;;;;;;;;;EA0GjC"}

package/src/contracts/callSpread/pricedCallSpread.js

@@ -10,7 +10,6 @@ import {
   assertNatAssetKind,
   makeRatio,
   ceilMultiplyBy,
-  atomicRearrange,
 } from '../../contractSupport/index.js';
 import { makePayoffHandler } from './payoffHandler.js';
 import { Position } from './position.js';
@@ -132,8 +131,7 @@ const start = zcf => {
         'wanted option not a match',
       );
 
-      atomicRearrange(
-        zcf,
+      zcf.atomicRearrange(
         harden([
           [collateralSeat, depositSeat, spreadAmount],
           [depositSeat, collateralSeat, { Collateral: newCollateral }],

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

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

package/src/contracts/loan/borrow.js

@@ -9,7 +9,6 @@ import {
   getAmountOut,
   ceilMultiplyBy,
   getTimestamp,
-  atomicRearrange,
 } from '../../contractSupport/index.js';
 
 import { scheduleLiquidation } from './scheduleLiquidation.js';
@@ -72,8 +71,7 @@ export const makeBorrowInvitation = (zcf, config) => {
 
     const { zcfSeat: collateralSeat } = zcf.makeEmptySeatKit();
 
-    atomicRearrange(
-      zcf,
+    zcf.atomicRearrange(
       harden([
         // Transfer the wanted Loan amount to the borrower
         [lenderSeat, borrowerSeat, { Loan: loanWanted }],

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

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

package/src/contracts/loan/close.js

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

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

@@ -1 +1 @@
-{"version":3,"file":"sellItems.d.ts","sourceRoot":"","sources":["sellItems.js"],"names":[],"mappings":"AAkBA;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH;kBAF8B,OAAO,KAAK,CAAC;;;;;EAwH1C"}
+{"version":3,"file":"sellItems.d.ts","sourceRoot":"","sources":["sellItems.js"],"names":[],"mappings":"AAiBA;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH;kBAF8B,OAAO,KAAK,CAAC;;;;;EAuH1C"}

package/src/contracts/sellItems.js

@@ -11,7 +11,6 @@ import {
   defaultAcceptanceMsg,
   assertProposalShape,
   assertNatAssetKind,
-  atomicRearrange,
 } from '../contractSupport/index.js';
 
 const { Fail } = assert;
@@ -107,8 +106,7 @@ const start = zcf => {
       Fail`More money (${totalCost}) is required to buy these items`;
 
     // Reallocate.
-    atomicRearrange(
-      zcf,
+    zcf.atomicRearrange(
       harden([
         [buyerSeat, sellerSeat, { Money: providedMoney }],
         [sellerSeat, buyerSeat, { Items: wantedItems }],

package/src/zoeService/startInstance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"startInstance.d.ts","sourceRoot":"","sources":["startInstance.js"],"names":[],"mappings":"AA0BO,uDANI,KAAK,iBAAiB,EAAE,+BAA+B,GAAG,oBAAoB,CAAC,oBAC/E,MAAM,KAAK,SAAS,CAAC,4BAChB,MAAM,KAAK,SAAS,0CAEvB,OAAO,SAAS,EAAE,aAAa,CAmU3C;sBA7Ua,OAAO,kBAAkB,EAAE,OAAO;wBACjC,OAAO,sBAAsB,EAAE,SAAS"}
+{"version":3,"file":"startInstance.d.ts","sourceRoot":"","sources":["startInstance.js"],"names":[],"mappings":"AA0BO,uDANI,KAAK,iBAAiB,EAAE,+BAA+B,GAAG,oBAAoB,CAAC,oBAC/E,MAAM,KAAK,SAAS,CAAC,4BAChB,MAAM,KAAK,SAAS,0CAEvB,OAAO,SAAS,EAAE,aAAa,CAiU3C;sBA3Ua,OAAO,kBAAkB,EAAE,OAAO;wBACjC,OAAO,sBAAsB,EAAE,SAAS"}

package/src/zoeService/startInstance.js

@@ -43,6 +43,12 @@ export const makeStartInstance = (
     seatHandleToZoeSeatAdmin,
   );
 
+  const getFreshZcfBundleCap = async () => {
+    const settledBundleCap = await getZcfBundleCapP();
+    settledBundleCap !== undefined || Fail`the ZCF bundle cap was broken`;
+    return settledBundleCap;
+  };
+
   const InstanceAdminStateShape = harden({
     instanceStorage: M.remotable('ZoeInstanceStorageManager'),
     instanceAdmin: M.remotable('InstanceAdmin'),
@@ -178,12 +184,10 @@ export const makeStartInstance = (
     /**
      *
      * @param {import('@agoric/swingset-vat').VatAdminFacet} adminNode
-     * @param {*} zcfBundleCap
      * @param {*} contractBundleCap
      */
-    (adminNode, zcfBundleCap, contractBundleCap) => ({
+    (adminNode, contractBundleCap) => ({
       adminNode,
-      zcfBundleCap,
       contractBundleCap,
     }),
     {
@@ -200,12 +204,13 @@ export const makeStartInstance = (
           privateArgs: newPrivateArgs,
         };
 
-        return E(state.adminNode).upgrade(state.zcfBundleCap, {
-          vatParameters,
-        });
+        return E.when(getFreshZcfBundleCap(), bCap =>
+          E(state.adminNode).upgrade(bCap, { vatParameters }),
+        );
       },
       async upgradeContract(contractBundleId, newPrivateArgs = undefined) {
         const { state } = this;
+
         const newContractBundleCap = await getBundleCapByIdNow(
           contractBundleId,
         );
@@ -213,9 +218,9 @@ export const makeStartInstance = (
           contractBundleCap: newContractBundleCap,
           privateArgs: newPrivateArgs,
         };
-        return E(state.adminNode).upgrade(state.zcfBundleCap, {
-          vatParameters,
-        });
+        return E.when(getFreshZcfBundleCap(), bCap =>
+          E(state.adminNode).upgrade(bCap, { vatParameters }),
+        );
       },
     },
   );
@@ -306,9 +311,6 @@ export const makeStartInstance = (
 
     instanceAdmin.initDelayedState(handleOfferObj, publicFacet);
 
-    const settledBundleCap = await getZcfBundleCapP();
-    settledBundleCap !== undefined || Fail`the bundle cap was broken`;
-
     // creatorInvitation can be undefined, but if it is defined,
     // let's make sure it is an invitation.
     return E.when(
@@ -324,11 +326,7 @@ export const makeStartInstance = (
           isLiveResult ||
           Fail`The contract did not correctly return a creatorInvitation`;
 
-        const adminFacet = makeAdminFacet(
-          adminNode,
-          harden(settledBundleCap),
-          contractBundleCap,
-        );
+        const adminFacet = makeAdminFacet(adminNode, contractBundleCap);
 
         // Actually returned to the user.
         return harden({

package/src/zoeService/zoe.d.ts

@@ -1,7 +1,7 @@
 export type Baggage = import('@agoric/vat-data').Baggage;
 export type ZoeKit = ReturnType<typeof makeDurableZoeKit>;
 /**
- * Create an durable instance of Zoe.
+ * Create a durable instance of Zoe.
  *
  * @param {object} options
  * @param {Baggage} options.zoeBaggage - the baggage for Zoe durability. Must be provided by caller
@@ -22,6 +22,11 @@ export function makeDurableZoeKit({ zoeBaggage, vatAdminSvc, shutdownZoeVat, fee
     zcfSpec?: ZCFSpec | undefined;
 }): {
     zoeService: ZoeService;
+    zoeConfigFacet: {
+        updateZcfBundleId(bundleId: any): void;
+    } & import("@endo/eventual-send").RemotableBrand<{}, {
+        updateZcfBundleId(bundleId: any): void;
+    }>;
     /** @type {FeeMintAccess} */
     feeMintAccess: FeeMintAccess;
     setVatAdminService: ((lateVatAdminSvc: any) => void) & import("@endo/eventual-send").RemotableBrand<{}, (lateVatAdminSvc: any) => void>;
@@ -44,6 +49,11 @@ export function makeDurableZoeKit({ zoeBaggage, vatAdminSvc, shutdownZoeVat, fee
  */
 export function makeZoeKit(vatAdminSvc?: import("@agoric/swingset-vat").VatAdminSvc | Promise<import("@agoric/swingset-vat").VatAdminSvc> | undefined, shutdownZoeVat?: import("@agoric/swingset-vat").ShutdownWithFailure | undefined, feeIssuerConfig?: FeeIssuerConfig | undefined, zcfSpec?: ZCFSpec | undefined): {
     zoeService: ZoeService;
+    zoeConfigFacet: {
+        updateZcfBundleId(bundleId: any): void;
+    } & import("@endo/eventual-send").RemotableBrand<{}, {
+        updateZcfBundleId(bundleId: any): void;
+    }>;
     /** @type {FeeMintAccess} */
     feeMintAccess: FeeMintAccess;
     setVatAdminService: ((lateVatAdminSvc: any) => void) & import("@endo/eventual-send").RemotableBrand<{}, (lateVatAdminSvc: any) => void>;

package/src/zoeService/zoe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zoe.d.ts","sourceRoot":"","sources":["zoe.js"],"names":[],"mappings":"sBA6Bc,OAAO,kBAAkB,EAAE,OAAO;qBAwOnC,WAAW,wBAAwB,CAAC;AApOjD;;;;;;;;;;;;;GAaG;AACH;IAV4B,UAAU,EAA3B,OAAO;IACsC,WAAW;IAG1B,cAAc;IAGlB,eAAe;IACvB,OAAO;;;IAoLhC,4BAA4B;mBAAjB,aAAa;;EAK3B;AAED;;;;;;;;;;;;;;;GAeG;AACH;;IAvBI,4BAA4B;mBAAjB,aAAa;;EA8BxB"}
+{"version":3,"file":"zoe.d.ts","sourceRoot":"","sources":["zoe.js"],"names":[],"mappings":"sBA8Bc,OAAO,kBAAkB,EAAE,OAAO;qBA6PnC,WAAW,wBAAwB,CAAC;AAzPjD;;;;;;;;;;;;;GAaG;AACH;IAV4B,UAAU,EAA3B,OAAO;IACsC,WAAW;IAG1B,cAAc;IAGlB,eAAe;IACvB,OAAO;;;;;;;;IAyMhC,4BAA4B;mBAAjB,aAAa;;EAK3B;AAED;;;;;;;;;;;;;;;GAeG;AACH;;;;;;;IAvBI,4BAA4B;mBAAjB,aAAa;;EA8BxB"}

package/src/zoeService/zoe.js

@@ -18,6 +18,7 @@ import '../internal-types.js';
 import { E } from '@endo/eventual-send';
 import { Far } from '@endo/marshal';
 import { makeScalarBigMapStore, prepareExo } from '@agoric/vat-data';
+import { M } from '@agoric/store';
 
 import { makeZoeStorageManager } from './zoeStorageManager.js';
 import { makeStartInstance } from './startInstance.js';
@@ -32,7 +33,7 @@ import { ZoeServiceI } from '../typeGuards.js';
 const { Fail } = assert;
 
 /**
- * Create an durable instance of Zoe.
+ * Create a durable instance of Zoe.
  *
  * @param {object} options
  * @param {Baggage} options.zoeBaggage - the baggage for Zoe durability. Must be provided by caller
@@ -52,6 +53,7 @@ const makeDurableZoeKit = ({
   feeIssuerConfig = defaultFeeIssuerConfig,
   zcfSpec = { name: 'zcf' },
 }) => {
+  /** @type {BundleCap} */
   let zcfBundleCap;
 
   const saveBundleCap = () => {
@@ -168,6 +170,25 @@ const makeDurableZoeKit = ({
     });
   };
 
+  const ZoeConfigI = M.interface('ZoeConfigFacet', {
+    updateZcfBundleId: M.call(M.string()).returns(),
+  });
+
+  const zoeConfigFacet = prepareExo(zoeBaggage, 'ZoeConfigFacet', ZoeConfigI, {
+    updateZcfBundleId(bundleId) {
+      E.when(
+        getZcfBundleCap({ id: bundleId }, vatAdminSvc),
+        bundleCap => {
+          zcfBundleCap = bundleCap;
+        },
+        e => {
+          console.error(`'🚨 unable to update ZCF Bundle: `, e);
+          throw e;
+        },
+      );
+    },
+  });
+
   /** @type {ZoeService} */
   const zoeService = prepareExo(zoeBaggage, 'ZoeService', ZoeServiceI, {
     install(bundleId, bundleLabel) {
@@ -223,6 +244,7 @@ const makeDurableZoeKit = ({
 
   return harden({
     zoeService,
+    zoeConfigFacet,
     /** @type {FeeMintAccess} */
     // @ts-expect-error cast
     feeMintAccess: feeMintKit.feeMintAccess,

package/src/zoeService/zoeStorageManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zoeStorageManager.d.ts","sourceRoot":"","sources":["zoeStorageManager.js"],"names":[],"mappings":"AAmDO,oDAXI,YAAY,qBAEZ,iBAAiB,kBACjB,mBAAmB,WACnB;IACV,eAAoB,EAAE,eAAe,CAAC;IACtC,YAAiB,EAAE,MAAM,MAAM,CAAC;IAChC,WAAgB,EAAE,MAAM,KAAK,CAAC;CAC3B;;;;;;;;;;;;;;;;;;;;;;;QA+ZI,iCAAiC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAAjC,iCAAiC;;;;;;;;;;;GAYxC;sBAjca,OAAO,kBAAkB,EAAE,OAAO"}
+{"version":3,"file":"zoeStorageManager.d.ts","sourceRoot":"","sources":["zoeStorageManager.js"],"names":[],"mappings":"AAwDO,oDAXI,YAAY,qBAEZ,iBAAiB,kBACjB,mBAAmB,WACnB;IACV,eAAoB,EAAE,eAAe,CAAC;IACtC,YAAiB,EAAE,MAAM,MAAM,CAAC;IAChC,WAAgB,EAAE,MAAM,KAAK,CAAC;CAC3B;;;;;;;;;;;;;;;;;;;;;;;QA+ZI,iCAAiC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAAjC,iCAAiC;;;;;;;;;;;GAYxC;sBAjca,OAAO,kBAAkB,EAAE,OAAO"}

package/src/zoeService/zoeStorageManager.js

@@ -1,5 +1,10 @@
 import { E } from '@endo/far';
-import { AssetKind, makeDurableIssuerKit, AmountMath } from '@agoric/ertp';
+import {
+  AssetKind,
+  makeDurableIssuerKit,
+  AmountMath,
+  prepareIssuerKit,
+} from '@agoric/ertp';
 import {
   makeScalarBigMapStore,
   provideDurableWeakMapStore,
@@ -117,7 +122,7 @@ export const makeZoeStorageManager = (
     'zoeMintBaggageSet',
   );
   for (const issuerBaggage of zoeMintBaggageSet.values()) {
-    zoeMintBaggageSet(issuerBaggage);
+    prepareIssuerKit(issuerBaggage);
   }
 
   const makeZoeMint = prepareExoClass(

package/tools/setup-zoe.d.ts

@@ -1,5 +1,10 @@
 export function makeZoeKitForTest(vatAdminSvc?: import("@agoric/swingset-vat").VatAdminSvc | undefined): {
     zoeService: ZoeService;
+    zoeConfigFacet: {
+        updateZcfBundleId(bundleId: any): void;
+    } & import("@endo/eventual-send").RemotableBrand<{}, {
+        updateZcfBundleId(bundleId: any): void;
+    }>;
     feeMintAccess: FeeMintAccess;
     setVatAdminService: ((lateVatAdminSvc: any) => void) & import("@endo/eventual-send").RemotableBrand<{}, (lateVatAdminSvc: any) => void>;
 };

package/tools/setup-zoe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup-zoe.d.ts","sourceRoot":"","sources":["setup-zoe.js"],"names":[],"mappings":"AASO;;;;EAKN;AAKM,iHACoC;AAYpC;IAL+B,MAAM,gBAArB,IAAI;IACU,eAAe;IACnB,WAAW;IACf,aAAa;;;;;;;;;;;;;;;;;;GA+BzC"}
+{"version":3,"file":"setup-zoe.d.ts","sourceRoot":"","sources":["setup-zoe.js"],"names":[],"mappings":"AASO;;;;;;;;;EAKN;AAKM,iHACoC;AAYpC;IAL+B,MAAM,gBAArB,IAAI;IACU,eAAe;IACnB,WAAW;IACf,aAAa;;;;;;;;;;;;;;;;;;GA+BzC"}