@agoric/fast-usdc 0.1.1-dev-35cb8ca.0 → 0.1.1-dev-83c2ebd.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/fast-usdc",
-  "version": "0.1.1-dev-35cb8ca.0+35cb8ca",
+  "version": "0.1.1-dev-83c2ebd.0+83c2ebd",
   "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-35cb8ca.0+35cb8ca",
-    "@agoric/vats": "0.15.2-dev-35cb8ca.0+35cb8ca",
-    "@agoric/zone": "0.2.3-dev-35cb8ca.0+35cb8ca",
+    "@agoric/swingset-liveslots": "0.10.3-dev-83c2ebd.0+83c2ebd",
+    "@agoric/vats": "0.15.2-dev-83c2ebd.0+83c2ebd",
+    "@agoric/zone": "0.2.3-dev-83c2ebd.0+83c2ebd",
     "@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-35cb8ca.0+35cb8ca",
-    "@agoric/cosmic-proto": "0.4.1-dev-35cb8ca.0+35cb8ca",
-    "@agoric/ertp": "0.16.3-dev-35cb8ca.0+35cb8ca",
-    "@agoric/internal": "0.3.3-dev-35cb8ca.0+35cb8ca",
-    "@agoric/notifier": "0.6.3-dev-35cb8ca.0+35cb8ca",
-    "@agoric/orchestration": "0.1.1-dev-35cb8ca.0+35cb8ca",
-    "@agoric/store": "0.9.3-dev-35cb8ca.0+35cb8ca",
-    "@agoric/vat-data": "0.5.3-dev-35cb8ca.0+35cb8ca",
-    "@agoric/vow": "0.1.1-dev-35cb8ca.0+35cb8ca",
-    "@agoric/zoe": "0.26.3-dev-35cb8ca.0+35cb8ca",
+    "@agoric/client-utils": "0.1.1-dev-83c2ebd.0+83c2ebd",
+    "@agoric/cosmic-proto": "0.4.1-dev-83c2ebd.0+83c2ebd",
+    "@agoric/ertp": "0.16.3-dev-83c2ebd.0+83c2ebd",
+    "@agoric/internal": "0.3.3-dev-83c2ebd.0+83c2ebd",
+    "@agoric/notifier": "0.6.3-dev-83c2ebd.0+83c2ebd",
+    "@agoric/orchestration": "0.1.1-dev-83c2ebd.0+83c2ebd",
+    "@agoric/store": "0.9.3-dev-83c2ebd.0+83c2ebd",
+    "@agoric/vat-data": "0.5.3-dev-83c2ebd.0+83c2ebd",
+    "@agoric/vow": "0.1.1-dev-83c2ebd.0+83c2ebd",
+    "@agoric/zoe": "0.26.3-dev-83c2ebd.0+83c2ebd",
     "@cosmjs/proto-signing": "^0.32.4",
     "@cosmjs/stargate": "^0.32.4",
     "@endo/base64": "^1.0.9",
@@ -82,5 +82,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "35cb8caa621416371d94b570762804e703a23461"
+  "gitHead": "83c2ebdab859d3ac8365e2b7237e055360bd0536"
 }

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/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

