@agoric/fast-usdc 0.1.1-dev-fb6a3e0.0 → 0.1.1-dev-46061c3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/fast-usdc",
-  "version": "0.1.1-dev-fb6a3e0.0+fb6a3e0",
+  "version": "0.1.1-dev-46061c3.0+46061c3",
   "description": "CLI and library for Fast USDC product",
   "type": "module",
   "files": [
@@ -23,9 +23,9 @@
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/swingset-liveslots": "0.10.3-dev-fb6a3e0.0+fb6a3e0",
-    "@agoric/vats": "0.15.2-dev-fb6a3e0.0+fb6a3e0",
-    "@agoric/zone": "0.2.3-dev-fb6a3e0.0+fb6a3e0",
+    "@agoric/swingset-liveslots": "0.10.3-dev-46061c3.0+46061c3",
+    "@agoric/vats": "0.15.2-dev-46061c3.0+46061c3",
+    "@agoric/zone": "0.2.3-dev-46061c3.0+46061c3",
     "@fast-check/ava": "^2.0.1",
     "ava": "^5.3.0",
     "c8": "^10.1.2",
@@ -33,16 +33,16 @@
     "ts-blank-space": "^0.4.4"
   },
   "dependencies": {
-    "@agoric/client-utils": "0.1.1-dev-fb6a3e0.0+fb6a3e0",
-    "@agoric/cosmic-proto": "0.4.1-dev-fb6a3e0.0+fb6a3e0",
-    "@agoric/ertp": "0.16.3-dev-fb6a3e0.0+fb6a3e0",
-    "@agoric/internal": "0.3.3-dev-fb6a3e0.0+fb6a3e0",
-    "@agoric/notifier": "0.6.3-dev-fb6a3e0.0+fb6a3e0",
-    "@agoric/orchestration": "0.1.1-dev-fb6a3e0.0+fb6a3e0",
-    "@agoric/store": "0.9.3-dev-fb6a3e0.0+fb6a3e0",
-    "@agoric/vat-data": "0.5.3-dev-fb6a3e0.0+fb6a3e0",
-    "@agoric/vow": "0.1.1-dev-fb6a3e0.0+fb6a3e0",
-    "@agoric/zoe": "0.26.3-dev-fb6a3e0.0+fb6a3e0",
+    "@agoric/client-utils": "0.1.1-dev-46061c3.0+46061c3",
+    "@agoric/cosmic-proto": "0.4.1-dev-46061c3.0+46061c3",
+    "@agoric/ertp": "0.16.3-dev-46061c3.0+46061c3",
+    "@agoric/internal": "0.3.3-dev-46061c3.0+46061c3",
+    "@agoric/notifier": "0.6.3-dev-46061c3.0+46061c3",
+    "@agoric/orchestration": "0.1.1-dev-46061c3.0+46061c3",
+    "@agoric/store": "0.9.3-dev-46061c3.0+46061c3",
+    "@agoric/vat-data": "0.5.3-dev-46061c3.0+46061c3",
+    "@agoric/vow": "0.1.1-dev-46061c3.0+46061c3",
+    "@agoric/zoe": "0.26.3-dev-46061c3.0+46061c3",
     "@cosmjs/proto-signing": "^0.32.4",
     "@cosmjs/stargate": "^0.32.4",
     "@endo/base64": "^1.0.9",
@@ -82,5 +82,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fb6a3e0102deabc5e57eb0511e2208bc3b415d27"
+  "gitHead": "46061c3ad3267fb9642309a5c8287dc01ef9c5dc"
 }

package/src/exos/advancer.js

@@ -32,12 +32,12 @@ import { makeFeeTools } from '../utils/fees.js';
  * @typedef {{
  *  chainHub: ChainHub;
  *  feeConfig: FeeConfig;
- *  localTransfer: ZoeTools['localTransfer'];
  *  log?: LogFn;
  *  statusManager: StatusManager;
  *  usdc: { brand: Brand<'nat'>; denom: Denom; };
  *  vowTools: VowTools;
  *  zcf: ZCF;
+ *  zoeTools: ZoeTools;
  * }} AdvancerKitPowers
  */
 
@@ -69,6 +69,16 @@ const AdvancerKitI = harden({
     ),
     onRejected: M.call(M.error(), AdvancerVowCtxShape).returns(M.undefined()),
   }),
