@agoric/fast-usdc 0.1.1-dev-74ab972.0 → 0.1.1-dev-340ef0d.0

package/package.json

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

package/src/exos/advancer.js

@@ -56,6 +56,7 @@ const AdvancerVowCtxShape = M.splitRecord(
 const AdvancerKitI = harden({
   advancer: M.interface('AdvancerI', {
     handleTransactionEvent: M.callWhen(CctpTxEvidenceShape).returns(),
+    setIntermediateRecipient: M.call(ChainAddressShape).returns(),
   }),
   depositHandler: M.interface('DepositHandlerI', {
     onFulfilled: M.call(M.undefined(), AdvancerVowCtxShape).returns(VowShape),
@@ -95,7 +96,7 @@ export const prepareAdvancerKit = (
     usdc,
     vowTools: { watch, when },
     zcf,
-  } = /** @type {AdvancerKitPowers} */ ({}),
+  },
 ) => {
   assertAllDefined({
     chainHub,
@@ -116,10 +117,15 @@ export const prepareAdvancerKit = (
      *   notifyFacet: import('./settler.js').SettlerKit['notify'];
      *   borrowerFacet: LiquidityPoolKit['borrower'];
      *   poolAccount: HostInterface<OrchestrationAccount<{chainId: 'agoric'}>>;
-     *   intermediateRecipient: ChainAddress;
+     *   intermediateRecipient?: ChainAddress;
      * }} config
      */
-    config => harden(config),
+    config =>
+      harden({
+        ...config,
+        // make sure the state record has this property, perhaps with an undefined value
+        intermediateRecipient: config.intermediateRecipient,
+      }),
     {
       advancer: {
         /**
@@ -181,6 +187,10 @@ export const prepareAdvancerKit = (
             statusManager.observe(evidence);
           }
         },
+        /** @param {ChainAddress} intermediateRecipient */
+        setIntermediateRecipient(intermediateRecipient) {
+          this.state.intermediateRecipient = intermediateRecipient;
+        },
       },
       depositHandler: {
         /**
@@ -192,15 +202,8 @@ export const prepareAdvancerKit = (
           const { destination, advanceAmount, ...detail } = ctx;
           const transferV = E(poolAccount).transfer(
             destination,
-            {
-              denom: usdc.denom,
-              value: advanceAmount.value,
-            },
-            {
-              forwardOpts: {
-                intermediateRecipient,
-              },
-            },
+            { denom: usdc.denom, value: advanceAmount.value },
+            { forwardOpts: { intermediateRecipient } },
           );
           return watch(transferV, this.facets.transferHandler, {
             destination,
@@ -259,7 +262,7 @@ export const prepareAdvancerKit = (
         notifyFacet: M.remotable(),
         borrowerFacet: M.remotable(),
         poolAccount: M.remotable(),
-        intermediateRecipient: ChainAddressShape,
+        intermediateRecipient: M.opt(ChainAddressShape),
       }),
     },
   );

package/src/exos/settler.js

@@ -62,6 +62,7 @@ export const prepareSettler = (
     {
       creator: M.interface('SettlerCreatorI', {
         monitorMintingDeposits: M.callWhen().returns(M.any()),
+        setIntermediateRecipient: M.call(ChainAddressShape).returns(),
       }),
       tap: M.interface('SettlerTapI', {
         receiveUpcall: M.call(M.record()).returns(M.promise()),
@@ -94,13 +95,15 @@ export const prepareSettler = (
      *   remoteDenom: Denom;
      *   repayer: LiquidityPoolKit['repayer'];
      *   settlementAccount: HostInterface<OrchestrationAccount<{ chainId: 'agoric' }>>
-     *   intermediateRecipient: ChainAddress;
+     *   intermediateRecipient?: ChainAddress;
      * }} config
      */
     config => {
       log('config', config);
       return {
         ...config,
+        // make sure the state record has this property, perhaps with an undefined value
+        intermediateRecipient: config.intermediateRecipient,
         /** @type {HostInterface<TargetRegistration>|undefined} */
         registration: undefined,
         /** @type {SetStore<ReturnType<typeof makeMintedEarlyKey>>} */
@@ -117,6 +120,10 @@ export const prepareSettler = (
           assert.typeof(registration, 'object');
           this.state.registration = registration;
         },
+        /** @param {ChainAddress} intermediateRecipient */
+        setIntermediateRecipient(intermediateRecipient) {
+          this.state.intermediateRecipient = intermediateRecipient;
+        },
       },
       tap: {
         /** @param {VTransferIBCEvent} event */
@@ -265,11 +272,7 @@ export const prepareSettler = (
           const txfrV = E(settlementAccount).transfer(
             dest,
             AmountMath.make(USDC, fullValue),
-            {
-              forwardOpts: {
-                intermediateRecipient,
-              },
-            },
+            { forwardOpts: { intermediateRecipient } },
           );
           void vowTools.watch(txfrV, this.facets.transferHandler, {
             txHash,
@@ -312,7 +315,7 @@ export const prepareSettler = (
         sourceChannel: M.string(),
         remoteDenom: M.string(),
         mintedEarly: M.remotable('mintedEarly'),
-        intermediateRecipient: ChainAddressShape,
+        intermediateRecipient: M.opt(ChainAddressShape),
       }),
     },
   );

package/src/fast-usdc.contract.js

@@ -1,5 +1,5 @@
 import { AssetKind } from '@agoric/ertp';
-import { assertAllDefined, makeTracer } from '@agoric/internal';
+import { makeTracer } from '@agoric/internal';
 import { observeIteration, subscribeEach } from '@agoric/notifier';
 import {
   CosmosChainInfoShape,
@@ -126,7 +126,6 @@ export const contract = async (zcf, privateArgs, zone, tools) => {
   });
 
   const makeFeedKit = prepareTransactionFeedKit(zone, zcf);
-  assertAllDefined({ makeFeedKit, makeAdvancer, makeSettler, statusManager });
 
   const makeLiquidityPoolKit = prepareLiquidityPoolKit(
     zone,
@@ -147,6 +146,20 @@ export const contract = async (zcf, privateArgs, zone, tools) => {
     async makeOperatorInvitation(operatorId) {
       return feedKit.creator.makeOperatorInvitation(operatorId);
     },
+    async connectToNoble() {
+      return vowTools.when(nobleAccountV, nobleAccount => {
+        trace('nobleAccount', nobleAccount);
+        return vowTools.when(
+          E(nobleAccount).getAddress(),
+          intermediateRecipient => {
+            trace('intermediateRecipient', intermediateRecipient);
+            advancer.setIntermediateRecipient(intermediateRecipient);
+            settlerKit.creator.setIntermediateRecipient(intermediateRecipient);
+            return intermediateRecipient;
+          },
+        );
+      });
+    },
   });
 
   const publicFacet = zone.exo('Fast USDC Public', undefined, {
@@ -214,7 +227,9 @@ export const contract = async (zcf, privateArgs, zone, tools) => {
       privateArgs.assetInfo,
     );
   }
+
   const nobleAccountV = zone.makeOnce('NobleAccount', () => makeNobleAccount());
+
   const feedKit = zone.makeOnce('Feed Kit', () => makeFeedKit());
 
   const poolAccountV = zone.makeOnce('PoolAccount', () => makeLocalAccount());
@@ -222,18 +237,12 @@ export const contract = async (zcf, privateArgs, zone, tools) => {
     makeLocalAccount(),
   );
   // when() is OK here since this clearly resolves promptly.
-  /** @type {[HostInterface<OrchestrationAccount<{chainId: 'noble-1';}>>, HostInterface<OrchestrationAccount<{chainId: 'agoric-3';}>>, HostInterface<OrchestrationAccount<{chainId: 'agoric-3';}>>]} */
-  const [nobleAccount, poolAccount, settlementAccount] = await vowTools.when(
-    vowTools.all([nobleAccountV, poolAccountV, settleAccountV]),
+  /** @type {[HostInterface<OrchestrationAccount<{chainId: 'agoric-3';}>>, HostInterface<OrchestrationAccount<{chainId: 'agoric-3';}>>]} */
+  const [poolAccount, settlementAccount] = await vowTools.when(
+    vowTools.all([poolAccountV, settleAccountV]),
   );
   trace('settlementAccount', settlementAccount);
   trace('poolAccount', poolAccount);
-  trace('nobleAccount', nobleAccount);
-
-  const intermediateRecipient = await vowTools.when(
-    E(nobleAccount).getAddress(),
-  );
-  trace('intermediateRecipient', intermediateRecipient);
 
   const [_agoric, _noble, agToNoble] = await vowTools.when(
     chainHub.getChainsAndConnection('agoric', 'noble'),
@@ -243,7 +252,6 @@ export const contract = async (zcf, privateArgs, zone, tools) => {
     sourceChannel: agToNoble.transferChannel.counterPartyChannelId,
     remoteDenom: 'uusdc',
     settlementAccount,
-    intermediateRecipient,
   });
 
   const advancer = zone.makeOnce('Advancer', () =>
@@ -251,7 +259,6 @@ export const contract = async (zcf, privateArgs, zone, tools) => {
       borrowerFacet: poolKit.borrower,
       notifyFacet: settlerKit.notify,
       poolAccount,
-      intermediateRecipient,
     }),
   );
   // Connect evidence stream to advancer

package/src/fast-usdc.start.js

@@ -147,12 +147,11 @@ export const startFastUSDC = async (
     USDC: await E(USDCissuer).getBrand(),
   });
 
-  const { terms, oracles, feeConfig, feedPolicy, chainInfo, assetInfo } =
-    fromExternalConfig(
-      config?.options, // just in case config is missing somehow
-      brands,
-      FastUSDCConfigShape,
-    );
+  const { terms, oracles, feeConfig, feedPolicy, ...net } = fromExternalConfig(
+    config.options,
+    brands,
+    FastUSDCConfigShape,
+  );
   trace('using terms', terms);
   trace('using fee config', feeConfig);
 
@@ -186,8 +185,8 @@ export const startFastUSDC = async (
       storageNode,
       timerService,
       marshaller,
-      chainInfo,
-      assetInfo,
+      chainInfo: net.chainInfo,
+      assetInfo: net.assetInfo,
     }),
   );
 
@@ -224,6 +223,11 @@ export const startFastUSDC = async (
 
   produceInstance.reset();
   produceInstance.resolve(instance);
+
+  if (!net.noNoble) {
+    const addr = await E(kit.creatorFacet).connectToNoble();
+    trace('noble intermediate recipient', addr);
+  }
   trace('startFastUSDC done', instance);
 };
 harden(startFastUSDC);

package/src/types.ts

@@ -6,7 +6,7 @@ import type {
 } from '@agoric/orchestration';
 import type { IBCChannelID } from '@agoric/vats';
 import type { Amount } from '@agoric/ertp';
-import type { Passable } from '@endo/pass-style';
+import type { CopyRecord, Passable } from '@endo/pass-style';
 import type { PendingTxStatus } from './constants.js';
 import type { FastUsdcTerms } from './fast-usdc.contract.js';
 
@@ -78,14 +78,15 @@ export interface FeedPolicy {
   eventFilter?: string;
 }
 
-export type FastUSDCConfig = Passable & {
+export type FastUSDCConfig = {
   terms: FastUsdcTerms;
   oracles: Record<string, string>;
   feeConfig: FeeConfig;
   feedPolicy: FeedPolicy & Passable;
+  noNoble: boolean; // support a3p-integration, which has no noble chain
   chainInfo: Record<string, CosmosChainInfo & Passable>;
   assetInfo: [Denom, DenomDetail & { brandKey?: string }][];
-};
+} & CopyRecord;
 
 export type * from './constants.js';
 export type { LiquidityPoolKit } from './exos/liquidity-pool.js';

package/src/utils/deploy-config.js

@@ -35,6 +35,11 @@ export const defaultAssetInfo = [
     },
   ],
 ];
+harden(defaultAssetInfo);
+
+const agoricAssetInfo = defaultAssetInfo.filter(
+  ([_d, i]) => i.chainName === 'agoric',
+);
 
 /**
  * @type {Record<string, Pick<FastUSDCConfig, 'oracles' | 'feedPolicy' | 'chainInfo' | 'assetInfo' >>}
@@ -43,6 +48,11 @@ export const defaultAssetInfo = [
  * meanwhile, use price oracle addresses (from updatePriceFeeds.js).
  */
 export const configurations = {
+  /**
+   * NOTE: The a3p-integration runtime does _not_ include
+   * a noble chain; this limits functionality to advancing
+   * to the Agoric chain.
+   */
   A3P_INTEGRATION: {
     oracles: {
       gov1: 'agoric1ee9hr0jyrxhy999y755mp862ljgycmwyp4pl7q',
@@ -50,7 +60,7 @@ export const configurations = {
       gov3: 'agoric1ydzxwh6f893jvpaslmaz6l8j2ulup9a7x8qvvq',
     },
     feedPolicy: {
-      nobleAgoricChannelId: 'TODO',
+      nobleAgoricChannelId: 'channel-does-not-exist',
       nobleDomainId: 4,
       chainPolicies: {
         Arbitrum: {
@@ -63,9 +73,13 @@ export const configurations = {
       },
     },
     chainInfo: /** @type {Record<string, CosmosChainInfo & Passable>} */ (
-      withChainCapabilities(fetchedChainInfo)
+      withChainCapabilities({
+        agoric: fetchedChainInfo.agoric,
+        // registering USDC-on-agoric requires registering the noble chain
+        noble: fetchedChainInfo.noble,
+      })
     ),
-    assetInfo: defaultAssetInfo,
+    assetInfo: agoricAssetInfo,
   },
   MAINNET: {
     oracles: {
@@ -139,3 +153,4 @@ export const configurations = {
     assetInfo: defaultAssetInfo, // TODO: use emerynet values
   },
 };
+harden(configurations);