@agoric/fast-usdc 0.2.0-u19.2 → 0.2.0-u21.0

package/README.md

@@ -1,101 +1,184 @@
 # 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. `multichain-testing` does this now but not organized per contract.
 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)
-```
+# Funds flow
 
 ```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)
+  actor User as User
+  participant NEA as User Wallet<br>[Browser]
+  participant ETH as CCTP Contract<br>[Ethereum]
+  participant NFA as Noble Forwarding Account<br/>[Noble]
+  participant NC as Noble Chain<br/>[Noble]
+  participant NAR as Noble-Agoric<br/>[IBC Relayer]
+  participant SA as Settlement Account<br/>[Agoric]
+  participant CFA as Contract Fee Account<br/>[Agoric]
+  participant DAR as Destination-Agoric<br/>[IBC Relayer]
+  participant EUD as End User Destination<br/>[Dest Chain]
+
+  autonumber
+  rect rgb(240, 248, 255)
+    User ->> NEA: Sign transaction<br/>(MintAmount, to NFA)
+    NEA ->> ETH: Submit USDC Burn Txn via CCTP
+  end
+  rect rgb(200, 255, 230)
+    FUC ->> P: Initiate PFM transfer(AdvanceAmount, EUD) from pool<br/>of Noble-Agoric tokens to EUD Chain
+    P ->> NC: PFM transfer(AdvanceAmount of Agoric USDC denom) to EUD
+    NC ->> EUD: deliver AdvanceAmount as final USDC denom
+  end
+  Note over User, EUD: User got their AdvanceAmountof IBC USDC<br/>UX COMPLETE
+  rect rgb(255, 200, 200)
+    Note over ETH, SA: Minting Process
+    Note over ETH: ~12 minutes for Ethereum finality
+    Note over NC: 1-6 minutes for CCTP<br/>to Mint on Noble
+    NC ->> NFA: Noble CCTP contract mints USDC<br/> into Noble Forwarding Address
+    NFA ->> NAR: Broadcast Forward MintAmount (as Agoric USDC Denom) to FU Account
+    NAR ->> SA: Relay    
+  end
+  rect rgb(255, 245, 230)
+    Note over FUC, CFA: Settlement Process
+    alt Advance was started:
+      FUC ->> SA: Initiate transfers out of settlement
+      SA ->> P: Deposit the AdvanceAmount + PoolFee (= MintAmount - ContractFee)
+      SA ->> CFA: Deposit ContractFee
+    else Advance for matched transaction that has not yet started:
+      P ->> NC: PFM transfer(MintAmount of Agoric USDC denom) to EUD
+      NC ->> EUD: deliver MintAmount as final USDC denom
+    else Settlement for unknown transaction:
+      Note over SA: Leave funds in SettlementAccount.
+      Note over SA: Wait for observation from watcher
+    end
+  end
 ```
 
-# Status Manager
+Not pictured:
+- Circle Attestation Service
+- CCTP Relayer
 
-### Pending Advance State Diagram
+"Noble Forwarding Account" is also owned by the CCTP Relayer as they actually register it
+CCTP Relayer can be many parties, but only one when caller is specified
 
-*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)
+# Transaction flow
 
 ```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
