@agoric/inter-protocol 0.13.2-dev-95c7d1a.0 → 0.13.2-dev-9e33502.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/inter-protocol",
-  "version": "0.13.2-dev-95c7d1a.0+95c7d1a",
+  "version": "0.13.2-dev-9e33502.0+9e33502",
   "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-95c7d1a.0+95c7d1a",
-    "@agoric/ertp": "0.15.4-dev-95c7d1a.0+95c7d1a",
-    "@agoric/governance": "0.9.2-dev-95c7d1a.0+95c7d1a",
-    "@agoric/internal": "0.2.2-dev-95c7d1a.0+95c7d1a",
-    "@agoric/notifier": "0.5.2-dev-95c7d1a.0+95c7d1a",
-    "@agoric/store": "0.8.4-dev-95c7d1a.0+95c7d1a",
-    "@agoric/time": "0.2.2-dev-95c7d1a.0+95c7d1a",
-    "@agoric/vat-data": "0.4.4-dev-95c7d1a.0+95c7d1a",
-    "@agoric/vats": "0.13.1-dev-95c7d1a.0+95c7d1a",
-    "@agoric/zoe": "0.25.4-dev-95c7d1a.0+95c7d1a",
+    "@agoric/assert": "0.5.2-dev-9e33502.0+9e33502",
+    "@agoric/ertp": "0.15.4-dev-9e33502.0+9e33502",
+    "@agoric/governance": "0.9.2-dev-9e33502.0+9e33502",
+    "@agoric/internal": "0.2.2-dev-9e33502.0+9e33502",
+    "@agoric/notifier": "0.5.2-dev-9e33502.0+9e33502",
+    "@agoric/store": "0.8.4-dev-9e33502.0+9e33502",
+    "@agoric/time": "0.2.2-dev-9e33502.0+9e33502",
+    "@agoric/vat-data": "0.4.4-dev-9e33502.0+9e33502",
+    "@agoric/vats": "0.13.1-dev-9e33502.0+9e33502",
+    "@agoric/zoe": "0.25.4-dev-9e33502.0+9e33502",
     "@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-95c7d1a.0+95c7d1a",
-    "@agoric/smart-wallet": "0.4.3-dev-95c7d1a.0+95c7d1a",
-    "@agoric/swingset-liveslots": "0.9.1-dev-95c7d1a.0+95c7d1a",
-    "@agoric/swingset-vat": "0.30.3-dev-95c7d1a.0+95c7d1a",
+    "@agoric/deploy-script-support": "0.9.5-dev-9e33502.0+9e33502",
+    "@agoric/smart-wallet": "0.4.3-dev-9e33502.0+9e33502",
+    "@agoric/swingset-liveslots": "0.9.1-dev-9e33502.0+9e33502",
+    "@agoric/swingset-vat": "0.30.3-dev-9e33502.0+9e33502",
     "@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": "95c7d1aecfbb3b562dea05908846f9b5c99e31b4"
+  "gitHead": "9e33502cbd414eb093761423c347bac086035daa"
 }

package/src/contractSupport.js

@@ -49,28 +49,6 @@ export const allEmpty = amounts => {
   return amounts.every(a => AmountMath.isEmpty(a));
 };
 
-/**
- * Stage a transfer between `fromSeat` and `toSeat`, specified as the delta between
- * the gain and a loss on the `fromSeat`. The gain/loss are typically from the
- * give/want respectively of a proposal. The `key` is the allocation keyword.
- *
- * @deprecated Use atomicRearrange instead
- * @param {ZCFSeat} fromSeat
- * @param {ZCFSeat} toSeat
- * @param {Amount} fromLoses
- * @param {Amount} fromGains
- * @param {Keyword} key
- */
-export const stageDelta = (fromSeat, toSeat, fromLoses, fromGains, key) => {
-  // Must check `isEmpty`; can't subtract `empty` from a missing allocation.
-  if (!AmountMath.isEmpty(fromLoses)) {
-    toSeat.incrementBy(fromSeat.decrementBy(harden({ [key]: fromLoses })));
-  }
-  if (!AmountMath.isEmpty(fromGains)) {
-    fromSeat.incrementBy(toSeat.decrementBy(harden({ [key]: fromGains })));
-  }
-};
-
 /**
  * @param {Amount<'nat'>} debtLimit
  * @param {Amount<'nat'>} totalDebt

package/src/reserve/doc.md

@@ -77,9 +77,7 @@ zoe ->> addCollateralHook: call addCollateralHook
 addCollateralHook ->> seat: get proposal
 
 addCollateralHook ->> addCollateralHook: get Keyword for amountIn brand
-addCollateralHook ->> seat: decrementBy amountIn
-addCollateralHook ->> collateralSeat: incrementBy collateralKeyword: amountIn
-addCollateralHook ->> zcf: reallocate collateralSeat, seat
+addCollateralHook ->> zcf: atomicTransfer amountIn from seat to collateralSeat
 addCollateralHook ->> seat: seat.exit()
 seat ->> zoe: added collateral to the reserve
 zoe ->> caller: return status

package/src/stakeFactory/stakeFactoryKit.js

@@ -4,7 +4,10 @@ import { bindAllMethods, makeTracer } from '@agoric/internal';
 import { makePublishKit } from '@agoric/notifier';
 import { M, matches } from '@agoric/store';
 import { defineKindMulti } from '@agoric/vat-data';
-import { assertProposalShape } from '@agoric/zoe/src/contractSupport/index.js';
+import {
+  assertProposalShape,
+  atomicRearrange,
+} from '@agoric/zoe/src/contractSupport/index.js';
 import { ceilMultiplyBy } from '@agoric/zoe/src/contractSupport/ratio.js';
 import { addSubtract, assertOnlyKeys } from '../contractSupport.js';
 import { calculateCurrentDebt, reverseInterest } from '../interest-math.js';
@@ -342,15 +345,18 @@ const helperBehavior = {
     } = seat.getProposal();
     AmountMath.isGTE(runOffered, currentDebt) ||
       Fail`Offer ${runOffered} is not sufficient to pay off debt ${currentDebt}`;
-    vaultSeat.incrementBy(seat.decrementBy(harden({ [KW.Debt]: currentDebt })));
-    seat.incrementBy(
-      vaultSeat.decrementBy(
-        harden({ Attestation: vaultSeat.getAmountAllocated('Attestation') }),
-      ),
+    atomicRearrange(
+      zcf,
+      harden([
+        [seat, vaultSeat, { [KW.Debt]: currentDebt }],
+        [
+          vaultSeat,
+          seat,
+          { Attestation: vaultSeat.getAmountAllocated('Attestation') },
+        ],
+      ]),
     );
 
-    zcf.reallocate(seat, vaultSeat);
-
     manager.burnDebt(currentDebt, vaultSeat);
     state.open = false;
     helper.updateDebtSnapshot(AmountMath.makeEmpty(debtBrand));