@agoric/fast-usdc 0.2.0-upgrade-19-dev-0754752.0 → 0.2.0-upgrade-18a-dev-4ee0508.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/fast-usdc",
-  "version": "0.2.0-upgrade-19-dev-0754752.0+0754752",
+  "version": "0.2.0-upgrade-18a-dev-4ee0508.0+4ee0508",
   "description": "CLI and library for Fast USDC product",
   "type": "module",
   "files": [
@@ -8,7 +8,6 @@
     "src",
     "tools"
   ],
-  "main": "src/main.js",
   "bin": {
     "fast-usdc": "./src/cli/bin.js"
   },
@@ -23,9 +22,9 @@
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/swingset-liveslots": "0.10.3-upgrade-19-dev-0754752.0+0754752",
-    "@agoric/vats": "0.16.0-upgrade-19-dev-0754752.0+0754752",
-    "@agoric/zone": "0.3.0-upgrade-19-dev-0754752.0+0754752",
+    "@agoric/swingset-liveslots": "0.10.3-upgrade-18a-dev-4ee0508.0+4ee0508",
+    "@agoric/vats": "0.16.0-upgrade-18a-dev-4ee0508.0+4ee0508",
+    "@agoric/zone": "0.3.0-upgrade-18a-dev-4ee0508.0+4ee0508",
     "@fast-check/ava": "^2.0.1",
     "ava": "^5.3.0",
     "c8": "^10.1.2",
@@ -33,29 +32,29 @@
     "ts-blank-space": "^0.4.4"
   },
   "dependencies": {
-    "@agoric/client-utils": "0.2.0-upgrade-19-dev-0754752.0+0754752",
-    "@agoric/cosmic-proto": "0.5.0-upgrade-19-dev-0754752.0+0754752",
-    "@agoric/ertp": "0.16.3-upgrade-19-dev-0754752.0+0754752",
-    "@agoric/internal": "0.4.0-upgrade-19-dev-0754752.0+0754752",
-    "@agoric/notifier": "0.7.0-upgrade-19-dev-0754752.0+0754752",
-    "@agoric/orchestration": "0.2.0-upgrade-19-dev-0754752.0+0754752",
-    "@agoric/store": "0.9.3-upgrade-19-dev-0754752.0+0754752",
-    "@agoric/vat-data": "0.5.3-upgrade-19-dev-0754752.0+0754752",
-    "@agoric/vow": "0.2.0-upgrade-19-dev-0754752.0+0754752",
-    "@agoric/zoe": "0.27.0-upgrade-19-dev-0754752.0+0754752",
+    "@agoric/client-utils": "0.2.0-upgrade-18a-dev-4ee0508.0+4ee0508",
+    "@agoric/cosmic-proto": "0.5.0-upgrade-18a-dev-4ee0508.0+4ee0508",
+    "@agoric/ertp": "0.16.3-upgrade-18a-dev-4ee0508.0+4ee0508",
+    "@agoric/internal": "0.4.0-upgrade-18a-dev-4ee0508.0+4ee0508",
+    "@agoric/notifier": "0.7.0-upgrade-18a-dev-4ee0508.0+4ee0508",
+    "@agoric/orchestration": "0.2.0-upgrade-18a-dev-4ee0508.0+4ee0508",
+    "@agoric/store": "0.9.3-upgrade-18a-dev-4ee0508.0+4ee0508",
+    "@agoric/vat-data": "0.5.3-upgrade-18a-dev-4ee0508.0+4ee0508",
+    "@agoric/vow": "0.2.0-upgrade-18a-dev-4ee0508.0+4ee0508",
+    "@agoric/zoe": "0.26.3-upgrade-18a-dev-4ee0508.0+4ee0508",
     "@cosmjs/proto-signing": "^0.32.4",
     "@cosmjs/stargate": "^0.32.4",
     "@endo/base64": "^1.0.9",
-    "@endo/common": "^1.2.9",
-    "@endo/errors": "^1.2.9",
-    "@endo/eventual-send": "^1.3.0",
-    "@endo/far": "^1.1.10",
-    "@endo/init": "^1.1.8",
-    "@endo/marshal": "^1.6.3",
-    "@endo/nat": "^5.0.14",
-    "@endo/pass-style": "^1.4.8",
-    "@endo/patterns": "^1.4.8",
-    "@endo/promise-kit": "^1.1.9",
+    "@endo/common": "^1.2.8",
+    "@endo/errors": "^1.2.8",
+    "@endo/eventual-send": "^1.2.8",
+    "@endo/far": "^1.1.9",
+    "@endo/init": "^1.1.7",
+    "@endo/marshal": "^1.6.2",
+    "@endo/nat": "^5.0.13",
+    "@endo/pass-style": "^1.4.7",
+    "@endo/patterns": "^1.4.7",
+    "@endo/promise-kit": "^1.1.8",
     "@nick134-bit/noblejs": "0.0.2",
     "bech32": "^2.0.0",
     "commander": "^12.1.0",
@@ -82,5 +81,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "07547522e9d8a06692fa5ff12c35230ddb4b252b"
+  "gitHead": "4ee05088e5ada989a866a11ff65838d395505ce6"
 }