+%%{init: {
+  'theme': 'base',
+  'themeVariables': {
+    'primaryColor': '#f0f8ff',
+    'primaryTextColor': '#2c3e50',
+    'primaryBorderColor': '#7fb2e6',
+    'lineColor': '#7fb2e6',
+    'secondaryColor': '#f6f8fa',
+    'tertiaryColor': '#fff5e6'
+  }
+}}%%
+sequenceDiagram
+    title Fast USDC Transaction Process
+    autonumber
+    actor User
+    %% [Where it runs]
+    participant NEA as Noble Express app<br/>[Browser]
+    participant ETH as CCTP Contract<br/>[Ethereum]
+    participant NFA as Noble Forwarding Account<br/>[Noble]
+    participant NC as Noble Chain<br/>[Noble]
+    participant NAR as Noble-Agoric<br/>[Relayer]
+    participant OCW as Eth Watcher<br/>[Off-chain]
+    participant FUC as Fast USDC Contract<br/>[Agoric]
+    participant P as Pool<br/>[Agoric]
+    participant SA as Settlement Account<br/>[Agoric]
+    participant CFA as Contract Fee Account<br/>[Agoric]
+    participant DAR as Destination-Agoric<br/>[Relayer]
+    participant EUD as End User Destination<br/>[User]
+
+    %% Notation: --> for async, ->> for sync
+    rect rgb(240, 248, 255)
+        Note over User,OCW: User request
+        Note over NEA: App looks up fees and SettlementAccount address
+        User->>NEA: Input desired MintAmount and EUD
+        NEA->>User: Display fees and AdvanceAmount
+        Note over NEA: Calculate VirtualRecipient from (SettlementAccount, EUD)
+        Note over NEA: Calculate NFA address from (VirtualRecipient) using Signerless forwarding
+        %% Getting from here to the burn is mostly up to Noble
+        User->>NEA: Initiate transfer
+        NEA-->>NC: Register NFA
+        NEA->>User: Request signature
+        User->>NEA: Sign transaction<br/>(MintAmount, to NFA) 
+        NEA->>ETH: Submit USDC Burn Txn via CCTP
+        Note over ETH: Burn succeeds,<br/>implying mint to NFA will happen
+        OCW->>ETH: Query CCTP transactions to Noble
+        ETH-->>OCW: 1 block confirmed
+        OCW->>NC: Look up recipient of NFA<br/>by account query
+        NC->>OCW: RPC replies with account including `recipient` (LCA+EUD)
+    end
+
+    Note over OCW: Continue if recipient is over the Noble-Agoric channel
+    rect rgb(200, 255, 230)
+        Note over NC,EUD: Advancement Process
+        Note over OCW: Log proof of each confirmation
+        Note over OCW,FUC: Provide info needed by policy to make a decision
+        OCW->>FUC: Notify of each confirmation<br/>(dest=agoric1 recipient, amount,<br/>metadata=transaction-nonce,chain,block,timestamp)
+        Note over FUC: MM's policy decides whether to advance (e.g. 2 confirmations from Ethereum, 5 from Polygon)
+        Note over FUC: Syslog with sufficient detail to debug
+        Note over FUC: calculate AdvanceAmount = (MintAmount – PoolFee - ContractFee)<br/>based on fee rates at this moment, and record for future lookup
+        FUC->>P: Initiate PFM transfer(AdvanceAmount, EUD) from pool<br/>of Noble-Agoric tokens to EUD Chain
+        P->>NC: PFM transfer(AdvanceAmount of Agoric USDC denom) to EUD
+        NC->>EUD: deliver AdvanceAmount as final USDC denom
+        %% TODO do need epsilon tolerance on MintAmount for if Noble takes a small cut of the minted amount
+        %% TODO map out the event handling for these states: START: only-observed,advance-started,received-minted-unobserved, END: done
+        Note over SA: Wake up the settlement process to handle observed (key=EUD,MintAmount)
+
+    end
+    Note over User,EUD: User got their AdvanceAmountof IBC USDC<br/>UX COMPLETE
+
+    rect rgb(255, 200, 200)
+        Note over ETH,SA: Minting Process
+        Note over ETH: ~12 minutes for Ethereum finality
+        Note over NC: 1-6 minutes for CCTP<br/>to Mint on Noble
+        NC->>NFA: Noble CCTP contract mints USDC<br/> into Noble Forwarding Address
+        NFA->>SA: Forward MintAmount (as Agoric USDC Denom) to FU Account
+    end
+
+    rect rgb(255, 245, 230)
+        Note over FUC,CFA: Settlement Process
+        Note over FUC,SA: Tap on account reads MintAmount,<br/>parses EUD from virtual address recipient<br/>and looks up AdvanceAmount,PoolFee,ContractFee.<br/>Matches against an unsettled transaction (by EUD and approx amount).
+        %% Treat starting the advance as an atomic action. Assume it will complete once started.
+        alt Advance was started:
+            FUC->>SA: Initiate transfers out of settlement
+            SA->>P: Deposit the AdvanceAmount + PoolFee (= MintAmount - ContractFee)
+            SA->>CFA: Deposit ContractFee
+        else Advance for matched transaction that has not yet started:
+            P->>NC: PFM transfer(MintAmount of Agoric USDC denom) to EUD
+            NC->>EUD: deliver MintAmount as final USDC denom
+        else Settlement for unknown transaction:
+            %% Have not received notification of this Amount,EUD from the watcher
+            Note over SA: Leave funds in SettlementAccount.
+            Note over SA: Wait for observation from watcher
+        end
+    end
 ```

package/package.json

@@ -1,61 +1,52 @@
 {
   "name": "@agoric/fast-usdc",
-  "version": "0.2.0-u19.2",
+  "version": "0.2.0-u21.0",
   "description": "CLI and library for Fast USDC product",
   "type": "module",
   "files": [
-    "contract",
     "src",
     "tools"
   ],
   "main": "src/main.js",
-  "bin": {
-    "fast-usdc": "./src/cli/bin.js"
-  },
+  "bin": "./src/cli/bin.js",
   "scripts": {
     "build": "exit 0",
     "test": "ava",
     "test:c8": "c8 --all $C8_OPTIONS ava",
     "test:xs": "exit 0",
     "lint-fix": "yarn lint:eslint --fix",
-    "lint": "run-s --continue-on-error lint:*",
-    "lint:types": "tsc",
-    "lint:eslint": "eslint ."
+    "lint": "yarn run -T run-s --continue-on-error 'lint:*'",
+    "lint:eslint": "yarn run -T eslint .",
+    "lint:types": "yarn run -T tsc"
   },
   "devDependencies": {
-    "@agoric/swingset-liveslots": "^0.10.3-u19.2",
-    "@agoric/vats": "^0.16.0-u19.2",
-    "@agoric/zone": "^0.3.0-u19.2",
     "@fast-check/ava": "^2.0.1",
     "ava": "^5.3.0",
-    "c8": "^10.1.2",
-    "execa": "9.1.0",
-    "ts-blank-space": "^0.4.4"
+    "c8": "^10.1.3",
+    "nano-spawn": "^1.0.2",
+    "ts-blank-space": "^0.6.1"
   },
   "dependencies": {
-    "@agoric/client-utils": "^0.2.0-u19.2",
-    "@agoric/cosmic-proto": "^0.5.0-u19.2",
-    "@agoric/ertp": "^0.16.3-u19.2",
-    "@agoric/internal": "^0.4.0-u19.2",
-    "@agoric/notifier": "^0.7.0-u19.2",
-    "@agoric/orchestration": "^0.2.0-u19.2",
-    "@agoric/store": "^0.9.3-u19.0",
-    "@agoric/vat-data": "^0.5.3-u19.2",
-    "@agoric/vow": "^0.2.0-u19.2",
-    "@agoric/zoe": "^0.27.0-u19.2",
-    "@cosmjs/proto-signing": "^0.32.4",
-    "@cosmjs/stargate": "^0.32.4",
+    "@agoric/client-utils": "workspace:*",
+    "@agoric/cosmic-proto": "workspace:*",
+    "@agoric/ertp": "workspace:*",
+    "@agoric/internal": "workspace:*",
+    "@agoric/notifier": "workspace:*",
+    "@agoric/orchestration": "workspace:*",
+    "@agoric/zoe": "workspace:*",
+    "@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 +73,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f0ae74b84cb6de3724bfdcd18b4bea7e8199dee1"
+  "gitHead": "e4dd46857133403d584bcf822a81817b355532f9"
 }

package/src/cli/cli.js

@@ -12,7 +12,7 @@ import {
 import { addConfigCommands } from './config-commands.js';
 import { addOperatorCommands } from './operator-commands.js';
 import * as configLib from './config.js';
-import transferLib from './transfer.js';
+import * as transferLib from './transfer.js';
 import { makeFile } from './util/file.js';
 import { addLPCommands } from './lp-commands.js';
 

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,12 +16,12 @@ 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' */
 
-const transfer = async (
+export const transfer = async (
   /** @type {File} */ configFile,
   /** @type {string} */ amount,
   /** @type {string} */ EUD,
@@ -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(
@@ -137,5 +137,3 @@ const transfer = async (
   }
   await execute(config);
 };
-
-export default { transfer };

package/src/cli/util/agoric.js

@@ -4,9 +4,8 @@ export const queryFastUSDCLocalChainAccount = async (
   /** @type {VStorage} */ vstorage,
   out = console,
 ) => {
-  const agoricAddr = await vstorage.readLatest(
-    'published.fastUsdc.settlementAccount',
-  );
-  out.log(`Got Fast USDC Local Chain Account ${agoricAddr}`);
-  return agoricAddr;
+  const { value } = await vstorage.readLatest('published.fastUsdc');
+  const { settlementAccount } = JSON.parse(JSON.parse(value).values[0]);
+  out.log(`settlementAccount: ${settlementAccount}`);
+  return settlementAccount;
 };

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]}
  */
@@ -16,6 +16,8 @@ export const TxStatus = /** @type {const} */ ({
   AdvanceSkipped: 'ADVANCE_SKIPPED',
   /** settlement for matching advance received and funds disbursed */
   Disbursed: 'DISBURSED',
+  /** No route, forward not attempted */
+  ForwardedSkipped: 'FORWARD_SKIPPED',
   /** fallback: do not collect fees */
   Forwarded: 'FORWARDED',
   /** failed to forward to EUD */
@@ -31,13 +33,11 @@ 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]}
  */
 export const PendingTxStatus = /** @type {const} */ ({
-  /** tx was observed but not advanced */
-  Observed: 'OBSERVED',
   /** IBC transfer is initiated */
   Advancing: 'ADVANCING',
   /** IBC transfer failed (timed out) */

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,
+      ),
     },
   });
 };