@agoric/inter-protocol 0.13.2-dev-2f08018.0 → 0.13.2-dev-8cbf697.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/inter-protocol",
-  "version": "0.13.2-dev-2f08018.0+2f08018",
+  "version": "0.13.2-dev-8cbf697.0+8cbf697",
   "description": "Core cryptoeconomy contracts",
   "type": "module",
   "main": "src/index.js",
@@ -29,18 +29,18 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "0.5.2-dev-2f08018.0+2f08018",
-    "@agoric/ertp": "0.15.4-dev-2f08018.0+2f08018",
-    "@agoric/governance": "0.9.2-dev-2f08018.0+2f08018",
-    "@agoric/internal": "0.2.2-dev-2f08018.0+2f08018",
-    "@agoric/notifier": "0.5.2-dev-2f08018.0+2f08018",
-    "@agoric/store": "0.8.4-dev-2f08018.0+2f08018",
-    "@agoric/swingset-liveslots": "0.9.1-dev-2f08018.0+2f08018",
-    "@agoric/swingset-vat": "0.30.3-dev-2f08018.0+2f08018",
-    "@agoric/time": "0.2.2-dev-2f08018.0+2f08018",
-    "@agoric/vat-data": "0.4.4-dev-2f08018.0+2f08018",
-    "@agoric/vats": "0.13.1-dev-2f08018.0+2f08018",
-    "@agoric/zoe": "0.25.4-dev-2f08018.0+2f08018",
+    "@agoric/assert": "0.5.2-dev-8cbf697.0+8cbf697",
+    "@agoric/ertp": "0.15.4-dev-8cbf697.0+8cbf697",
+    "@agoric/governance": "0.9.2-dev-8cbf697.0+8cbf697",
+    "@agoric/internal": "0.2.2-dev-8cbf697.0+8cbf697",
+    "@agoric/notifier": "0.5.2-dev-8cbf697.0+8cbf697",
+    "@agoric/store": "0.8.4-dev-8cbf697.0+8cbf697",
+    "@agoric/swingset-liveslots": "0.9.1-dev-8cbf697.0+8cbf697",
+    "@agoric/swingset-vat": "0.30.3-dev-8cbf697.0+8cbf697",
+    "@agoric/time": "0.2.2-dev-8cbf697.0+8cbf697",
+    "@agoric/vat-data": "0.4.4-dev-8cbf697.0+8cbf697",
+    "@agoric/vats": "0.13.1-dev-8cbf697.0+8cbf697",
+    "@agoric/zoe": "0.25.4-dev-8cbf697.0+8cbf697",
     "@endo/bundle-source": "^2.4.2",
     "@endo/captp": "^2.0.18",
     "@endo/eventual-send": "^0.16.8",
@@ -50,8 +50,8 @@
     "@endo/promise-kit": "^0.2.52"
   },
   "devDependencies": {
-    "@agoric/deploy-script-support": "0.9.5-dev-2f08018.0+2f08018",
-    "@agoric/smart-wallet": "0.4.3-dev-2f08018.0+2f08018",
+    "@agoric/deploy-script-support": "0.9.5-dev-8cbf697.0+8cbf697",
+    "@agoric/smart-wallet": "0.4.3-dev-8cbf697.0+8cbf697",
     "@endo/init": "^0.5.52",
     "@fast-check/ava": "^1.1.3",
     "ava": "^5.1.0",
@@ -78,5 +78,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2f0801825db82c1a391ca38578c9cc6cbc790bb4"
+  "gitHead": "8cbf6974a8c1e189589620fef4b682b1c3e134b2"
 }

package/src/vaultFactory/vault.js