+  withdrawHandler: M.interface('WithdrawHandlerI', {
+    onFulfilled: M.call(M.undefined(), {
+      advanceAmount: AnyNatAmountShape,
+      tmpReturnSeat: M.remotable(),
+    }).returns(M.undefined()),
+    onRejected: M.call(M.error(), {
+      advanceAmount: AnyNatAmountShape,
+      tmpReturnSeat: M.remotable(),
+    }).returns(M.undefined()),
+  }),
 });
 
 /**
@@ -98,12 +108,12 @@ export const prepareAdvancerKit = (
   {
     chainHub,
     feeConfig,
-    localTransfer,
     log = makeTracer('Advancer', true),
     statusManager,
     usdc,
     vowTools: { watch, when },
     zcf,
+    zoeTools: { localTransfer, withdrawToSeat },
   },
 ) => {
   assertAllDefined({
@@ -289,10 +299,55 @@ export const prepareAdvancerKit = (
          * @param {AdvancerVowCtx} ctx
          */
         onRejected(error, ctx) {
-          const { notifier } = this.state;
+          const { notifier, poolAccount } = this.state;
           log('Advance failed', error);
-          const { advanceAmount: _, ...restCtx } = ctx;
+          const { advanceAmount, ...restCtx } = ctx;
           notifier.notifyAdvancingResult(restCtx, false);
+          const { zcfSeat: tmpReturnSeat } = zcf.makeEmptySeatKit();
+          const withdrawV = withdrawToSeat(
+            // @ts-expect-error LocalAccountMethods vs OrchestrationAccount
+            poolAccount,
+            tmpReturnSeat,
+            harden({ USDC: advanceAmount }),
+          );
+          void watch(withdrawV, this.facets.withdrawHandler, {
+            advanceAmount,
+            tmpReturnSeat,
+          });
+        },
+      },
+      withdrawHandler: {
+        /**
+         *
+         * @param {undefined} result
+         * @param {{ advanceAmount: Amount<'nat'>; tmpReturnSeat: ZCFSeat; }} ctx
+         */
+        onFulfilled(result, { advanceAmount, tmpReturnSeat }) {
+          const { borrower } = this.state;
+          try {
+            borrower.returnToPool(tmpReturnSeat, advanceAmount);
+          } catch (e) {
+            // If we reach here, the unused advance funds will remain in `tmpReturnSeat`
+            // and must be retrieved from recovery sets.
+            log(
+              `🚨 return ${q(advanceAmount)} to pool failed. funds remain on "tmpReturnSeat"`,
+              e,
+            );
+          }
+          tmpReturnSeat.exit();
+        },
+        /**
+         * @param {Error} error
+         * @param {{ advanceAmount: Amount<'nat'>; tmpReturnSeat: ZCFSeat; }} ctx
+         */
+        onRejected(error, { advanceAmount, tmpReturnSeat }) {
+          log(
+            `🚨 withdraw ${q(advanceAmount)} from "poolAccount" to return to pool failed`,
+            error,
+          );
+          // If we reach here, the unused advance funds will remain in the `poolAccount`.
+          // A contract update will be required to return them to the LiquidityPool.
+          tmpReturnSeat.exit();
         },
       },
     },

package/src/exos/settler.js

@@ -362,7 +362,9 @@ export const prepareSettler = (
          * @param {EvmHash} txHash
          */
         onRejected(reason, txHash) {
-          log('⚠️ forward transfer rejected!', reason, txHash);
+          // funds remain in `settlementAccount` and must be recovered via a
+          // contract upgrade
+          log('🚨 forward transfer rejected!', reason, txHash);
           // update status manager, flagging a terminal state that needs to be
           // manual intervention or a code update to remediate
           statusManager.forwarded(txHash, false);

package/src/fast-usdc.contract.js

@@ -125,11 +125,10 @@ export const contract = async (zcf, privateArgs, zone, tools) => {
     chainHub,
   });
 
-  const { localTransfer } = makeZoeTools(zcf, vowTools);
+  const zoeTools = makeZoeTools(zcf, vowTools);
   const makeAdvancer = prepareAdvancer(zone, {
     chainHub,
     feeConfig,
-    localTransfer,
     usdc: harden({
       brand: terms.brands.USDC,
       denom: terms.usdcDenom,
@@ -137,6 +136,7 @@ export const contract = async (zcf, privateArgs, zone, tools) => {
     statusManager,
     vowTools,
     zcf,
+    zoeTools,
   });
 
   const makeFeedKit = prepareTransactionFeedKit(zone, zcf);