@@ -81,6 +81,14 @@ 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
@@ -114,8 +122,8 @@ export const prepareAdvancerKit = (
     AdvancerKitI,
     /**
      * @param {{
-     *   notifyFacet: import('./settler.js').SettlerKit['notify'];
-     *   borrowerFacet: LiquidityPoolKit['borrower'];
+     *   notifier: import('./settler.js').SettlerKit['notifier'];
+     *   borrower: LiquidityPoolKit['borrower'];
      *   poolAccount: HostInterface<OrchestrationAccount<{chainId: 'agoric'}>>;
      *   settlementAddress: ChainAddress;
      *   intermediateRecipient?: ChainAddress;
@@ -165,9 +173,9 @@ export const prepareAdvancerKit = (
             const destination = chainHub.makeChainAddress(EUD);
 
             const fullAmount = toAmount(evidence.tx.amount);
-            const { borrowerFacet, notifyFacet, poolAccount } = this.state;
+            const { borrower, notifier, poolAccount } = this.state;
             // do not advance if we've already received a mint/settlement
-            const mintedEarly = notifyFacet.checkMintedEarly(
+            const mintedEarly = notifier.checkMintedEarly(
               evidence,
               destination,
             );
@@ -178,7 +186,7 @@ export const prepareAdvancerKit = (
 
             const { zcfSeat: tmpSeat } = zcf.makeEmptySeatKit();
             // throws if the pool has insufficient funds
-            borrowerFacet.borrow(tmpSeat, advanceAmount);
+            borrower.borrow(tmpSeat, advanceAmount);
 
             // this cannot throw since `.isSeen()` is called in the same turn
             statusManager.advance(evidence);
@@ -249,9 +257,9 @@ export const prepareAdvancerKit = (
             error,
           );
           try {
-            const { borrowerFacet, notifyFacet } = this.state;
-            notifyFacet.notifyAdvancingResult(restCtx, false);
-            borrowerFacet.returnToPool(tmpSeat, advanceAmount);
+            const { borrower, notifier } = this.state;
+            notifier.notifyAdvancingResult(restCtx, false);
+            borrower.returnToPool(tmpSeat, advanceAmount);
           } catch (e) {
             log('🚨 deposit to localOrchAccount failure recovery failed', e);
           }
@@ -263,37 +271,31 @@ export const prepareAdvancerKit = (
          * @param {AdvancerVowCtx} ctx
          */
         onFulfilled(result, ctx) {
-          const { notifyFacet } = this.state;
+          const { notifier } = this.state;
           const { advanceAmount, destination, ...detail } = ctx;
           log('Advance succeeded', { advanceAmount, destination });
           // 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
-          // notifyFacet, statusManager, and callers of handleTransactionEvent().
+          // notify, statusManager, and callers of handleTransactionEvent().
           // TODO: revisit #10576 during #10510
-          notifyFacet.notifyAdvancingResult({ destination, ...detail }, true);
+          notifier.notifyAdvancingResult({ destination, ...detail }, true);
         },
         /**
          * @param {Error} error
          * @param {AdvancerVowCtx} ctx
          */
         onRejected(error, ctx) {
-          const { notifyFacet } = this.state;
+          const { notifier } = this.state;
           log('Advance failed', error);
           const { advanceAmount: _, ...restCtx } = ctx;
-          notifyFacet.notifyAdvancingResult(restCtx, false);
+          notifier.notifyAdvancingResult(restCtx, false);
         },
       },
     },
     {
-      stateShape: harden({
-        notifyFacet: M.remotable(),
-        borrowerFacet: M.remotable(),
-        poolAccount: M.remotable(),
-        settlementAddress: ChainAddressShape,
-        intermediateRecipient: M.opt(ChainAddressShape),
-      }),
+      stateShape,
     },
   );
 };

package/src/exos/liquidity-pool.js

@@ -1,8 +1,9 @@
-import { AmountMath, AmountShape } from '@agoric/ertp';
+import { AmountMath, AmountShape, RatioShape } from '@agoric/ertp';
 import {
   makeRecorderTopic,
+  RecorderKitShape,
   TopicsRecordShape,
-} from '@agoric/zoe/src/contractSupport/topics.js';
+} from '@agoric/zoe/src/contractSupport/index.js';
 import { SeatShape } from '@agoric/zoe/src/typeGuards.js';
 import { M } from '@endo/patterns';
 import { Fail, q } from '@endo/errors';
@@ -48,6 +49,22 @@ const { add, isGTE, makeEmpty } = AmountMath;
  * }} RepayPaymentKWR
  */
 