@@ -89,6 +89,7 @@ const validTransitions = {
  * @property {() => Subscriber<import('./vaultManager').AssetState>} getAssetSubscriber
  * @property {(collateralAmount: Amount) => ERef<Amount<'nat'>>} maxDebtFor
  * @property {() => Brand} getCollateralBrand
+ * @property {(base: string) => string} scopeDescription
  * @property {() => Brand<'nat'>} getDebtBrand
  * @property {MintAndReallocate} mintAndReallocate
  * @property {(amount: Amount, seat: ZCFSeat) => void} burnAndRecord
@@ -796,22 +797,22 @@ export const prepareVault = (baggage, marshaller, zcf) => {
         },
 
         makeAdjustBalancesInvitation() {
-          const { facets } = this;
+          const { state, facets } = this;
           const { helper } = facets;
           helper.assertActive();
           return zcf.makeInvitation(
             seat => helper.adjustBalancesHook(seat),
-            'AdjustBalances',
+            state.manager.scopeDescription('AdjustBalances'),
           );
         },
 
         makeCloseInvitation() {
-          const { facets } = this;
+          const { state, facets } = this;
           const { helper } = facets;
           helper.assertCloseable();
           return zcf.makeInvitation(
             seat => helper.closeHook(seat),
-            'CloseVault',
+            state.manager.scopeDescription('CloseVault'),
           );
         },
 
@@ -840,7 +841,7 @@ export const prepareVault = (baggage, marshaller, zcf) => {
           };
           return zcf.makeInvitation(
             seat => helper.makeTransferInvitationHook(seat),
-            'TransferVault',
+            state.manager.scopeDescription('TransferVault'),
             transferState,
           );
         },

package/src/vaultFactory/vaultDirector.js

