@agoric/fast-usdc 0.1.1-dev-1d5cb99.0 → 0.1.1-dev-8a52ddd.0

package/package.json

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

package/src/exos/advancer.js

@@ -1,6 +1,6 @@
-import { AmountMath, AmountShape } from '@agoric/ertp';
+import { AmountMath } from '@agoric/ertp';
 import { assertAllDefined, makeTracer } from '@agoric/internal';
-import { ChainAddressShape } from '@agoric/orchestration';
+import { AnyNatAmountShape, ChainAddressShape } from '@agoric/orchestration';
 import { pickFacet } from '@agoric/vat-data';
 import { VowShape } from '@agoric/vow';
 import { q } from '@endo/errors';
@@ -16,6 +16,7 @@ import { makeFeeTools } from '../utils/fees.js';
 
 /**
  * @import {HostInterface} from '@agoric/async-flow';
+ * @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';
@@ -39,47 +40,40 @@ import { makeFeeTools } from '../utils/fees.js';
  * }} AdvancerKitPowers
  */
 
+/** @type {TypedPattern<AdvancerVowCtx>} */
+const AdvancerVowCtxShape = M.splitRecord(
+  {
+    fullAmount: AnyNatAmountShape,
+    advanceAmount: AnyNatAmountShape,
+    destination: ChainAddressShape,
+    forwardingAddress: M.string(),
+    txHash: EvmHashShape,
+  },
+  { tmpSeat: M.remotable() },
+);
+
 /** type guards internal to the AdvancerKit */
 const AdvancerKitI = harden({
   advancer: M.interface('AdvancerI', {
     handleTransactionEvent: M.callWhen(CctpTxEvidenceShape).returns(),
   }),
   depositHandler: M.interface('DepositHandlerI', {
-    onFulfilled: M.call(M.undefined(), {
-      amount: AmountShape,
-      destination: ChainAddressShape,
-      forwardingAddress: M.string(),
-      tmpSeat: M.remotable(),
-      txHash: EvmHashShape,
-    }).returns(VowShape),
-    onRejected: M.call(M.error(), {
-      amount: AmountShape,
-      destination: ChainAddressShape,
-      forwardingAddress: M.string(),
-      tmpSeat: M.remotable(),
-      txHash: EvmHashShape,
-    }).returns(),
+    onFulfilled: M.call(M.undefined(), AdvancerVowCtxShape).returns(VowShape),
+    onRejected: M.call(M.error(), AdvancerVowCtxShape).returns(),
   }),
   transferHandler: M.interface('TransferHandlerI', {
     // TODO confirm undefined, and not bigint (sequence)
-    onFulfilled: M.call(M.undefined(), {
-      amount: AmountShape,
-      destination: ChainAddressShape,
-      forwardingAddress: M.string(),
-      txHash: EvmHashShape,
-    }).returns(M.undefined()),
-    onRejected: M.call(M.error(), {
-      amount: AmountShape,
-      destination: ChainAddressShape,
-      forwardingAddress: M.string(),
-      txHash: EvmHashShape,
-    }).returns(M.undefined()),
+    onFulfilled: M.call(M.undefined(), AdvancerVowCtxShape).returns(
+      M.undefined(),
+    ),
+    onRejected: M.call(M.error(), AdvancerVowCtxShape).returns(M.undefined()),
   }),
 });
 
 /**
  * @typedef {{
- *  amount: NatAmount;
+ *  fullAmount: NatAmount;
+ *  advanceAmount: NatAmount;
  *  destination: ChainAddress;
  *  forwardingAddress: NobleAddress;
  *  txHash: EvmHash;
@@ -155,9 +149,9 @@ export const prepareAdvancerKit = (
             // throws if the bech32 prefix is not found
             const destination = chainHub.makeChainAddress(EUD);
 
-            const requestedAmount = toAmount(evidence.tx.amount);
+            const fullAmount = toAmount(evidence.tx.amount);
             // throws if requested does not exceed fees
-            const advanceAmount = feeTools.calculateAdvance(requestedAmount);
+            const advanceAmount = feeTools.calculateAdvance(fullAmount);
 
             const { zcfSeat: tmpSeat } = zcf.makeEmptySeatKit();
             const amountKWR = harden({ USDC: advanceAmount });
@@ -174,7 +168,8 @@ export const prepareAdvancerKit = (
               amountKWR,
             );
             void watch(depositV, this.facets.depositHandler, {
-              amount: advanceAmount,
+              fullAmount,
+              advanceAmount,
               destination,
               forwardingAddress: evidence.tx.forwardingAddress,
               tmpSeat,
@@ -193,16 +188,15 @@ export const prepareAdvancerKit = (
          */
         onFulfilled(result, ctx) {
           const { poolAccount } = this.state;
-          const { amount, destination, forwardingAddress, txHash } = ctx;
+          const { destination, advanceAmount, ...detail } = ctx;
           const transferV = E(poolAccount).transfer(destination, {
             denom: usdc.denom,
-            value: amount.value,
+            value: advanceAmount.value,
           });
           return watch(transferV, this.facets.transferHandler, {
             destination,
-            amount,
-            forwardingAddress,
-            txHash,
+            advanceAmount,
+            ...detail,
           });
         },
         /**
@@ -222,23 +216,23 @@ export const prepareAdvancerKit = (
       },
       transferHandler: {
         /**
-         * @param {undefined} result TODO confirm this is not a bigint (sequence)
+         * @param {unknown} result TODO confirm this is not a bigint (sequence)
          * @param {AdvancerVowCtx} ctx
          */
         onFulfilled(result, ctx) {
           const { notifyFacet } = this.state;
-          const { amount, destination, forwardingAddress, txHash } = ctx;
+          const { advanceAmount, destination, ...detail } = ctx;
           log(
             'Advance transfer fulfilled',
-            q({ amount, destination, result }).toString(),
-          );
-          notifyFacet.notifyAdvancingResult(
-            txHash,
-            forwardingAddress,
-            amount.value,
-            destination.value,
-            true,
+            q({ advanceAmount, destination, result }).toString(),
           );
+          // 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().
+          // TODO: revisit #10576 during #10510
+          notifyFacet.notifyAdvancingResult({ destination, ...detail }, true);
         },
         /**
          * @param {Error} error
@@ -246,15 +240,8 @@ export const prepareAdvancerKit = (
          */
         onRejected(error, ctx) {
           const { notifyFacet } = this.state;
-          const { amount, destination, forwardingAddress, txHash } = ctx;
           log('Advance transfer rejected', q(error).toString());
-          notifyFacet.notifyAdvancingResult(
-            txHash,
-            forwardingAddress,
-            amount.value,
-            destination.value,
-            false,
-          );
+          notifyFacet.notifyAdvancingResult(ctx, false);
         },
       },
     },

