@agoric/inter-protocol 0.13.2-dev-55d06de.0 → 0.13.2-dev-097dca8.0

package/package.json

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

package/src/contractSupport.js

@@ -174,6 +174,13 @@ export const makeEphemeraProvider = init => {
 };
 harden(makeEphemeraProvider);
 
+/**
+ *
+ * @param {ZCF} zcf
+ * @param {import('@agoric/ertp').Baggage} baggage
+ * @param {string} name
+ * @returns {ZCFSeat}
+ */
 export const provideEmptySeat = (zcf, baggage, name) => {
   return provide(baggage, name, () => zcf.makeEmptySeatKit().zcfSeat);
 };

package/src/vaultFactory/vault.js

@@ -14,7 +14,6 @@ import {
   addSubtract,
   allEmpty,
   assertOnlyKeys,
-  makeEphemeraProvider,
   stageDelta,
 } from '../contractSupport.js';
 import { calculateCurrentDebt, reverseInterest } from '../interest-math.js';
@@ -102,6 +101,7 @@ const validTransitions = {
  * @typedef {Readonly<{
  * idInManager: VaultId,
  * manager: VaultManager,
+ * storageNode: StorageNode,
  * vaultSeat: ZCFSeat,
  * }>} ImmutableState
  */
@@ -113,59 +113,10 @@ const validTransitions = {
  *   interestSnapshot: Ratio,
  *   phase: VaultPhase,
  *   debtSnapshot: Amount<'nat'>,
+ *   outerUpdater: Publisher<VaultNotification> | null,
  * }} MutableState
  */
 