package/src/cli/cli.js

@@ -13,7 +13,7 @@ import { addConfigCommands } from './config-commands.js';
 import { addOperatorCommands } from './operator-commands.js';
 import * as configLib from './config.js';
 import transferLib from './transfer.js';
-import { makeFile } from './util/file.js';
+import { makeFile } from '../util/file.js';
 import { addLPCommands } from './lp-commands.js';
 
 const packageJson = JSON.parse(

package/src/cli/config-commands.js

@@ -1,6 +1,6 @@
 /**
  * @import {Command} from 'commander';
- * @import {File} from './util/file.js';
+ * @import {File} from '../util/file.js';
  * @import * as ConfigHelpers from './config.js';
  */
 /**

package/src/cli/config.js

@@ -23,7 +23,7 @@ import { stdin as input, stdout as output } from 'node:process';
   }} ConfigOpts
  */
 
-/** @import { File } from './util/file' */
+/** @import { File } from '../util/file' */
 
 export const init = async (
   /** @type {File} */ configFile,

package/src/cli/lp-commands.js

@@ -1,7 +1,6 @@
 /* eslint-env node */
 /**
  * @import {Command} from 'commander';
- * @import {Amount, Brand} from '@agoric/ertp';
  * @import {OfferSpec} from '@agoric/smart-wallet/src/offers.js';
  * @import {ExecuteOfferAction} from '@agoric/smart-wallet/src/smartWallet.js';
  * @import {USDCProposalShapes} from '../pool-share-math.js';
@@ -15,13 +14,11 @@ import { AmountMath } from '@agoric/ertp';
 import {
   assertParsableNumber,
   ceilDivideBy,
-  floorDivideBy,
   multiplyBy,
   parseRatio,
 } from '@agoric/zoe/src/contractSupport/ratio.js';
 import { InvalidArgumentError } from 'commander';
 import { outputActionAndHint } from './bridge-action.js';
-import { Offers } from '../clientSupport.js';
 
 export const delay = ms => new Promise(resolve => setTimeout(resolve, ms));
 
@@ -84,27 +81,30 @@ export const addLPCommands = (
     .action(async opts => {
       swkP ||= loadSwk();
       const swk = await swkP;
-
       /** @type {Brand<'nat'>} */
       // @ts-expect-error it doesnt recognize usdc as a Brand type
       const usdc = swk.agoricNames.brand.USDC;
       assert(usdc, 'USDC brand not in agoricNames');
 
-      /** @type {Brand<'nat'>} */
-      // @ts-expect-error it doesnt recognize FastLP as a Brand type
-      const poolShare = swk.agoricNames.brand.FastLP;
-      assert(poolShare, 'FastLP brand not in agoricNames');
-
       const usdcAmount = parseUSDCAmount(opts.amount, usdc);
 
-      const metrics = await swk.readPublished('fastUsdc.poolMetrics');
-      const fastLPAmount = floorDivideBy(usdcAmount, metrics.shareWorth);
+      /** @type {USDCProposalShapes['deposit']} */
+      const proposal = {
+        give: {
+          USDC: usdcAmount,
+        },
+      };
 
-      const offer = Offers.fastUsdc.Deposit(swk.agoricNames, {
-        offerId: opts.offerId,
-        fastLPAmount: fastLPAmount.value,
-        usdcAmount: usdcAmount.value,
-      });
+      /** @type {OfferSpec} */
+      const offer = {
+        id: opts.offerId,
+        invitationSpec: {
+          source: 'agoricContract',
+          instancePath: ['fastUsdc'],
+          callPipe: [['makeDepositInvitation', []]],
+        },
+        proposal,
+      };
 
       /** @type {ExecuteOfferAction} */
       const bridgeAction = {
@@ -125,6 +125,7 @@ export const addLPCommands = (
     .requiredOption('--amount <number>', 'USDC amount', parseDecimal)
     .option('--offerId <string>', 'Offer id', String, `lpWithdraw-${now()}`)
     .action(async opts => {
+      swkP ||= loadSwk();
       swkP ||= loadSwk();
       const swk = await swkP;
 
@@ -140,14 +141,31 @@ export const addLPCommands = (
 
       const usdcAmount = parseUSDCAmount(opts.amount, usdc);
 
+      /** @type {import('../types.js').PoolMetrics} */
+      // @ts-expect-error it treats this as "unknown"
       const metrics = await swk.readPublished('fastUsdc.poolMetrics');
       const fastLPAmount = ceilDivideBy(usdcAmount, metrics.shareWorth);
 
-      const offer = Offers.fastUsdc.Withdraw(swk.agoricNames, {
-        offerId: opts.offerId,
-        fastLPAmount: fastLPAmount.value,
-        usdcAmount: usdcAmount.value,
-      });
+      /** @type {USDCProposalShapes['withdraw']} */
+      const proposal = {
+        give: {
+          PoolShare: fastLPAmount,
+        },
+        want: {
+          USDC: usdcAmount,
+        },
+      };
+
+      /** @type {OfferSpec} */
+      const offer = {
+        id: opts.offerId,
+        invitationSpec: {
+          source: 'agoricContract',
+          instancePath: ['fastUsdc'],
+          callPipe: [['makeWithdrawInvitation', []]],
+        },
+        proposal,
+      };
 
       outputActionAndHint(
         { method: 'executeOffer', offer },

package/src/cli/operator-commands.js

@@ -96,7 +96,6 @@ export const addOperatorCommands = (
     .requiredOption('--recipientAddress <string>', 'bech32 address', String)
     .requiredOption('--blockHash <0xhex>', 'hex hash', parseHex)
     .requiredOption('--blockNumber <number>', 'number', parseNat)
-    .requiredOption('--blockTimestamp <number>', 'number', parseNat)
     .requiredOption('--chainId <string>', 'chain id', Number)
     .requiredOption('--amount <number>', 'number', parseNat)
     .requiredOption('--forwardingAddress <string>', 'bech32 address', String)

package/src/cli/transfer.js

@@ -7,16 +7,16 @@ import {
   pickEndpoint,
 } from '@agoric/client-utils';
 import { encodeAddressHook } from '@agoric/cosmic-proto/address-hooks.js';
-import { queryFastUSDCLocalChainAccount } from './util/agoric.js';
-import { depositForBurn, makeProvider } from './util/cctp.js';
+import { queryFastUSDCLocalChainAccount } from '../util/agoric.js';
+import { depositForBurn, makeProvider } from '../util/cctp.js';
 import {
   makeSigner,
   queryForwardingAccount,
   registerFwdAccount,
-} from './util/noble.js';
-import { queryUSDCBalance } from './util/bank.js';
+} from '../util/noble.js';
+import { queryUSDCBalance } from '../util/bank.js';
 
-/** @import { File } from './util/file' */
+/** @import { File } from '../util/file' */
 /** @import { VStorage } from '@agoric/client-utils' */
 /** @import { SigningStargateClient } from '@cosmjs/stargate' */
 /** @import { JsonRpcProvider as ethProvider } from 'ethers' */

package/src/exos/advancer.js

@@ -16,14 +16,13 @@ import { makeFeeTools } from '../utils/fees.js';
 
 /**
  * @import {HostInterface} from '@agoric/async-flow';
- * @import {Amount, Brand} from '@agoric/ertp';
  * @import {TypedPattern} from '@agoric/internal'
  * @import {NatAmount} from '@agoric/ertp';
  * @import {ChainAddress, ChainHub, Denom, OrchestrationAccount} from '@agoric/orchestration';
  * @import {ZoeTools} from '@agoric/orchestration/src/utils/zoe-tools.js';
  * @import {VowTools} from '@agoric/vow';
  * @import {Zone} from '@agoric/zone';
- * @import {AddressHook, EvmHash, FeeConfig, LogFn, NobleAddress, EvidenceWithRisk} from '../types.js';
+ * @import {CctpTxEvidence, AddressHook, EvmHash, FeeConfig, LogFn, NobleAddress, EvidenceWithRisk} from '../types.js';
  * @import {StatusManager} from './status-manager.js';
  * @import {LiquidityPoolKit} from './liquidity-pool.js';
  */
@@ -32,12 +31,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
  */
 
@@ -64,21 +63,12 @@ const AdvancerKitI = harden({
     onRejected: M.call(M.error(), AdvancerVowCtxShape).returns(),
   }),
   transferHandler: M.interface('TransferHandlerI', {
+    // TODO confirm undefined, and not bigint (sequence)
     onFulfilled: M.call(M.undefined(), AdvancerVowCtxShape).returns(
       M.undefined(),
     ),
     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()),
-  }),
 });
 
 /**
@@ -91,14 +81,6 @@ const AdvancerKitI = harden({
  * }} AdvancerVowCtx
  */
 
-export const stateShape = harden({
-  notifier: M.remotable(),
-  borrower: M.remotable(),
-  poolAccount: M.remotable(),
-  intermediateRecipient: M.opt(ChainAddressShape),
-  settlementAddress: M.opt(ChainAddressShape),
-});
-
 /**
  * @param {Zone} zone
  * @param {AdvancerKitPowers} caps
@@ -108,12 +90,12 @@ export const prepareAdvancerKit = (
   {
     chainHub,
     feeConfig,
+    localTransfer,
     log = makeTracer('Advancer', true),
     statusManager,
     usdc,
     vowTools: { watch, when },
     zcf,
-    zoeTools: { localTransfer, withdrawToSeat },
   },
 ) => {
   assertAllDefined({
@@ -132,8 +114,8 @@ export const prepareAdvancerKit = (
     AdvancerKitI,
     /**
      * @param {{
-     *   notifier: import('./settler.js').SettlerKit['notifier'];
-     *   borrower: LiquidityPoolKit['borrower'];
+     *   notifyFacet: import('./settler.js').SettlerKit['notify'];
+     *   borrowerFacet: LiquidityPoolKit['borrower'];
      *   poolAccount: HostInterface<OrchestrationAccount<{chainId: 'agoric'}>>;
      *   settlementAddress: ChainAddress;
      *   intermediateRecipient?: ChainAddress;
@@ -170,7 +152,9 @@ export const prepareAdvancerKit = (
               statusManager.skipAdvance(evidence, risk.risksIdentified);
               return;
             }
-            const { settlementAddress } = this.state;
+
+            const { borrowerFacet, poolAccount, settlementAddress } =
+              this.state;
             const { recipientAddress } = evidence.aux;
             const decoded = decodeAddressHook(recipientAddress);
             mustMatch(decoded, AddressHookShape);
@@ -183,20 +167,12 @@ export const prepareAdvancerKit = (
             const destination = chainHub.makeChainAddress(EUD);
 
             const fullAmount = toAmount(evidence.tx.amount);
-            const { borrower, notifier, poolAccount } = this.state;
-            // do not advance if we've already received a mint/settlement
-            const mintedEarly = notifier.checkMintedEarly(
-              evidence,
-              destination,
-            );
-            if (mintedEarly) return;
-
             // throws if requested does not exceed fees
             const advanceAmount = feeTools.calculateAdvance(fullAmount);
 
             const { zcfSeat: tmpSeat } = zcf.makeEmptySeatKit();
             // throws if the pool has insufficient funds
-            borrower.borrow(tmpSeat, advanceAmount);
+            borrowerFacet.borrow(tmpSeat, advanceAmount);
 
             // this cannot throw since `.isSeen()` is called in the same turn
             statusManager.advance(evidence);
@@ -217,7 +193,7 @@ export const prepareAdvancerKit = (
             });
           } catch (error) {
             log('Advancer error:', error);
-            statusManager.skipAdvance(evidence, [error.message]);
+            statusManager.observe(evidence);
           }
         },
         /** @param {ChainAddress} intermediateRecipient */
@@ -231,21 +207,14 @@ export const prepareAdvancerKit = (
          * @param {AdvancerVowCtx & { tmpSeat: ZCFSeat }} ctx
          */
         onFulfilled(result, ctx) {
-          const { poolAccount, intermediateRecipient, settlementAddress } =
-            this.state;
-          const { destination, advanceAmount, tmpSeat, ...detail } = ctx;
-          tmpSeat.exit();
-          const amount = harden({
-            denom: usdc.denom,
-            value: advanceAmount.value,
-          });
-          const transferOrSendV =
-            destination.chainId === settlementAddress.chainId
-              ? E(poolAccount).send(destination, amount)
-              : E(poolAccount).transfer(destination, amount, {
-                  forwardOpts: { intermediateRecipient },
-                });
-          return watch(transferOrSendV, this.facets.transferHandler, {
+          const { poolAccount, intermediateRecipient } = this.state;
+          const { destination, advanceAmount, ...detail } = ctx;
+          const transferV = E(poolAccount).transfer(
+            destination,
+            { denom: usdc.denom, value: advanceAmount.value },
+            { forwardOpts: { intermediateRecipient } },
+          );
+          return watch(transferV, this.facets.transferHandler, {
             destination,
             advanceAmount,
             ...detail,
@@ -268,10 +237,9 @@ export const prepareAdvancerKit = (
             error,
           );
           try {
-            const { borrower, notifier } = this.state;
-            notifier.notifyAdvancingResult(restCtx, false);
-            borrower.returnToPool(tmpSeat, advanceAmount);
-            tmpSeat.exit();
+            const { borrowerFacet, notifyFacet } = this.state;
+            notifyFacet.notifyAdvancingResult(restCtx, false);
+            borrowerFacet.returnToPool(tmpSeat, advanceAmount);
           } catch (e) {
             log('🚨 deposit to localOrchAccount failure recovery failed', e);
           }
@@ -279,80 +247,44 @@ export const prepareAdvancerKit = (
       },
       transferHandler: {
         /**
-         * @param {undefined} result
+         * @param {unknown} result TODO confirm this is not a bigint (sequence)
          * @param {AdvancerVowCtx} ctx
          */
         onFulfilled(result, ctx) {
-          const { notifier } = this.state;
+          const { notifyFacet } = this.state;
           const { advanceAmount, destination, ...detail } = ctx;
-          log('Advance succeeded', { advanceAmount, destination });
+          log('Advance transfer fulfilled', {
+            advanceAmount,
+            destination,
+            result,
+          });
           // During development, due to a bug, this call threw.
           // The failure was silent (no diagnostics) due to:
           //  - #10576 Vows do not report unhandled rejections
           // For now, the advancer kit relies on consistency between
-          // notify, statusManager, and callers of handleTransactionEvent().
+          // notifyFacet, statusManager, and callers of handleTransactionEvent().
           // TODO: revisit #10576 during #10510
-          notifier.notifyAdvancingResult({ destination, ...detail }, true);
+          notifyFacet.notifyAdvancingResult({ destination, ...detail }, true);
         },
         /**
          * @param {Error} error
          * @param {AdvancerVowCtx} ctx
          */
         onRejected(error, ctx) {
-          const { notifier, poolAccount } = this.state;
-          log('Advance failed', error);
-          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();
+          const { notifyFacet } = this.state;
+          log('Advance transfer rejected', error);
+          notifyFacet.notifyAdvancingResult(ctx, false);
         },
       },
     },
     {
-      stateShape,
+      stateShape: harden({
+        notifyFacet: M.remotable(),
+        borrowerFacet: M.remotable(),
+        poolAccount: M.remotable(),
+        intermediateRecipient: M.opt(ChainAddressShape),
+        settlementAddress: M.opt(ChainAddressShape),
+      }),
     },
   );
 };