@agoric/zoe 0.26.3-dev-97f26d4.0 → 0.26.3-dev-d708d81.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/zoe",
-  "version": "0.26.3-dev-97f26d4.0+97f26d4",
+  "version": "0.26.3-dev-d708d81.0+d708d81",
   "description": "Zoe: the Smart Contract Framework for Offer Enforcement",
   "type": "module",
   "main": "./src/zoeService/zoe.js",
@@ -43,15 +43,15 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-97f26d4.0+97f26d4",
-    "@agoric/ertp": "0.16.3-dev-97f26d4.0+97f26d4",
-    "@agoric/internal": "0.3.3-dev-97f26d4.0+97f26d4",
-    "@agoric/notifier": "0.6.3-dev-97f26d4.0+97f26d4",
-    "@agoric/store": "0.9.3-dev-97f26d4.0+97f26d4",
-    "@agoric/swingset-liveslots": "0.10.3-dev-97f26d4.0+97f26d4",
-    "@agoric/swingset-vat": "0.32.3-dev-97f26d4.0+97f26d4",
-    "@agoric/time": "0.3.3-dev-97f26d4.0+97f26d4",
-    "@agoric/vat-data": "0.5.3-dev-97f26d4.0+97f26d4",
+    "@agoric/assert": "0.6.1-dev-d708d81.0+d708d81",
+    "@agoric/ertp": "0.16.3-dev-d708d81.0+d708d81",
+    "@agoric/internal": "0.3.3-dev-d708d81.0+d708d81",
+    "@agoric/notifier": "0.6.3-dev-d708d81.0+d708d81",
+    "@agoric/store": "0.9.3-dev-d708d81.0+d708d81",
+    "@agoric/swingset-liveslots": "0.10.3-dev-d708d81.0+d708d81",
+    "@agoric/swingset-vat": "0.32.3-dev-d708d81.0+d708d81",
+    "@agoric/time": "0.3.3-dev-d708d81.0+d708d81",
+    "@agoric/vat-data": "0.5.3-dev-d708d81.0+d708d81",
     "@endo/bundle-source": "^2.7.0",
     "@endo/captp": "^3.1.4",
     "@endo/eventual-send": "^0.17.5",
@@ -64,7 +64,7 @@
     "yargs-parser": "^21.1.1"
   },
   "devDependencies": {
-    "@agoric/kmarshal": "0.1.1-dev-97f26d4.0+97f26d4",
+    "@agoric/kmarshal": "0.1.1-dev-d708d81.0+d708d81",
     "@endo/init": "^0.5.59",
     "ava": "^5.3.0",
     "c8": "^7.13.0",
@@ -137,5 +137,5 @@
   "typeCoverage": {
     "atLeast": 81.5
   },
-  "gitHead": "97f26d4e149bd2665f96571edfdae04f1ffec22d"
+  "gitHead": "d708d81ab9cee46fe0c2dfa9555cbabd6f6f44f5"
 }

package/src/contractSupport/priceAuthorityQuoteMint.js

@@ -1,34 +1,22 @@
-import {
-  AssetKind,
-  makeDurableIssuerKit,
-  prepareIssuerKit,
-} from '@agoric/ertp';
-import { makeScalarBigMapStore } from '@agoric/vat-data';
+import { AssetKind, reallyPrepareIssuerKit } from '@agoric/ertp';
+import { provideDurableMapStore } from '@agoric/vat-data';
 
 /**
  *
  * @param {import('@agoric/vat-data').Baggage} baggage
+ * @returns {ERef<Mint<'set'>>}
  */
 export const provideQuoteMint = baggage => {
-  /** @type {ERef<Mint<'set'>>} */
-  let baggageQuoteMint;
-  if (baggage.has(`quoteMintIssuerBaggage`)) {
-    const issuerBaggage = baggage.get(`quoteMintIssuerBaggage`);
-    baggageQuoteMint = /** @type {Mint<'set'>} */ (
-      prepareIssuerKit(issuerBaggage).mint
-    );
-  } else {
-    const issuerBaggage = makeScalarBigMapStore(
-      `scaledPriceAuthority quoteMintIssuerBaggage`,
-      { durable: true },
-    );
-    baggage.init(`quoteMintIssuerBaggage`, issuerBaggage);
-    baggageQuoteMint = makeDurableIssuerKit(
-      issuerBaggage,
-      'quote',
-      AssetKind.SET,
-    ).mint;
-  }
-
-  return baggageQuoteMint;
+  const issuerBaggage = provideDurableMapStore(
+    baggage,
+    'quoteMintIssuerBaggage',
+  );
+  const issuerKit = reallyPrepareIssuerKit(
+    issuerBaggage,
+    'quote',
+    AssetKind.SET,
+    undefined,
+    undefined,
+  );
+  return issuerKit.mint;
 };

package/src/zoeService/feeMint.js