-/**
- * Ephemera are the elements of state that cannot (or need not) be durable.
- * When there's a single instance it can be held in a closure, but there are
- * many vault manaager objects. So we hold their ephemera keyed by the durable
- * vault manager object reference.
- *
- * @type {(key: VaultId) => {
- * storageNode: ERef<StorageNode>,
- * marshaller: ERef<Marshaller>,
- * outerUpdater: Publisher<VaultNotification> | null,
- * zcf: ZCF,
- * }} */
-// @ts-expect-error not yet defined
-const provideEphemera = makeEphemeraProvider(() => ({}));
-
-/**
- * @param {ZCF} zcf
- * @param {VaultManager} manager
- * @param {VaultId} idInManager
- * @param {ERef<StorageNode>} storageNode
- * @param {ERef<Marshaller>} marshaller
- * @returns {ImmutableState & MutableState}
- */
-const initState = (zcf, manager, idInManager, storageNode, marshaller) => {
-  trace('vault initState');
-
-  const ephemera = provideEphemera(idInManager);
-  ephemera.storageNode = storageNode;
-  ephemera.marshaller = marshaller;
-  ephemera.zcf = zcf;
-
-  return harden({
-    idInManager,
-    manager,
-    outerUpdater: null,
-    phase: Phase.ACTIVE,
-
-    // vaultSeat will hold the collateral until the loan is retired. The
-    // payout from it will be handed to the user: if the vault dies early
-    // (because the vaultFactory vat died), they'll get all their
-    // collateral back. If that happens, the issuer for the Minted will be dead,
-    // so their loan will be worthless.
-    vaultSeat: zcf.makeEmptySeatKit().zcfSeat,
-
-    // Two values from the same moment
-    interestSnapshot: manager.getCompoundedInterest(),
-    debtSnapshot: AmountMath.makeEmpty(manager.getDebtBrand()),
-  });
-};
-
 /**
  * Check whether we can proceed with an `adjustBalances`.
  *
@@ -205,9 +156,7 @@ export const VaultI = M.interface('Vault', {
   getCurrentDebt: M.call().returns(AmountShape),
   getNormalizedDebt: M.call().returns(AmountShape),
   getVaultSeat: M.call().returns(SeatShape),
-  initVaultKit: M.call(SeatShape, M.eref(StorageNodeShape)).returns(
-    M.promise(),
-  ),
+  initVaultKit: M.call(SeatShape, StorageNodeShape).returns(M.promise()),
   liquidated: M.call().returns(undefined),
   liquidating: M.call().returns(undefined),
   makeAdjustBalancesInvitation: M.call().returns(M.promise()),
@@ -215,11 +164,14 @@ export const VaultI = M.interface('Vault', {
   makeTransferInvitation: M.call().returns(M.promise()),
 });
 
-export const prepareVault = baggage => {
-  trace('prepareVault');
-  const makeVaultKit = prepareVaultKit(baggage);
+/**
+ * @param {import('@agoric/ertp').Baggage} baggage
+ * @param {ERef<Marshaller>} marshaller
+ * @param {ZCF} zcf
+ */
+export const prepareVault = (baggage, marshaller, zcf) => {
+  const makeVaultKit = prepareVaultKit(baggage, marshaller);
 
-  // TODO find a way to not have to indent a level deeper than defineDurableExoClassKit does
   const maker = prepareExoClassKit(
     baggage,
     'Vault',
@@ -227,7 +179,33 @@ export const prepareVault = baggage => {
       helper: UnguardedHelperI,
       self: VaultI,
     },
-    initState,
+    /**
+     * @param {VaultManager} manager
+     * @param {VaultId} idInManager
+     * @param {StorageNode} storageNode
+     * @returns {ImmutableState & MutableState}
+     */
+    (manager, idInManager, storageNode) => {
+      return harden({
+        idInManager,
+        manager,
+        outerUpdater: null,
+        phase: Phase.ACTIVE,
+
+        storageNode,
+
+        // vaultSeat will hold the collateral until the loan is retired. The
+        // payout from it will be handed to the user: if the vault dies early
+        // (because the vaultFactory vat died), they'll get all their
+        // collateral back. If that happens, the issuer for the Minted will be dead,
+        // so their loan will be worthless.
+        vaultSeat: zcf.makeEmptySeatKit().zcfSeat,
+
+        // Two values from the same moment
+        interestSnapshot: manager.getCompoundedInterest(),
+        debtSnapshot: AmountMath.makeEmpty(manager.getDebtBrand()),
+      });
+    },
     {
       helper: {
         // #region Computed constants
@@ -370,8 +348,7 @@ export const prepareVault = baggage => {
          */
         updateUiState() {
           const { state, facets } = this;
-          const ephemera = provideEphemera(state.idInManager);
-          const { outerUpdater } = ephemera;
+          const { outerUpdater } = state;
           if (!outerUpdater) {
             // It's not an error to change to liquidating during transfer
             return;
@@ -388,7 +365,7 @@ export const prepareVault = baggage => {
               break;
             case Phase.CLOSED:
               outerUpdater.finish(uiState);
-              ephemera.outerUpdater = null;
+              state.outerUpdater = null;
               break;
             default:
               throw Error(`unreachable vault phase: ${phase}`);
@@ -404,7 +381,6 @@ export const prepareVault = baggage => {
           const { self, helper } = facets;
           helper.assertCloseable();
           const { phase, vaultSeat } = state;
-          const { zcf } = provideEphemera(state.idInManager);
 
           // Held as keys for cleanup in the manager
           const oldDebtNormalized = self.getNormalizedDebt();
@@ -502,8 +478,7 @@ export const prepareVault = baggage => {
           const { state, facets } = this;
 
           const { self, helper } = facets;
-          const ephemera = provideEphemera(state.idInManager);
-          const { outerUpdater: updaterPre } = ephemera;
+          const { outerUpdater: updaterPre } = state;
           const { vaultSeat } = state;
           const proposal = clientSeat.getProposal();
           assertOnlyKeys(proposal, ['Collateral', 'Minted']);
@@ -521,7 +496,7 @@ export const prepareVault = baggage => {
           );
           // max debt supported by current Collateral as modified by proposal
           const maxDebtPre = await state.manager.maxDebtFor(newCollateralPre);
-          updaterPre === ephemera.outerUpdater ||
+          updaterPre === state.outerUpdater ||
             Fail`Transfer during vault adjustment`;
           helper.assertActive();
 
@@ -611,16 +586,13 @@ export const prepareVault = baggage => {
           helper.assertCloseable();
           seat.exit();
 
-          const ephemera = provideEphemera(state.idInManager);
-
           // eslint-disable-next-line no-use-before-define
           const vaultKit = makeVaultKit(
             self,
-            ephemera.storageNode,
-            ephemera.marshaller,
+            state.storageNode,
             state.manager.getAssetSubscriber(),
           );
-          ephemera.outerUpdater = vaultKit.vaultUpdater;
+          state.outerUpdater = vaultKit.vaultUpdater;
           helper.updateUiState();
 
           return vaultKit;
@@ -638,8 +610,6 @@ export const prepareVault = baggage => {
         async initVaultKit(seat, storageNode) {
           const { state, facets } = this;
 
-          const ephemera = provideEphemera(state.idInManager);
-
           const { self, helper } = facets;
 
           const normalizedDebtPre = self.getNormalizedDebt();
@@ -694,10 +664,9 @@ export const prepareVault = baggage => {
           const vaultKit = makeVaultKit(
             self,
             storageNode,
-            ephemera.marshaller,
             state.manager.getAssetSubscriber(),
           );
-          ephemera.outerUpdater = vaultKit.vaultUpdater;
+          state.outerUpdater = vaultKit.vaultUpdater;
           helper.updateUiState();
           return vaultKit;
         },
@@ -731,10 +700,9 @@ export const prepareVault = baggage => {
         },
 
         makeAdjustBalancesInvitation() {
-          const { state, facets } = this;
+          const { facets } = this;
           const { helper } = facets;
           helper.assertActive();
-          const { zcf } = provideEphemera(state.idInManager);
           return zcf.makeInvitation(
             seat => helper.adjustBalancesHook(seat),
             'AdjustBalances',
@@ -742,10 +710,9 @@ export const prepareVault = baggage => {
         },
 
         makeCloseInvitation() {
-          const { state, facets } = this;
+          const { facets } = this;
           const { helper } = facets;
           helper.assertCloseable();
-          const { zcf } = provideEphemera(state.idInManager);
           return zcf.makeInvitation(
             seat => helper.closeHook(seat),
             'CloseVault',
@@ -757,8 +724,7 @@ export const prepareVault = baggage => {
          */
         makeTransferInvitation() {
           const { state, facets } = this;
-          const ephemera = provideEphemera(state.idInManager);
-          const { outerUpdater } = ephemera;
+          const { outerUpdater } = state;
           const { self, helper } = facets;
           // Bring the debt snapshot current for the final report before transfer
           helper.updateDebtSnapshot(self.getCurrentDebt());
@@ -769,14 +735,13 @@ export const prepareVault = baggage => {
           } = state;
           if (outerUpdater) {
             outerUpdater.finish(helper.getStateSnapshot(Phase.TRANSFER));
-            ephemera.outerUpdater = null;
+            state.outerUpdater = null;
           }
           const transferState = {
             debtSnapshot: { debt, interest },
             locked: self.getCollateralAmount(),
             vaultState: phase,
           };
-          const { zcf } = provideEphemera(state.idInManager);
           return zcf.makeInvitation(
             seat => helper.makeTransferInvitationHook(seat),
             'TransferVault',