@agoric/fast-usdc 0.1.1-dev-0e4c5b5.0 → 0.1.1-dev-78063fc.0

package/package.json

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

package/src/cli/lp-commands.js

@@ -1,6 +1,7 @@
 /* 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';

package/src/exos/advancer.js

@@ -16,13 +16,14 @@ 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 {CctpTxEvidence, AddressHook, EvmHash, FeeConfig, LogFn, NobleAddress, EvidenceWithRisk} from '../types.js';
+ * @import {AddressHook, EvmHash, FeeConfig, LogFn, NobleAddress, EvidenceWithRisk} from '../types.js';
  * @import {StatusManager} from './status-manager.js';
  * @import {LiquidityPoolKit} from './liquidity-pool.js';
  */
@@ -212,14 +213,20 @@ export const prepareAdvancerKit = (
          * @param {AdvancerVowCtx & { tmpSeat: ZCFSeat }} ctx
          */
         onFulfilled(result, ctx) {
-          const { poolAccount, intermediateRecipient } = this.state;
+          const { poolAccount, intermediateRecipient, settlementAddress } =
+            this.state;
           const { destination, advanceAmount, tmpSeat: _, ...detail } = ctx;
-          const transferV = E(poolAccount).transfer(
-            destination,
-            { denom: usdc.denom, value: advanceAmount.value },
-            { forwardOpts: { intermediateRecipient } },
-          );
-          return watch(transferV, this.facets.transferHandler, {
+          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, {
             destination,
             advanceAmount,
             ...detail,
@@ -252,17 +259,13 @@ export const prepareAdvancerKit = (
       },
       transferHandler: {
         /**
-         * @param {unknown} result TODO confirm this is not a bigint (sequence)
+         * @param {undefined} result
          * @param {AdvancerVowCtx} ctx
          */
         onFulfilled(result, ctx) {
           const { notifyFacet } = this.state;
           const { advanceAmount, destination, ...detail } = ctx;
-          log('Advance transfer fulfilled', {
-            advanceAmount,
-            destination,
-            result,
-          });
+          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
@@ -277,7 +280,7 @@ export const prepareAdvancerKit = (
          */
         onRejected(error, ctx) {
           const { notifyFacet } = this.state;
-          log('Advance transfer rejected', error);
+          log('Advance failed', error);
           const { advanceAmount: _, ...restCtx } = ctx;
           notifyFacet.notifyAdvancingResult(restCtx, false);
         },

package/src/exos/liquidity-pool.js

@@ -20,6 +20,7 @@ import {
 } from '../type-guards.js';
 
 /**
+ * @import {Amount, Brand, Payment} from '@agoric/ertp';
  * @import {Zone} from '@agoric/zone';
  * @import {Remote} from '@agoric/internal'
  * @import {StorageNode} from '@agoric/internal/src/lib-chainStorage.js'

package/src/exos/settler.js

@@ -16,6 +16,7 @@ import {
 
 /**
  * @import {FungibleTokenPacketData} from '@agoric/cosmic-proto/ibc/applications/transfer/v2/packet.js';
+ * @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';

package/src/fast-usdc-policy.core.js

@@ -5,6 +5,7 @@ import { fromExternalConfig } from './utils/config-marshal.js';
 import { FeedPolicyShape } from './type-guards.js';
 
 /**
+ * @import {Issuer} from '@agoric/ertp';
  * @import {Passable} from '@endo/pass-style'
  * @import {BootstrapManifest} from '@agoric/vats/src/core/lib-boot.js'
  * @import {LegibleCapData} from './utils/config-marshal.js'

package/src/fast-usdc.start.js

@@ -16,7 +16,7 @@ import {
 import { fromExternalConfig } from './utils/config-marshal.js';
 
 /**
- * @import {DepositFacet} from '@agoric/ertp/src/types.js'
+ * @import {Amount, Brand, DepositFacet, Issuer, Payment} from '@agoric/ertp';
  * @import {TypedPattern} from '@agoric/internal'
  * @import {Instance, StartParams} from '@agoric/zoe/src/zoeService/utils'
  * @import {Board} from '@agoric/vats'

package/src/pool-share-math.js

@@ -10,6 +10,7 @@ import { Fail, q } from '@endo/errors';
 const { getValue, add, isEmpty, isEqual, isGTE, subtract } = AmountMath;
 
 /**
+ * @import {Amount, Brand, DepositFacet, NatValue, Payment} from '@agoric/ertp';
  * @import {PoolStats} from './types';
  * @import {RepayAmountKWR} from './exos/liquidity-pool';
  */

package/src/type-guards.js

@@ -3,6 +3,7 @@ import { M } from '@endo/patterns';
 import { PendingTxStatus } from './constants.js';
 
 /**
+ * @import {Amount, Brand, NatValue, Payment} from '@agoric/ertp';
  * @import {TypedPattern} from '@agoric/internal';
  * @import {FastUsdcTerms} from './fast-usdc.contract.js';
  * @import {USDCProposalShapes} from './pool-share-math.js';