fixup! zoe

Author: erights

packages/ERTP/src/amountMath.js

@@ -83,7 +83,7 @@ const helpers = {
  * @param {V} value
  * @returns {AssetKind}
  */
-const assertValueGetAssetKind = value => {
+export const assertValueGetAssetKind = value => {
   const kind = kindOf(value);
   switch (kind) {
     case 'bigint': {

packages/ERTP/src/purse.js

@@ -3,6 +3,7 @@ import { M, makeCopySet } from '@agoric/store';
 import { AmountMath } from './amountMath.js';
 import { makeTransientNotifierKit } from './transientNotifier.js';
 import { makeAmountStore } from './amountStore.js';
+import { kindOf } from '@endo/patterns';
 
 /** @import {AssetKind, RecoverySetsOption, Brand, Payment} from './types.js' */
 
@@ -114,10 +115,16 @@ export const preparePurseKind = (
 
           const optRecoverySet = maybeRecoverySet(state);
           const balanceStore = makeAmountStore(state, 'currentBalance');
+          let amount;
+          if (kindOf(amountBound) === 'match:containerHas') {
+            throw Fail`TODO handle match:containerHas`;
+          } else {
+            amount = amountBound;
+          }
           // Note COMMIT POINT within withdrawInternal.
           const payment = withdrawInternal(
             balanceStore,
-            amountBound,
+            amount,
             optRecoverySet,
           );
           updateBalance(purse, balanceStore.getAmount());

packages/zoe/src/zoeService/escrowStorage.js

@@ -1,4 +1,4 @@
-import { AmountMath } from '@agoric/ertp';
+import { AmountMath, assertValueGetAssetKind } from '@agoric/ertp';
 import { E } from '@endo/eventual-send';
 import { q, Fail } from '@endo/errors';
 import { deeplyFulfilledObject, objectMap } from '@agoric/internal';
@@ -10,16 +10,30 @@ import './internal-types.js';
 import { cleanKeywords } from '../cleanProposal.js';
 
 /**
- * @import {LegacyWeakMap, WeakMapStore} from '@agoric/store';
+ * @import {WeakMapStore} from '@agoric/store';
  */
 
 /**
  * Store the pool purses whose purpose is to escrow assets, with one
  * purse per brand.
  *
  * @param {import('@agoric/vat-data').Baggage} baggage
+ * @param {GetAssetKindByBrand} _getAssetKindByBrand
  */
-export const provideEscrowStorage = baggage => {
+export const provideEscrowStorage = (baggage, _getAssetKindByBrand) => {
+  const getAssetKindByAmount = amount => {
+    const { /* brand, */ value } = amount;
+    // const ak1 = getAssetKindByBrand(brand);
+    const ak2 = assertValueGetAssetKind(value);
+    // TODO this fails in escrowStorage.test.js, likely meaning we
+    // don't do enough checking elsewhere that the storage assetKind is the
+    // assetKind of the value.
+    // ak1 === ak2 ||
+    //   // line break for ease of interactive breakpointing
+    //   Fail`${q(ak1)} must === ${q(ak2)}`;
+    return ak2;
+  };
+
   /** @type {WeakMapStore<Brand, Purse>} */
   const brandToPurse = provideDurableWeakMapStore(baggage, 'brandToPurse');
 
@@ -112,7 +126,9 @@ export const provideEscrowStorage = baggage => {
     const deposits = await deeplyFulfilledObject(depositPs);
 
     const initialAllocation = harden({
-      ...objectMap(want, amount => AmountMath.makeEmptyFromAmount(amount)),
+      ...objectMap(want, amount =>
+        AmountMath.makeEmpty(amount.brand, getAssetKindByAmount(amount)),
+      ),
       // Deposits should win in case of overlapping give/want keywords
       // (which are not allowed as of 2024-01).
       ...deposits,

packages/zoe/src/zoeService/zoeStorageManager.js

@@ -71,7 +71,9 @@ export const makeZoeStorageManager = (
   // EscrowStorage holds the purses that Zoe uses for escrow. This
   // object should be closely held and tracked: all of the digital
   // assets that users escrow are contained within these purses.
-  const escrowStorage = provideEscrowStorage(zoeBaggage);
+  const escrowStorage = provideEscrowStorage(zoeBaggage, brand =>
+    issuerStorage.getAssetKindByBrand(brand),
+  );
 
   // Add a purse for escrowing user funds (not for fees). Create the
   // local, non-remote escrow purse for the fee mint immediately.

packages/zoe/test/unitTests/zoe/escrowStorage.test.js

@@ -1,7 +1,8 @@
 import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import { AmountMath, makeIssuerKit, AssetKind } from '@agoric/ertp';
-
+import { Fail } from '@endo/errors';
 import { E } from '@endo/eventual-send';
+
+import { AmountMath, makeIssuerKit, AssetKind } from '@agoric/ertp';
 import { makeScalarBigMapStore } from '@agoric/vat-data';
 import { provideEscrowStorage } from '../../../src/zoeService/escrowStorage.js';
 import {
@@ -13,6 +14,7 @@ test('provideEscrowStorage', async t => {
   const { createPurse, provideLocalPurse, withdrawPayments, depositPayments } =
     provideEscrowStorage(
       makeScalarBigMapStore('zoe baggage', { durable: true }),
+      _brand => 'nat',
     );
 
   const stableKit = makeIssuerKit(
@@ -138,6 +140,7 @@ const setupPurses = async createPurse => {
 test('payments without matching give keywords', async t => {
   const { createPurse, depositPayments } = provideEscrowStorage(
     makeScalarBigMapStore('zoe baggage', { durable: true }),
+    _brand => Fail`Not in a mock test`,
   );
 
   const { ticketKit, stableKit } = await setupPurses(createPurse);
@@ -175,6 +178,7 @@ test('payments without matching give keywords', async t => {
 test(`give keywords without matching payments`, async t => {
   const { createPurse, depositPayments } = provideEscrowStorage(
     makeScalarBigMapStore('zoe baggage', { durable: true }),
+    _brand => Fail`Not in a mock test`,
   );
 
   const { ticketKit, stableKit } = await setupPurses(createPurse);