@agoric/fast-usdc 0.2.0-u19.1 → 0.2.0-u20.0

package/README.md

@@ -1,101 +1,27 @@
 # Fast USDC
 
-Development package for the Fast USDC product.
-Here in agoric-sdk as a convenience for integration testing and iterating on the SDK affordances required for the product.
+Development package for the Fast USDC product. Here in agoric-sdk as a
+convenience for integration testing and iterating on the SDK affordances
+required for the product.
 
 # Factoring
 
-This package is meant to contain all the code for the Fast USDC product. However there are some constraints:
+This package is meant to contain all the code for the Fast USDC product.
+However, there are some constraints:
 
-- a3p integration tests are in the `a3p-integration` top-level package, separate from this workspace
-- the proposal builders are in `@agoric/builders` to work with the a3p-integration `build:submissions` script
-- the RunUtils tests are in `@agoric/boot` to test running them atop a fresh bootstrapped environment
+- a3p integration tests are in the `a3p-integration` top-level package, separate
+    from this workspace
+- the proposal builders are in `@agoric/builders` to work with the
+    a3p-integration `build:submissions` script
+- the RunUtils tests are in `@aglocal/boot` to test running them atop a fresh
+    bootstrapped environment
 
 Over time we can update our tooling to decouple this more from the `packages` directory.
 
-1. Make a3p-integration `build:submissions` script work with arbitrary builder paths, allowing this to be above `@agoric/builders` in the package graph
-2. Export bootstrap testing utilities from `@agoric/boot`, allowing this to be above `@agoric/boot` in the package graph
-3. Update CI to support packages that aren't under `packages/`, eg. a top-level `dapps` directory
+1. Make a3p-integration `build:submissions` script work with arbitrary builder
+    paths, allowing this to be above `@agoric/builders` in the package graph
+2. Export bootstrap testing utilities from `@aglocal/boot`, allowing this to be
+    above `@aglocal/boot` in the package graph
+3. Update CI to support packages that aren't under `packages/`, eg. a top-level
+   `dapps` directory
 4. Move this package out of agoric-sdk
-
-# Transaction feed
-
-## Oracles interface
-
-Oracles run off-chain and interact with the contract via an Agoric smart wallet bridge.
-```mermaid
-sequenceDiagram
-    title Becoming an oracle operator
-    participant OW as Operator N<br/>Smart Wallet
-    participant FUC as Fast USDC<br/>Contract Exo
-    participant CE as Core Eval
-
-    CE->>FUC: makeOperatorInvitation()
-    FUC-->>CE: operatorInvitation
-    CE->>+OW: deposit(operatorInvitation)
-
-    Note left of FUC: Off-chain wallet accepts the operator invitation
-
-    OW->>+FUC: offer(operatorInvitation)
-    FUC-->>OW: operator invitationMakers: {SubmitEvidence}
-
-    Note left of FUC: Off-chain watcher detects evidence
-    OW->>+FUC: offer(SubmitEvidence, evidence)
-```
-
-```mermaid
-sequenceDiagram
-    title Receiving evidence
-    participant W as Operator N<br/>Smart Wallet
-    participant A as Operator N<br/>Admin Oexo
-    participant TF as Transaction<br/>Feed
-
-    W->>A: offer(SubmitEvidence, evidence)
-
-    Note left of A: Once 3 operators push the same…
-
-    A->>TF: notify(evidence)
-```
-
-# Status Manager
-
-### Pending Advance State Diagram
-
-*Transactions are qualified by the OCW and EventFeed before arriving to the Advancer.*
-
-```mermaid
-stateDiagram-v2
-  [*] --> Observed: observe()
-  [*] --> Advancing: advancing()
-
-  Advancing --> Advanced: advanceOutcome(...true)
-  Advancing --> AdvanceFailed: advanceOutcome(...false)
-
-  Observed --> [*]: dequeueStatus()
-  Advanced --> [*]: dequeueStatus()
-  AdvanceFailed --> [*]: dequeueStatus()
-
-  note right of [*]
-    After dequeueStatus():
-    Transaction is removed 
-    from pendingTxs store.
-    Settler will .disburse()
-    or .forward()
-  end note
-```
-
-### Complete state diagram (starting from Transaction Feed into Advancer)
-
-```mermaid
-stateDiagram-v2
-  Observed --> AdvanceSkipped : Risks identified
-  Observed --> Advancing : No risks, can advance
-  Observed --> Forwarding : No risks, Mint deposited before advance
-  Forwarding --> Forwarded
-  Advancing --> Advanced
-  Advanced --> Disbursed
-  AdvanceSkipped --> Forwarding : Mint deposited
-  AdvanceFailed --> Forwarding : Mint deposited
-  Advancing --> AdvanceFailed
-  Forwarding --> ForwardFailed
-```

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "@agoric/fast-usdc",
-  "version": "0.2.0-u19.1",
+  "version": "0.2.0-u20.0",
   "description": "CLI and library for Fast USDC product",
   "type": "module",
   "files": [
-    "contract",
     "src",
     "tools"
   ],