+export const stateShape = harden({
+  encumberedBalance: AmountShape,
+  feeSeat: M.remotable(),
+  poolStats: M.record(),
+  poolMetricsRecorderKit: RecorderKitShape,
+  poolSeat: M.remotable(),
+  PoolShares: M.remotable(),
+  proposalShapes: {
+    deposit: M.pattern(),
+    withdraw: M.pattern(),
+    withdrawFees: M.pattern(),
+  },
+  shareMint: M.remotable(),
+  shareWorth: RatioShape,
+});
+
 /**
  * @param {Zone} zone
  * @param {ZCF} zcf
@@ -384,6 +401,7 @@ export const prepareLiquidityPoolKit = (zone, zcf, USDC, tools) => {
       finish: ({ facets: { external } }) => {
         void external.publishPoolMetrics();
       },
+      stateShape,
     },
   );
 };

package/src/exos/operator-kit.js

@@ -90,8 +90,6 @@ export const prepareOperatorKit = (zone, staticPowers) =>
          */
         async SubmitEvidence(evidence, riskAssessment) {
           const { operator } = this.facets;
-          // TODO(bootstrap integration): cause this call to throw and confirm that it
-          // shows up in the the smart-wallet UpdateRecord `error` property
           operator.submitEvidence(evidence, riskAssessment);
           return staticPowers.makeInertInvitation(
             'evidence was pushed in the invitation maker call',

package/src/exos/settler.js

@@ -19,7 +19,7 @@ import {
  * @import {Amount, Brand, NatValue, Payment} from '@agoric/ertp';
  * @import {Denom, OrchestrationAccount, ChainHub, ChainAddress} from '@agoric/orchestration';
  * @import {WithdrawToSeat} from '@agoric/orchestration/src/utils/zoe-tools'
- * @import {IBCChannelID, VTransferIBCEvent} from '@agoric/vats';
+ * @import {IBCChannelID, IBCPacket, VTransferIBCEvent} from '@agoric/vats';
  * @import {Zone} from '@agoric/zone';
  * @import {HostOf, HostInterface} from '@agoric/async-flow';
  * @import {TargetRegistration} from '@agoric/vats/src/bridge-target.js';
@@ -27,6 +27,53 @@ import {
  * @import {StatusManager} from './status-manager.js';
  */
 
+/**
+ * @param {IBCPacket} data
+ * @param {string} remoteDenom
+ * @returns {{ nfa: NobleAddress, amount: bigint, EUD: string } | {error: object[]}}
+ */
+const decodeEventPacket = ({ data }, remoteDenom) => {
+  // NB: may not be a FungibleTokenPacketData or even JSON
+  /** @type {FungibleTokenPacketData} */
+  let tx;
+  try {
+    tx = JSON.parse(atob(data));
+  } catch (e) {
+    return { error: ['could not parse packet data', data] };
+  }
+
+  // given the sourceChannel check, we can be certain of this cast
+  const nfa = /** @type {NobleAddress} */ (tx.sender);
+
+  if (tx.denom !== remoteDenom) {
+    const { denom: actual } = tx;
+    return { error: ['unexpected denom', { actual, expected: remoteDenom }] };
+  }
+
+  let EUD;
+  try {
+    ({ EUD } = decodeAddressHook(tx.receiver).query);
+    if (!EUD) {
+      return { error: ['no EUD parameter', tx.receiver] };
+    }
+    if (typeof EUD !== 'string') {
+      return { error: ['EUD is not a string', EUD] };
+    }
+  } catch (e) {
+    return { error: ['no query params', tx.receiver] };
+  }
+
+  let amount;
+  try {
+    amount = BigInt(tx.amount);
+  } catch (e) {
+    return { error: ['invalid amount', tx.amount] };
+  }
+
+  return { nfa, amount, EUD };
+};
+harden(decodeEventPacket);
+
 /**
  * NOTE: not meant to be parsable.
  *
@@ -45,6 +92,16 @@ export const makeAdvanceDetailsShape = USDC =>
     txHash: EvmHashShape,
   });
 
+export const stateShape = harden({
+  repayer: M.remotable('Repayer'),
+  settlementAccount: M.remotable('Account'),
+  registration: M.or(M.undefined(), M.remotable('Registration')),
+  sourceChannel: M.string(),
+  remoteDenom: M.string(),
+  mintedEarly: M.remotable('mintedEarly'),
+  intermediateRecipient: M.opt(ChainAddressShape),
+});
+
 /**
  * @param {Zone} zone
  * @param {object} caps
@@ -81,7 +138,7 @@ export const prepareSettler = (
       tap: M.interface('SettlerTapI', {
         receiveUpcall: M.call(M.record()).returns(M.promise()),
       }),
-      notify: M.interface('SettlerNotifyI', {
+      notifier: M.interface('SettlerNotifyI', {
         notifyAdvancingResult: M.call(
           makeAdvanceDetailsShape(USDC),
           M.boolean(),
@@ -148,38 +205,13 @@ export const prepareSettler = (
             return;
           }
 
-          // TODO: why is it safe to cast this without a runtime check?
-          const tx = /** @type {FungibleTokenPacketData} */ (
-            JSON.parse(atob(packet.data))
-          );
-
-          // given the sourceChannel check, we can be certain of this cast
-          const nfa = /** @type {NobleAddress} */ (tx.sender);
-
-          if (tx.denom !== remoteDenom) {
-            const { denom: actual } = tx;
-            log('unexpected denom', { actual, expected: remoteDenom });
-            return;
-          }
-
-          let EUD;
-          try {
-            ({ EUD } = decodeAddressHook(tx.receiver).query);
-            if (!EUD) {
-              log('no EUD parameter', tx.receiver);
-              return;
-            }
-            if (typeof EUD !== 'string') {
-              log('EUD is not a string', EUD);
-              return;
-            }
-          } catch (e) {
-            log('no query params', tx.receiver);
+          const decoded = decodeEventPacket(event.packet, remoteDenom);
+          if ('error' in decoded) {
+            log('invalid event packet', decoded.error);
             return;
           }
 
-          const amount = BigInt(tx.amount); // TODO: what if this throws?
-
+          const { nfa, amount, EUD } = decoded;
           const { self } = this.facets;
           const found = statusManager.dequeueStatus(nfa, amount);
           log('dequeued', found, 'for', nfa, amount);
@@ -206,7 +238,7 @@ export const prepareSettler = (
           }
         },
       },
-      notify: {
+      notifier: {
         /**
          * @param {object} ctx
          * @param {EvmHash} ctx.txHash
@@ -337,21 +369,11 @@ export const prepareSettler = (
       },
     },
     {
-      stateShape: harden({
-        repayer: M.remotable('Repayer'),
-        settlementAccount: M.remotable('Account'),
-        registration: M.or(M.undefined(), M.remotable('Registration')),
-        sourceChannel: M.string(),
-        remoteDenom: M.string(),
-        mintedEarly: M.remotable('mintedEarly'),
-        intermediateRecipient: M.opt(ChainAddressShape),
-      }),
+      stateShape,
     },
   );
 };
 harden(prepareSettler);
 
-/**
- * XXX consider using pickFacet (do we have pickFacets?)
- * @typedef {ReturnType<ReturnType<typeof prepareSettler>>} SettlerKit
- */
+// Expose the whole kit because the contract needs `creatorFacet` and the Advancer needs `notifier`
+/** @typedef {ReturnType<ReturnType<typeof prepareSettler>>} SettlerKit */

package/src/exos/status-manager.js

@@ -53,6 +53,12 @@ const pendingTxKeyOf = evidence => {
  * }} StatusManagerPowers
  */
 
+export const stateShape = harden({
+  pendingSettleTxs: M.remotable(),
+  seenTxs: M.remotable(),
+  storedCompletedTxs: M.remotable(),
+});
+
 /**
  * The `StatusManager` keeps track of Pending and Seen Transactions
  * via {@link PendingTxStatus} states, aiding in coordination between the `Advancer`
@@ -408,6 +414,7 @@ export const prepareStatusManager = (
         return pendingSettleTxs.get(key);
       },
     },
+    { stateShape },
   );
 };
 harden(prepareStatusManager);

package/src/exos/transaction-feed.js

@@ -59,6 +59,12 @@ const allRisksIdentified = (riskStores, txHash) => {
   return [...setOfRisks.values()].sort();
 };
 
+export const stateShape = {
+  operators: M.remotable(),
+  pending: M.remotable(),
+  risks: M.remotable(),
+};
+
 /**
  * @param {Zone} zone
  * @param {ZCF} zcf
@@ -245,6 +251,7 @@ export const prepareTransactionFeedKit = (zone, zcf) => {
         getEvidenceSubscriber: () => subscriber,
       },
     },
+    { stateShape },
   );
 };
 harden(prepareTransactionFeedKit);

package/src/fast-usdc.contract.js

@@ -284,8 +284,8 @@ export const contract = async (zcf, privateArgs, zone, tools) => {
 
   const advancer = zone.makeOnce('Advancer', () =>
     makeAdvancer({
-      borrowerFacet: poolKit.borrower,
-      notifyFacet: settlerKit.notify,
+      borrower: poolKit.borrower,
+      notifier: settlerKit.notifier,
       poolAccount,
       settlementAddress,
     }),