@agoric/fast-usdc 0.1.1-dev-e596a01.0 → 0.1.1-dev-3653dc7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/fast-usdc",
-  "version": "0.1.1-dev-e596a01.0+e596a01",
+  "version": "0.1.1-dev-3653dc7.0+3653dc7",
   "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-e596a01.0+e596a01",
-    "@agoric/vats": "0.15.2-dev-e596a01.0+e596a01",
-    "@agoric/zone": "0.2.3-dev-e596a01.0+e596a01",
+    "@agoric/swingset-liveslots": "0.10.3-dev-3653dc7.0+3653dc7",
+    "@agoric/vats": "0.15.2-dev-3653dc7.0+3653dc7",
+    "@agoric/zone": "0.2.3-dev-3653dc7.0+3653dc7",
     "@fast-check/ava": "^2.0.1",
     "ava": "^5.3.0",
     "c8": "^10.1.2",
@@ -32,15 +32,15 @@
     "ts-blank-space": "^0.4.1"
   },
   "dependencies": {
-    "@agoric/client-utils": "0.1.1-dev-e596a01.0+e596a01",
-    "@agoric/ertp": "0.16.3-dev-e596a01.0+e596a01",
-    "@agoric/internal": "0.3.3-dev-e596a01.0+e596a01",
-    "@agoric/notifier": "0.6.3-dev-e596a01.0+e596a01",
-    "@agoric/orchestration": "0.1.1-dev-e596a01.0+e596a01",
-    "@agoric/store": "0.9.3-dev-e596a01.0+e596a01",
-    "@agoric/vat-data": "0.5.3-dev-e596a01.0+e596a01",
-    "@agoric/vow": "0.1.1-dev-e596a01.0+e596a01",
-    "@agoric/zoe": "0.26.3-dev-e596a01.0+e596a01",
+    "@agoric/client-utils": "0.1.1-dev-3653dc7.0+3653dc7",
+    "@agoric/ertp": "0.16.3-dev-3653dc7.0+3653dc7",
+    "@agoric/internal": "0.3.3-dev-3653dc7.0+3653dc7",
+    "@agoric/notifier": "0.6.3-dev-3653dc7.0+3653dc7",
+    "@agoric/orchestration": "0.1.1-dev-3653dc7.0+3653dc7",
+    "@agoric/store": "0.9.3-dev-3653dc7.0+3653dc7",
+    "@agoric/vat-data": "0.5.3-dev-3653dc7.0+3653dc7",
+    "@agoric/vow": "0.1.1-dev-3653dc7.0+3653dc7",
+    "@agoric/zoe": "0.26.3-dev-3653dc7.0+3653dc7",
     "@cosmjs/proto-signing": "^0.32.4",
     "@cosmjs/stargate": "^0.32.4",
     "@endo/base64": "^1.0.9",
@@ -80,5 +80,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e596a010f6b0885db9f8a8aa1cc4cb2f232e8f91"
+  "gitHead": "3653dc7fa4da616034cff2021fe82e2c3fbfe479"
 }

package/src/cli/operator-commands.js

@@ -85,7 +85,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/exos/advancer.js

@@ -116,6 +116,7 @@ export const prepareAdvancerKit = (
      *   notifyFacet: import('./settler.js').SettlerKit['notify'];
      *   borrowerFacet: LiquidityPoolKit['borrower'];
      *   poolAccount: HostInterface<OrchestrationAccount<{chainId: 'agoric'}>>;
+     *   intermediateRecipient: ChainAddress;
      * }} config
      */
     config => harden(config),