package/src/exos/settler.js

@@ -11,18 +11,16 @@ import { EvmHashShape } from '../type-guards.js';
 
 /**
  * @import {FungibleTokenPacketData} from '@agoric/cosmic-proto/ibc/applications/transfer/v2/packet.js';
- * @import {Denom, OrchestrationAccount, ChainHub} from '@agoric/orchestration';
+ * @import {Denom, OrchestrationAccount, ChainHub, ChainAddress} from '@agoric/orchestration';
  * @import {WithdrawToSeat} from '@agoric/orchestration/src/utils/zoe-tools'
  * @import {IBCChannelID, 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';
- * @import {NobleAddress, LiquidityPoolKit, FeeConfig, EvmHash} from '../types.js';
+ * @import {NobleAddress, LiquidityPoolKit, FeeConfig, EvmHash, LogFn} from '../types.js';
  * @import {StatusManager} from './status-manager.js';
  */
 
-const trace = makeTracer('Settler');
-
 /**
  * NOTE: not meant to be parsable.
  *
@@ -42,10 +40,20 @@ const makeMintedEarlyKey = (addr, amount) =>
  * @param {HostOf<WithdrawToSeat>} caps.withdrawToSeat
  * @param {import('@agoric/vow').VowTools} caps.vowTools
  * @param {ChainHub} caps.chainHub
+ * @param {LogFn} [caps.log]
  */
 export const prepareSettler = (
   zone,
-  { statusManager, USDC, zcf, feeConfig, withdrawToSeat, vowTools, chainHub },
+  {
+    chainHub,
+    feeConfig,
+    log = makeTracer('Settler', true),
+    statusManager,
+    USDC,
+    vowTools,
+    withdrawToSeat,
+    zcf,
+  },
 ) => {
   assertAllDefined({ statusManager });
   return zone.exoClassKit(
@@ -59,8 +67,7 @@ export const prepareSettler = (
       }),
       notify: M.interface('SettlerNotifyI', {
         notifyAdvancingResult: M.call(
-          M.string(),
-          M.nat(),
+          M.record(), // XXX fill in details TODO
           M.boolean(),
         ).returns(),
       }),
@@ -89,6 +96,7 @@ export const prepareSettler = (
      * }} config
      */
     config => {
+      log('config', config);
       return {
         ...config,
         /** @type {HostInterface<TargetRegistration>|undefined} */
@@ -111,11 +119,12 @@ export const prepareSettler = (
       tap: {
         /** @param {VTransferIBCEvent} event */
         async receiveUpcall(event) {
+          log('upcall event', event.packet.sequence, event.blockTime);
           const { sourceChannel, remoteDenom } = this.state;
           const { packet } = event;
           if (packet.source_channel !== sourceChannel) {
             const { source_channel: actual } = packet;
-            trace('unexpected channel', { actual, expected: sourceChannel });
+            log('unexpected channel', { actual, expected: sourceChannel });
             return;
           }
 
@@ -129,7 +138,7 @@ export const prepareSettler = (
 
           if (tx.denom !== remoteDenom) {
             const { denom: actual } = tx;
-            trace('unexpected denom', { actual, expected: remoteDenom });
+            log('unexpected denom', { actual, expected: remoteDenom });
             return;
           }
 
@@ -148,7 +157,7 @@ export const prepareSettler = (
 
           const { self } = this.facets;
           const found = statusManager.dequeueStatus(sender, amount);
-          trace('dequeued', found, 'for', sender, amount);
+          log('dequeued', found, 'for', sender, amount);
           switch (found?.status) {
             case PendingTxStatus.Advanced:
               return self.disburse(found.txHash, sender, amount);
@@ -157,35 +166,51 @@ export const prepareSettler = (
               this.state.mintedEarly.add(makeMintedEarlyKey(sender, amount));
               return;
 
-            case undefined:
             case PendingTxStatus.Observed:
             case PendingTxStatus.AdvanceFailed:
+              return self.forward(found.txHash, sender, amount, EUD);
+
+            case undefined:
             default:
-              return self.forward(found?.txHash, sender, amount, EUD);
+              log('⚠️ tap: no status for ', sender, amount);
           }
         },
       },
       notify: {
         /**
-         * @param {EvmHash} txHash
-         * @param {NobleAddress} sender
-         * @param {NatValue} amount
-         * @param {string} EUD
+         * @param {object} ctx
+         * @param {EvmHash} ctx.txHash
+         * @param {NobleAddress} ctx.forwardingAddress
+         * @param {Amount<'nat'>} ctx.fullAmount
+         * @param {ChainAddress} ctx.destination
          * @param {boolean} success
          * @returns {void}
          */
-        notifyAdvancingResult(txHash, sender, amount, EUD, success) {
+        notifyAdvancingResult(
+          { txHash, forwardingAddress, fullAmount, destination },
+          success,
+        ) {
           const { mintedEarly } = this.state;
-          const key = makeMintedEarlyKey(sender, amount);
+          const { value: fullValue } = fullAmount;
+          const key = makeMintedEarlyKey(forwardingAddress, fullValue);
           if (mintedEarly.has(key)) {
             mintedEarly.delete(key);
             if (success) {
-              void this.facets.self.disburse(txHash, sender, amount);
+              void this.facets.self.disburse(
+                txHash,
+                forwardingAddress,
+                fullValue,
+              );
             } else {
-              void this.facets.self.forward(txHash, sender, amount, EUD);
+              void this.facets.self.forward(
+                txHash,
+                forwardingAddress,
+                fullValue,
+                destination.value,
+              );
             }
           } else {
-            statusManager.advanceOutcome(sender, amount, success);
+            statusManager.advanceOutcome(forwardingAddress, fullValue, success);
           }
         },
       },
@@ -193,15 +218,15 @@ export const prepareSettler = (
         /**
          * @param {EvmHash} txHash
          * @param {NobleAddress} sender
-         * @param {NatValue} amount
+         * @param {NatValue} fullValue
          */
-        async disburse(txHash, sender, amount) {
+        async disburse(txHash, sender, fullValue) {
           const { repayer, settlementAccount } = this.state;
-          const received = AmountMath.make(USDC, amount);
+          const received = AmountMath.make(USDC, fullValue);
           const { zcfSeat: settlingSeat } = zcf.makeEmptySeatKit();
           const { calculateSplit } = makeFeeTools(feeConfig);
           const split = calculateSplit(received);
-          trace('disbursing', split);
+          log('disbursing', split);
 
           // TODO: what if this throws?
           // arguably, it cannot. Even if deposits
@@ -224,12 +249,12 @@ export const prepareSettler = (
           statusManager.disbursed(txHash);
         },
         /**
-         * @param {EvmHash | undefined} txHash
+         * @param {EvmHash} txHash
          * @param {NobleAddress} sender
-         * @param {NatValue} amount
+         * @param {NatValue} fullValue
          * @param {string} EUD
          */
-        forward(txHash, sender, amount, EUD) {
+        forward(txHash, sender, fullValue, EUD) {
           const { settlementAccount } = this.state;
 
           const dest = chainHub.makeChainAddress(EUD);
@@ -237,12 +262,12 @@ export const prepareSettler = (
           // TODO? statusManager.forwarding(txHash, sender, amount);
           const txfrV = E(settlementAccount).transfer(
             dest,
-            AmountMath.make(USDC, amount),
+            AmountMath.make(USDC, fullValue),
           );
           void vowTools.watch(txfrV, this.facets.transferHandler, {
             txHash,
             sender,
-            amount,
+            fullValue,
           });
         },
       },
@@ -254,20 +279,21 @@ export const prepareSettler = (
          * @typedef {{
          *   txHash: EvmHash;
          *   sender: NobleAddress;
-         *   amount: NatValue;
+         *   fullValue: NatValue;
          * }} SettlerTransferCtx
          */
         onFulfilled(_result, ctx) {
-          const { txHash, sender, amount } = ctx;
-          statusManager.forwarded(txHash, sender, amount);
+          const { txHash, sender, fullValue } = ctx;
+          statusManager.forwarded(txHash, sender, fullValue);
         },
         /**
-         * @param {unknown} _result
-         * @param {SettlerTransferCtx} _ctx
+         * @param {unknown} reason
+         * @param {SettlerTransferCtx} ctx
          */
-        onRejected(_result, _ctx) {
+        onRejected(reason, ctx) {
+          log('⚠️ transfer rejected!', reason, ctx);
           // const { txHash, sender, amount } = ctx;
-          // TODO: statusManager.forwardFailed(txHash, sender, amount);
+          // TODO(#10510): statusManager.forwardFailed(txHash, sender, amount);
         },
       },
     },

package/src/fast-usdc.contract.js

@@ -30,12 +30,14 @@ import * as flows from './fast-usdc.flows.js';
 const trace = makeTracer('FastUsdc');
 
 const STATUS_NODE = 'status';
+const FEE_NODE = 'feeConfig';
 
 /**
  * @import {HostInterface} from '@agoric/async-flow';
  * @import {CosmosChainInfo, Denom, DenomDetail, OrchestrationAccount} from '@agoric/orchestration';
  * @import {OrchestrationPowers, OrchestrationTools} from '@agoric/orchestration/src/utils/start-helper.js';
- * @import {Vow} from '@agoric/vow';
+ * @import {Remote} from '@agoric/internal';
+ * @import {Marshaller, StorageNode} from '@agoric/internal/src/lib-chainStorage.js'
  * @import {Zone} from '@agoric/zone';
  * @import {OperatorKit} from './exos/operator-kit.js';
  * @import {CctpTxEvidence, FeeConfig} from './types.js';
@@ -63,6 +65,17 @@ export const meta = {
 };
 harden(meta);
 
+/**
+ * @param {Remote<StorageNode>} node
+ * @param {ERef<Marshaller>} marshaller
+ * @param {FeeConfig} feeConfig
+ */
+const publishFeeConfig = async (node, marshaller, feeConfig) => {
+  const feeNode = E(node).makeChildNode(FEE_NODE);
+  const value = await E(marshaller).toCapData(feeConfig);
+  return E(feeNode).setValue(JSON.stringify(value));
+};
+
 /**
  * @param {ZCF<FastUsdcTerms>} zcf
  * @param {OrchestrationPowers & {
@@ -80,14 +93,13 @@ export const contract = async (zcf, privateArgs, zone, tools) => {
   assert('USDC' in terms.brands, 'no USDC brand');
   assert('usdcDenom' in terms, 'no usdcDenom');
 
-  const { feeConfig, marshaller } = privateArgs;
+  const { feeConfig, marshaller, storageNode } = privateArgs;
   const { makeRecorderKit } = prepareRecorderKitMakers(
     zone.mapStore('vstorage'),
     marshaller,
   );
 
-  const makeStatusNode = () =>
-    E(privateArgs.storageNode).makeChildNode(STATUS_NODE);
+  const makeStatusNode = () => E(storageNode).makeChildNode(STATUS_NODE);
   const statusManager = prepareStatusManager(zone, makeStatusNode);
 
   const { USDC } = terms.brands;
@@ -209,6 +221,8 @@ export const contract = async (zcf, privateArgs, zone, tools) => {
   // So we use zone.exoClassKit above to define the liquidity pool kind
   // and pass the shareMint into the maker / init function.
 
+  void publishFeeConfig(storageNode, marshaller, feeConfig);
+
   const shareMint = await provideSingleton(
     zone.mapStore('mint'),
     'PoolShare',
@@ -246,9 +260,12 @@ export const contract = async (zcf, privateArgs, zone, tools) => {
     vowTools.all([poolAccountV, settleAccountV]),
   );
 
+  const [_agoric, _noble, agToNoble] = await vowTools.when(
+    chainHub.getChainsAndConnection('agoric', 'noble'),
+  );
   const settlerKit = makeSettler({
     repayer: poolKit.repayer,
-    sourceChannel: 'channel-1234', // TODO: fix this as soon as testing needs it',
+    sourceChannel: agToNoble.transferChannel.counterPartyChannelId,
     remoteDenom: 'uusdc',
     settlementAccount,
   });