@agoric/fast-usdc 0.2.0-upgrade-19-dev-0754752.0 → 0.2.0-upgrade-18a-dev-4ee0508.0

package/src/{start-fast-usdc.core.js → fast-usdc.start.js}

@@ -1,22 +1,30 @@
-import { deeplyFulfilledObject, makeTracer } from '@agoric/internal';
+import { deeplyFulfilledObject, makeTracer, objectMap } from '@agoric/internal';
+import {
+  CosmosChainInfoShape,
+  DenomDetailShape,
+  DenomShape,
+} from '@agoric/orchestration';
+import { Fail } from '@endo/errors';
 import { E } from '@endo/far';
-import { FastUSDCConfigShape } from './type-guards.js';
-import { fromExternalConfig } from './utils/config-marshal.js';
+import { makeMarshal } from '@endo/marshal';
+import { M } from '@endo/patterns';
 import {
-  inviteOracles,
-  publishDisplayInfo,
-  publishFeedPolicy,
-} from './utils/core-eval.js';
+  FastUSDCTermsShape,
+  FeeConfigShape,
+  FeedPolicyShape,
+} from './type-guards.js';
+import { fromExternalConfig } from './utils/config-marshal.js';
 
 /**
- * @import {Brand, Issuer} from '@agoric/ertp';
+ * @import {DepositFacet} from '@agoric/ertp/src/types.js'
+ * @import {TypedPattern} from '@agoric/internal'
  * @import {Instance, StartParams} from '@agoric/zoe/src/zoeService/utils'
  * @import {Board} from '@agoric/vats'
  * @import {ManifestBundleRef} from '@agoric/deploy-script-support/src/externalTypes.js'
  * @import {BootstrapManifest} from '@agoric/vats/src/core/lib-boot.js'
  * @import {LegibleCapData} from './utils/config-marshal.js'
  * @import {FastUsdcSF} from './fast-usdc.contract.js'
- * @import {FastUSDCConfig} from './types.js'
+ * @import {FeedPolicy, FastUSDCConfig} from './types.js'
  */
 
 const ShareAssetInfo = /** @type {const} */ harden({
@@ -30,6 +38,16 @@ const trace = makeTracer('FUSD-Start', true);
 
 const contractName = 'fastUsdc';
 
+/** @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),
+  assetInfo: M.arrayOf([DenomShape, DenomDetailShape]),
+});
+
 /**
  * XXX Shouldn't the bridge or board vat handle this?
  *
@@ -46,8 +64,38 @@ const makePublishingStorageKit = async (path, { chainStorage, board }) => {
   return { storageNode, marshaller };
 };
 
+const BOARD_AUX = 'boardAux';
+const marshalData = makeMarshal(_val => Fail`data only`);
+/**
+ * @param {Brand} brand
+ * @param {Pick<BootstrapPowers['consume'], 'board' | 'chainStorage'>} powers
+ */
+const publishDisplayInfo = async (brand, { board, chainStorage }) => {
+  // chainStorage type includes undefined, which doesn't apply here.
+  // @ts-expect-error UNTIL https://github.com/Agoric/agoric-sdk/issues/8247
+  const boardAux = E(chainStorage).makeChildNode(BOARD_AUX);
+  const [id, displayInfo, allegedName] = await Promise.all([
+    E(board).getId(brand),
+    E(brand).getDisplayInfo(),
+    E(brand).getAllegedName(),
+  ]);
+  const node = E(boardAux).makeChildNode(id);
+  const aux = marshalData.toCapData(harden({ allegedName, displayInfo }));
+  await E(node).setValue(JSON.stringify(aux));
+};
+
+const FEED_POLICY = 'feedPolicy';
 const POOL_METRICS = 'poolMetrics';
 
+/**
+ * @param {ERef<StorageNode>} node
+ * @param {FeedPolicy} policy
+ */
+const publishFeedPolicy = async (node, policy) => {
+  const feedPolicy = E(node).makeChildNode(FEED_POLICY);
+  await E(feedPolicy).setValue(JSON.stringify(policy));
+};
+
 /**
  * @typedef { PromiseSpaceOf<{
  *   fastUsdcKit: FastUSDCKit
@@ -59,7 +107,6 @@ const POOL_METRICS = 'poolMetrics';
  * }} FastUSDCCorePowers
  *
  * @typedef {StartedInstanceKitWithLabel & {
- *   creatorFacet: StartedInstanceKit<FastUsdcSF>['creatorFacet'];
  *   privateArgs: StartParams<FastUsdcSF>['privateArgs'];
  * }} FastUSDCKit
  */
@@ -117,6 +164,18 @@ export const startFastUSDC = async (
   trace('using terms', terms);
   trace('using fee config', feeConfig);
 
+  trace('look up oracle deposit facets');
+  const oracleDepositFacets = await deeplyFulfilledObject(
+    objectMap(oracles, async address => {
+      /** @type {DepositFacet} */
+      const depositFacet = await E(namesByAddress).lookup(
+        address,
+        'depositFacet',
+      );
+      return depositFacet;
+    }),
+  );
+
   const { storageNode, marshaller } = await makePublishingStorageKit(
     contractName,
     {
@@ -172,7 +231,16 @@ export const startFastUSDC = async (
     brand: shareBrand,
   });
 
-  await inviteOracles({ creatorFacet, namesByAddress }, oracles);
+  await Promise.all(
+    Object.entries(oracleDepositFacets).map(async ([name, depositFacet]) => {
+      const address = oracles[name];
+      trace('making invitation for', name, address);
+      const toWatch = await E(creatorFacet).makeOperatorInvitation(address);
+
+      const amt = await E(depositFacet).receive(toWatch);
+      trace('sent', amt, 'to', name);
+    }),
+  );
 
   produceInstance.reset();
   produceInstance.resolve(instance);
@@ -225,10 +293,10 @@ export const getManifestForFastUSDC = (
           board: true,
         },
         issuer: {
-          produce: { FastLP: true },
+          produce: { FastLP: true }, // UNTIL #10432
         },
         brand: {
-          produce: { FastLP: true },
+          produce: { FastLP: true }, // UNTIL #10432
         },
         instance: {
           produce: { fastUsdc: true },

package/src/pool-share-math.js

@@ -7,11 +7,9 @@ import {
 } from '@agoric/zoe/src/contractSupport/ratio.js';
 import { Fail, q } from '@endo/errors';
 
-const { keys } = Object;
-const { add, isEmpty, isEqual, isGTE, make, makeEmpty, subtract } = AmountMath;
+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';
  */
@@ -19,7 +17,8 @@ const { add, isEmpty, isEqual, isGTE, make, makeEmpty, subtract } = AmountMath;
 /**
  * Invariant: shareWorth is the pool balance divided by shares outstanding.
  *
- * Use `makeParity(USDC, PoolShares)` for an initial value.
+ * Use `makeParity(make(USDC, epsilon), PoolShares)` for an initial
+ * value, for some negligible `epsilon` such as 1n.
  *
  * @typedef {Ratio} ShareWorth
  */
@@ -27,26 +26,23 @@ const { add, isEmpty, isEqual, isGTE, make, makeEmpty, subtract } = AmountMath;
 /**
  * Make a 1-to-1 ratio between amounts of 2 brands.
  *
- * @param {Brand<'nat'>} numeratorBrand
+ * @param {Amount<'nat'>} numerator
  * @param {Brand<'nat'>} denominatorBrand
  */
-export const makeParity = (numeratorBrand, denominatorBrand) => {
-  const dust = 1n;
-  return makeRatio(dust, numeratorBrand, dust, denominatorBrand);
+export const makeParity = (numerator, denominatorBrand) => {
+  const value = getValue(numerator.brand, numerator);
+  return makeRatio(value, numerator.brand, value, denominatorBrand);
 };
 
 /**
  * @typedef {{
  *   deposit: {
  *     give: { USDC: Amount<'nat'> },
- *     want: { PoolShare: Amount<'nat'> }
+ *     want?: { PoolShare: Amount<'nat'> }
  *   },
  *   withdraw: {
  *     give: { PoolShare: Amount<'nat'> }
  *     want: { USDC: Amount<'nat'> },
- *   },
- *   withdrawFees: {
- *     want: { USDC: Amount<'nat'> }
  *   }
  * }} USDCProposalShapes
  */
@@ -95,54 +91,14 @@ export const depositCalc = (shareWorth, { give, want }) => {
   });
 };
 
-/**
- * Verifies that the total pool balance (unencumbered + encumbered) matches the
- * shareWorth numerator. The total pool balance consists of:
- * 1. unencumbered balance - USDC available in the pool for borrowing
- * 2. encumbered balance - USDC currently lent out
- *
- * A negligible `dust` amount is used to initialize shareWorth with a non-zero
- * denominator. It must remain in the pool at all times.
- *
- * @param {Allocation} poolAlloc
- * @param {ShareWorth} shareWorth
- * @param {Amount<'nat'>} encumberedBalance
- */
-export const checkPoolBalance = (poolAlloc, shareWorth, encumberedBalance) => {
-  const { brand: usdcBrand } = encumberedBalance;
-  const unencumberedBalance = poolAlloc.USDC || makeEmpty(usdcBrand);
-  const kwds = keys(poolAlloc);
-  kwds.length === 0 ||
-    (kwds.length === 1 && kwds[0] === 'USDC') ||
-    Fail`unexpected pool allocations: ${poolAlloc}`;
-  const dust = make(usdcBrand, 1n);
-  const grossBalance = add(add(unencumberedBalance, dust), encumberedBalance);
-  isEqual(grossBalance, shareWorth.numerator) ||
-    Fail`🚨 pool balance ${q(unencumberedBalance)} and encumbered balance ${q(encumberedBalance)} inconsistent with shareWorth ${q(shareWorth)}`;
-  return harden({ unencumberedBalance, grossBalance });
-};
-
 /**
  * Compute payout from a withdraw proposal, along with updated shareWorth
  *
  * @param {ShareWorth} shareWorth
  * @param {USDCProposalShapes['withdraw']} proposal
- * @param {Allocation} poolAlloc
- * @param {Amount<'nat'>} [encumberedBalance]
  * @returns {{ shareWorth: ShareWorth, payouts: { USDC: Amount<'nat'> }}}
  */
-export const withdrawCalc = (
-  shareWorth,
-  { give, want },
-  poolAlloc,
-  encumberedBalance = makeEmpty(shareWorth.numerator.brand),
-) => {
-  const { unencumberedBalance } = checkPoolBalance(
-    poolAlloc,
-    shareWorth,
-    encumberedBalance,
-  );
-
+export const withdrawCalc = (shareWorth, { give, want }) => {
   assert(!isEmpty(give.PoolShare));
   assert(!isEmpty(want.USDC));
 
@@ -152,8 +108,6 @@ export const withdrawCalc = (
   const { denominator: sharesOutstanding, numerator: poolBalance } = shareWorth;
   !isGTE(want.USDC, poolBalance) ||
     Fail`cannot withdraw ${q(want.USDC)}; only ${q(poolBalance)} in pool`;
-  isGTE(unencumberedBalance, want.USDC) ||
-    Fail`cannot withdraw ${q(want.USDC)}; ${q(encumberedBalance)} is in use; stand by for pool to return to ${q(poolBalance)}`;
   const balancePost = subtract(poolBalance, payout);
   // giving more shares than are outstanding is impossible,
   // so it's not worth a custom diagnostic. subtract will fail

package/src/type-guards.js

@@ -1,18 +1,12 @@
 import { AmountShape, BrandShape, RatioShape } from '@agoric/ertp';
 import { M } from '@endo/patterns';
-import {
-  CosmosChainInfoShape,
-  DenomDetailShape,
-  DenomShape,
-} from '@agoric/orchestration/src/typeGuards.js';
 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';
- * @import {CctpTxEvidence, FastUSDCConfig, FeeConfig, PendingTx, PoolMetrics, ChainPolicy, FeedPolicy, AddressHook, EvmAddress, EvmHash, RiskAssessment, EvidenceWithRisk} from './types.js';
+ * @import {CctpTxEvidence, FeeConfig, PendingTx, PoolMetrics, ChainPolicy, FeedPolicy, AddressHook, EvmAddress, EvmHash, RiskAssessment, EvidenceWithRisk} from './types.js';
  */
 
 /**
@@ -25,20 +19,16 @@ export const makeNatAmountShape = (brand, min) =>
 /** @param {Record<'PoolShares' | 'USDC', Brand<'nat'>>} brands */
 export const makeProposalShapes = ({ PoolShares, USDC }) => {
   /** @type {TypedPattern<USDCProposalShapes['deposit']>} */
-  const deposit = M.splitRecord({
-    give: { USDC: makeNatAmountShape(USDC, 1n) },
-    want: { PoolShare: makeNatAmountShape(PoolShares) },
-  });
+  const deposit = M.splitRecord(
+    { give: { USDC: makeNatAmountShape(USDC, 1n) } },
+    { want: M.splitRecord({}, { PoolShare: makeNatAmountShape(PoolShares) }) },
+  );
   /** @type {TypedPattern<USDCProposalShapes['withdraw']>} */
   const withdraw = M.splitRecord({
     give: { PoolShare: makeNatAmountShape(PoolShares, 1n) },
     want: { USDC: makeNatAmountShape(USDC, 1n) },
   });
-  /** @type {TypedPattern<USDCProposalShapes['withdrawFees']>} */
-  const withdrawFees = M.splitRecord({
-    want: { USDC: makeNatAmountShape(USDC, 1n) },
-  });
-  return harden({ deposit, withdraw, withdrawFees });
+  return harden({ deposit, withdraw });
 };
 
 /** @type {TypedPattern<FastUsdcTerms>} */
@@ -76,7 +66,6 @@ export const CctpTxEvidenceShape = {
   },
   blockHash: EvmHashShape,
   blockNumber: M.nat(),
-  blockTimestamp: M.nat(),
   chainId: M.number(),
   tx: {
     amount: M.nat(),
@@ -114,6 +103,7 @@ const NatAmountShape = { brand: BrandShape, value: M.nat() };
 export const FeeConfigShape = {
   flat: NatAmountShape,
   variableRate: RatioShape,
+  maxVariable: NatAmountShape,
   contractRate: RatioShape,
 };
 harden(FeeConfigShape);
@@ -131,19 +121,10 @@ harden(PoolMetricsShape);
 
 /** @type {TypedPattern<ChainPolicy>} */
 export const ChainPolicyShape = {
-  attenuatedCttpBridgeAddresses: M.splitArray(
-    [EvmHashShape],
-    undefined,
-    M.arrayOf(EvmHashShape),
-  ),
+  attenuatedCttpBridgeAddress: EvmHashShape,
   cctpTokenMessengerAddress: EvmHashShape,
   confirmations: M.number(),
   chainId: M.number(),
-  rateLimits: {
-    tx: M.bigint(),
-    blockWindow: M.bigint(),
-    blockWindowSize: M.number(),
-  },
 };
 harden(ChainPolicyShape);
 
@@ -162,13 +143,3 @@ export const FeedPolicyShape = M.splitRecord(
   { eventFilter: M.string() },
 );
 harden(FeedPolicyShape);
-
-/** @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),
-  assetInfo: M.arrayOf([DenomShape, DenomDetailShape]),
-});

package/src/types.ts

@@ -27,21 +27,8 @@ export interface CctpTxEvidence {
     forwardingChannel: IBCChannelID;
     recipientAddress: ChainAddress['value'];
   };
-  /** on the source chain (e.g. L1 Ethereum and L2s Arbitrum, Base) */
   blockHash: EvmHash;
-  /** height of blockHash on the source chain */
   blockNumber: bigint;
-  /**
-   * Seconds since Unix epoch. Not all CCTP source chains update time the same
-   * way but they all use Unix epoch and thus are approximately equal. (Within
-   * minutes apart.)
-   */
-  blockTimestamp: bigint;
-  //
-  /**
-   * [Domain of values](https://chainid.network/) per [EIP-155](https://eips.ethereum.org/EIPS/eip-155)
-   * (We don't have [CCTP `domain`](https://developers.circle.com/stablecoins/supported-domains) )
-   */
   chainId: number;
   /** data covered by signature (aka txHash) */
   tx: {
@@ -68,12 +55,6 @@ export interface TransactionRecord extends CopyRecord {
   status: TxStatus;
 }
 
-/** the record in vstorage at the path of the contract's node */
-export interface ContractRecord extends CopyRecord {
-  poolAccount: ChainAddress['value'];
-  settlementAccount: ChainAddress['value'];
-}
-
 export type LogFn = (...args: unknown[]) => void;
 
 export interface PendingTx extends CctpTxEvidence {
@@ -81,11 +62,9 @@ export interface PendingTx extends CctpTxEvidence {
 }
 
 export type FeeConfig = {
-  /** flat fee charged for every advance */
   flat: Amount<'nat'>;
-  /** proportion of advance kept as a fee */
   variableRate: Ratio;
-  /** proportion of fees that goes to the contract (remaining goes to LPs) */
+  maxVariable: Amount<'nat'>;
   contractRate: Ratio;
 };
 
@@ -103,35 +82,27 @@ export interface PoolMetrics extends PoolStats {
 
 export interface ChainPolicy {
   /** `msg.sender` of DepositAndBurn to TokenMessenger must be an attenuated wrapper contract that does not contain `replaceDepositForBurn` */
-  attenuatedCttpBridgeAddresses: EvmHash[];
+  attenuatedCttpBridgeAddress: EvmHash;
   /** @see {@link https://developers.circle.com/stablecoins/evm-smart-contracts} */
   cctpTokenMessengerAddress: EvmHash;
   /** e.g., `1` for ETH mainnet 42161 for Arbitrum One. @see {@link https://chainlist.org/} */
   chainId: EvmChainID;
   /** the number of block confirmations to observe before reporting */
   confirmations: number;
-  rateLimits: {
-    /** do not advance more than this amount for an individual transaction */
-    tx: bigint;
-    /** do not advance more than this amount per block window */
-    blockWindow: bigint;
-    /** the number of blocks to consider for `blockWindow` */
-    blockWindowSize: number;
-  };
 }
 
-export type FeedPolicy = {
+export interface FeedPolicy {
   nobleDomainId: number;
   nobleAgoricChannelId: string;
   chainPolicies: Record<EvmChainName, ChainPolicy>;
   eventFilter?: string;
-} & CopyRecord;
+}
 
 export type FastUSDCConfig = {
   terms: FastUsdcTerms;
   oracles: Record<string, string>;
   feeConfig: FeeConfig;
-  feedPolicy: FeedPolicy;
+  feedPolicy: FeedPolicy & Passable;
   noNoble: boolean; // support a3p-integration, which has no noble chain
   chainInfo: Record<string, CosmosChainInfo & Passable>;
   assetInfo: [Denom, DenomDetail & { brandKey?: string }][];

package/src/utils/deploy-config.js

@@ -1,38 +1,50 @@
 import { denomHash, withChainCapabilities } from '@agoric/orchestration';
 import fetchedChainInfo from '@agoric/orchestration/src/fetched-chain-info.js';
-import { ChainPolicies } from './chain-policies.js';
 
 /**
- * @import {FastUSDCConfig} from '@agoric/fast-usdc';
+ * @import {FastUSDCConfig} from '@agoric/fast-usdc/src/types.js'
  * @import {Passable} from '@endo/marshal';
  * @import {CosmosChainInfo, Denom, DenomDetail} from '@agoric/orchestration';
  */
 
-/** @type {[Denom, DenomDetail & { brandKey?: string}]} */
-const usdcOnAgoric = [
-  `ibc/${denomHash({ denom: 'uusdc', channelId: fetchedChainInfo.agoric.connections['noble-1'].transferChannel.channelId })}`,
-  {
-    baseName: 'noble',
-    chainName: 'agoric',
-    baseDenom: 'uusdc',
-    brandKey: 'USDC',
-  },
-];
-
 /** @type {[Denom, DenomDetail & { brandKey?: string}][]} */
-export const transferAssetInfo = [
-  ['uusdc', { baseName: 'noble', chainName: 'noble', baseDenom: 'uusdc' }],
-  usdcOnAgoric,
+export const defaultAssetInfo = [
+  [
+    'uusdc',
+    {
+      baseName: 'noble',
+      chainName: 'noble',
+      baseDenom: 'uusdc',
+    },
+  ],
+  [
+    `ibc/${denomHash({ denom: 'uusdc', channelId: fetchedChainInfo.agoric.connections['noble-1'].transferChannel.channelId })}`,
+    {
+      baseName: 'noble',
+      chainName: 'agoric',
+      baseDenom: 'uusdc',
+      brandKey: 'USDC',
+    },
+  ],
+  [
+    `ibc/${denomHash({ denom: 'uusdc', channelId: fetchedChainInfo.osmosis.connections['noble-1'].transferChannel.channelId })}`,
+    {
+      baseName: 'noble',
+      chainName: 'osmosis',
+      baseDenom: 'uusdc',
+    },
+  ],
 ];
-harden(transferAssetInfo);
+harden(defaultAssetInfo);
 
-/** ABI for DepositForBurn event in TokenMessenger contract */
-const DepositForBurnEvent =
-  'DepositForBurn(uint64,address,uint256,address,bytes32,uint32,bytes32,bytes32)';
+const agoricAssetInfo = defaultAssetInfo.filter(
+  ([_d, i]) => i.chainName === 'agoric',
+);
 
 /**
  * @type {Record<string, Pick<FastUSDCConfig, 'oracles' | 'feedPolicy' | 'chainInfo' | 'assetInfo' >>}
  *
+ * TODO: determine OCW operator addresses
  * meanwhile, use price oracle addresses (from updatePriceFeeds.js).
  */
 export const configurations = {
@@ -50,8 +62,16 @@ export const configurations = {
     feedPolicy: {
       nobleAgoricChannelId: 'channel-does-not-exist',
       nobleDomainId: 4,
-      chainPolicies: ChainPolicies.TESTNET,
-      eventFilter: DepositForBurnEvent,
+      chainPolicies: {
+        Arbitrum: {
+          attenuatedCttpBridgeAddress:
+            '0xe298b93ffB5eA1FB628e0C0D55A43aeaC268e347',
+          cctpTokenMessengerAddress:
+            '0x19330d10D9Cc8751218eaf51E8885D058642E08A',
+          chainId: 42161,
+          confirmations: 2,
+        },
+      },
     },
     chainInfo: /** @type {Record<string, CosmosChainInfo & Passable>} */ (
       withChainCapabilities({
@@ -60,25 +80,32 @@ export const configurations = {
         noble: fetchedChainInfo.noble,
       })
     ),
-    assetInfo: [usdcOnAgoric],
+    assetInfo: agoricAssetInfo,
   },
   MAINNET: {
-    // per JVC 12 Feb 2025
     oracles: {
-      '01node': 'agoric1ym488t6j24x3ys3va3452ftx44lhs64rz8pu7h',
-      SimplyStaking: 'agoric1s5yawjgj6xcw4ea5r2x4cjrnkprmd0fcun2tyk',
-      DSRV: 'agoric17crpkfxarq658e9ddru2petrfr0fhjzvjfccq9',
+      '01node': 'agoric19uscwxdac6cf6z7d5e26e0jm0lgwstc47cpll8',
+      'Simply Staking': 'agoric1krunjcqfrf7la48zrvdfeeqtls5r00ep68mzkr',
+      P2P: 'agoric1n4fcxsnkxe4gj6e24naec99hzmc4pjfdccy5nj',
     },
     feedPolicy: {
       nobleAgoricChannelId: 'channel-21',
       nobleDomainId: 4,
-      chainPolicies: ChainPolicies.MAINNET,
-      eventFilter: DepositForBurnEvent,
+      chainPolicies: {
+        Arbitrum: {
+          attenuatedCttpBridgeAddress:
+            '0xe298b93ffB5eA1FB628e0C0D55A43aeaC268e347',
+          cctpTokenMessengerAddress:
+            '0x19330d10D9Cc8751218eaf51E8885D058642E08A',
+          chainId: 42161,
+          confirmations: 2,
+        },
+      },
     },
     chainInfo: /** @type {Record<string, CosmosChainInfo & Passable>} */ (
       withChainCapabilities(fetchedChainInfo)
     ),
-    assetInfo: transferAssetInfo,
+    assetInfo: defaultAssetInfo,
   },
   DEVNET: {
     oracles: {
@@ -91,13 +118,19 @@ export const configurations = {
     feedPolicy: {
       nobleAgoricChannelId: 'TODO',
       nobleDomainId: 4,
-      chainPolicies: ChainPolicies.TESTNET,
-      eventFilter: DepositForBurnEvent,
+      chainPolicies: {
+        Arbitrum: {
+          attenuatedCttpBridgeAddress: '0xTODO',
+          cctpTokenMessengerAddress: '0xTODO',
+          chainId: 421614,
+          confirmations: 2,
+        },
+      },
     },
     chainInfo: /** @type {Record<string, CosmosChainInfo & Passable>} */ (
       withChainCapabilities(fetchedChainInfo) // TODO: use devnet values
     ),
-    assetInfo: transferAssetInfo,
+    assetInfo: defaultAssetInfo, // TODO: use emerynet values
   },
   EMERYNET: {
     oracles: {
@@ -107,13 +140,19 @@ export const configurations = {
     feedPolicy: {
       nobleAgoricChannelId: 'TODO',
       nobleDomainId: 4,
-      chainPolicies: ChainPolicies.TESTNET,
-      eventFilter: DepositForBurnEvent,
+      chainPolicies: {
+        Arbitrum: {
+          attenuatedCttpBridgeAddress: '0xTODO',
+          cctpTokenMessengerAddress: '0xTODO',
+          chainId: 421614,
+          confirmations: 2,
+        },
+      },
     },
     chainInfo: /** @type {Record<string, CosmosChainInfo & Passable>} */ (
       withChainCapabilities(fetchedChainInfo) // TODO: use emerynet values
     ),
-    assetInfo: transferAssetInfo,
+    assetInfo: defaultAssetInfo, // TODO: use emerynet values
   },
 };
 harden(configurations);

package/src/utils/fees.js

@@ -4,7 +4,7 @@ import { Fail } from '@endo/errors';
 import { mustMatch } from '@endo/patterns';
 import { FeeConfigShape } from '../type-guards.js';
 
-const { add, isGTE, subtract } = AmountMath;
+const { add, isGTE, min, subtract } = AmountMath;
 
 /**
  * @import {Amount} from '@agoric/ertp';
@@ -15,7 +15,7 @@ const { add, isGTE, subtract } = AmountMath;
 /** @param {FeeConfig} feeConfig */
 export const makeFeeTools = feeConfig => {
   mustMatch(feeConfig, FeeConfigShape, 'Must provide feeConfig');
-  const { flat, variableRate } = feeConfig;
+  const { flat, variableRate, maxVariable } = feeConfig;
   const feeTools = harden({
     /**
      * Calculate the net amount to advance after withholding fees.
@@ -34,7 +34,8 @@ export const makeFeeTools = feeConfig => {
      * @throws {Error} if requested does not exceed fees
      */
     calculateAdvanceFee(requested) {
-      const fee = add(multiplyBy(requested, variableRate), flat);
+      const variable = min(multiplyBy(requested, variableRate), maxVariable);
+      const fee = add(variable, flat);
       !isGTE(fee, requested) || Fail`Request must exceed fees.`;
       return fee;
     },