@@ -23,39 +22,33 @@
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/swingset-liveslots": "^0.10.3-u19.1",
-    "@agoric/vats": "^0.16.0-u19.1",
-    "@agoric/zone": "^0.3.0-u19.1",
     "@fast-check/ava": "^2.0.1",
     "ava": "^5.3.0",
     "c8": "^10.1.2",
-    "execa": "9.1.0",
+    "nano-spawn": "^0.2.0",
     "ts-blank-space": "^0.4.4"
   },
   "dependencies": {
-    "@agoric/client-utils": "^0.2.0-u19.1",
-    "@agoric/cosmic-proto": "^0.5.0-u19.1",
-    "@agoric/ertp": "^0.16.3-u19.1",
-    "@agoric/internal": "^0.4.0-u19.1",
-    "@agoric/notifier": "^0.7.0-u19.1",
-    "@agoric/orchestration": "^0.2.0-u19.1",
-    "@agoric/store": "^0.9.3-u19.0",
-    "@agoric/vat-data": "^0.5.3-u19.1",
-    "@agoric/vow": "^0.2.0-u19.1",
-    "@agoric/zoe": "^0.27.0-u19.1",
-    "@cosmjs/proto-signing": "^0.32.4",
-    "@cosmjs/stargate": "^0.32.4",
+    "@agoric/client-utils": "^0.2.0-u20.0",
+    "@agoric/cosmic-proto": "^0.5.0-u20.0",
+    "@agoric/ertp": "^0.16.3-u20.0",
+    "@agoric/internal": "^0.4.0-u20.0",
+    "@agoric/notifier": "^0.7.0-u20.0",
+    "@agoric/orchestration": "^0.2.0-u20.0",
+    "@agoric/zoe": "^0.27.0-u20.0",
+    "@cosmjs/proto-signing": "^0.33.0",
+    "@cosmjs/stargate": "^0.33.0",
     "@endo/base64": "^1.0.9",
-    "@endo/common": "^1.2.9",
-    "@endo/errors": "^1.2.9",
-    "@endo/eventual-send": "^1.3.0",
-    "@endo/far": "^1.1.10",
-    "@endo/init": "^1.1.8",
-    "@endo/marshal": "^1.6.3",
-    "@endo/nat": "^5.0.14",
-    "@endo/pass-style": "^1.4.8",
-    "@endo/patterns": "^1.4.8",
-    "@endo/promise-kit": "^1.1.9",
+    "@endo/common": "^1.2.10",
+    "@endo/errors": "^1.2.10",
+    "@endo/eventual-send": "^1.3.1",
+    "@endo/far": "^1.1.11",
+    "@endo/init": "^1.1.9",
+    "@endo/marshal": "^1.6.4",
+    "@endo/nat": "^5.1.0",
+    "@endo/pass-style": "^1.5.0",
+    "@endo/patterns": "^1.5.0",
+    "@endo/promise-kit": "^1.1.10",
     "@nick134-bit/noblejs": "0.0.2",
     "bech32": "^2.0.0",
     "commander": "^12.1.0",
@@ -82,5 +75,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a04d2bf43a9753d123954b52c6ba8d35083a3c8f"
+  "gitHead": "8e4207fa19dabf76c1f91f8779b5b5b93570ecea"
 }

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.js' */
 
 export const init = async (
   /** @type {File} */ configFile,

package/src/cli/lp-commands.js

@@ -18,7 +18,7 @@ import {
   floorDivideBy,
   multiplyBy,
   parseRatio,
-} from '@agoric/zoe/src/contractSupport/ratio.js';
+} from '@agoric/ertp/src/ratio.js';
 import { InvalidArgumentError } from 'commander';
 import { outputActionAndHint } from './bridge-action.js';
 import { Offers } from '../clientSupport.js';
