@agoric/inter-protocol 0.13.2-dev-68094ec.0 → 0.13.2-dev-834679c.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/inter-protocol",
-  "version": "0.13.2-dev-68094ec.0+68094ec",
+  "version": "0.13.2-dev-834679c.0+834679c",
   "description": "Core cryptoeconomy contracts",
   "type": "module",
   "main": "src/index.js",
@@ -29,16 +29,16 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "0.5.2-dev-68094ec.0+68094ec",
-    "@agoric/ertp": "0.15.4-dev-68094ec.0+68094ec",
-    "@agoric/governance": "0.9.2-dev-68094ec.0+68094ec",
-    "@agoric/internal": "0.2.2-dev-68094ec.0+68094ec",
-    "@agoric/notifier": "0.5.2-dev-68094ec.0+68094ec",
-    "@agoric/store": "0.8.4-dev-68094ec.0+68094ec",
-    "@agoric/time": "0.2.2-dev-68094ec.0+68094ec",
-    "@agoric/vat-data": "0.4.4-dev-68094ec.0+68094ec",
-    "@agoric/vats": "0.13.1-dev-68094ec.0+68094ec",
-    "@agoric/zoe": "0.25.4-dev-68094ec.0+68094ec",
+    "@agoric/assert": "0.5.2-dev-834679c.0+834679c",
+    "@agoric/ertp": "0.15.4-dev-834679c.0+834679c",
+    "@agoric/governance": "0.9.2-dev-834679c.0+834679c",
+    "@agoric/internal": "0.2.2-dev-834679c.0+834679c",
+    "@agoric/notifier": "0.5.2-dev-834679c.0+834679c",
+    "@agoric/store": "0.8.4-dev-834679c.0+834679c",
+    "@agoric/time": "0.2.2-dev-834679c.0+834679c",
+    "@agoric/vat-data": "0.4.4-dev-834679c.0+834679c",
+    "@agoric/vats": "0.13.1-dev-834679c.0+834679c",
+    "@agoric/zoe": "0.25.4-dev-834679c.0+834679c",
     "@endo/captp": "^2.0.18",
     "@endo/eventual-send": "^0.16.8",
     "@endo/far": "^0.2.14",
@@ -46,10 +46,10 @@
     "@endo/nat": "^4.1.23"
   },
   "devDependencies": {
-    "@agoric/deploy-script-support": "0.9.5-dev-68094ec.0+68094ec",
-    "@agoric/smart-wallet": "0.4.3-dev-68094ec.0+68094ec",
-    "@agoric/swingset-liveslots": "0.9.1-dev-68094ec.0+68094ec",
-    "@agoric/swingset-vat": "0.30.3-dev-68094ec.0+68094ec",
+    "@agoric/deploy-script-support": "0.9.5-dev-834679c.0+834679c",
+    "@agoric/smart-wallet": "0.4.3-dev-834679c.0+834679c",
+    "@agoric/swingset-liveslots": "0.9.1-dev-834679c.0+834679c",
+    "@agoric/swingset-vat": "0.30.3-dev-834679c.0+834679c",
     "@endo/bundle-source": "^2.4.2",
     "@endo/init": "^0.5.52",
     "@endo/promise-kit": "^0.2.52",
@@ -78,5 +78,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "68094ecd94c9b3934a5dc5dea39b167d373d9beb"
+  "gitHead": "834679c92c9185122314963cd16cfa8efd5f929f"
 }

package/src/auction/auctionBook.js

@@ -25,6 +25,7 @@ import {
   makeBrandedRatioPattern,
   priceFrom,
 } from './util.js';
+import { makeNatAmountShape } from '../contractSupport.js';
 
 const { Fail } = assert;
 