@@ -6,7 +6,6 @@ import { E } from '@endo/eventual-send';
 
 import { keyEQ, M, makeScalarMapStore, mustMatch } from '@agoric/store';
 import {
-  assertProposalShape,
   getAmountIn,
   getAmountOut,
   provideChildBaggage,
@@ -98,6 +97,7 @@ export const prepareVaultDirector = (
   const mintSeat = provideEmptySeat(zcf, baggage, 'mintSeat');
   const rewardPoolSeat = provideEmptySeat(zcf, baggage, 'rewardPoolSeat');
 
+  /** @type {MapStore<Brand, VaultManager>} */
   const collateralTypes = provideDurableMapStore(baggage, 'collateralTypes');
 
   // Non-durable map because param managers aren't durable.
@@ -215,6 +215,7 @@ export const prepareVaultDirector = (
         getLimitedCreatorFacet: M.call().returns(M.remotable()),
         getGovernedApis: M.call().returns(M.record()),
         getGovernedApiNames: M.call().returns(M.record()),
+        setOfferFilter: M.call(M.arrayOf(M.string())).returns(M.promise()),
       }),
       machine: M.interface('machine', {
         addVaultType: M.call(IssuerShape, M.string(), M.record()).returns(
@@ -229,7 +230,6 @@ export const prepareVaultDirector = (
         getCollateralManager: M.call(BrandShape).returns(M.remotable()),
         getCollaterals: M.call().returns(M.promise()),
         getMetrics: M.call().returns(SubscriberShape),
-        makeVaultInvitation: M.call().returns(M.promise()),
         getRunIssuer: M.call().returns(IssuerShape),
         getSubscription: M.call({ collateralBrand: BrandShape }).returns(
           SubscriberShape,
@@ -274,6 +274,7 @@ export const prepareVaultDirector = (
         getGovernedApiNames() {
           return harden({});
         },
+        setOfferFilter: strings => zcf.setOfferFilter(strings),
       },
       machine: {
         // TODO move this under governance #3924
@@ -301,10 +302,10 @@ export const prepareVaultDirector = (
           !collateralTypes.has(collateralBrand) ||
             Fail`Collateral brand ${q(collateralBrand)} has already been added`;
 
+          // counter to be incremented at end of addVaultType
+          const managerId = `manager${state.managerCounter}`;
           const managerStorageNode =
-            storageNode &&
-            E(storageNode).makeChildNode(`manager${state.managerCounter}`);
-          state.managerCounter += 1;
+            storageNode && E(storageNode).makeChildNode(managerId);
 
           /** a powerful object; can modify parameters */
           const vaultParamManager = makeVaultParamManager(
@@ -397,13 +398,16 @@ export const prepareVaultDirector = (
             brandName,
             prepareVaultManagerKit,
             zcf,
-            debtMint,
-            collateralBrand,
-            collateralUnit,
-            factoryPowers,
-            startTimeStamp,
-            managerStorageNode,
             marshaller,
+            {
+              debtMint,
+              collateralBrand,
+              collateralUnit,
+              descriptionScope: managerId,
+              factoryPowers,
+              startTimeStamp,
+              storageNode: managerStorageNode,
+            },
           );
 
           const { self: vm } = makeVaultManager();
@@ -412,6 +416,7 @@ export const prepareVaultDirector = (
           await vm.setupLiquidator(install, terms);
           watchGovernance(vm, install, terms);
           facets.machine.updateMetrics();
+          state.managerCounter += 1;
           return vm;
         },
         makeCollectFeesInvitation() {
@@ -472,40 +477,6 @@ export const prepareVaultDirector = (
         getMetrics() {
           return metricsSubscriber;
         },
-        /**
-         * @deprecated use getCollateralManager and then makeVaultInvitation instead
-         *
-         * Make a vault in the vaultManager based on the collateral type.
-         */
-        makeVaultInvitation() {
-          /** @param {ZCFSeat} seat */
-          const makeVaultHook = async seat => {
-            assertProposalShape(seat, {
-              give: { Collateral: null },
-              want: { Minted: null },
-            });
-            const {
-              give: { Collateral: collateralAmount },
-              want: { Minted: requestedAmount },
-            } = seat.getProposal();
-            const { brand: brandIn } = collateralAmount;
-            collateralTypes.has(brandIn) ||
-              Fail`Not a supported collateral type ${brandIn}`;
-
-            AmountMath.isGTE(
-              requestedAmount,
-              directorParamManager.getMinInitialDebt(),
-            ) ||
-              Fail`The request must be for at least ${
-                directorParamManager.getMinInitialDebt().value
-              }. ${requestedAmount.value} is too small`;
-
-            /** @type {VaultManager} */
-            const mgr = collateralTypes.get(brandIn);
-            return mgr.makeVaultKit(seat);
-          };
-          return zcf.makeInvitation(makeVaultHook, 'MakeVault');
-        },
         getRunIssuer() {
           return debtMint.getIssuerRecord().issuer;
         },

package/src/vaultFactory/vaultManager.js

@@ -127,24 +127,30 @@ const trace = makeTracer('VM', false);
  *
  * @param {import('@agoric/ertp').Baggage} baggage
  * @param {import('./vaultFactory.js').VaultFactoryZCF} zcf
- * @param {ZCFMint<'nat'>} debtMint
- * @param {Brand<'nat'>} collateralBrand
- * @param {Amount<'nat'>} collateralUnit
- * @param {import('./vaultDirector.js').FactoryPowersFacet} factoryPowers
- * @param {Timestamp} startTimeStamp
- * @param {ERef<StorageNode>} storageNode
  * @param {ERef<Marshaller>} marshaller
+ * @param {Readonly<{
+ * debtMint: ZCFMint<'nat'>,
+ * collateralBrand: Brand<'nat'>,
+ * collateralUnit: Amount<'nat'>,
+ * factoryPowers: import('./vaultDirector.js').FactoryPowersFacet,
+ * descriptionScope: string,
+ * startTimeStamp: Timestamp,
+ * storageNode: ERef<StorageNode>,
+ * }>} unique per singleton
  */
 export const prepareVaultManagerKit = (
   baggage,
   zcf,
-  debtMint,
-  collateralBrand,
-  collateralUnit,
-  factoryPowers,
-  startTimeStamp,
-  storageNode,
   marshaller,
+  {
+    debtMint,
+    collateralBrand,
+    collateralUnit,
+    descriptionScope,
+    factoryPowers,
+    startTimeStamp,
+    storageNode,
+  },
 ) => {
   assert(
     storageNode && marshaller,
@@ -276,6 +282,7 @@ export const prepareVaultManagerKit = (
         getCollateralBrand: M.call().returns(BrandShape),
         getDebtBrand: M.call().returns(BrandShape),
         getCompoundedInterest: M.call().returns(RatioShape),
+        scopeDescription: M.call(M.string()).returns(M.string()),
         handleBalanceChange: M.call(
           AmountShape,
           AmountShape,
@@ -299,9 +306,10 @@ export const prepareVaultManagerKit = (
     {
       collateral: {
         makeVaultInvitation() {
+          const { facets } = this;
           return zcf.makeInvitation(
             seat => this.facets.self.makeVaultKit(seat),
-            'MakeVault',
+            facets.manager.scopeDescription('MakeVault'),
           );
         },
         /** @deprecated use getPublicTopics */
@@ -688,6 +696,14 @@ export const prepareVaultManagerKit = (
         getDebtBrand() {
           return debtBrand;
         },
+        /**
+         * Prepend with an identifier of this vault manager
+         *
+         * @param {string} base
+         */
+        scopeDescription(base) {
+          return `${descriptionScope}: ${base}`;
+        },
         /**
          * coefficient on existing debt to calculate new debt
          */