@@ -38,7 +38,7 @@ const parseDecimal = arg => {
 
 /**
  * @param {string} amountString
- * @param {Brand} usdc
+ * @param {Brand<'nat'>} usdc
  */
 const parseUSDCAmount = (amountString, usdc) => {
   const USDC_DECIMALS = 6;

package/src/cli/operator-commands.js

@@ -3,7 +3,6 @@
  * @import {Command} from 'commander';
  * @import {OfferSpec} from '@agoric/smart-wallet/src/offers.js';
  * @import {ExecuteOfferAction} from '@agoric/smart-wallet/src/smartWallet.js';
- * @import {OperatorKit} from '../exos/operator-kit.js';
  */
 
 import {
@@ -13,7 +12,7 @@ import {
 import { mustMatch } from '@agoric/internal';
 import { Nat } from '@endo/nat';
 import { InvalidArgumentError } from 'commander';
-import { INVITATION_MAKERS_DESC } from '../exos/transaction-feed.js';
+import { INVITATION_MAKERS_DESC } from '../operator-kit-interface.js';
 import { CctpTxEvidenceShape } from '../type-guards.js';
 import { outputActionAndHint } from './bridge-action.js';
 
@@ -128,9 +127,7 @@ export const addOperatorCommands = (
         invitationSpec: {
           source: 'continuing',
           previousOffer: previousOfferId,
-          /** @type {string & keyof OperatorKit['invitationMakers'] } */
           invitationMakerName: 'SubmitEvidence',
-          /** @type {Parameters<OperatorKit['invitationMakers']['SubmitEvidence']> } */
           invitationArgs: [evidence],
         },
         proposal: {},

package/src/cli/transfer.js

@@ -16,7 +16,7 @@ import {
 } from './util/noble.js';
 import { queryUSDCBalance } from './util/bank.js';
 
-/** @import { File } from './util/file' */
+/** @import { File } from './util/file.js' */
 /** @import { VStorage } from '@agoric/client-utils' */
 /** @import { SigningStargateClient } from '@cosmjs/stargate' */
 /** @import { JsonRpcProvider as ethProvider } from 'ethers' */
@@ -34,7 +34,7 @@ const transfer = async (
   setTimeout = globalThis.setTimeout,
 ) => {
   const execute = async (
-    /** @type {import('./config').ConfigOpts} */ config,
+    /** @type {import('./config.js').ConfigOpts} */ config,
   ) => {
     const netConfig = await fetchEnvNetworkConfig({ env, fetch });
     vstorage ||= makeVStorage(

package/src/constants.js

@@ -1,5 +1,5 @@
 /**
- * Status values for FastUSDC.
+ * Status values for FastUSDC. Includes states for advancing and settling.
  *
  * @enum {(typeof TxStatus)[keyof typeof TxStatus]}
  */
@@ -31,7 +31,7 @@ export const TerminalTxStatus = {
 };
 
 /**
- * Status values for the StatusManager.
+ * Status values for the StatusManager while an advance is being processed.
  *
  * @enum {(typeof PendingTxStatus)[keyof typeof PendingTxStatus]}
  */

package/src/operator-kit-interface.js

@@ -0,0 +1,29 @@
+import { M } from '@endo/patterns';
+import { CctpTxEvidenceShape, RiskAssessmentShape } from './type-guards.js';
+
+/**
+ * @import {Zone} from '@agoric/zone';
+ * @import {CctpTxEvidence, RiskAssessment} from '@agoric/fast-usdc/src/types.js';
+ */
+
+/** Name in the invitation purse (keyed also by this contract instance) */
+export const INVITATION_MAKERS_DESC = 'oracle operator invitation';
+
+export const OperatorKitI = {
+  admin: M.interface('Admin', {
+    disable: M.call().returns(),
+  }),
+
+  invitationMakers: M.interface('InvitationMakers', {
+    SubmitEvidence: M.call(CctpTxEvidenceShape)
+      .optional(RiskAssessmentShape)
+      .returns(M.promise()),
+  }),
+
+  operator: M.interface('Operator', {
+    submitEvidence: M.call(CctpTxEvidenceShape)
+      .optional(RiskAssessmentShape)
+      .returns(),
+    getStatus: M.call().returns(M.record()),
+  }),
+};

package/src/pool-share-math.js

@@ -4,16 +4,17 @@ import {
   makeRatio,
   makeRatioFromAmounts,
   multiplyBy,
-} from '@agoric/zoe/src/contractSupport/ratio.js';
+} from '@agoric/ertp/src/ratio.js';
 import { Fail, q } from '@endo/errors';
 
 const { keys } = Object;
 const { add, isEmpty, isEqual, isGTE, make, makeEmpty, subtract } = AmountMath;
 
 /**
- * @import {Amount, Brand, DepositFacet, NatValue, Payment} from '@agoric/ertp';
- * @import {PoolStats} from './types';
- * @import {RepayAmountKWR} from './exos/liquidity-pool';
+ * @import {Amount, Brand, DepositFacet, NatValue, Payment, Ratio} from '@agoric/ertp';
+ * @import {Allocation} from '@agoric/zoe';
+ * @import {PoolStats} from './types.js';
+ * @import {RepayAmountKWR} from './utils/fees.js';
  */
 
 /**
@@ -201,35 +202,26 @@ export const borrowCalc = (
 
 /**
  * @param {ShareWorth} shareWorth
- * @param {Allocation} fromSeatAllocation
- * @param {RepayAmountKWR} amounts
+ * @param {RepayAmountKWR} split
  * @param {Amount<'nat'>} encumberedBalance aka 'outstanding borrows'
  * @param {PoolStats} poolStats
- * @throws {Error} if allocations do not match amounts or Principal exceeds encumberedBalance
+ * @throws {Error} if Principal exceeds encumberedBalance
  */
-export const repayCalc = (
-  shareWorth,
-  fromSeatAllocation,
-  amounts,
-  encumberedBalance,
-  poolStats,
-) => {
-  (isEqual(fromSeatAllocation.Principal, amounts.Principal) &&
-    isEqual(fromSeatAllocation.PoolFee, amounts.PoolFee) &&
-    isEqual(fromSeatAllocation.ContractFee, amounts.ContractFee)) ||
-    Fail`Cannot repay. From seat allocation ${q(fromSeatAllocation)} does not equal amounts ${q(amounts)}.`;
-
-  isGTE(encumberedBalance, amounts.Principal) ||
-    Fail`Cannot repay. Principal ${q(amounts.Principal)} exceeds encumberedBalance ${q(encumberedBalance)}.`;
+export const repayCalc = (shareWorth, split, encumberedBalance, poolStats) => {
+  isGTE(encumberedBalance, split.Principal) ||
+    Fail`Cannot repay. Principal ${q(split.Principal)} exceeds encumberedBalance ${q(encumberedBalance)}.`;
 
   return harden({
-    shareWorth: withFees(shareWorth, amounts.PoolFee),
-    encumberedBalance: subtract(encumberedBalance, amounts.Principal),
+    shareWorth: withFees(shareWorth, split.PoolFee),
+    encumberedBalance: subtract(encumberedBalance, split.Principal),
     poolStats: {
       ...poolStats,
-      totalRepays: add(poolStats.totalRepays, amounts.Principal),
-      totalPoolFees: add(poolStats.totalPoolFees, amounts.PoolFee),
-      totalContractFees: add(poolStats.totalContractFees, amounts.ContractFee),
+      totalRepays: add(poolStats.totalRepays, split.Principal),
+      totalPoolFees: add(poolStats.totalPoolFees, split.PoolFee),
+      totalContractFees: add(
+        add(poolStats.totalContractFees, split.ContractFee),
+        split.RelayFee,
+      ),
     },
   });
 };

package/src/type-guards.js

@@ -1,7 +1,6 @@
 import { AmountShape, BrandShape, RatioShape } from '@agoric/ertp';
 import { M } from '@endo/patterns';
 import {
-  CosmosChainInfoShape,
   DenomDetailShape,
   DenomShape,
 } from '@agoric/orchestration/src/typeGuards.js';
@@ -10,13 +9,13 @@ 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 {CosmosChainInfo, Denom, DenomDetail, OrchestrationAccount, IBCConnectionInfo, CaipChainId} from '@agoric/orchestration';
  * @import {USDCProposalShapes} from './pool-share-math.js';
- * @import {CctpTxEvidence, FastUSDCConfig, FeeConfig, PendingTx, PoolMetrics, ChainPolicy, FeedPolicy, AddressHook, EvmAddress, EvmHash, RiskAssessment, EvidenceWithRisk} from './types.js';
+ * @import {CctpTxEvidence, FastUSDCConfig, FastUsdcTerms, FeeConfig, PendingTx, PoolMetrics, ChainPolicy, FeedPolicy, AddressHook, EvmAddress, EvmHash, RiskAssessment, EvidenceWithRisk} from './types.js';
  */
 
 /**
- * @param {Brand} brand must be a 'nat' brand, not checked
+ * @param {Brand<'nat'>} brand must be a 'nat' brand, not checked
  * @param {NatValue} [min]
  */
 export const makeNatAmountShape = (brand, min) =>
@@ -110,13 +109,33 @@ export const AddressHookShape = {
 harden(AddressHookShape);
 
 const NatAmountShape = { brand: BrandShape, value: M.nat() };
+
+export const DestinationOverridesShape = M.recordOf(
+  M.string(),
+  M.splitRecord(
+    {},
+    {
+      flat: NatAmountShape,
+      variableRate: RatioShape,
+      contractRate: RatioShape,
+      relay: NatAmountShape,
+    },
+  ),
+);
+
 /** @type {TypedPattern<FeeConfig>} */
-export const FeeConfigShape = {
-  flat: NatAmountShape,
-  variableRate: RatioShape,
-  contractRate: RatioShape,
-};
-harden(FeeConfigShape);
+export const FeeConfigShape = M.splitRecord(
+  {
+    flat: NatAmountShape,
+    variableRate: RatioShape,
+    contractRate: RatioShape,
+  },
+  {
+    relay: NatAmountShape,
+    destinationOverrides: DestinationOverridesShape,
+  },
+  {},
+);
 
 /** @type {TypedPattern<PoolMetrics>} */
 export const PoolMetricsShape = {
@@ -150,8 +169,7 @@ harden(ChainPolicyShape);
 /**
  * @type {TypedPattern<FeedPolicy>}
  *
- * Should be JSON serializable so CLI can specify policy. E.g. no bigint,
- * undefined, remotable, etc.
+ * must be CopyData; no Brands or other Remotables
  */
 export const FeedPolicyShape = M.splitRecord(
   {
@@ -163,12 +181,30 @@ export const FeedPolicyShape = M.splitRecord(
 );
 harden(FeedPolicyShape);
 
+/**
+ * The version of CosmosChainInfoShape that matches the `valueShape` used in FUSDC's ChainHub's `chainInfos` mapStore.
+ * @type {TypedPattern<CosmosChainInfo>}
+ */
+export const CosmosChainInfoShapeV1 = M.splitRecord(
+  {
+    chainId: M.string(),
+  },
+  {
+    bech32Prefix: M.string(),
+    connections: M.record(),
+    stakingTokens: M.arrayOf({ denom: M.string() }),
+    // UNTIL https://github.com/Agoric/agoric-sdk/issues/9326
+    icqEnabled: M.boolean(),
+    pfmEnabled: M.boolean(),
+  },
+);
+
 /** @type {TypedPattern<FastUSDCConfig>} */
 export const FastUSDCConfigShape = M.splitRecord({
   terms: FastUSDCTermsShape,
   oracles: M.recordOf(M.string(), M.string()),
   feeConfig: FeeConfigShape,
   feedPolicy: FeedPolicyShape,
-  chainInfo: M.recordOf(M.string(), CosmosChainInfoShape),
+  chainInfo: M.recordOf(M.string(), CosmosChainInfoShapeV1),
   assetInfo: M.arrayOf([DenomShape, DenomDetailShape]),
 });

package/src/types.ts

@@ -1,17 +1,35 @@
 import type {
-  ChainAddress,
+  AccountId,
+  CosmosChainAddress,
+  Bech32Address,
   CosmosChainInfo,
   Denom,
   DenomDetail,
+  BaseChainInfo,
+  KnownNamespace,
+  CaipChainId,
 } from '@agoric/orchestration';
 import type { IBCChannelID } from '@agoric/vats';
 import type { Amount } from '@agoric/ertp';
 import type { CopyRecord, Passable } from '@endo/pass-style';
 import type { PendingTxStatus, TxStatus } from './constants.js';
-import type { FastUsdcTerms } from './fast-usdc.contract.js';
-import type { RepayAmountKWR } from './exos/liquidity-pool.js';
+import type { RepayAmountKWR } from './utils/fees.js';
 
+// XXX duped with Zoe contractSupport ambient types
+type Ratio = {
+  numerator: Amount<'nat'>;
+  denominator: Amount<'nat'>;
+};
+
+/**
+ * Block hash is calculated using the keccak256 algorithm that always results
+ * in 32 bytes (64 hex characters prepended by 0x) no matter the input length.
+ */
 export type EvmHash = `0x${string}`;
+/**
+ * An address is always the last 20 bytes (40 hex charaters prepended by 0x) of
+ * the public key hash.
+ */
 export type EvmAddress = `0x${string & { length: 40 }}`;
 export type NobleAddress = `noble1${string}`;
 export type EvmChainID = number;
@@ -25,7 +43,7 @@ export interface CctpTxEvidence {
   /** from Noble RPC */
   aux: {
     forwardingChannel: IBCChannelID;
-    recipientAddress: ChainAddress['value'];
+    recipientAddress: CosmosChainAddress['value'] | AccountId;
   };
   /** on the source chain (e.g. L1 Ethereum and L2s Arbitrum, Base) */
   blockHash: EvmHash;
@@ -70,8 +88,9 @@ export interface TransactionRecord extends CopyRecord {
 
 /** the record in vstorage at the path of the contract's node */
 export interface ContractRecord extends CopyRecord {
-  poolAccount: ChainAddress['value'];
-  settlementAccount: ChainAddress['value'];
+  nobleICA?: CosmosChainAddress['value'];
+  poolAccount: CosmosChainAddress['value'];
+  settlementAccount: CosmosChainAddress['value'];
 }
 
 export type LogFn = (...args: unknown[]) => void;
@@ -81,12 +100,22 @@ export interface PendingTx extends CctpTxEvidence {
 }
 
 export type FeeConfig = {
-  /** flat fee charged for every advance */
+  /** flat fee charged for every advance, eligible for LP disbursement */
   flat: Amount<'nat'>;
-  /** proportion of advance kept as a fee */
+  /** proportion of advance kept as a fee, eligible for LP disbursement */
   variableRate: Ratio;
-  /** proportion of fees that goes to the contract (remaining goes to LPs) */
+  /** proportion of `flat` and `variableRate` fees that goes to the contract (remaining goes to LPs) */
   contractRate: Ratio;
+  /**
+   * if present, a fee required to relay (e.g. CCTP to EVM/Solana). Not
+   * considered for LP disbursement - goes to `contractSeat`.
+   */
+  relay?: Amount<'nat'>;
+  /** Optional destination-specific overrides. If present, must supersede base values. */
+  destinationOverrides?: Record<
+    CaipChainId,
+    Partial<Omit<FeeConfig, 'destinationOverrides'>>
+  >;
 };
 
 export interface PoolStats {
@@ -127,13 +156,17 @@ export type FeedPolicy = {
   eventFilter?: string;
 } & CopyRecord;
 
+export type FastUsdcTerms = {
+  usdcDenom: Denom;
+};
+
 export type FastUSDCConfig = {
   terms: FastUsdcTerms;
   oracles: Record<string, string>;
   feeConfig: FeeConfig;
   feedPolicy: FeedPolicy;
   noNoble: boolean; // support a3p-integration, which has no noble chain
-  chainInfo: Record<string, CosmosChainInfo & Passable>;
+  chainInfo: Record<string, ChainHubChainInfo>;
   assetInfo: [Denom, DenomDetail & { brandKey?: string }][];
 } & CopyRecord;
 
@@ -142,9 +175,22 @@ export type AddressHook = {
   baseAddress: string;
   query: {
     /** end user destination address */
-    EUD: string;
+    EUD: Bech32Address;
   };
 };
 
+/**
+ * The shape of ChainInfo ChainHub is expecting for FUSDC.
+ *
+ * Note: this diverges from `CosmosChainInfo` and `BaseChainInfo` in that:
+ * - BaseChainInfo includes chainId for backwards compatibility with `CosmosChainInfoShapeV1`
+ */
+export type ChainHubChainInfo<N extends KnownNamespace = KnownNamespace> =
+  N extends 'cosmos' ? CosmosChainInfo : BaseChainInfoWithChainId<N>;
+
+interface BaseChainInfoWithChainId<N extends KnownNamespace = KnownNamespace>
+  extends BaseChainInfo<N> {
+  chainId: string;
+}
+
 export type * from './constants.js';
-export type { LiquidityPoolKit } from './exos/liquidity-pool.js';