@agoric/zoe 0.26.3-upgrade-14-dev-c8f9e7b.0 → 0.26.3-upgrade-16-dev-8879538.0

package/exported.js

@@ -1,12 +1 @@
-// @jessie-check
-
-import './src/contractFacet/types.js';
-import './src/zoeService/types.js';
-import './src/contractSupport/types.js';
-import './src/contracts/exported.js';
-import './src/types.js';
-import './tools/types-ambient.js';
-import '@agoric/notifier/exported.js';
-import '@agoric/ertp/exported.js';
-import '@agoric/store/exported.js';
-import '@agoric/swingset-vat/exported.js';
+// Dummy file for .d.ts twin to declare ambients

package/package.json

@@ -1,29 +1,29 @@
 {
   "name": "@agoric/zoe",
-  "version": "0.26.3-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
+  "version": "0.26.3-upgrade-16-dev-8879538.0+8879538",
   "description": "Zoe: the Smart Contract Framework for Offer Enforcement",
   "type": "module",
   "main": "./src/zoeService/zoe.js",
   "engines": {
-    "node": ">=14.15.0"
+    "node": "^18.12 || ^20.9"
   },
   "scripts": {
     "build": "yarn build:bundles",
     "build:bundles": "node scripts/build-bundles.js",
-    "prepack": "echo \"export {}; \" | cat - tools/types-ambient.js > tools/types.js && tsc --build jsconfig.build.json",
-    "postpack": "git clean -f '*.d.ts*' tools/types.js",
+    "prepack": "tsc --build tsconfig.build.json",
+    "postpack": "git clean -f '*.d.ts*'",
     "test": "ava --verbose",
     "test:c8": "c8 $C8_OPTIONS ava --config=ava-nesm.config.js",
-    "test:unit": "ava 'test/unitTests/**/test-*.js' -T 1m --verbose",
-    "test:swingset": "ava 'test/swingsetTests/**/test-*.js' -T 10m --verbose",
+    "test:unit": "ava 'test/unitTests' -T 1m --verbose",
+    "test:swingset": "ava 'test/swingsetTests' -T 10m --verbose",
     "test:xs": "yarn test:xs-unit",
     "test:xs-unit": "ava-xs --verbose",
-    "test:xs-worker": "SWINGSET_WORKER_TYPE=xs-worker ava -c 2 'test/swingsetTests/**/test-*.js'",
+    "test:xs-worker": "SWINGSET_WORKER_TYPE=xs-worker ava -c 2 'test/swingsetTests'",
     "build-zcfBundle": "yarn build:bundles",
     "lint-fix": "yarn lint:eslint --fix",
     "lint": "run-s --continue-on-error lint:*",
     "lint:eslint": "eslint .",
-    "lint:types": "tsc -p jsconfig.json"
+    "lint:types": "tsc"
   },
   "repository": {
     "type": "git",
@@ -43,30 +43,37 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "0.6.1-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@agoric/ertp": "0.16.3-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@agoric/internal": "0.4.0-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@agoric/notifier": "0.6.3-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@agoric/store": "0.9.3-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@agoric/swingset-vat": "0.32.3-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@agoric/time": "0.3.3-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@agoric/vat-data": "0.5.3-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@endo/bundle-source": "2.5.2-upstream-rollup",
-    "@endo/captp": "3.1.1",
-    "@endo/eventual-send": "0.17.2",
-    "@endo/far": "0.2.18",
-    "@endo/import-bundle": "0.3.4",
-    "@endo/marshal": "0.8.5",
-    "@endo/nat": "4.1.27",
-    "@endo/patterns": "0.2.2",
-    "@endo/promise-kit": "0.2.56"
+    "@agoric/assert": "0.6.1-upgrade-16-dev-8879538.0+8879538",
+    "@agoric/base-zone": "0.1.1-upgrade-16-dev-8879538.0+8879538",
+    "@agoric/ertp": "0.16.3-upgrade-16-dev-8879538.0+8879538",
+    "@agoric/internal": "0.3.3-upgrade-16-dev-8879538.0+8879538",
+    "@agoric/notifier": "0.6.3-upgrade-16-dev-8879538.0+8879538",
+    "@agoric/store": "0.9.3-upgrade-16-dev-8879538.0+8879538",
+    "@agoric/swingset-liveslots": "0.10.3-upgrade-16-dev-8879538.0+8879538",
+    "@agoric/swingset-vat": "0.32.3-upgrade-16-dev-8879538.0+8879538",
+    "@agoric/time": "0.3.3-upgrade-16-dev-8879538.0+8879538",
+    "@agoric/vat-data": "0.5.3-upgrade-16-dev-8879538.0+8879538",
+    "@agoric/zone": "0.2.3-upgrade-16-dev-8879538.0+8879538",
+    "@endo/bundle-source": "^3.2.3",
+    "@endo/captp": "^4.2.0",
+    "@endo/common": "^1.2.2",
+    "@endo/eventual-send": "^1.2.2",
+    "@endo/exo": "^1.5.0",
+    "@endo/far": "^1.1.2",
+    "@endo/import-bundle": "^1.1.2",
+    "@endo/marshal": "^1.5.0",
+    "@endo/nat": "^5.0.7",
+    "@endo/patterns": "^1.4.0",
+    "@endo/promise-kit": "^1.1.2",
+    "yargs-parser": "^21.1.1"
   },
   "devDependencies": {
-    "@endo/init": "0.5.56",
-    "ava": "^5.2.0",
-    "c8": "^7.13.0",
+    "@agoric/kmarshal": "0.1.1-upgrade-16-dev-8879538.0+8879538",
+    "@endo/init": "^1.1.2",
+    "ava": "^5.3.0",
+    "c8": "^9.1.0",
     "import-meta-resolve": "^2.2.1",
-    "tsd": "^0.28.1"
+    "tsd": "^0.30.7"
   },
   "files": [
     "bundles/",
@@ -80,51 +87,59 @@
     "exclude": [
       "# path/url/import.meta stuff",
       "unitTests/contracts/",
-      "test/swingsetTests/privateArgs/test-privateArgs.js",
-      "test/swingsetTests/brokenContracts/test-crashingContract.js",
-      "test/swingsetTests/offerArgs/test-offerArgs.js",
-      "test/swingsetTests/makeKind/test-makeKind.js",
-      "test/swingsetTests/zoe/test-zoe.js",
-      "test/swingsetTests/runMint/test-runMint.js",
-      "test/unitTests/test-zoe.js",
-      "test/unitTests/test-scriptedOracle.js",
-      "test/unitTests/test-makeKind.js",
-      "test/unitTests/test-instanceStorage.js",
-      "test/unitTests/contractSupport/test-depositTo.js",
-      "test/unitTests/contractSupport/test-withdrawFrom.js",
-      "test/unitTests/contractSupport/test-offerTo.js",
-      "test/unitTests/zcf/test-zcfSeat.js",
-      "test/unitTests/zcf/test-zcfSeat-exit.js",
+      "test/swingsetTests/privateArgs/privateArgs.test.js",
+      "test/swingsetTests/brokenContracts/crashingContract.test.js",
+      "test/swingsetTests/offerArgs/offerArgs.test.js",
+      "test/swingsetTests/makeKind/makeKind.test.js",
+      "test/swingsetTests/zoe/zoe.test.js",
+      "test/swingsetTests/runMint/runMint.test.js",
+      "test/unitTests/zoe.test.js",
+      "test/unitTests/scriptedOracle.test.js",
+      "test/unitTests/makeKind.test.js",
+      "test/unitTests/instanceStorage.test.js",
+      "test/unitTests/contractSupport/depositTo.test.js",
+      "test/unitTests/contractSupport/withdrawFrom.test.js",
+      "test/unitTests/contractSupport/offerTo.test.js",
+      "test/unitTests/zcf/zcfSeat.test.js",
+      "test/unitTests/zcf/zcfSeat-exit.test.js",
       "test/unitTests/zcf/setupZcfTest.js",
-      "test/unitTests/zcf/test-feeMintAccess.js",
+      "test/unitTests/zcf/feeMintAccess.test.js",
       "# import.meta.url by way of setupZcfTest",
-      "test/unitTests/test-zoe.js",
-      "test/unitTests/test-blockedOffers.js",
-      "test/unitTests/zcf/test-reallocate-empty.js",
-      "test/unitTests/zcf/test-zoeHelpersWZcf.js",
-      "test/unitTests/zcf/test-reallocateForZCFMint.js",
-      "test/unitTests/zcf/test-zcf.js",
-      "test/unitTests/zcf/test-allStagedSeatsUsed.js",
+      "test/unitTests/zoe.test.js",
+      "test/unitTests/zoe-startInstance.test.js",
+      "test/unitTests/blockedOffers.test.js",
+      "test/unitTests/zcf/reallocate-empty.test.js",
+      "test/unitTests/zcf/zoeHelpersWZcf.test.js",
+      "test/unitTests/zcf/reallocateForZCFMint.test.js",
+      "test/unitTests/zcf/atomicRearrange.test.js",
+      "test/unitTests/zcf/zcf.test.js",
+      "test/unitTests/zcf/allStagedSeatsUsed.test.js",
       "# ManualTimer.setWakeup: no function",
-      "test/unitTests/test-fakePriceAuthority.js",
-      "test/unitTests/test-manualTimer.js",
+      "test/unitTests/fakePriceAuthority.test.js",
+      "test/unitTests/manualTimer.test.js",
       "# hangs",
-      "test-makeKind.js",
-      "test/unitTests/test-scriptedOracle.js",
-      "test/unitTests/test-zoe.js",
-      "test/unitTests/zcf/test-allStagedSeatsUsed.js",
+      "makeKind.test.js",
+      "test/unitTests/scriptedOracle.test.js",
+      "test/unitTests/zoe.test.js",
+      "test/unitTests/zcf/allStagedSeatsUsed.test.js",
       "# We use SWINGSET_WORKER_TYPE=xs ava to run these...",
       "swingsetTests"
     ]
   },
   "ava": {
     "files": [
-      "test/**/test-*.js"
+      "test/**/*.test.*"
+    ],
+    "require": [
+      "@endo/init/debug.js"
     ],
     "timeout": "20m"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c8f9e7be1645e0be23f47de197409a7d4874add5"
+  "typeCoverage": {
+    "atLeast": 84.92
+  },
+  "gitHead": "8879538cd1d125a08346f02dd5701d0d70c90bb8"
 }

package/src/cleanProposal.d.ts

@@ -3,7 +3,7 @@ export function assertKeywordName(keyword: any): void;
 export function cleanKeywords(uncleanKeywordRecord: {
     [name: string]: any;
 }): string[];
-export function coerceAmountPatternKeywordRecord(allegedAmountKeywordRecord: any, getAssetKindByBrand: any): Record<string, any>;
-export function coerceAmountKeywordRecord(allegedAmountKeywordRecord: any, getAssetKindByBrand: any): Record<string, any>;
+export function coerceAmountPatternKeywordRecord(allegedAmountKeywordRecord: any, getAssetKindByBrand: any): Record<string | number | symbol, any>;
+export function coerceAmountKeywordRecord(allegedAmountKeywordRecord: unknown, getAssetKindByBrand: any): AmountKeywordRecord;
 export function cleanProposal(proposal: Proposal, getAssetKindByBrand: GetAssetKindByBrand): ProposalRecord;
 //# sourceMappingURL=cleanProposal.d.ts.map

package/src/cleanProposal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cleanProposal.d.ts","sourceRoot":"","sources":["cleanProposal.js"],"names":[],"mappings":"AAWA,qCAAsC;AAa/B,sDAYN;AAMM;;IAFM,MAAM,EAAE,CAYpB;AAEM,iIA0BN;AAEM,0HAUN;AA4CM,wCAJI,QAAQ,uBACR,mBAAmB,GACjB,cAAc,CA6B1B"}
+{"version":3,"file":"cleanProposal.d.ts","sourceRoot":"","sources":["cleanProposal.js"],"names":[],"mappings":"AAWA,qCAAsC;AAa/B,sDAYN;AAMM,oDAHI;IAAC,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAA;CAAC,GACnB,MAAM,EAAE,CAYpB;AAEM,mJAsBN;AAQM,sEAJI,OAAO,6BAEL,mBAAmB,CAa/B;AA4CM,wCAJI,QAAQ,uBACR,mBAAmB,GACjB,cAAc,CA6B1B"}

package/src/cleanProposal.js

@@ -1,9 +1,9 @@
 import { assert, q, Fail } from '@agoric/assert';
 import { AmountMath, getAssetKind } from '@agoric/ertp';
+import { objectMap } from '@agoric/internal';
 import { assertRecord } from '@endo/marshal';
 import { assertKey, assertPattern, mustMatch, isKey } from '@agoric/store';
 import { FullProposalShape } from './typeGuards.js';
-import { arrayToObj } from './objArrayConversion.js';
 
 import './internal-types.js';
 
@@ -56,12 +56,11 @@ export const coerceAmountPatternKeywordRecord = (
   allegedAmountKeywordRecord,
   getAssetKindByBrand,
 ) => {
-  const keywords = cleanKeywords(allegedAmountKeywordRecord);
-
-  const amounts = Object.values(allegedAmountKeywordRecord);
-  // Check that each value can be coerced using the AmountMath
-  // indicated by brand. `AmountMath.coerce` throws if coercion fails.
-  const coercedAmounts = amounts.map(amount => {
+  cleanKeywords(allegedAmountKeywordRecord);
+  // FIXME objectMap should constrain the mapping function by the record's type
+  return objectMap(allegedAmountKeywordRecord, amount => {
+    // Check that each value can be coerced using the AmountMath
+    // indicated by brand. `AmountMath.coerce` throws if coercion fails.
     if (isKey(amount)) {
       const brandAssetKind = getAssetKindByBrand(amount.brand);
       const assetKind = getAssetKind(amount);
@@ -75,11 +74,14 @@ export const coerceAmountPatternKeywordRecord = (
       return amount;
     }
   });
-
-  // Recreate the amountKeywordRecord with coercedAmounts.
-  return harden(arrayToObj(coercedAmounts, keywords));
 };
 
+/**
+ *
+ * @param {unknown} allegedAmountKeywordRecord
+ * @param {*} getAssetKindByBrand
+ * @returns {AmountKeywordRecord}
+ */
 export const coerceAmountKeywordRecord = (
   allegedAmountKeywordRecord,
   getAssetKindByBrand,
@@ -89,6 +91,7 @@ export const coerceAmountKeywordRecord = (
     getAssetKindByBrand,
   );
   assertKey(result);
+  // @ts-expect-error checked cast
   return result;
 };
 
@@ -112,10 +115,10 @@ const assertKeywordNotInBoth = (want, give) => {
   const wantKeywordSet = new Set(ownKeys(want));
   const giveKeywords = ownKeys(give);
 
-  giveKeywords.forEach(keyword => {
+  for (const keyword of giveKeywords) {
     !wantKeywordSet.has(keyword) ||
       Fail`a keyword cannot be in both 'want' and 'give'`;
-  });
+  }
 };
 
 /**

package/src/contractFacet/exit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exit.d.ts","sourceRoot":"","sources":["exit.js"],"names":[],"mappings":"AAyBO,sGAuGN"}
+{"version":3,"file":"exit.d.ts","sourceRoot":"","sources":["exit.js"],"names":[],"mappings":"AAyBO,sGAwGN"}

package/src/contractFacet/exit.js

@@ -35,6 +35,7 @@ export const makeMakeExiter = baggage => {
       exit() {
         const { state } = this;
         state.zcfSeat.exit();
+        state.zcfSeat = undefined;
       },
     },
     {

package/src/contractFacet/internal-types.d.ts

@@ -1,5 +1,5 @@
-type TestJigSetter = ({ zcf: ZCF }: {
-    zcf: any;
+type TestJigSetter = ({ zcf }: {
+    zcf: ZCF;
 }) => void;
 type ZCFZygote = {
     startContract: (instanceAdminFromZoe: ERef<ZoeInstanceAdmin>, instanceRecordFromZoe: InstanceRecord, issuerStorageFromZoe: IssuerRecords, privateArgs?: object) => Promise<ExecuteContractResult>;

package/src/contractFacet/internal-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"internal-types.d.ts","sourceRoot":"","sources":["internal-types.js"],"names":[],"mappings":";;MAG+B,IAAI;;0CAKE,KAAK,gBAAgB,CAAC,yBAC7B,cAAc,qDAEvB,MAAM,KACnB,QAAQ,qBAAqB,CAAC;oCACT,MAAM,KAAK,IAAI"}
+{"version":3,"file":"internal-types.d.ts","sourceRoot":"","sources":["internal-types.js"],"names":[],"mappings":"qBAGa,CAAE,EAAC,GAAG,EAAC,EAAE;IAAC,GAAG,EAAE,GAAG,CAAA;CAAC,KAAM,IAAI;;mBAK5B,CAAC,oBAAoB,EAAE,IAAI,CAAC,gBAAgB,CAAC,EAC1D,qBAA2B,EAAE,cAAc,EAC3C,oBAA0B,EAAE,aAAa,EACzC,WAAiB,CAAC,EAAE,MAAM,KACnB,OAAO,CAAC,qBAAqB,CAAC;qBACxB,CAAC,WAAW,CAAC,EAAE,MAAM,KAAK,IAAI"}

package/src/contractFacet/internal-types.js

@@ -1,7 +1,7 @@
 // @jessie-check
 
 /**
- * @typedef {( {zcf: ZCF} ) => void} TestJigSetter
+ * @typedef {( {zcf}: {zcf: ZCF} ) => void} TestJigSetter
  */
 
 /**

package/src/contractFacet/offerHandlerStorage.d.ts

@@ -1,5 +1,8 @@
 export function makeOfferHandlerStorage(zcfBaggage: any): {
-    storeOfferHandler: (offerHandler: OfferHandler) => InvitationHandle;
+    storeOfferHandler: (offerHandler: any) => Handle<"Invitation">;
     takeOfferHandler: (invitationHandle: InvitationHandle, details?: Details) => OfferHandler;
 };
+export type PassableOfferHandler = RemotableBrand<any, any> & RemotableObject & OfferHandler<unknown, never>;
+import type { RemotableBrand } from '@endo/eventual-send';
+import type { RemotableObject } from '@endo/pass-style';
 //# sourceMappingURL=offerHandlerStorage.d.ts.map

package/src/contractFacet/offerHandlerStorage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"offerHandlerStorage.d.ts","sourceRoot":"","sources":["offerHandlerStorage.js"],"names":[],"mappings":"AAQO;sCAkBqB,YAAY,KAAK,gBAAgB;yCAe9B,gBAAgB,YAAY,OAAO,KAAK,YAAY;EAsBlF"}
+{"version":3,"file":"offerHandlerStorage.d.ts","sourceRoot":"","sources":["offerHandlerStorage.js"],"names":[],"mappings":"AAiBO;;yCAgCwB,gBAAgB,YAAY,OAAO,KAAK,YAAY;EAsBlF;;oCA9DgC,qBAAqB;qCACpB,kBAAkB"}

package/src/contractFacet/offerHandlerStorage.js

@@ -6,9 +6,18 @@ import { canBeDurable, provideDurableWeakMapStore } from '@agoric/vat-data';
 
 import { defineDurableHandle } from '../makeHandle.js';
 
+/**
+ * @import {RemotableBrand} from '@endo/eventual-send';
+ * @import {RemotableObject} from '@endo/pass-style';
+ */
+
+/**
+ * @typedef {RemotableBrand & RemotableObject & OfferHandler} PassableOfferHandler
+ */
+
 export const makeOfferHandlerStorage = zcfBaggage => {
   const makeInvitationHandle = defineDurableHandle(zcfBaggage, 'Invitation');
-  /** @type {WeakMapStore<InvitationHandle, OfferHandler>} */
+  /** @type {WeakMapStore<InvitationHandle, PassableOfferHandler>} */
 
   // ZCF needs to ephemerally hold on to ephemeral handlers, and durably hold
   // onto handlers that are intended to be durable. We keep two stores and store
@@ -18,13 +27,12 @@ export const makeOfferHandlerStorage = zcfBaggage => {
   const invitationHandleToEphemeralHandler = makeScalarWeakMapStore(
     'invitationHandleToEphemeralHandler',
   );
-  /** @type {WeakMapStore<InvitationHandle, OfferHandler>} */
+  /** @type {WeakMapStore<InvitationHandle, PassableOfferHandler>} */
   const invitationHandleToDurableHandler = provideDurableWeakMapStore(
     zcfBaggage,
     'invitationHandleToDurableHandler',
   );
 
-  /** @type {(offerHandler: OfferHandler) => InvitationHandle} */
   const storeOfferHandler = offerHandler => {
     if (typeof offerHandler === 'function') {
       offerHandler = ToFarFunction('offerHandler', offerHandler);

package/src/contractFacet/reallocate.d.ts

@@ -0,0 +1,3 @@
+export function makeAllocationMap(transfers: Array<TransferPart>): [ZCFSeat, AmountKeywordRecord][];
+export type TransactionList = Array<AmountKeywordRecord>;
+//# sourceMappingURL=reallocate.d.ts.map

package/src/contractFacet/reallocate.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"reallocate.d.ts","sourceRoot":"","sources":["reallocate.js"],"names":[],"mappings":"AAiBO,6CAHI,KAAK,CAAC,YAAY,CAAC,GACjB,CAAC,OAAO,EAAE,mBAAmB,CAAC,EAAE,CA8E5C;8BAtFa,KAAK,CAAC,mBAAmB,CAAC"}

package/src/contractFacet/reallocate.js

@@ -0,0 +1,94 @@
+import { makeScalarMapStore } from '@agoric/vat-data';
+
+import { assertRightsConserved } from './rightsConservation.js';
+import { addToAllocation, subtractFromAllocation } from './allocationMath.js';
+
+const { Fail } = assert;
+
+/** @typedef {Array<AmountKeywordRecord>} TransactionList */
+
+/**
+ * Convert from a list of transfer descriptions ([fromSeat, toSeat, fromAmount,
+ * toAmount], with many parts optional) to a list of resulting allocations for
+ * each of the seats mentioned.
+ *
+ * @param {Array<TransferPart>} transfers
+ * @returns {[ZCFSeat, AmountKeywordRecord][]}
+ */
+export const makeAllocationMap = transfers => {
+  /** @type {MapStore<ZCFSeat, [TransactionList, TransactionList]>} */
+  const allocations = makeScalarMapStore();
+
+  const getAllocations = seat => {
+    if (allocations.has(seat)) {
+      return allocations.get(seat);
+    }
+
+    /** @type {[TransactionList, TransactionList]} */
+    const pair = [[], []];
+    allocations.init(seat, pair);
+    return pair;
+  };
+
+  const decrementAllocation = (seat, decrement) => {
+    const [incr, decr] = getAllocations(seat);
+
+    const newDecr = [...decr, decrement];
+    allocations.set(seat, [incr, newDecr]);
+  };
+
+  const incrementAllocation = (seat, increment) => {
+    const [incr, decr] = getAllocations(seat);
+
+    const newIncr = [...incr, increment];
+    allocations.set(seat, [newIncr, decr]);
+  };
+
+  for (const [fromSeat, toSeat, fromAmounts, toAmounts] of transfers) {
+    if (fromSeat) {
+      if (!fromAmounts) {
+        throw Fail`Transfer from ${fromSeat} must say how much`;
+      }
+      decrementAllocation(fromSeat, fromAmounts);
+      if (toSeat) {
+        // Conserved transfer between seats
+        if (toAmounts) {
+          // distinct amounts, so we check conservation.
+          assertRightsConserved(
+            Object.values(fromAmounts),
+            Object.values(toAmounts),
+          );
+          incrementAllocation(toSeat, toAmounts);
+        } else {
+          // fromAmounts will be used for toAmounts as well
+          incrementAllocation(toSeat, fromAmounts);
+        }
+      } else {
+        // Transfer only from fromSeat
+        !toAmounts ||
+          Fail`Transfer without toSeat cannot have toAmounts ${toAmounts}`;
+      }
+    } else {
+      toSeat || Fail`Transfer must have at least one of fromSeat or toSeat`;
+      // Transfer only to toSeat
+      !fromAmounts ||
+        Fail`Transfer without fromSeat cannot have fromAmounts ${fromAmounts}`;
+      toAmounts || Fail`Transfer to ${toSeat} must say how much`;
+      incrementAllocation(toSeat, toAmounts);
+    }
+  }
+
+  /** @type {[ZCFSeat,AmountKeywordRecord][]} */
+  const resultingAllocations = [];
+  for (const [seat, [incrList, decrList]] of allocations.entries()) {
+    let newAlloc = seat.getCurrentAllocation();
+    for (const incr of incrList) {
+      newAlloc = addToAllocation(newAlloc, incr);
+    }
+    for (const decr of decrList) {
+      newAlloc = subtractFromAllocation(newAlloc, decr);
+    }
+    resultingAllocations.push([seat, newAlloc]);
+  }
+  return resultingAllocations;
+};

package/src/contractFacet/rightsConservation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rightsConservation.d.ts","sourceRoot":"","sources":["rightsConservation.js"],"names":[],"mappings":"AAkFA;;;;;;;;;GASG;AACH,uDANW,MAAM,EAAE,cAER,MAAM,EAAE,GAEN,IAAI,CAMhB"}
+{"version":3,"file":"rightsConservation.d.ts","sourceRoot":"","sources":["rightsConservation.js"],"names":[],"mappings":"AAqFA;;;;;;;;;GASG;AACH,uDANW,MAAM,EAAE,cAER,MAAM,EAAE,GAEN,IAAI,CAMhB"}

package/src/contractFacet/rightsConservation.js

@@ -3,6 +3,9 @@ import { assert, Fail } from '@agoric/assert';
 import { AmountMath } from '@agoric/ertp';
 
 import '../internal-types.js';
+/**
+ * @import {MapStore} from '@agoric/store';
+ */
 
 /**
  * Iterate over the amounts and sum, storing the sums in a