@@ -187,12 +188,20 @@ export const prepareAdvancerKit = (
          * @param {AdvancerVowCtx & { tmpSeat: ZCFSeat }} ctx
          */
         onFulfilled(result, ctx) {
-          const { poolAccount } = this.state;
+          const { poolAccount, intermediateRecipient } = this.state;
           const { destination, advanceAmount, ...detail } = ctx;
-          const transferV = E(poolAccount).transfer(destination, {
-            denom: usdc.denom,
-            value: advanceAmount.value,
-          });
+          const transferV = E(poolAccount).transfer(
+            destination,
+            {
+              denom: usdc.denom,
+              value: advanceAmount.value,
+            },
+            {
+              forwardOpts: {
+                intermediateRecipient,
+              },
+            },
+          );
           return watch(transferV, this.facets.transferHandler, {
             destination,
             advanceAmount,
@@ -250,6 +259,7 @@ export const prepareAdvancerKit = (
         notifyFacet: M.remotable(),
         borrowerFacet: M.remotable(),
         poolAccount: M.remotable(),
+        intermediateRecipient: ChainAddressShape,
       }),
     },
   );

package/src/exos/settler.js

@@ -1,5 +1,6 @@
 import { AmountMath } from '@agoric/ertp';
 import { assertAllDefined, makeTracer } from '@agoric/internal';
+import { ChainAddressShape } from '@agoric/orchestration';
 import { atob } from '@endo/base64';
 import { E } from '@endo/far';
 import { M } from '@endo/patterns';
@@ -93,6 +94,7 @@ export const prepareSettler = (
      *   remoteDenom: Denom;
      *   repayer: LiquidityPoolKit['repayer'];
      *   settlementAccount: HostInterface<OrchestrationAccount<{ chainId: 'agoric' }>>
+     *   intermediateRecipient: ChainAddress;
      * }} config
      */
     config => {
@@ -255,7 +257,7 @@ export const prepareSettler = (
          * @param {string} EUD
          */
         forward(txHash, sender, fullValue, EUD) {
-          const { settlementAccount } = this.state;
+          const { settlementAccount, intermediateRecipient } = this.state;
 
           const dest = chainHub.makeChainAddress(EUD);
 
@@ -263,6 +265,11 @@ export const prepareSettler = (
           const txfrV = E(settlementAccount).transfer(
             dest,
             AmountMath.make(USDC, fullValue),
+            {
+              forwardOpts: {
+                intermediateRecipient,
+              },
+            },
           );
           void vowTools.watch(txfrV, this.facets.transferHandler, {
             txHash,
@@ -305,6 +312,7 @@ export const prepareSettler = (
         sourceChannel: M.string(),
         remoteDenom: M.string(),
         mintedEarly: M.remotable('mintedEarly'),
+        intermediateRecipient: ChainAddressShape,
       }),
     },
   );

package/src/fast-usdc.contract.js

@@ -140,7 +140,7 @@ export const contract = async (zcf, privateArgs, zone, tools) => {
     'test of forcing evidence',
   );
 
-  const { makeLocalAccount } = orchestrateAll(flows, {});
+  const { makeLocalAccount, makeNobleAccount } = orchestrateAll(flows, {});
 
   const creatorFacet = zone.exo('Fast USDC Creator', undefined, {
     /** @type {(operatorId: string) => Promise<Invitation<OperatorKit>>} */
@@ -214,7 +214,7 @@ 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,10 +222,18 @@ export const contract = async (zcf, privateArgs, zone, tools) => {
     makeLocalAccount(),
   );
   // when() is OK here since this clearly resolves promptly.
-  /** @type {HostInterface<OrchestrationAccount<{chainId: 'agoric';}>>[]} */
-  const [poolAccount, settlementAccount] = await vowTools.when(
-    vowTools.all([poolAccountV, settleAccountV]),
+  /** @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]),
+  );
+  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'),
@@ -235,6 +243,7 @@ export const contract = async (zcf, privateArgs, zone, tools) => {
     sourceChannel: agToNoble.transferChannel.counterPartyChannelId,
     remoteDenom: 'uusdc',
     settlementAccount,
+    intermediateRecipient,
   });
 
   const advancer = zone.makeOnce('Advancer', () =>
@@ -242,6 +251,7 @@ 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.flows.js

@@ -11,3 +11,13 @@ export const makeLocalAccount = async orch => {
   return agoricChain.makeAccount();
 };
 harden(makeLocalAccount);
+
+/**
+ * @satisfies {OrchestrationFlow}
+ * @param {Orchestrator} orch
+ */
+export const makeNobleAccount = async orch => {
+  const nobleChain = await orch.getChain('noble');
+  return nobleChain.makeAccount();
+};
+harden(makeNobleAccount);

package/src/type-guards.js

@@ -49,11 +49,10 @@ export const CctpTxEvidenceShape = {
     recipientAddress: M.string(),
   },
   blockHash: EvmHashShape,
-  blockNumber: M.bigint(),
-  blockTimestamp: M.bigint(),
+  blockNumber: M.nat(),
   chainId: M.number(),
   tx: {
-    amount: M.bigint(),
+    amount: M.nat(),
     forwardingAddress: M.string(),
   },
   txHash: EvmHashShape,

package/src/types.ts

@@ -16,7 +16,6 @@ export interface CctpTxEvidence {
   };
   blockHash: EvmHash;
   blockNumber: bigint;
-  blockTimestamp: bigint;
   chainId: number;
   /** data covered by signature (aka txHash) */
   tx: {