@@ -65,8 +66,8 @@ const trace = makeTracer('AucBook', false);
  * @param {Brand<'nat'>} collateralBrand
  */
 export const makeBidSpecShape = (currencyBrand, collateralBrand) => {
-  const currencyAmountShape = { brand: currencyBrand, value: M.nat() };
-  const collateralAmountShape = { brand: collateralBrand, value: M.nat() };
+  const currencyAmountShape = makeNatAmountShape(currencyBrand);
+  const collateralAmountShape = makeNatAmountShape(collateralBrand);
   return M.splitRecord(
     { want: collateralAmountShape },
     {

package/src/auction/auctioneer.js

@@ -27,6 +27,7 @@ import { makeAuctionBook, makeBidSpecShape } from './auctionBook.js';
 import { AuctionState } from './util.js';
 import { makeScheduler } from './scheduler.js';
 import { auctioneerParamTypes } from './params.js';
+import { makeNatAmountShape } from '../contractSupport.js';
 
 /** @typedef {import('@agoric/vat-data').Baggage} Baggage */
 
@@ -270,7 +271,7 @@ export const start = async (zcf, privateArgs, baggage) => {
 
   const bidProposalShape = M.splitRecord(
     {
-      give: { Currency: { brand: brands.Currency, value: M.nat() } },
+      give: { Currency: makeNatAmountShape(brands.Currency) },
     },
     {
       want: M.or({ Collateral: AmountShape }, {}),

package/src/contractSupport.js

@@ -119,3 +119,8 @@ export const makeMetricsPublishKit = (storageNode, marshaller) => {
   };
 };
 harden(makeMetricsPublishKit);
+
+/**
+ * @param {Brand} brand must be a 'nat' brand, not checked
+ */
+export const makeNatAmountShape = brand => harden({ brand, value: M.nat() });

package/src/vaultFactory/vault.js

@@ -2,13 +2,16 @@ import { AmountMath, AmountShape } from '@agoric/ertp';
 import { makeTracer, makeTypeGuards } from '@agoric/internal';
 import { M, prepareExoClassKit } from '@agoric/vat-data';
 import {
-  assertProposalShape,
   atomicTransfer,
   floorMultiplyBy,
   makeRatioFromAmounts,
 } from '@agoric/zoe/src/contractSupport/index.js';
 import { SeatShape } from '@agoric/zoe/src/typeGuards.js';
-import { addSubtract, allEmpty, assertOnlyKeys } from '../contractSupport.js';
+import {
+  addSubtract,
+  allEmpty,
+  makeNatAmountShape,
+} from '../contractSupport.js';
 import { calculateCurrentDebt, reverseInterest } from '../interest-math.js';
 import { UnguardedHelperI } from '../typeGuards.js';
 import { prepareVaultKit } from './vaultKit.js';
@@ -237,7 +240,6 @@ export const prepareVault = (baggage, marshaller, zcf) => {
          * @returns {FullProposal}
          */
         fullProposal(partial) {
-          assertOnlyKeys(partial, ['Collateral', 'Minted']);
           return {
             give: {
               Collateral:
@@ -418,15 +420,12 @@ export const prepareVault = (baggage, marshaller, zcf) => {
           const oldCollateral = self.getCollateralAmount();
 
           if (phase === Phase.ACTIVE) {
-            assertProposalShape(seat, {
-              give: { Minted: null },
-            });
-
             // you're paying off the debt, you get everything back.
             const debt = self.getCurrentDebt();
             const {
               give: { Minted: given },
             } = seat.getProposal();
+            given || Fail`closing an active vault requires a give`;
 
             // you must pay off the entire remainder but if you offer too much, we won't
             // take more than you owe
@@ -792,9 +791,33 @@ export const prepareVault = (baggage, marshaller, zcf) => {
           const { state, facets } = this;
           const { helper } = facets;
           helper.assertActive();
+
           return zcf.makeInvitation(
             seat => helper.adjustBalancesHook(seat),
             state.manager.scopeDescription('AdjustBalances'),
+            undefined,
+            M.splitRecord({
+              give: M.splitRecord(
+                {},
+                {
+                  // It may seem odd to give both at once but there is use case:
+                  // To rescue a vault that's on the verge of being liquidated
+                  // when you have limited resources, you might add collateral
+                  // at the same time that you're repaying IST.
+                  Collateral: makeNatAmountShape(helper.collateralBrand()),
+                  Minted: makeNatAmountShape(helper.debtBrand()),
+                },
+                {},
+              ),
+              want: M.splitRecord(
+                {},
+                {
+                  Collateral: makeNatAmountShape(helper.collateralBrand()),
+                  Minted: makeNatAmountShape(helper.debtBrand()),
+                },
+                {},
+              ),
+            }),
           );
         },
 
@@ -805,6 +828,23 @@ export const prepareVault = (baggage, marshaller, zcf) => {
           return zcf.makeInvitation(
             seat => helper.closeHook(seat),
             state.manager.scopeDescription('CloseVault'),
+            undefined,
+            M.splitRecord({
+              give: M.splitRecord(
+                {},
+                {
+                  Minted: makeNatAmountShape(helper.debtBrand()),
+                },
+                {},
+              ),
+              want: M.splitRecord(
+                {},
+                {
+                  Collateral: makeNatAmountShape(helper.collateralBrand()),
+                },
+                {},
+              ),
+            }),
           );
         },
 

package/src/vaultFactory/vaultManager.js

@@ -26,8 +26,8 @@ import {
 } from '@agoric/ertp';
 import { makeTracer } from '@agoric/internal';
 import {
-  makeStoredNotifier,
   makePublicTopic,
+  makeStoredNotifier,
   observeNotifier,
   pipeTopicToStorage,
   prepareDurablePublishKit,
@@ -40,8 +40,8 @@ import {
   provideDurableMapStore,
   provideDurableSetStore,
 } from '@agoric/vat-data';
+import { TransferPartShape } from '@agoric/zoe/src/contractSupport/atomicTransfer.js';
 import {
-  assertProposalShape,
   atomicRearrange,
   ceilMultiplyBy,
   floorMultiplyBy,
@@ -55,15 +55,14 @@ import {
 } from '@agoric/zoe/src/contractSupport/index.js';
 import { SeatShape } from '@agoric/zoe/src/typeGuards.js';
 import { E } from '@endo/eventual-send';
-import { TransferPartShape } from '@agoric/zoe/src/contractSupport/atomicTransfer.js';
-import { checkDebtLimit } from '../contractSupport.js';
+import { AuctionPFShape } from '../auction/auctioneer.js';
+import { checkDebtLimit, makeNatAmountShape } from '../contractSupport.js';
 import { chargeInterest } from '../interest.js';
+import { getLiquidatableVaults, liquidationResults } from './liquidation.js';
 import { maxDebtForVault } from './math.js';
 import { makePrioritizedVaults } from './prioritizedVaults.js';
-import { Phase, prepareVault } from './vault.js';
 import { normalizedCollRatio, normalizedCollRatioKey } from './storeUtils.js';
-import { getLiquidatableVaults, liquidationResults } from './liquidation.js';
-import { AuctionPFShape } from '../auction/auctioneer.js';
+import { Phase, prepareVault } from './vault.js';
 
 const { details: X, Fail } = assert;
 
@@ -322,6 +321,15 @@ export const prepareVaultManagerKit = (
           return zcf.makeInvitation(
             seat => this.facets.self.makeVaultKit(seat),
             facets.manager.scopeDescription('MakeVault'),
+            undefined,
+            M.splitRecord({
+              give: {
+                Collateral: makeNatAmountShape(collateralBrand),
+              },
+              want: {
+                Minted: makeNatAmountShape(debtBrand),
+              },
+            }),
           );
         },
         /** @deprecated use getPublicTopics */
@@ -711,10 +719,6 @@ export const prepareVaultManagerKit = (
           assert(marshaller, 'makeVaultKit missing marshaller');
           assert(storageNode, 'makeVaultKit missing storageNode');
           assert(zcf, 'makeVaultKit missing zcf');
-          assertProposalShape(seat, {
-            give: { Collateral: null },
-            want: { Minted: null },
-          });
 
           const vaultId = String(state.vaultCounter);