@@ -1,9 +1,9 @@
 import {
-  makeDurableIssuerKit,
   AssetKind,
-  prepareIssuerKit,
   IssuerShape,
   BrandShape,
+  reallyPrepareIssuerKit,
+  hasIssuer,
 } from '@agoric/ertp';
 import { initEmpty, M } from '@agoric/store';
 import {
@@ -13,8 +13,9 @@ import {
 } from '@agoric/vat-data';
 import { FeeMintAccessShape } from '../typeGuards.js';
 
-const { Fail } = assert;
+const { Fail, quote: q } = assert;
 
+/** @deprecated Redundant. Just omit it. */
 const FEE_MINT_KIT = 'FeeMintKit';
 
 export const defaultFeeIssuerConfig = harden(
@@ -32,19 +33,24 @@ export const defaultFeeIssuerConfig = harden(
  */
 const prepareFeeMint = (zoeBaggage, feeIssuerConfig, shutdownZoeVat) => {
   const mintBaggage = provideDurableMapStore(zoeBaggage, 'mintBaggage');
-  if (!mintBaggage.has(FEE_MINT_KIT)) {
-    /** @type {IssuerKit} */
-    const feeIssuerKit = makeDurableIssuerKit(
+  if (mintBaggage.has(FEE_MINT_KIT)) {
+    hasIssuer(mintBaggage) ||
+      Fail`Legacy ${q(
+        FEE_MINT_KIT,
+      )} must be redundant with normal storing of issuerKit in issuerBaggage`;
+    // Upgrade this legacy state by simply deleting it.
+    mintBaggage.delete(FEE_MINT_KIT);
+  }
+
+  const feeIssuerKit = /** @type {IssuerKit<'nat'>} */ (
+    reallyPrepareIssuerKit(
       mintBaggage,
       feeIssuerConfig.name,
       feeIssuerConfig.assetKind,
       feeIssuerConfig.displayInfo,
       shutdownZoeVat,
-    );
-    mintBaggage.init(FEE_MINT_KIT, feeIssuerKit);
-  } else {
-    prepareIssuerKit(mintBaggage, shutdownZoeVat);
-  }
+    )
+  );
 
   const FeeMintIKit = harden({
     feeMint: M.interface('FeeMint', {
@@ -66,13 +72,13 @@ const prepareFeeMint = (zoeBaggage, feeIssuerConfig, shutdownZoeVat) => {
           const { facets } = this;
           facets.feeMintAccess === allegedFeeMintAccess ||
             Fail`The object representing access to the fee brand mint was not provided`;
-          return mintBaggage.get(FEE_MINT_KIT);
+          return feeIssuerKit;
         },
         getFeeIssuer() {
-          return mintBaggage.get(FEE_MINT_KIT).issuer;
+          return feeIssuerKit.issuer;
         },
         getFeeBrand() {
-          return mintBaggage.get(FEE_MINT_KIT).brand;
+          return feeIssuerKit.brand;
         },
       },
       // feeMintAccess is an opaque durable object representing the right to get

package/src/zoeService/makeInvitation.js

@@ -1,13 +1,13 @@
 // @jessie-check
 
+import { Fail, q } from '@agoric/assert';
 import { provideDurableMapStore } from '@agoric/vat-data';
-import {
-  AssetKind,
-  makeDurableIssuerKit,
-  prepareIssuerKit,
-} from '@agoric/ertp';
+import { AssetKind, hasIssuer, reallyPrepareIssuerKit } from '@agoric/ertp';
 import { InvitationElementShape } from '../typeGuards.js';
 
+/**
+ * Not deprecated because the first use below is still correct.
+ */
 const ZOE_INVITATION_KIT = 'ZoeInvitationKit';
 
 /**
@@ -15,26 +15,27 @@ const ZOE_INVITATION_KIT = 'ZoeInvitationKit';
  * @param {ShutdownWithFailure | undefined} shutdownZoeVat
  */
 export const prepareInvitationKit = (baggage, shutdownZoeVat = undefined) => {
-  /** @type {IssuerKit<'set'> | undefined} */
-  let invitationKit;
-
   const invitationKitBaggage = provideDurableMapStore(
     baggage,
     ZOE_INVITATION_KIT,
   );
-  if (!invitationKitBaggage.has(ZOE_INVITATION_KIT)) {
-    invitationKit = makeDurableIssuerKit(
-      invitationKitBaggage,
-      'Zoe Invitation',
-      AssetKind.SET,
-      undefined,
-      shutdownZoeVat,
-      { elementShape: InvitationElementShape },
-    );
-    invitationKitBaggage.init(ZOE_INVITATION_KIT, invitationKit);
-  } else {
-    invitationKit = prepareIssuerKit(invitationKitBaggage);
+  if (invitationKitBaggage.has(ZOE_INVITATION_KIT)) {
+    // This legacy second use of ZOE_INVITATION_KIT is unneeded.
+    hasIssuer(invitationKitBaggage) ||
+      Fail`Legacy use of ${q(
+        ZOE_INVITATION_KIT,
+      )} must be redundant with normal storing of issuerKit in issuerBaggage`;
+    // Upgrade this legacy state by simply deleting it.
+    invitationKitBaggage.delete(ZOE_INVITATION_KIT);
   }
+  const invitationKit = reallyPrepareIssuerKit(
+    invitationKitBaggage,
+    'Zoe Invitation',
+    AssetKind.SET,
+    undefined,
+    shutdownZoeVat,
+    { elementShape: InvitationElementShape },
+  );
 
   return harden({
     invitationIssuer: invitationKit.issuer,

package/src/zoeService/zoeStorageManager.js

@@ -3,7 +3,7 @@ import {
   AssetKind,
   makeDurableIssuerKit,
   AmountMath,
-  prepareIssuerKit,
+  upgradeIssuerKit,
 } from '@agoric/ertp';
 import {
   makeScalarBigMapStore,
@@ -122,7 +122,7 @@ export const makeZoeStorageManager = (
     'zoeMintBaggageSet',
   );
   for (const issuerBaggage of zoeMintBaggageSet.values()) {
-    prepareIssuerKit(issuerBaggage);
+    upgradeIssuerKit(issuerBaggage);
   }
 
   const makeZoeMint = prepareExoClass(