From f4df38c965a69269ee67c86ed984cc5eb9167d3a Mon Sep 17 00:00:00 2001
From: Richard Gibson <richard.gibson@gmail.com>
Date: Mon, 6 Jan 2025 13:38:27 -0500
Subject: [PATCH 1/9] feat(scripts): Rewrite gen-upgrade-proposal.sh (#10590)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #8784

## Description
* script arguments for target release/tag/commit and Cosmos upgrade name, plus pass-through of arbitrary `agd tx` arguments
* automatic selection of upgrade name from gen-github-release.sh release contents, with interactive disambiguation (where possible) of multiple candidates
* reasonable defaults for title and description from gen-github-release.sh release contents
* script option `--send` to invoke `agd tx` rather than just printing it out (but successfully invocation additionally requires `--from` etc.)
* readable output of the `agd tx` command and data affecting it, whether or not it is to be invoked directly
* argument checking with readable error messages and usage details
* use of GitHub requests and https://main.agoric.net/network-config, overridable by environment variables

Sample use:
```console
$ scripts/gen-upgrade-proposal.sh --send agoric-upgrade-18-rc2
Checking https://api.github.com/repos/Agoric/agoric-sdk for agoric-upgrade-18-rc2...
Verifying archive at https://github.com/Agoric/agoric-sdk/archive/431b36a49f8574ce49c29d152bf0ace03eb5a348.zip...
Generating SHA-256 checksum...
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
100 10.1M    0 10.1M    0     0  4421k      0 --:--:--  0:00:02 --:--:-- 5292k

Found upgrade names:
* agoric-upgrade-18-basic-2
* agoric-upgrade-18-devnet
* agoric-upgrade-18-mainnet

upgrade name (agoric-upgrade-18-mainnet): typo
use unknown upgrade name typo (y/n)? n
upgrade name (agoric-upgrade-18-mainnet):

agd tx gov submit-proposal software-upgrade agoric-upgrade-18-mainnet \
  --upgrade-info '{"binaries":{"any":"https://github.com/Agoric/agoric-sdk/archive/431b36a49f8574ce49c29d152bf0ace03eb5a348.zip//agoric-sdk-431b36a49f8574ce49c29d152bf0ace03eb5a348?checksum=sha256:6d8d7b444e28c52dc15731bfc42955d3bb78d135bc6569c290261f278a587046"},"source":"https://github.com/Agoric/agoric-sdk/archive/431b36a49f8574ce49c29d152bf0ace03eb5a348.zip?checksum=sha256:6d8d7b444e28c52dc15731bfc42955d3bb78d135bc6569c290261f278a587046"}' \
  --title 'Upgrade to agoric-upgrade-18-rc2' \
  --description https://github.com/Agoric/agoric-sdk/releases/tag/agoric-upgrade-18-rc2 \
  --chain-id "$(curl -sSL https://main.agoric.net/network-config | jq -r .chainName)" \
  --from '<WALLET>' \
  --upgrade-height "$(agoric-estimator -date '<DATE>' -rpc https://main.rpc.agoric.net:443 | tee /dev/stderr | sed -n '$s/.* //p')" \
  --help

Executing...
scripts/gen-upgrade-proposal.sh: line 286: agoric-estimator: command not found
Error: invalid argument "" for "--upgrade-height" flag: strconv.ParseInt: parsing "": invalid syntax
Usage:
  agd tx gov submit-proposal software-upgrade [name] (--upgrade-height [height]) (--upgrade-info [info]) [flags]
…
```

### Security Considerations
This script is not directly on a security-critical path, but it is important for it to remain transparent for operators.

### Scaling Considerations
n/a

### Documentation Considerations
Includes embedded usage information, and also remains backwards-compatible in a zero-argument form that uses git HEAD as the target ref (although we should consider instead making target ref a required argument).

I'd also like to incorporate https://github.com/Agoric/estimator into `agd` itself, for something better than `--upgrade-height "$(agoric-estimator -date '<DATE>' -rpc https://main.rpc.agoric.net:443 | tee /dev/stderr | sed -n '$s/.* //p')"`, but haven't done so in this PR.

### Testing Considerations
Tested manually, although I'm open to ideas.

### Upgrade Considerations
None in particular.
---
 scripts/gen-upgrade-proposal.sh | 315 ++++++++++++++++++++++++++++----
 1 file changed, 282 insertions(+), 33 deletions(-)

diff --git a/scripts/gen-upgrade-proposal.sh b/scripts/gen-upgrade-proposal.sh
index dab5a576e9a2..fdc802177de8 100755
--- a/scripts/gen-upgrade-proposal.sh
+++ b/scripts/gen-upgrade-proposal.sh
@@ -1,46 +1,295 @@
 #! /bin/bash
 set -ueo pipefail
+# shellcheck disable=SC2016 # intentionally escape `agd tx`
+declare -r USAGE="Usage: $0"' \
+  [<option>]... [--send] \
+  [<target ref>] \
+  [--] [<agd tx argument>]...
 
-cat << 'EOF' 1>&2
-------------------------------------------------------------------------
-This script shows a command for a software upgrade proposal which is
-compatible with the Cosmovisor found at:
-https://github.com/agoric-labs/cosmos-sdk/tree/Agoric/cosmovisor#readme
-------------------------------------------------------------------------
-EOF
+Generate and optionally issue an `agd tx` command for making a software-upgrade
+governance proposal to bring the nodes of an Agoric blockchain up to the state
+of GitHub repository Agoric/agoric-sdk at a particular release or commit
+identified by checking the following in order:
+1. [remote] Latest Release: If the specified target is "latest" and there is at
+   least one non-prerelease non-draft GitHub release, its target tag name.
+2. [remote] Named Release: If the specified target is the name of a GitHub
+   release, its target tag name.
+3. [remote] Remote Ref: If the specified target is a valid git rev such as a
+   commit ID or tag name or branch name, the commit currently identified by it.
+4. [local] Local Ref: If the working directory is part of a git repository
+   (presumably agoric-sdk) and the specified target is a valid git rev, the
+   commit currently identified by it.
+5. [local] Local Head: If no target is specified and the working directory is
+   part of a git repository, the commit currently identified by HEAD.
 
-UPGRADE_TO="${1:-HEAD}"
-COMMIT_ID=$(git rev-parse "$UPGRADE_TO")
-ZIP_URL="https://github.com/Agoric/agoric-sdk/archive/${COMMIT_ID}.zip"
+OPTIONS
+  -h, --help
+    Output this usage information.
+  -m {local|remote|any}, --mode={local|remote|any}
+    "local" omits [remote] checks; "remote" omits [local] checks.
+    Note that some required arguments (such as upgrade name) can only be
+    determined from a [remote] release created using gen-github-release.sh.
+  -u UPGRADE_NAME, --upgrade-name=UPGRADE_NAME
+    Force use of the specified upgrade name.
+  -s, --send
+    Invoke `agd tx` to send the proposal, rather than just printing out the
+    command to do so (additionally requires `--from` etc.).
 
-echo "Verifying archive is at $ZIP_URL..." 1>&2
-curl -fLI --no-progress-meter "$ZIP_URL" -o- > /dev/null
+ENVIRONMENT VARIABLES
+  GITHUB_API_URL specifies a substitute for "https://api.github.com".
+  GITHUB_SERVER_URL specifies a substitute for "https://github.com".
+  GITHUB_REPOSITORY specifies a substitute for "Agoric/agoric-sdk".
+  CONFIG_URL specifies a substitute for "https://main.agoric.net/network-config".
+
+Past proposals for mainnet can be reviewed at https://ping.pub/agoric/gov
+'
+# usage [<exit code>]
+usage() {
+  printf '%s' "$USAGE"
+  exit "${1:-64}" # EX_USAGE from BSD sysexits
+}
+# fail <error message> [<exit code>]
+fail() {
+  printf '%s\n\n' "$1"
+  usage "${2:-}"
+} 1>&2
+# q <string>
+q() {
+  if [ -z "$1" ] || printf '%s' "$1" | grep -q '[^a-zA-Z0-9_,./:=-]'; then
+    printf '%s' "$1" | sed "s/'/'\\\\''/g; 1s/^/'/; \$s/\$/'/"
+  else
+    printf '%s' "$1"
+  fi
+}
+
+GH_API="${GITHUB_API_URL:-https://api.github.com}"
+GH_URL="${GITHUB_SERVER_URL:-https://github.com}"
+GH_REPO="${GITHUB_REPOSITORY:-Agoric/agoric-sdk}"
+# gh_repo_curl /path/to/repo_resource
+gh_repo_curl() {
+  curl -sSLf \
+    -H 'Accept: application/vnd.github+json' \
+    -H 'X-GitHub-Api-Version: 2022-11-28' \
+    "${GH_API}/repos/${GH_REPO}$1"
+}
+NET_CONFIG_URL="${CONFIG_URL:-https://main.agoric.net/network-config}"
 
+# Consume script arguments (but not agd arguments).
+MODE=any
+SEND=
+FORCE_UPGRADE_NAME=
+TARGET_REF=
+ARG_COUNT=0
+while [ $# -ge 1 ]; do
+  o="$1"
+  case "$1" in
+    --)
+      shift
+      break
+      ;;
+    -h* | --help) usage ;;
+    -m* | --mode=* | --mode)
+      # consume the argument, then push back a value from -x... or --xxx=...
+      shift
+      if [ -n "${o##--*}" ]; then
+        [ ${#o} -ge 3 ] && set -- "${o#-?}" "$@"
+      elif [ "${o#--*=}" != "$o" ]; then
+        set -- "${o#--*=}" "$@"
+      fi
+      # consume the value
+      [ $# -ge 1 ] || fail "$o requires a value"
+      case "$1" in
+        local | remote | any) MODE="$1" ;;
+        *) fail 'mode must be "local", "remote", or "any"' ;;
+      esac
+      shift
+      ;;
+    -s* | --send)
+      # consume the argument, then push back any following [short] options
+      SEND=1
+      shift
+      if [ -n "${o##--*}" ]; then
+        [ ${#o} -ge 3 ] && set -- "-${o#-?}" "$@"
+      fi
+      ;;
+    -u* | --upgrade-name=* | --upgrade-name)
+      # consume the argument, then push back a value from -x... or --xxx=...
+      shift
+      if [ -n "${o##--*}" ]; then
+        [ ${#o} -ge 3 ] && set -- "${o#-?}" "$@"
+      elif [ "${o#--*=}" != "$o" ]; then
+        set -- "${o#--*=}" "$@"
+      fi
+      [ $# -ge 1 ] || fail "$o requires a value"
+      FORCE_UPGRADE_NAME="$1"
+      shift
+      ;;
+    -*) break ;;
+    *)
+      case "$ARG_COUNT" in
+        0) TARGET_REF="$1" ;;
+        *) fail 'Too many arguments' ;;
+      esac
+      ARG_COUNT=$((ARG_COUNT + 1))
+      shift
+      ;;
+  esac
+done
+
+# Determine target commit and (if possible) release name and known upgrade names.
+COMMIT_ID=
+RELEASE_NAME=
+UPGRADE_NAMES=()
+if [[ -z "$COMMIT_ID" && "$MODE" != local && -n "$TARGET_REF" ]]; then
+  echo "Checking $GH_API/repos/$GH_REPO for $TARGET_REF..." 1>&2
+  tag_name=
+  if [ "$TARGET_REF" = latest ]; then
+    path="/releases/latest"
+  else
+    path="/releases/tags/$TARGET_REF"
+  fi
+  release_json="$(gh_repo_curl "$path" || true)"
+  if [ -n "$release_json" ]; then
+    eval "$(printf '%s\n' "$release_json" | jq -r --arg q "'" --arg qsub "'\\''" '
+      [
+        ["tag_name", .tag_name],
+        ["RELEASE_NAME", .name],
+        (.body
+          | match("cosmos.*?name.*?: ([^\r\n]+)"; "gi")
+          | .captures[0].string
+          | ["UPGRADE_NAMES[${#UPGRADE_NAMES[@]}]", .]
+        )
+      ]
+      | map("\(.[0])=\(.[1] | ($q + gsub($q; $qsub) + $q))")
+      | join("\n")
+    ')"
+  fi
+  commit_json="$(gh_repo_curl "/commits/${tag_name:-$TARGET_REF}" || true)"
+  if [ -n "$commit_json" ]; then
+    COMMIT_ID="$(printf '%s\n' "$commit_json" | jq -r .sha)"
+  fi
+fi
+if [[ -z "$COMMIT_ID" && "$MODE" != remote ]]; then
+  echo "Checking $(pwd) for ${TARGET_REF:-HEAD}..." 1>&2
+  COMMIT_ID="$(git rev-parse "${TARGET_REF:-HEAD}")"
+fi
+if [ -z "$COMMIT_ID" ]; then
+  echo "Could not identify a target commit" 1>&2
+  usage 1 | sed '/^$/q' 1>&2
+fi
+
+# Verify and digest the zipball.
+ZIP_URL="$GH_URL/$GH_REPO/archive/${COMMIT_ID}.zip"
+echo "Verifying archive at $ZIP_URL..." 1>&2
+curl -fLI --no-progress-meter "$ZIP_URL" -o- > /dev/null
 echo "Generating SHA-256 checksum..." 1>&2
 CHECKSUM=sha256:$(curl -fL "$ZIP_URL" -o- | shasum -a 256 | cut -d' ' -f1)
+printf '\n' 1>&2
 
+# Generate upgrade-info compatible with Agoric Cosmovisor.
+# https://github.com/agoric-labs/cosmos-sdk/tree/Agoric/cosmovisor#readme
 BINARY_URL="$ZIP_URL//agoric-sdk-${COMMIT_ID}?checksum=$CHECKSUM"
 SOURCE_URL="$ZIP_URL?checksum=$CHECKSUM"
 UPGRADE_INFO="{\"binaries\":{\"any\":\"$BINARY_URL\"},\"source\":\"$SOURCE_URL\"}"
 
-cat << 'EOF' 1>&2
-------------------------------------------------------------------------
-Here is the skeleton of the recomended upgrade proposal command.
-You'll need to fill in the details and add arguments such as
-`--chain-id=<chain id>` and `--from=<wallet>`.
-
-Try `agd tx submit-proposal software-upgrade --help` for more info.
-
-Also, take a look at existing on-chain software upgrade proposals for
-examples: https://ping.pub/agoric/gov
-------------------------------------------------------------------------
-EOF
-
-cat << EOF
-agd tx submit-proposal software-upgrade <UPGRADE-NAME> \\
-  --upgrade-info='$UPGRADE_INFO' \\
-  --upgrade-height <HEIGHT> \\
-  --title '<TITLE>' \\
-  --description '<DESCRIPTION>' \\
-  <TXOPTS>...
-EOF
+# Determine the Cosmos upgrade name, prompting to resolve ambiguity (if possible).
+UPGRADE_NAME_COUNT=${#UPGRADE_NAMES[@]}
+LAST_UPGRADE_NAME=
+[ "$UPGRADE_NAME_COUNT" -gt 0 ] && LAST_UPGRADE_NAME="${UPGRADE_NAMES[$UPGRADE_NAME_COUNT - 1]}"
+UPGRADE_NAME=
+if [ "$UPGRADE_NAME_COUNT" -gt 0 ]; then
+  echo 'Found upgrade names:' 1>&2
+  for name in "${UPGRADE_NAMES[@]}"; do
+    printf '* %s\n' "$name" 1>&2
+  done
+  UPGRADE_NAME="$LAST_UPGRADE_NAME"
+fi
+if [ -n "$FORCE_UPGRADE_NAME" ]; then
+  UPGRADE_NAME="$FORCE_UPGRADE_NAME"
+elif [[ -t 0 && -t 1 && -t 2 && "$UPGRADE_NAME_COUNT" -ne 1 ]]; then
+  hint="$(printf '%s' "$UPGRADE_NAME" | sed 's/\(..*\)/ (\1)/')"
+  found=0
+  printf '\n' 1>&2
+  while [ $found -eq 0 ]; do
+    printf 'upgrade name%s: ' "$hint" 1>&2
+    read -r UPGRADE_NAME
+    [ -n "$UPGRADE_NAME" ] || UPGRADE_NAME="$LAST_UPGRADE_NAME"
+    if [ -n "$UPGRADE_NAME" ]; then
+      found=$((UPGRADE_NAME_COUNT == 0))
+      for name in "${UPGRADE_NAMES[@]}"; do
+        [[ -n "$name" && "$UPGRADE_NAME" = "$name" ]] && found=1
+      done
+    fi
+    if [ "$found" -eq 0 ]; then
+      printf 'use unknown upgrade name %s (y/n)? ' "$(q "$UPGRADE_NAME")"
+      read -r ok
+      case "$(printf '%s' "$ok" | tr '[:upper:]' '[:lower:]')" in
+        y | yes) found=1 ;;
+      esac
+    fi
+  done
+elif [ -n "$UPGRADE_NAME" ]; then
+  printf 'Automatically selected %s.\n' "$(q "$UPGRADE_NAME")" 1>&2
+else
+  echo "Could not identify an upgrade name" 1>&2
+  usage 1 | sed '/^$/q' 1>&2
+fi
+
+# Determine defaults for title and description.
+DEFAULT_TITLE='<TITLE>'
+DEFAULT_DESC='<DESCRIPTION>'
+if [ -n "$RELEASE_NAME" ]; then
+  DEFAULT_TITLE="Upgrade to $RELEASE_NAME"
+  DEFAULT_DESC="$GH_URL/$GH_REPO/releases/tag/$RELEASE_NAME"
+fi
+
+# Determine which agd options are no-value flags.
+flags="$(agd tx gov submit-proposal software-upgrade --help 2>&1 | awk '{
+  if (!sub(/^[[:space:]]*-/, "-")) next;
+  gsub(/,|  +.*/, " ");
+  if (!match($0, / [^ -]/)) printf " %s ", $0;
+}' || true)"
+flags="${flags:-' --aux --dry-run --generate-only -h --help --ledger --no-validate --offline -y --yes --trace '}"
+
+# Determine which agd options have been provided.
+opts=' '
+skip=
+for arg in "$@"; do
+  [[ -n "$skip" || "${arg#-}" = "$arg" ]] && skip= && continue
+  opts="$opts ${arg%%=*} "                          # exclude trailing `=...`
+  skip="${arg##*=*}"                                # skip next arg as an option value if $arg has no `=`
+  [ "${flags/ ${arg%%=*} /}" != "$flags" ] && skip= # ...and is not a flag
+done
+
+# Initialize the agd command with mandatory arguments.
+get_chain_id="curl -sSL $NET_CONFIG_URL | jq -r .chainName"
+get_height="agoric-estimator -date '<DATE>' -rpc https://main.rpc.agoric.net:443 | tee /dev/stderr | sed -n '\$s/.* //p'"
+CMD="agd tx gov submit-proposal software-upgrade $(q "$UPGRADE_NAME") \\
+  --upgrade-info $(q "$UPGRADE_INFO") \\
+  $([ -z "${opts##* --title *}" ] || printf '%s %s' --title "$(q "$DEFAULT_TITLE")") \\
+  $([ -z "${opts##* --description *}" ] || printf '%s %s' --description "$(q "$DEFAULT_DESC")") \\
+  $([ -z "${opts##* --chain-id *}" ] || printf '%s "%s(%s)"' --chain-id '$' "$get_chain_id") \\
+  $([ -z "${opts##* --from *}" ] || echo "--from '<WALLET>'") \\
+  $([ -z "${opts##* --upgrade-height *}" ] || printf '%s "%s(%s)"' --upgrade-height '$' "$get_height") \\
+"
+CMD="$(echo "$CMD" | grep -v '^   [\\]$\|^$' | sed '$s/ [\\]$//')"
+
+# Incorporate remaining arguments.
+skip=
+for arg in "$@"; do
+  CMD="$CMD$(printf " $([ -n "$skip" ] || printf '%s' '\\\n  ')%s" "$(q "$arg")")"
+  [[ -n "$skip" || "${arg#-}" = "$arg" ]] && skip= && continue
+  skip="${arg##*=*}"                                # next arg is an option value if $arg has no `=`
+  [ "${flags/ ${arg%%=*} /}" != "$flags" ] && skip= # ...and is not a flag
+done
+
+# Print and optionally invoke the agd command.
+printf '\n'
+if [ -z "$SEND" ]; then
+  printf '%s\n\n' "$CMD"
+else
+  printf '%s\n\n' "$CMD" 1>&2
+  echo "Executing..." 1>&2
+  eval "$CMD"
+  printf '\n'
+fi

From 26f5229b247536570d91aef4bda18c3290e2178c Mon Sep 17 00:00:00 2001
From: 0xPatrick <patrick@0xpatrick.dev>
Date: Wed, 18 Dec 2024 10:12:19 -0500
Subject: [PATCH 2/9] chore: `pendingTxs` -> `pendingSettleTxs`

---
 packages/fast-usdc/src/exos/status-manager.js |  22 +++++++++---------
 .../snapshots/fast-usdc.contract.test.ts.md   |   2 +-
 .../snapshots/fast-usdc.contract.test.ts.snap | Bin 5832 -> 5841 bytes
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/fast-usdc/src/exos/status-manager.js b/packages/fast-usdc/src/exos/status-manager.js
index c261ec599a88..22966c2784c6 100644
--- a/packages/fast-usdc/src/exos/status-manager.js
+++ b/packages/fast-usdc/src/exos/status-manager.js
@@ -76,7 +76,7 @@ export const prepareStatusManager = (
    * Keyed by a tuple of the Noble Forwarding Account and amount.
    * @type {MapStore<PendingTxKey, PendingTx[]>}
    */
-  const pendingTxs = zone.mapStore('PendingTxs', {
+  const pendingSettleTxs = zone.mapStore('PendingSettleTxs', {
     keyShape: M.string(),
     valueShape: M.arrayOf(PendingTxShape),
   });
@@ -156,7 +156,7 @@ export const prepareStatusManager = (
     seenTxs.add(txHash);
 
     appendToStoredArray(
-      pendingTxs,
+      pendingSettleTxs,
       pendingTxKeyOf(evidence),
       harden({ ...evidence, status }),
     );
@@ -177,8 +177,8 @@ export const prepareStatusManager = (
    */
   function setPendingTxStatus({ nfa, amount }, status) {
     const key = makePendingTxKey(nfa, amount);
-    pendingTxs.has(key) || Fail`no advancing tx with ${{ nfa, amount }}`;
-    const pending = pendingTxs.get(key);
+    pendingSettleTxs.has(key) || Fail`no advancing tx with ${{ nfa, amount }}`;
+    const pending = pendingSettleTxs.get(key);
     const ix = pending.findIndex(tx => tx.status === PendingTxStatus.Advancing);
     ix >= 0 || Fail`no advancing tx with ${{ nfa, amount }}`;
     const [prefix, tx, suffix] = [
@@ -187,7 +187,7 @@ export const prepareStatusManager = (
       pending.slice(ix + 1),
     ];
     const txpost = { ...tx, status };
-    pendingTxs.set(key, harden([...prefix, txpost, ...suffix]));
+    pendingSettleTxs.set(key, harden([...prefix, txpost, ...suffix]));
     void publishTxnRecord(tx.txHash, harden({ status }));
   }
 
@@ -312,8 +312,8 @@ export const prepareStatusManager = (
        */
       dequeueStatus(nfa, amount) {
         const key = makePendingTxKey(nfa, amount);
-        if (!pendingTxs.has(key)) return undefined;
-        const pending = pendingTxs.get(key);
+        if (!pendingSettleTxs.has(key)) return undefined;
+        const pending = pendingSettleTxs.get(key);
 
         const dequeueIdx = pending.findIndex(
           x => x.status !== PendingTxStatus.Advancing,
@@ -323,9 +323,9 @@ export const prepareStatusManager = (
         if (pending.length > 1) {
           const pendingCopy = [...pending];
           pendingCopy.splice(dequeueIdx, 1);
-          pendingTxs.set(key, harden(pendingCopy));
+          pendingSettleTxs.set(key, harden(pendingCopy));
         } else {
-          pendingTxs.delete(key);
+          pendingSettleTxs.delete(key);
         }
 
         const { status, txHash } = pending[dequeueIdx];
@@ -376,10 +376,10 @@ export const prepareStatusManager = (
        */
       lookupPending(nfa, amount) {
         const key = makePendingTxKey(nfa, amount);
-        if (!pendingTxs.has(key)) {
+        if (!pendingSettleTxs.has(key)) {
           return harden([]);
         }
-        return pendingTxs.get(key);
+        return pendingSettleTxs.get(key);
       },
     },
   );
diff --git a/packages/fast-usdc/test/snapshots/fast-usdc.contract.test.ts.md b/packages/fast-usdc/test/snapshots/fast-usdc.contract.test.ts.md
index 52a2897ceb7b..abab8df6efde 100644
--- a/packages/fast-usdc/test/snapshots/fast-usdc.contract.test.ts.md
+++ b/packages/fast-usdc/test/snapshots/fast-usdc.contract.test.ts.md
@@ -594,7 +594,7 @@ Generated by [AVA](https://avajs.dev).
         'Liquidity Pool_kindHandle': 'Alleged: kind',
         NobleAccount: 'Vow',
         'Operator Kit_kindHandle': 'Alleged: kind',
-        PendingTxs: {},
+        PendingSettleTxs: {},
         PoolAccount: 'Vow',
         SeenTxs: [],
         SettleAccount: 'Vow',
diff --git a/packages/fast-usdc/test/snapshots/fast-usdc.contract.test.ts.snap b/packages/fast-usdc/test/snapshots/fast-usdc.contract.test.ts.snap
index 2554e4fe33dcd3587803f69cb4930a38b3ca35ad..07715403500491ee6710fbbd04df01f97ac872bf 100644
GIT binary patch
literal 5841
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
b#J_Xes0`?8tTFLtx%K}AkZdP340QkifWBZw

literal 5832
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
SH6{KmxBfr5o^xUbbpQZeGFqho


From ac0dd9b21f8a72e36e4e9ee5162dd83f648ef623 Mon Sep 17 00:00:00 2001
From: 0xPatrick <patrick@0xpatrick.dev>
Date: Thu, 19 Dec 2024 15:44:58 -0500
Subject: [PATCH 3/9] chore: misc fusdc contract test improvements

- verify poolAccount is sender for Advances
- verify Advance is Disbursed in happy path
- verify pool and settlement account addresses (better visibility in active dev)
---
 .../fast-usdc/test/fast-usdc.contract.test.ts | 47 ++++++++++++++-----
 packages/fast-usdc/test/supports.ts           |  2 +
 2 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/packages/fast-usdc/test/fast-usdc.contract.test.ts b/packages/fast-usdc/test/fast-usdc.contract.test.ts
index 9d333a40531b..2e1018d19b1e 100644
--- a/packages/fast-usdc/test/fast-usdc.contract.test.ts
+++ b/packages/fast-usdc/test/fast-usdc.contract.test.ts
@@ -6,7 +6,6 @@ import {
   encodeAddressHook,
 } from '@agoric/cosmic-proto/address-hooks.js';
 import { AmountMath } from '@agoric/ertp/src/amountMath.js';
-import type { makeFakeStorageKit } from '@agoric/internal/src/storage-test-utils.js';
 import {
   eventLoopIteration,
   inspectMapStore,
@@ -137,11 +136,13 @@ const makeTestContext = async (t: ExecutionContext) => {
     return E(purse).deposit(pmt);
   };
 
+  const accountsData = common.bootstrap.storage.data.get('fun');
+  const { settlementAccount, poolAccount } = JSON.parse(
+    JSON.parse(accountsData!).values[0],
+  );
+  t.is(settlementAccount, 'agoric1qyqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqc09z0g');
+  t.is(poolAccount, 'agoric1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqp7zqht');
   const mint = async (e: CctpTxEvidence) => {
-    const accountsData = common.bootstrap.storage.data.get('fun');
-    const { settlementAccount } = JSON.parse(
-      JSON.parse(accountsData!).values[0],
-    );
     const rxd = await receiveUSDCAt(settlementAccount, e.tx.amount);
     await VE(transferBridge).fromBridge(
       buildVTransferEvent({
@@ -157,7 +158,15 @@ const makeTestContext = async (t: ExecutionContext) => {
     return rxd;
   };
 
-  return { bridges: { snapshot, since }, common, evm, mint, startKit, sync };
+  return {
+    bridges: { snapshot, since },
+    common,
+    evm,
+    mint,
+    startKit,
+    sync,
+    addresses: { settlementAccount, poolAccount },
+  };
 };
 
 type FucContext = Awaited<ReturnType<typeof makeTestContext>>;
@@ -429,7 +438,7 @@ const makeCustomer = (
       return tx;
     },
     checkSent: (
-      t: ExecutionContext,
+      t: ExecutionContext<FucContext>,
       { bank = [] as any[], local = [] as any[] } = {},
       forward?: unknown,
     ) => {
@@ -467,6 +476,8 @@ const makeCustomer = (
         if (forward) return;
         throw t.fail(`no MsgTransfer to ${EUD}`);
       }
+      const { poolAccount } = t.context.addresses;
+      t.is(myMsg.address, poolAccount, 'advance sent from pool account');
       const [ibcTransferMsg] = myMsg.messages;
       // C4 - Contract MUST release funds to the end user destination address
       // in response to invocation by the off-chain watcher that
@@ -476,7 +487,7 @@ const makeCustomer = (
         { amount: String(toReceive.value), denom: uusdcOnAgoric },
         'C4',
       );
-      t.log(who, 'sees', ibcTransferMsg.token, 'sent to', EUD);
+      t.log(who, 'sees', ibcTransferMsg.token, 'sending to', EUD);
       if (!(EUD as string).startsWith('noble')) {
         t.like(
           JSON.parse(ibcTransferMsg.memo),
@@ -579,6 +590,7 @@ test.serial('Contract skips advance when risks identified', async t => {
 test.serial('STORY01: advancing happy path for 100 USDC', async t => {
   const {
     common: {
+      bootstrap: { storage },
       brands: { usdc },
       commonPrivateArgs: { feeConfig },
       utils: { inspectBankBridge, transmitTransferAck },
@@ -593,10 +605,15 @@ test.serial('STORY01: advancing happy path for 100 USDC', async t => {
   const bridgePos = snapshot();
   const sent1 = await cust1.sendFast(t, 108_000_000n, 'osmo1234advanceHappy');
   await transmitTransferAck(); // ack IBC transfer for advance
-  // Nothing we can check here, unless we want to inspect calls to `trace`.
-  // `test/exos/advancer.test.ts` covers calls to `log: LogFn` with mocks.
-  // This is still helpful to call, so we can observe "Advance transfer
-  // fulfilled" in the test output.
+  const expectedTransitions = [
+    { evidence: sent1, status: 'OBSERVED' },
+    { status: 'ADVANCING' },
+    { status: 'ADVANCED' },
+  ];
+  t.deepEqual(
+    storage.getDeserialized(`fun.txns.${sent1.txHash}`),
+    expectedTransitions,
+  );
 
   const { calculateAdvance, calculateSplit } = makeFeeTools(feeConfig);
   const expectedAdvance = calculateAdvance(usdc.make(sent1.tx.amount));
@@ -663,6 +680,11 @@ test.serial('STORY01: advancing happy path for 100 USDC', async t => {
     },
     'metrics after advancing',
   );
+
+  t.deepEqual(storage.getDeserialized(`fun.txns.${sent1.txHash}`), [
+    ...expectedTransitions,
+    { split, status: 'DISBURSED' },
+  ]);
 });
 
 // most likely in exo unit tests
@@ -781,7 +803,6 @@ test.serial('C20 - Contract MUST function with an empty pool', async t => {
       utils: { transmitTransferAck },
     },
     evm: { cctp, txPub },
-    startKit: { metricsSub },
     bridges: { snapshot, since },
     mint,
   } = t.context;
diff --git a/packages/fast-usdc/test/supports.ts b/packages/fast-usdc/test/supports.ts
index 6a4608a0cf5d..6983f5a709d0 100644
--- a/packages/fast-usdc/test/supports.ts
+++ b/packages/fast-usdc/test/supports.ts
@@ -196,6 +196,8 @@ export const commonSetup = async (t: ExecutionContext<any>) => {
         target: lastMsgTransfer.sender,
         sourceChannel: lastMsgTransfer.sourceChannel,
         sequence: ibcSequenceNonce,
+        denom: lastMsgTransfer.token.denom,
+        amount: BigInt(lastMsgTransfer.token.amount),
       }),
     );
     // let the bridge handler finish

From ee0922802a093bf19a66c8ee34a214eae0873db7 Mon Sep 17 00:00:00 2001
From: 0xPatrick <patrick@0xpatrick.dev>
Date: Thu, 19 Dec 2024 15:55:50 -0500
Subject: [PATCH 4/9] chore: only Observed txs are Forwardable

---
 packages/fast-usdc/src/exos/settler.js        | 60 ++++++-------------
 packages/fast-usdc/src/exos/status-manager.js | 20 ++-----
 2 files changed, 22 insertions(+), 58 deletions(-)

diff --git a/packages/fast-usdc/src/exos/settler.js b/packages/fast-usdc/src/exos/settler.js
index 7b3b3de2e6f0..fc1c7a0865b7 100644
--- a/packages/fast-usdc/src/exos/settler.js
+++ b/packages/fast-usdc/src/exos/settler.js
@@ -74,19 +74,12 @@ export const prepareSettler = (
         ).returns(),
       }),
       self: M.interface('SettlerSelfI', {
-        disburse: M.call(EvmHashShape, M.string(), M.nat()).returns(
-          M.promise(),
-        ),
-        forward: M.call(
-          M.opt(EvmHashShape),
-          M.string(),
-          M.nat(),
-          M.string(),
-        ).returns(),
+        disburse: M.call(EvmHashShape, M.nat()).returns(M.promise()),
+        forward: M.call(EvmHashShape, M.nat(), M.string()).returns(),
       }),
       transferHandler: M.interface('SettlerTransferI', {
-        onFulfilled: M.call(M.any(), M.record()).returns(),
-        onRejected: M.call(M.any(), M.record()).returns(),
+        onFulfilled: M.call(M.undefined(), M.string()).returns(),
+        onRejected: M.call(M.error(), M.string()).returns(),
       }),
     },
     /**
@@ -174,7 +167,7 @@ export const prepareSettler = (
           log('dequeued', found, 'for', nfa, amount);
           switch (found?.status) {
             case PendingTxStatus.Advanced:
-              return self.disburse(found.txHash, nfa, amount);
+              return self.disburse(found.txHash, amount);
 
             case PendingTxStatus.Advancing:
               this.state.mintedEarly.add(makeMintedEarlyKey(nfa, amount));
@@ -183,7 +176,7 @@ export const prepareSettler = (
             case PendingTxStatus.Observed:
             case PendingTxStatus.AdvanceSkipped:
             case PendingTxStatus.AdvanceFailed:
-              return self.forward(found.txHash, nfa, amount, EUD);
+              return self.forward(found.txHash, amount, EUD);
 
             case undefined:
             default:
@@ -211,15 +204,10 @@ export const prepareSettler = (
           if (mintedEarly.has(key)) {
             mintedEarly.delete(key);
             if (success) {
-              void this.facets.self.disburse(
-                txHash,
-                forwardingAddress,
-                fullValue,
-              );
+              void this.facets.self.disburse(txHash, fullValue);
             } else {
               void this.facets.self.forward(
                 txHash,
-                forwardingAddress,
                 fullValue,
                 destination.value,
               );
@@ -232,10 +220,9 @@ export const prepareSettler = (
       self: {
         /**
          * @param {EvmHash} txHash
-         * @param {NobleAddress} nfa
          * @param {NatValue} fullValue
          */
-        async disburse(txHash, nfa, fullValue) {
+        async disburse(txHash, fullValue) {
           const { repayer, settlementAccount } = this.state;
           const received = AmountMath.make(USDC, fullValue);
           const { zcfSeat: settlingSeat } = zcf.makeEmptySeatKit();
@@ -260,16 +247,15 @@ export const prepareSettler = (
           );
           repayer.repay(settlingSeat, split);
 
-          // update status manager, marking tx `SETTLED`
+          // update status manager, marking tx `DISBURSED`
           statusManager.disbursed(txHash, split);
         },
         /**
          * @param {EvmHash} txHash
-         * @param {NobleAddress} nfa
          * @param {NatValue} fullValue
          * @param {string} EUD
          */
-        forward(txHash, nfa, fullValue, EUD) {
+        forward(txHash, fullValue, EUD) {
           const { settlementAccount, intermediateRecipient } = this.state;
 
           const dest = chainHub.makeChainAddress(EUD);
@@ -280,35 +266,23 @@ export const prepareSettler = (
             AmountMath.make(USDC, fullValue),
             { forwardOpts: { intermediateRecipient } },
           );
-          void vowTools.watch(txfrV, this.facets.transferHandler, {
-            txHash,
-            nfa,
-            fullValue,
-          });
+          void vowTools.watch(txfrV, this.facets.transferHandler, txHash);
         },
       },
       transferHandler: {
         /**
          * @param {unknown} _result
-         * @param {SettlerTransferCtx} ctx
-         *
-         * @typedef {{
-         *   txHash: EvmHash;
-         *   nfa: NobleAddress;
-         *   fullValue: NatValue;
-         * }} SettlerTransferCtx
+         * @param {EvmHash} txHash
          */
-        onFulfilled(_result, ctx) {
-          const { txHash, nfa, fullValue } = ctx;
-          statusManager.forwarded(txHash, nfa, fullValue);
+        onFulfilled(_result, txHash) {
+          statusManager.forwarded(txHash);
         },
         /**
          * @param {unknown} reason
-         * @param {SettlerTransferCtx} ctx
+         * @param {EvmHash} txHash
          */
-        onRejected(reason, ctx) {
-          log('⚠️ transfer rejected!', reason, ctx);
-          // const { txHash, nfa, amount } = ctx;
+        onRejected(reason, txHash) {
+          log('⚠️ transfer rejected!', reason, txHash);
           // TODO(#10510): statusManager.forwardFailed(txHash, nfa, amount);
         },
       },
diff --git a/packages/fast-usdc/src/exos/status-manager.js b/packages/fast-usdc/src/exos/status-manager.js
index 22966c2784c6..c040b86eb0ca 100644
--- a/packages/fast-usdc/src/exos/status-manager.js
+++ b/packages/fast-usdc/src/exos/status-manager.js
@@ -69,6 +69,7 @@ export const prepareStatusManager = (
   txnsNode,
   {
     marshaller,
+    // eslint-disable-next-line no-unused-vars
     log = makeTracer('Advancer', true),
   } = /** @type {StatusManagerPowers} */ ({}),
 ) => {
@@ -220,9 +221,7 @@ export const prepareStatusManager = (
       disbursed: M.call(EvmHashShape, AmountKeywordRecordShape).returns(
         M.undefined(),
       ),
-      forwarded: M.call(M.opt(EvmHashShape), M.string(), M.nat()).returns(
-        M.undefined(),
-      ),
+      forwarded: M.call(EvmHashShape).returns(M.undefined()),
       lookupPending: M.call(M.string(), M.bigint()).returns(
         M.arrayOf(PendingTxShape),
       ),
@@ -350,19 +349,10 @@ export const prepareStatusManager = (
       /**
        * Mark a transaction as `FORWARDED`
        *
-       * @param {EvmHash | undefined} txHash - undefined in case mint before observed
-       * @param {NobleAddress} nfa
-       * @param {bigint} amount
+       * @param {EvmHash} txHash - undefined in case mint before observed
        */
-      forwarded(txHash, nfa, amount) {
-        if (txHash) {
-          void publishTxnRecord(txHash, harden({ status: TxStatus.Forwarded }));
-        } else {
-          // TODO store (early) `Minted` transactions to check against incoming evidence
-          log(
-            `⚠️ Forwarded minted amount ${amount} from account ${nfa} before it was observed.`,
-          );
-        }
+      forwarded(txHash) {
+        void publishTxnRecord(txHash, harden({ status: TxStatus.Forwarded }));
       },
 
       /**

From 18f79d0513bad01e011e7cff0c9a0e5a13da79bb Mon Sep 17 00:00:00 2001
From: 0xPatrick <patrick@0xpatrick.dev>
Date: Thu, 19 Dec 2024 16:09:44 -0500
Subject: [PATCH 5/9] test: mint received while ADVANCING

---
 .../fast-usdc/test/fast-usdc.contract.test.ts | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/packages/fast-usdc/test/fast-usdc.contract.test.ts b/packages/fast-usdc/test/fast-usdc.contract.test.ts
index 2e1018d19b1e..1ae2a0f4e6db 100644
--- a/packages/fast-usdc/test/fast-usdc.contract.test.ts
+++ b/packages/fast-usdc/test/fast-usdc.contract.test.ts
@@ -868,6 +868,47 @@ test.serial('Settlement for unknown transaction (operator down)', async t => {
   await transmitTransferAck();
 });
 
+test.failing('mint received why ADVANCING', async t => {
+  // Settler should `disburse` on Transfer success
+  const {
+    bridges: { snapshot, since },
+    common: {
+      commonPrivateArgs: { feeConfig },
+      utils,
+      brands: { usdc },
+      bootstrap: { storage },
+    },
+    evm: { cctp, txPub },
+    mint,
+    startKit: { zoe, instance, metricsSub },
+  } = t.context;
+
+  t.log('top of liquidity pool');
+  const usdcPurse = purseOf(usdc.issuer, utils);
+  const lp999 = makeLP('Leo ', usdcPurse(999_000_000n), zoe, instance);
+  await E(lp999).deposit(t, 999_000_000n);
+
+  const earlySettle = makeCustomer('Earl E.', cctp, txPub.publisher, feeConfig);
+  const bridgePos = snapshot();
+
+  await earlySettle.checkPoolAvailable(t, 5_000_000n, metricsSub);
+  const sent = await earlySettle.sendFast(t, 5_000_000n, 'osmo1earl3');
+  await eventLoopIteration();
+  earlySettle.checkSent(t, since(bridgePos));
+
+  await mint(sent);
+  // mint received before Advance transfer settles
+  await utils.transmitTransferAck();
+
+  const split = makeFeeTools(feeConfig).calculateSplit(usdc.make(5_000_000n));
+  t.deepEqual(storage.getDeserialized(`fun.txns.${sent.txHash}`), [
+    { evidence: sent, status: 'OBSERVED' },
+    { status: 'ADVANCING' },
+    // { status: 'ADVANCED' }, TODO: not reported by notifyAdvancingResult
+    { split, status: 'DISBURSED' },
+  ]);
+});
+
 test.todo(
   'fee levels MUST be visible to external parties - i.e., written to public storage',
 );

From 3c4278d119e1764942d1957b30a73677ccfdae62 Mon Sep 17 00:00:00 2001
From: 0xPatrick <patrick@0xpatrick.dev>
Date: Thu, 19 Dec 2024 16:24:28 -0500
Subject: [PATCH 6/9] fix: Advancing txs are dequeueable

- Advancing txs are dequeueable so `case PendingTxStatus.Advancing:` is reachable
- update Settler tests to use `notifyAdvancing` result to simulate an advance
- add Settler test for minting while advancing (Advanced + AdvanceFailed paths)
---
 packages/fast-usdc/src/exos/settler.js        |  19 +-
 packages/fast-usdc/src/exos/status-manager.js |  37 ++-
 packages/fast-usdc/test/exos/settler.test.ts  | 248 +++++++++++++-----
 .../test/exos/status-manager.test.ts          |  34 +--
 .../fast-usdc/test/fast-usdc.contract.test.ts |   2 +-
 packages/fast-usdc/test/mocks.ts              |   3 +
 6 files changed, 233 insertions(+), 110 deletions(-)

diff --git a/packages/fast-usdc/src/exos/settler.js b/packages/fast-usdc/src/exos/settler.js
index fc1c7a0865b7..d1b18307f380 100644
--- a/packages/fast-usdc/src/exos/settler.js
+++ b/packages/fast-usdc/src/exos/settler.js
@@ -8,7 +8,7 @@ import { M } from '@endo/patterns';
 import { decodeAddressHook } from '@agoric/cosmic-proto/address-hooks.js';
 import { PendingTxStatus } from '../constants.js';
 import { makeFeeTools } from '../utils/fees.js';
-import { EvmHashShape } from '../type-guards.js';
+import { EvmHashShape, makeNatAmountShape } from '../type-guards.js';
 
 /**
  * @import {FungibleTokenPacketData} from '@agoric/cosmic-proto/ibc/applications/transfer/v2/packet.js';
@@ -31,6 +31,15 @@ import { EvmHashShape } from '../type-guards.js';
 const makeMintedEarlyKey = (addr, amount) =>
   `pendingTx:${JSON.stringify([addr, String(amount)])}`;
 
+/** @param {Brand<'nat'>} USDC */
+export const makeAdvanceDetailsShape = USDC =>
+  harden({
+    destination: ChainAddressShape,
+    forwardingAddress: M.string(),
+    fullAmount: makeNatAmountShape(USDC),
+    txHash: EvmHashShape,
+  });
+
 /**
  * @param {Zone} zone
  * @param {object} caps
@@ -69,7 +78,7 @@ export const prepareSettler = (
       }),
       notify: M.interface('SettlerNotifyI', {
         notifyAdvancingResult: M.call(
-          M.record(), // XXX fill in details TODO
+          makeAdvanceDetailsShape(USDC),
           M.boolean(),
         ).returns(),
       }),
@@ -170,6 +179,7 @@ export const prepareSettler = (
               return self.disburse(found.txHash, amount);
 
             case PendingTxStatus.Advancing:
+              log('⚠️ tap: minted while advancing', nfa, amount);
               this.state.mintedEarly.add(makeMintedEarlyKey(nfa, amount));
               return;
 
@@ -200,12 +210,17 @@ export const prepareSettler = (
         ) {
           const { mintedEarly } = this.state;
           const { value: fullValue } = fullAmount;
+          // XXX i think this only contains Advancing txs - should this be a separate store?
           const key = makeMintedEarlyKey(forwardingAddress, fullValue);
           if (mintedEarly.has(key)) {
             mintedEarly.delete(key);
             if (success) {
+              // TODO: does not write `ADVANCED` to vstorage
+              // this is the "slow" experience, but we've already earmarked fees so disburse
               void this.facets.self.disburse(txHash, fullValue);
             } else {
+              // TODO: does not write `ADVANCE_FAILED` to vstorage
+              // if advance fails, attempt to forward (no fees)
               void this.facets.self.forward(
                 txHash,
                 fullValue,
diff --git a/packages/fast-usdc/src/exos/status-manager.js b/packages/fast-usdc/src/exos/status-manager.js
index c040b86eb0ca..0738ba0b04c4 100644
--- a/packages/fast-usdc/src/exos/status-manager.js
+++ b/packages/fast-usdc/src/exos/status-manager.js
@@ -70,7 +70,7 @@ export const prepareStatusManager = (
   {
     marshaller,
     // eslint-disable-next-line no-unused-vars
-    log = makeTracer('Advancer', true),
+    log = makeTracer('StatusManager', true),
   } = /** @type {StatusManagerPowers} */ ({}),
 ) => {
   /**
@@ -208,12 +208,7 @@ export const prepareStatusManager = (
         M.or(
           {
             txHash: EvmHashShape,
-            status: M.or(
-              PendingTxStatus.Advanced,
-              PendingTxStatus.AdvanceSkipped,
-              PendingTxStatus.AdvanceFailed,
-              PendingTxStatus.Observed,
-            ),
+            status: M.or(...Object.values(PendingTxStatus)),
           },
           M.undefined(),
         ),
@@ -257,7 +252,7 @@ export const prepareStatusManager = (
       },
 
       /**
-       * Record result of ADVANCING
+       * Record result of an ADVANCING transaction
        *
        * @param {NobleAddress} nfa Noble Forwarding Account
        * @param {import('@agoric/ertp').NatValue} amount
@@ -302,34 +297,32 @@ export const prepareStatusManager = (
       },
 
       /**
-       * Remove and return an `ADVANCED` or `OBSERVED` tx waiting to be `SETTLED`.
+       * Remove and return the oldest pending settlement transaction that matches the given
+       * forwarding account and amount. Since multiple pending transactions may exist with
+       * identical (account, amount) pairs, we process them in FIFO order.
        *
        * @param {NobleAddress} nfa
        * @param {bigint} amount
-       * @returns {Pick<PendingTx, 'status' | 'txHash'> | undefined} undefined if nothing
-       *   with this address and amount has been marked pending.
+       * @returns {Pick<PendingTx, 'status' | 'txHash'> | undefined} undefined if no pending
+       *   transactions exist for this address and amount combination.
        */
       dequeueStatus(nfa, amount) {
         const key = makePendingTxKey(nfa, amount);
         if (!pendingSettleTxs.has(key)) return undefined;
         const pending = pendingSettleTxs.get(key);
 
-        const dequeueIdx = pending.findIndex(
-          x => x.status !== PendingTxStatus.Advancing,
-        );
-        if (dequeueIdx < 0) return undefined;
+        if (pending.length === 0) {
+          return undefined;
+        }
+        // extract first item
+        const [{ status, txHash }, ...remaining] = pending;
 
-        if (pending.length > 1) {
-          const pendingCopy = [...pending];
-          pendingCopy.splice(dequeueIdx, 1);
-          pendingSettleTxs.set(key, harden(pendingCopy));
+        if (remaining.length) {
+          pendingSettleTxs.set(key, harden(remaining));
         } else {
           pendingSettleTxs.delete(key);
         }
 
-        const { status, txHash } = pending[dequeueIdx];
-        // TODO: store txHash -> evidence for txs pending settlement?
-        // If necessary for vstorage writes in `forwarded` and `settled`
         return harden({ status, txHash });
       },
 
diff --git a/packages/fast-usdc/test/exos/settler.test.ts b/packages/fast-usdc/test/exos/settler.test.ts
index 5a8d9928385f..f9d4bf955308 100644
--- a/packages/fast-usdc/test/exos/settler.test.ts
+++ b/packages/fast-usdc/test/exos/settler.test.ts
@@ -1,12 +1,13 @@
 import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
 import type { TestFn } from 'ava';
 
+import { decodeAddressHook } from '@agoric/cosmic-proto/address-hooks.js';
+import { defaultMarshaller } from '@agoric/internal/src/storage-test-utils.js';
 import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
 import fetchedChainInfo from '@agoric/orchestration/src/fetched-chain-info.js';
 import type { Zone } from '@agoric/zone';
-import { defaultMarshaller } from '@agoric/internal/src/storage-test-utils.js';
-import { PendingTxStatus } from '../../src/constants.js';
-import { prepareSettler } from '../../src/exos/settler.js';
+import { PendingTxStatus, TxStatus } from '../../src/constants.js';
+import { prepareSettler, type SettlerKit } from '../../src/exos/settler.js';
 import { prepareStatusManager } from '../../src/exos/status-manager.js';
 import type { CctpTxEvidence } from '../../src/types.js';
 import { makeFeeTools } from '../../src/utils/fees.js';
@@ -95,45 +96,85 @@ const makeTestContext = async t => {
     intermediateRecipient,
   });
 
-  const simulate = harden({
-    advance: (evidence?: CctpTxEvidence) => {
-      const cctpTxEvidence: CctpTxEvidence = {
-        ...MockCctpTxEvidences.AGORIC_PLUS_OSMO(),
-        ...evidence,
-      };
-      t.log('Mock CCTP Evidence:', cctpTxEvidence);
-      t.log('Pretend we initiated advance, mark as `ADVANCED`');
-      statusManager.advance(cctpTxEvidence);
-      const { forwardingAddress, amount } = cctpTxEvidence.tx;
-      statusManager.advanceOutcome(forwardingAddress, BigInt(amount), true);
-
-      return cctpTxEvidence;
-    },
-
-    skipAdvance: (risksIdentified: string[], evidence?: CctpTxEvidence) => {
-      const cctpTxEvidence: CctpTxEvidence = {
-        ...MockCctpTxEvidences.AGORIC_PLUS_OSMO(),
-        ...evidence,
-      };
-      t.log('Mock CCTP Evidence:', cctpTxEvidence);
-      t.log('Mark as `ADVANCE_SKIPPED`');
-      statusManager.skipAdvance(cctpTxEvidence, risksIdentified ?? []);
-
-      return cctpTxEvidence;
-    },
-
-    observe: (evidence?: CctpTxEvidence) => {
-      const cctpTxEvidence: CctpTxEvidence = {
+  const makeSimulate = (notifyFacet: SettlerKit['notify']) => {
+    const makeEvidence = (evidence?: CctpTxEvidence): CctpTxEvidence =>
+      harden({
         ...MockCctpTxEvidences.AGORIC_PLUS_OSMO(),
         ...evidence,
-      };
-      t.log('Mock CCTP Evidence:', cctpTxEvidence);
-      t.log('Pretend we `OBSERVED`');
-      statusManager.observe(cctpTxEvidence);
+      });
+
+    const makeNotifyInfo = (evidence: CctpTxEvidence) => {
+      const { txHash } = evidence;
+      const { forwardingAddress, amount } = evidence.tx;
+      const { recipientAddress } = evidence.aux;
+      const { EUD } = decodeAddressHook(recipientAddress).query;
+      if (typeof EUD !== 'string') {
+        throw Error(`EUD not found in ${recipientAddress}`);
+      }
+      const destination = chainHub.makeChainAddress(EUD);
+      return harden({
+        txHash,
+        forwardingAddress,
+        fullAmount: usdc.make(amount),
+        destination,
+      });
+    };
+
+    const simulate = harden({
+      /**
+       * simulate Advancer starting advance
+       * @param evidence
+       */
+      startAdvance: (evidence?: CctpTxEvidence) => {
+        const cctpTxEvidence = makeEvidence(evidence);
+        t.log('Mock CCTP Evidence:', cctpTxEvidence);
+        t.log('Pretend we initiated advance, mark as `ADVANCING`');
+        statusManager.advance(cctpTxEvidence);
+        return cctpTxEvidence;
+      },
+      /**
+       * Simulate transfer vow settlement (success or failure)
+       * @param evidence
+       * @param success
+       */
+      finishAdvance: (evidence: CctpTxEvidence, success = true) => {
+        const { Advanced, AdvanceFailed } = TxStatus;
+        t.log(`Simulate ${success ? Advanced : AdvanceFailed}`);
+        const info = makeNotifyInfo(evidence);
+        notifyFacet.notifyAdvancingResult(info, success);
+      },
+      /**
+       * start and finish advance successfully
+       * @param evidence
+       */
+      advance: (evidence?: CctpTxEvidence) => {
+        const cctpTxEvidence = simulate.startAdvance(evidence);
+        simulate.finishAdvance(cctpTxEvidence, true);
+        return cctpTxEvidence;
+      },
+      skipAdvance: (risksIdentified: string[], evidence?: CctpTxEvidence) => {
+        const cctpTxEvidence = makeEvidence(evidence);
+        t.log('Mock CCTP Evidence:', cctpTxEvidence);
+        t.log('Mark as `ADVANCE_SKIPPED`');
+        statusManager.skipAdvance(cctpTxEvidence, risksIdentified ?? []);
 
-      return cctpTxEvidence;
-    },
-  });
+        return cctpTxEvidence;
+      },
+      /**
+       * slow path - e.g. insufficient pool funds
+       * @param evidence
+       */
+      observe: (evidence?: CctpTxEvidence) => {
+        const cctpTxEvidence = makeEvidence(evidence);
+        t.log('Mock CCTP Evidence:', cctpTxEvidence);
+        t.log('Pretend we `OBSERVED` (did not advance)');
+        statusManager.observe(cctpTxEvidence);
+
+        return cctpTxEvidence;
+      },
+    });
+    return simulate;
+  };
 
   const repayer = zone.exo('Repayer Mock', undefined, {
     repay(fromSeat: ZCFSeat, amounts: AmountKeywordRecord) {
@@ -146,7 +187,7 @@ const makeTestContext = async t => {
     makeSettler,
     statusManager,
     defaultSettlerParams,
-    simulate,
+    makeSimulate,
     repayer,
     peekCalls: () => harden([...callLog]),
     inspectLogs,
@@ -166,7 +207,7 @@ test('happy path: disburse to LPs; StatusManager removes tx', async t => {
     statusManager,
     defaultSettlerParams,
     repayer,
-    simulate,
+    makeSimulate,
     accounts,
     peekCalls,
   } = t.context;
@@ -178,7 +219,7 @@ test('happy path: disburse to LPs; StatusManager removes tx', async t => {
     settlementAccount: accounts.settlement.account,
     ...defaultSettlerParams,
   });
-
+  const simulate = makeSimulate(settler.notify);
   const cctpTxEvidence = simulate.advance();
   t.deepEqual(
     statusManager.lookupPending(
@@ -268,7 +309,7 @@ test('slow path: forward to EUD; remove pending tx', async t => {
     statusManager,
     defaultSettlerParams,
     repayer,
-    simulate,
+    makeSimulate,
     accounts,
     peekCalls,
   } = t.context;
@@ -279,7 +320,7 @@ test('slow path: forward to EUD; remove pending tx', async t => {
     settlementAccount: accounts.settlement.account,
     ...defaultSettlerParams,
   });
-
+  const simulate = makeSimulate(settler.notify);
   const cctpTxEvidence = simulate.observe();
   t.deepEqual(
     statusManager.lookupPending(
@@ -323,9 +364,11 @@ test('slow path: forward to EUD; remove pending tx', async t => {
       cctpTxEvidence.tx.amount,
     ),
     [],
-    'SETTLED entry removed from StatusManger',
+    'dequeueStatus entry removed from StatusManger',
   );
   const { storage } = t.context;
+  accounts.settlement.transferVResolver.resolve(undefined);
+  await eventLoopIteration();
   t.deepEqual(storage.getDeserialized(`fun.txns.${cctpTxEvidence.txHash}`), [
     { evidence: cctpTxEvidence, status: 'OBSERVED' },
     { status: 'FORWARDED' },
@@ -344,7 +387,7 @@ test('skip advance: forward to EUD; remove pending tx', async t => {
     statusManager,
     defaultSettlerParams,
     repayer,
-    simulate,
+    makeSimulate,
     accounts,
     peekCalls,
   } = t.context;
@@ -356,6 +399,7 @@ test('skip advance: forward to EUD; remove pending tx', async t => {
     ...defaultSettlerParams,
   });
 
+  const simulate = makeSimulate(settler.notify);
   const cctpTxEvidence = simulate.skipAdvance(['TOO_LARGE_AMOUNT']);
   t.deepEqual(
     statusManager.lookupPending(
@@ -392,6 +436,8 @@ test('skip advance: forward to EUD; remove pending tx', async t => {
       },
     ],
   ]);
+  accounts.settlement.transferVResolver.resolve(undefined);
+  await eventLoopIteration();
 
   t.deepEqual(
     statusManager.lookupPending(
@@ -414,15 +460,74 @@ test('skip advance: forward to EUD; remove pending tx', async t => {
   t.is(storage.data.get(`fun.txns.${cctpTxEvidence.txHash}`), undefined);
 });
 
-test('Settlement for unknown transaction', async t => {
+test('Settlement for Advancing transaction (advance succeeds)', async t => {
   const {
-    common,
-    makeSettler,
+    accounts,
     defaultSettlerParams,
+    inspectLogs,
+    makeSettler,
+    repayer,
+    makeSimulate,
+    statusManager,
+    common: {
+      brands: { usdc },
+      commonPrivateArgs: { feeConfig },
+    },
+    storage,
+  } = t.context;
+
+  const settler = makeSettler({
     repayer,
+    settlementAccount: accounts.settlement.account,
+    ...defaultSettlerParams,
+  });
+  const simulate = makeSimulate(settler.notify);
+  const cctpTxEvidence = simulate.startAdvance();
+  const { forwardingAddress, amount } = cctpTxEvidence.tx;
+
+  t.deepEqual(
+    statusManager.lookupPending(forwardingAddress, amount),
+    [{ ...cctpTxEvidence, status: PendingTxStatus.Advancing }],
+    'statusManager shows this tx is Advancing',
+  );
+
+  t.log('Simulate incoming IBC settlement');
+  void settler.tap.receiveUpcall(MockVTransferEvents.AGORIC_PLUS_OSMO());
+  await eventLoopIteration();
+
+  t.like(inspectLogs(), [
+    ['config', { sourceChannel: 'channel-21' }],
+    ['upcall event'],
+    ['dequeued', { status: PendingTxStatus.Advancing }],
+    ['⚠️ tap: minted while advancing'],
+  ]);
+
+  const In = usdc.make(MockCctpTxEvidences.AGORIC_PLUS_OSMO().tx.amount);
+  const expectedSplit = makeFeeTools(feeConfig).calculateSplit(In);
+
+  t.log('Simulate advance success');
+  simulate.finishAdvance(cctpTxEvidence, true);
+  await eventLoopIteration();
+  t.deepEqual(storage.getDeserialized(`fun.txns.${cctpTxEvidence.txHash}`), [
+    { evidence: cctpTxEvidence, status: 'OBSERVED' },
+    { status: 'ADVANCING' },
+    // { status: 'ADVANCED' }, TODO: not reported by notifyAdvancingResult
+    { split: expectedSplit, status: 'DISBURSED' },
+  ]);
+});
+
+test('Settlement for Advancing transaction (advance fails)', async t => {
+  const {
     accounts,
-    peekCalls,
+    defaultSettlerParams,
     inspectLogs,
+    makeSettler,
+    repayer,
+    makeSimulate,
+    common: {
+      brands: { usdc },
+    },
+    storage,
   } = t.context;
 
   const settler = makeSettler({
@@ -430,24 +535,49 @@ test('Settlement for unknown transaction', async t => {
     settlementAccount: accounts.settlement.account,
     ...defaultSettlerParams,
   });
+  const simulate = makeSimulate(settler.notify);
+  const cctpTxEvidence = simulate.startAdvance();
 
   t.log('Simulate incoming IBC settlement');
   void settler.tap.receiveUpcall(MockVTransferEvents.AGORIC_PLUS_OSMO());
   await eventLoopIteration();
 
-  t.log('Nothing was transferrred');
-  t.deepEqual(peekCalls(), []);
-  t.deepEqual(accounts.settlement.callLog, []);
   t.like(inspectLogs(), [
     ['config', { sourceChannel: 'channel-21' }],
     ['upcall event'],
-    ['dequeued', undefined],
+    ['dequeued', { status: PendingTxStatus.Advancing }],
+    ['⚠️ tap: minted while advancing'],
+  ]);
+
+  t.log('Simulate Advance failure (e.g. IBC Timeout)');
+  simulate.finishAdvance(cctpTxEvidence, false);
+  await eventLoopIteration();
+
+  t.log('Expecting Settler to initiate forward');
+  t.like(accounts.settlement.callLog, [
     [
-      '⚠️ tap: no status for ',
-      'noble1x0ydg69dh6fqvr27xjvp6maqmrldam6yfelqkd',
-      150000000n,
+      'transfer',
+      {
+        value: 'osmo183dejcnmkka5dzcu9xw6mywq0p2m5peks28men',
+      },
+      usdc.units(150),
+      {
+        forwardOpts: {
+          intermediateRecipient: {
+            value: 'noble1test',
+          },
+        },
+      },
     ],
   ]);
-});
 
-test.todo("StatusManager does not receive update when we can't settle");
+  t.log('Pretend Forward succeeds');
+  accounts.settlement.transferVResolver.resolve(undefined);
+  await eventLoopIteration();
+  t.deepEqual(storage.getDeserialized(`fun.txns.${cctpTxEvidence.txHash}`), [
+    { evidence: cctpTxEvidence, status: 'OBSERVED' },
+    { status: 'ADVANCING' },
+    // { status: 'ADVANCE_FAILED' }, TODO: not reported by notifyAdvancingResult
+    { status: 'FORWARDED' },
+  ]);
+});
diff --git a/packages/fast-usdc/test/exos/status-manager.test.ts b/packages/fast-usdc/test/exos/status-manager.test.ts
index 2c76fefa205e..2f2ebcf25c1c 100644
--- a/packages/fast-usdc/test/exos/status-manager.test.ts
+++ b/packages/fast-usdc/test/exos/status-manager.test.ts
@@ -277,27 +277,24 @@ test('dequeueStatus returns first (earliest) matched entry', async t => {
   statusManager.advance(evidence);
   statusManager.advance({ ...evidence, txHash: '0xtest2' });
 
-  // cannot dequeue ADVANCING pendingTx
-  t.is(
+  t.like(
     statusManager.dequeueStatus(
       evidence.tx.forwardingAddress,
       evidence.tx.amount,
     ),
-    undefined,
+    {
+      status: PendingTxStatus.Advancing,
+    },
+    'can dequeue Tx at any stage',
   );
 
-  statusManager.advanceOutcome(
-    evidence.tx.forwardingAddress,
-    evidence.tx.amount,
-    true,
-  );
   statusManager.advanceOutcome(
     evidence.tx.forwardingAddress,
     evidence.tx.amount,
     true,
   );
 
-  // also can dequeue OBSERVED statuses
+  // can dequeue OBSERVED statuses
   statusManager.observe({ ...evidence, txHash: '0xtest3' });
 
   // dequeue will return the first match
@@ -314,28 +311,13 @@ test('dequeueStatus returns first (earliest) matched entry', async t => {
     evidence.tx.forwardingAddress,
     evidence.tx.amount,
   );
-  t.is(entries0.length, 2);
-  t.is(
-    entries0?.[0].status,
-    PendingTxStatus.Advanced,
-    'first settled entry deleted',
-  );
+  t.is(entries0.length, 1);
   t.deepEqual(
-    entries0?.[1].status,
+    entries0?.[0].status,
     PendingTxStatus.Observed,
     'order of remaining entries preserved',
   );
 
-  // dequeue again wih same args to settle 2nd advance
-  t.like(
-    statusManager.dequeueStatus(
-      evidence.tx.forwardingAddress,
-      evidence.tx.amount,
-    ),
-    {
-      status: 'ADVANCED',
-    },
-  );
   // dequeue again wih same ags to settle remaining observe
   t.like(
     statusManager.dequeueStatus(
diff --git a/packages/fast-usdc/test/fast-usdc.contract.test.ts b/packages/fast-usdc/test/fast-usdc.contract.test.ts
index 1ae2a0f4e6db..d2aca85d647f 100644
--- a/packages/fast-usdc/test/fast-usdc.contract.test.ts
+++ b/packages/fast-usdc/test/fast-usdc.contract.test.ts
@@ -868,7 +868,7 @@ test.serial('Settlement for unknown transaction (operator down)', async t => {
   await transmitTransferAck();
 });
 
-test.failing('mint received why ADVANCING', async t => {
+test.serial('mint received why ADVANCING', async t => {
   // Settler should `disburse` on Transfer success
   const {
     bridges: { snapshot, since },
diff --git a/packages/fast-usdc/test/mocks.ts b/packages/fast-usdc/test/mocks.ts
index d6196d3b7d55..88df11b65a4f 100644
--- a/packages/fast-usdc/test/mocks.ts
+++ b/packages/fast-usdc/test/mocks.ts
@@ -27,6 +27,7 @@ export const prepareMockOrchAccounts = (
 ) => {
   // each can only be resolved/rejected once per test
   const poolAccountTransferVK = makeVowKit<undefined>();
+  const settleAccountTransferVK = makeVowKit<undefined>();
 
   const mockedPoolAccount = zone.exo('Mock Pool LocalOrchAccount', undefined, {
     transfer(destination: ChainAddress, amount: DenomAmount) {
@@ -48,6 +49,7 @@ export const prepareMockOrchAccounts = (
   const settlementAccountMock = zone.exo('Mock Settlement Account', undefined, {
     transfer(...args) {
       settlementCallLog.push(harden(['transfer', ...args]));
+      return settleAccountTransferVK.vow;
     },
   });
   const settlementAccount = settlementAccountMock as unknown as HostInterface<
@@ -61,6 +63,7 @@ export const prepareMockOrchAccounts = (
     settlement: {
       account: settlementAccount,
       callLog: settlementCallLog,
+      transferVResolver: settleAccountTransferVK.resolver,
     },
   };
 };

From 69740d2c7001ac7dfdebb142505ce3b1186f7fc4 Mon Sep 17 00:00:00 2001
From: 0xPatrick <patrick@0xpatrick.dev>
Date: Thu, 19 Dec 2024 16:29:32 -0500
Subject: [PATCH 7/9] chore: capture `ForwardFailed` state

- if Forward (slow transfer) fails, capture the state to distinguish from successful forwards
---
 packages/fast-usdc/src/exos/settler.js        | 12 ++--
 packages/fast-usdc/src/exos/status-manager.js | 16 +++--
 packages/fast-usdc/test/exos/settler.test.ts  | 66 +++++++++++++++++++
 3 files changed, 83 insertions(+), 11 deletions(-)

diff --git a/packages/fast-usdc/src/exos/settler.js b/packages/fast-usdc/src/exos/settler.js
index d1b18307f380..d1997ad2b521 100644
--- a/packages/fast-usdc/src/exos/settler.js
+++ b/packages/fast-usdc/src/exos/settler.js
@@ -272,10 +272,7 @@ export const prepareSettler = (
          */
         forward(txHash, fullValue, EUD) {
           const { settlementAccount, intermediateRecipient } = this.state;
-
           const dest = chainHub.makeChainAddress(EUD);
-
-          // TODO? statusManager.forwarding(txHash, sender, amount);
           const txfrV = E(settlementAccount).transfer(
             dest,
             AmountMath.make(USDC, fullValue),
@@ -290,15 +287,18 @@ export const prepareSettler = (
          * @param {EvmHash} txHash
          */
         onFulfilled(_result, txHash) {
-          statusManager.forwarded(txHash);
+          // update status manager, marking tx `FORWARDED` without fee split
+          statusManager.forwarded(txHash, true);
         },
         /**
          * @param {unknown} reason
          * @param {EvmHash} txHash
          */
         onRejected(reason, txHash) {
-          log('⚠️ transfer rejected!', reason, txHash);
-          // TODO(#10510): statusManager.forwardFailed(txHash, nfa, amount);
+          log('⚠️ forward transfer rejected!', reason, txHash);
+          // update status manager, flagging a terminal state that needs to be
+          // manual intervention or a code update to remediate
+          statusManager.forwarded(txHash, false);
         },
       },
     },
diff --git a/packages/fast-usdc/src/exos/status-manager.js b/packages/fast-usdc/src/exos/status-manager.js
index 0738ba0b04c4..2e4c6a2a5393 100644
--- a/packages/fast-usdc/src/exos/status-manager.js
+++ b/packages/fast-usdc/src/exos/status-manager.js
@@ -216,7 +216,7 @@ export const prepareStatusManager = (
       disbursed: M.call(EvmHashShape, AmountKeywordRecordShape).returns(
         M.undefined(),
       ),
-      forwarded: M.call(EvmHashShape).returns(M.undefined()),
+      forwarded: M.call(EvmHashShape, M.boolean()).returns(M.undefined()),
       lookupPending: M.call(M.string(), M.bigint()).returns(
         M.arrayOf(PendingTxShape),
       ),
@@ -340,12 +340,18 @@ export const prepareStatusManager = (
       },
 
       /**
-       * Mark a transaction as `FORWARDED`
+       * Mark a transaction as `FORWARDED` or `FORWARD_FAILED`
        *
-       * @param {EvmHash} txHash - undefined in case mint before observed
+       * @param {EvmHash} txHash
+       * @param {boolean} success
        */
-      forwarded(txHash) {
-        void publishTxnRecord(txHash, harden({ status: TxStatus.Forwarded }));
+      forwarded(txHash, success) {
+        void publishTxnRecord(
+          txHash,
+          harden({
+            status: success ? TxStatus.Forwarded : TxStatus.ForwardFailed,
+          }),
+        );
       },
 
       /**
diff --git a/packages/fast-usdc/test/exos/settler.test.ts b/packages/fast-usdc/test/exos/settler.test.ts
index f9d4bf955308..f3ef37fe910e 100644
--- a/packages/fast-usdc/test/exos/settler.test.ts
+++ b/packages/fast-usdc/test/exos/settler.test.ts
@@ -581,3 +581,69 @@ test('Settlement for Advancing transaction (advance fails)', async t => {
     { status: 'FORWARDED' },
   ]);
 });
+
+test('slow path, and forward fails (terminal state)', async t => {
+  const {
+    common,
+    makeSettler,
+    statusManager,
+    defaultSettlerParams,
+    repayer,
+    makeSimulate,
+    accounts,
+    peekCalls,
+    storage,
+  } = t.context;
+  const { usdc } = common.brands;
+
+  const settler = makeSettler({
+    repayer,
+    settlementAccount: accounts.settlement.account,
+    ...defaultSettlerParams,
+  });
+  const simulate = makeSimulate(settler.notify);
+  const cctpTxEvidence = simulate.observe();
+  t.deepEqual(
+    statusManager.lookupPending(
+      cctpTxEvidence.tx.forwardingAddress,
+      cctpTxEvidence.tx.amount,
+    ),
+    [{ ...cctpTxEvidence, status: PendingTxStatus.Observed }],
+    'statusManager shows this tx is only observed',
+  );
+
+  t.log('Simulate incoming IBC settlement');
+  void settler.tap.receiveUpcall(MockVTransferEvents.AGORIC_PLUS_OSMO());
+  await eventLoopIteration();
+
+  t.log('funds are forwarded; no interaction with LP');
+  t.like(accounts.settlement.callLog, [
+    [
+      'transfer',
+      {
+        value: 'osmo183dejcnmkka5dzcu9xw6mywq0p2m5peks28men',
+      },
+      usdc.units(150),
+      {
+        forwardOpts: {
+          intermediateRecipient: {
+            value: 'noble1test',
+          },
+        },
+      },
+    ],
+  ]);
+
+  t.log('simulating forward failure (e.g. unknown route)');
+  const mockE = Error('no connection info found');
+  accounts.settlement.transferVResolver.reject(mockE);
+  await eventLoopIteration();
+  t.deepEqual(storage.getDeserialized(`fun.txns.${cctpTxEvidence.txHash}`), [
+    { evidence: cctpTxEvidence, status: 'OBSERVED' },
+    { status: 'FORWARD_FAILED' },
+  ]);
+});
+
+test.todo('creator facet methods');
+
+test.todo('ignored packets');

From 2d2dc7b3bcd7694935b62dcb25b0b8f8987394d6 Mon Sep 17 00:00:00 2001
From: 0xPatrick <patrick@0xpatrick.dev>
Date: Thu, 19 Dec 2024 16:38:05 -0500
Subject: [PATCH 8/9] feat: evidence after mint results in forward

- Advancer calls `forwardIfMinted` to check for an early matching mint
- if found, no Advance occurs and the minted funds are forwarded
---
 packages/fast-usdc/src/exos/advancer.js       | 42 +++++++--
 packages/fast-usdc/src/exos/settler.js        | 33 ++++++-
 packages/fast-usdc/test/exos/advancer.test.ts | 62 ++++++++++++-
 packages/fast-usdc/test/exos/settler.test.ts  | 87 +++++++++++++++++++
 .../fast-usdc/test/fast-usdc.contract.test.ts | 83 +++++++++++++++---
 5 files changed, 282 insertions(+), 25 deletions(-)

diff --git a/packages/fast-usdc/src/exos/advancer.js b/packages/fast-usdc/src/exos/advancer.js
index 9620d93aa9c7..168ce7c06324 100644
--- a/packages/fast-usdc/src/exos/advancer.js
+++ b/packages/fast-usdc/src/exos/advancer.js
@@ -63,7 +63,6 @@ const AdvancerKitI = harden({
     onRejected: M.call(M.error(), AdvancerVowCtxShape).returns(),
   }),
   transferHandler: M.interface('TransferHandlerI', {
-    // TODO confirm undefined, and not bigint (sequence)
     onFulfilled: M.call(M.undefined(), AdvancerVowCtxShape).returns(
       M.undefined(),
     ),
@@ -152,9 +151,7 @@ export const prepareAdvancerKit = (
               statusManager.skipAdvance(evidence, risk.risksIdentified);
               return;
             }
-
-            const { borrowerFacet, poolAccount, settlementAddress } =
-              this.state;
+            const { settlementAddress } = this.state;
             const { recipientAddress } = evidence.aux;
             const decoded = decodeAddressHook(recipientAddress);
             mustMatch(decoded, AddressHookShape);
@@ -167,6 +164,26 @@ export const prepareAdvancerKit = (
             const destination = chainHub.makeChainAddress(EUD);
 
             const fullAmount = toAmount(evidence.tx.amount);
+            const {
+              tx: { forwardingAddress },
+              txHash,
+            } = evidence;
+
+            const { borrowerFacet, notifyFacet, poolAccount } = this.state;
+            if (
+              notifyFacet.forwardIfMinted(
+                destination,
+                forwardingAddress,
+                fullAmount,
+                txHash,
+              )
+            ) {
+              // settlement already received; tx will Forward.
+              // do not add to `pendingSettleTxs` by calling `.observe()`
+              log('⚠️ minted before Observed');
+              return;
+            }
+
             // throws if requested does not exceed fees
             const advanceAmount = feeTools.calculateAdvance(fullAmount);
 
@@ -189,7 +206,7 @@ export const prepareAdvancerKit = (
               forwardingAddress: evidence.tx.forwardingAddress,
               fullAmount,
               tmpSeat,
-              txHash: evidence.txHash,
+              txHash,
             });
           } catch (error) {
             log('Advancer error:', error);
@@ -208,7 +225,13 @@ export const prepareAdvancerKit = (
          */
         onFulfilled(result, ctx) {
           const { poolAccount, intermediateRecipient } = this.state;
-          const { destination, advanceAmount, ...detail } = ctx;
+          const {
+            destination,
+            advanceAmount,
+            // eslint-disable-next-line no-unused-vars
+            tmpSeat,
+            ...detail
+          } = ctx;
           const transferV = E(poolAccount).transfer(
             destination,
             { denom: usdc.denom, value: advanceAmount.value },
@@ -273,7 +296,12 @@ export const prepareAdvancerKit = (
         onRejected(error, ctx) {
           const { notifyFacet } = this.state;
           log('Advance transfer rejected', error);
-          notifyFacet.notifyAdvancingResult(ctx, false);
+          const {
+            // eslint-disable-next-line no-unused-vars
+            advanceAmount,
+            ...restCtx
+          } = ctx;
+          notifyFacet.notifyAdvancingResult(restCtx, false);
         },
       },
     },
diff --git a/packages/fast-usdc/src/exos/settler.js b/packages/fast-usdc/src/exos/settler.js
index d1997ad2b521..5ff573dfa13d 100644
--- a/packages/fast-usdc/src/exos/settler.js
+++ b/packages/fast-usdc/src/exos/settler.js
@@ -81,6 +81,9 @@ export const prepareSettler = (
           makeAdvanceDetailsShape(USDC),
           M.boolean(),
         ).returns(),
+        forwardIfMinted: M.call(
+          ...Object.values(makeAdvanceDetailsShape(USDC)),
+        ).returns(M.boolean()),
       }),
       self: M.interface('SettlerSelfI', {
         disburse: M.call(EvmHashShape, M.nat()).returns(M.promise()),
@@ -190,7 +193,10 @@ export const prepareSettler = (
 
             case undefined:
             default:
-              log('⚠️ tap: no status for ', nfa, amount);
+              log('⚠️ tap: minted before observed', nfa, amount);
+              // XXX consider capturing in vstorage
+              // we would need a new key, as this does not have a txHash
+              this.state.mintedEarly.add(makeMintedEarlyKey(nfa, amount));
           }
         },
       },
@@ -231,6 +237,31 @@ export const prepareSettler = (
             statusManager.advanceOutcome(forwardingAddress, fullValue, success);
           }
         },
+        /**
+         * @param {ChainAddress} destination
+         * @param {NobleAddress} forwardingAddress
+         * @param {Amount<'nat'>} fullAmount
+         * @param {EvmHash} txHash
+         * @returns {boolean}
+         * @throws {Error} if minted early, so advancer doesn't advance
+         */
+        forwardIfMinted(destination, forwardingAddress, fullAmount, txHash) {
+          const { value: fullValue } = fullAmount;
+          const key = makeMintedEarlyKey(forwardingAddress, fullValue);
+          const { mintedEarly } = this.state;
+          if (mintedEarly.has(key)) {
+            log(
+              'matched minted early key, initiating forward',
+              forwardingAddress,
+              fullValue,
+            );
+            mintedEarly.delete(key);
+            // TODO: does not write `OBSERVED` to vstorage
+            void this.facets.self.forward(txHash, fullValue, destination.value);
+            return true;
+          }
+          return false;
+        },
       },
       self: {
         /**
diff --git a/packages/fast-usdc/test/exos/advancer.test.ts b/packages/fast-usdc/test/exos/advancer.test.ts
index e8ee9c1a6263..ac4e652e530f 100644
--- a/packages/fast-usdc/test/exos/advancer.test.ts
+++ b/packages/fast-usdc/test/exos/advancer.test.ts
@@ -9,13 +9,17 @@ import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
 import { denomHash } from '@agoric/orchestration';
 import fetchedChainInfo from '@agoric/orchestration/src/fetched-chain-info.js';
 import { type ZoeTools } from '@agoric/orchestration/src/utils/zoe-tools.js';
-import { q } from '@endo/errors';
+import { Fail, q } from '@endo/errors';
 import { Far } from '@endo/pass-style';
 import type { TestFn } from 'ava';
 import { makeTracer } from '@agoric/internal';
+import { M, mustMatch } from '@endo/patterns';
 import { PendingTxStatus } from '../../src/constants.js';
 import { prepareAdvancer } from '../../src/exos/advancer.js';
-import type { SettlerKit } from '../../src/exos/settler.js';
+import {
+  makeAdvanceDetailsShape,
+  type SettlerKit,
+} from '../../src/exos/settler.js';
 import { prepareStatusManager } from '../../src/exos/status-manager.js';
 import type { LiquidityPoolKit } from '../../src/types.js';
 import { makeFeeTools } from '../../src/utils/fees.js';
@@ -108,8 +112,19 @@ const createTestExtensions = (t, common: CommonSetup) => {
   const mockNotifyF = Far('Settler Notify Facet', {
     notifyAdvancingResult: (...args: NotifyArgs) => {
       trace('Settler.notifyAdvancingResult called with', args);
+      const [advanceDetails, success] = args;
+      mustMatch(harden(advanceDetails), makeAdvanceDetailsShape(usdc.brand));
+      mustMatch(success, M.boolean());
       notifyAdvancingResultCalls.push(args);
     },
+    // assume this never returns true for most tests
+    forwardIfMinted: (...args) => {
+      mustMatch(
+        harden(args),
+        harden([...Object.values(makeAdvanceDetailsShape(usdc.brand))]),
+      );
+      return false;
+    },
   });
 
   const mockBorrowerFacetCalls: {
@@ -361,7 +376,6 @@ test('calls notifyAdvancingResult (AdvancedFailed) on failed transfer', async t
         txHash: evidence.txHash,
         forwardingAddress: evidence.tx.forwardingAddress,
         fullAmount: usdc.make(evidence.tx.amount),
-        advanceAmount: feeTools.calculateAdvance(usdc.make(evidence.tx.amount)),
         destination: {
           value: decodeAddressHook(evidence.aux.recipientAddress).query.EUD,
         },
@@ -659,3 +673,45 @@ test('rejects advances to unknown settlementAccount', async t => {
     ],
   ]);
 });
+
+test('no status update if `forwardIfMinted` returns true', async t => {
+  const {
+    brands: { usdc },
+    bootstrap: { storage },
+    extensions: {
+      services: { makeAdvancer },
+      helpers: { inspectLogs },
+      mocks: { mockPoolAccount, mockBorrowerF },
+    },
+  } = t.context;
+
+  const mockNotifyF = Far('Settler Notify Facet', {
+    notifyAdvancingResult: () => {},
+    forwardIfMinted: (destination, forwardingAddress, fullAmount, txHash) => {
+      return true;
+    },
+  });
+
+  const advancer = makeAdvancer({
+    borrowerFacet: mockBorrowerF,
+    notifyFacet: mockNotifyF,
+    poolAccount: mockPoolAccount.account,
+    intermediateRecipient,
+    settlementAddress,
+  });
+
+  const evidence = MockCctpTxEvidences.AGORIC_PLUS_DYDX();
+  void advancer.handleTransactionEvent({ evidence, risk: {} });
+  await eventLoopIteration();
+
+  // advancer does not post a tx status; settler will Forward and
+  // communicate Forwarded/ForwardFailed status'
+  t.throws(() => storage.getDeserialized(`fun.txns.${evidence.txHash}`), {
+    message: /no data at path fun.txns.0x/,
+  });
+
+  t.deepEqual(inspectLogs(), [
+    ['decoded EUD: dydx183dejcnmkka5dzcu9xw6mywq0p2m5peks28men'],
+    ['⚠️ minted before Observed'],
+  ]);
+});
diff --git a/packages/fast-usdc/test/exos/settler.test.ts b/packages/fast-usdc/test/exos/settler.test.ts
index f3ef37fe910e..a7352e79a19c 100644
--- a/packages/fast-usdc/test/exos/settler.test.ts
+++ b/packages/fast-usdc/test/exos/settler.test.ts
@@ -172,6 +172,22 @@ const makeTestContext = async t => {
 
         return cctpTxEvidence;
       },
+      /**
+       * mint early path. caller must simulate tap before calling
+       * @param evidence
+       */
+      observeLate: (evidence?: CctpTxEvidence) => {
+        const cctpTxEvidence = makeEvidence(evidence);
+        const { destination, forwardingAddress, fullAmount, txHash } =
+          makeNotifyInfo(cctpTxEvidence);
+        notifyFacet.forwardIfMinted(
+          destination,
+          forwardingAddress,
+          fullAmount,
+          txHash,
+        );
+        return cctpTxEvidence;
+      },
     });
     return simulate;
   };
@@ -460,6 +476,77 @@ test('skip advance: forward to EUD; remove pending tx', async t => {
   t.is(storage.data.get(`fun.txns.${cctpTxEvidence.txHash}`), undefined);
 });
 
+test('Settlement for unknown transaction (minted early)', async t => {
+  const {
+    common: {
+      brands: { usdc },
+    },
+    makeSettler,
+    defaultSettlerParams,
+    repayer,
+    accounts,
+    peekCalls,
+    inspectLogs,
+    makeSimulate,
+    storage,
+  } = t.context;
+
+  const settler = makeSettler({
+    repayer,
+    settlementAccount: accounts.settlement.account,
+    ...defaultSettlerParams,
+  });
+  const simulate = makeSimulate(settler.notify);
+
+  t.log('Simulate incoming IBC settlement');
+  void settler.tap.receiveUpcall(MockVTransferEvents.AGORIC_PLUS_OSMO());
+  await eventLoopIteration();
+
+  t.log('Nothing was transferred');
+  t.deepEqual(peekCalls(), []);
+  t.deepEqual(accounts.settlement.callLog, []);
+  const tapLogs = inspectLogs();
+  t.like(tapLogs, [
+    ['config', { sourceChannel: 'channel-21' }],
+    ['upcall event'],
+    ['dequeued', undefined],
+    ['⚠️ tap: minted before observed'],
+  ]);
+
+  t.log('Oracle operators eventually report...');
+  const evidence = simulate.observeLate();
+  t.deepEqual(inspectLogs().slice(tapLogs.length - 1), [
+    [
+      'matched minted early key, initiating forward',
+      'noble1x0ydg69dh6fqvr27xjvp6maqmrldam6yfelqkd',
+      150000000n,
+    ],
+  ]);
+  await eventLoopIteration();
+  t.like(accounts.settlement.callLog, [
+    [
+      'transfer',
+      {
+        value: 'osmo183dejcnmkka5dzcu9xw6mywq0p2m5peks28men',
+      },
+      usdc.units(150),
+      {
+        forwardOpts: {
+          intermediateRecipient: {
+            value: 'noble1test',
+          },
+        },
+      },
+    ],
+  ]);
+  accounts.settlement.transferVResolver.resolve(undefined);
+  await eventLoopIteration();
+  t.deepEqual(storage.getDeserialized(`fun.txns.${evidence.txHash}`), [
+    /// TODO with no observed / evidence, does this break reporting reqs?
+    { status: 'FORWARDED' },
+  ]);
+});
+
 test('Settlement for Advancing transaction (advance succeeds)', async t => {
   const {
     accounts,
diff --git a/packages/fast-usdc/test/fast-usdc.contract.test.ts b/packages/fast-usdc/test/fast-usdc.contract.test.ts
index d2aca85d647f..a8b0f3c4ecec 100644
--- a/packages/fast-usdc/test/fast-usdc.contract.test.ts
+++ b/packages/fast-usdc/test/fast-usdc.contract.test.ts
@@ -366,13 +366,17 @@ const makeLP = async (
 const makeEVM = (template = MockCctpTxEvidences.AGORIC_PLUS_OSMO()) => {
   let nonce = 0;
 
-  const makeTx = (amount: bigint, recipientAddress: string): CctpTxEvidence => {
+  const makeTx = (
+    amount: bigint,
+    recipientAddress: string,
+    nonceOverride?: number,
+  ): CctpTxEvidence => {
     nonce += 1;
 
     const tx: CctpTxEvidence = harden({
       ...template,
-      txHash: `0x00000${nonce}`,
-      blockNumber: template.blockNumber + BigInt(nonce),
+      txHash: `0x00000${nonceOverride || nonce}`,
+      blockNumber: template.blockNumber + BigInt(nonceOverride || nonce),
       tx: { ...template.tx, amount },
       // KLUDGE: CCTP doesn't know about aux; it would be added by OCW
       aux: { ...template.aux, recipientAddress },
@@ -421,6 +425,7 @@ const makeCustomer = (
       amount: bigint,
       EUD: string,
       isRisk = false,
+      nonceOverride?: number,
     ) => {
       const { storage } = t.context.common.bootstrap;
       const accountsData = storage.data.get('fun');
@@ -430,7 +435,7 @@ const makeCustomer = (
       const recipientAddress = encodeAddressHook(settlementAccount, { EUD });
       // KLUDGE: UI would ask noble for a forwardingAddress
       // "cctp" here has some noble stuff mixed in.
-      const tx = cctp.makeTx(amount, recipientAddress);
+      const tx = cctp.makeTx(amount, recipientAddress, nonceOverride);
       t.log(who, 'signs CCTP for', amount, 'uusdc w/EUD:', EUD);
       txPublisher.publish({ evidence: tx, isRisk });
       sent.push({ evidence: tx, isRisk });
@@ -816,11 +821,6 @@ test.serial('C20 - Contract MUST function with an empty pool', async t => {
   await transmitTransferAck(); // ack IBC transfer for forward
 });
 
-// advancedEarly stuff
-test.todo(
-  'C12 - Contract MUST only pay back the Pool only if they started the advance before USDC is minted',
-);
-
 test.todo('C18 - forward - MUST log and alert these incidents');
 
 test.serial('Settlement for unknown transaction (operator down)', async t => {
@@ -829,10 +829,13 @@ test.serial('Settlement for unknown transaction (operator down)', async t => {
     bridges: { snapshot, since },
     evm: { cctp, txPub },
     common: {
+      bootstrap: { storage },
       commonPrivateArgs: { feeConfig },
+      mocks: { transferBridge },
       utils: { transmitTransferAck },
     },
     mint,
+    addresses,
   } = t.context;
   const operators = await sync.ocw.promise;
 
@@ -843,7 +846,9 @@ test.serial('Settlement for unknown transaction (operator down)', async t => {
   const opDown = makeCustomer('Otto', cctp, txPub.publisher, feeConfig);
 
   const bridgePos = snapshot();
-  const sent = await opDown.sendFast(t, 20_000_000n, 'osmo12345');
+  const EUD = 'osmo10tt0';
+  const mintAmt = 5_000_000n;
+  const sent = await opDown.sendFast(t, mintAmt, EUD);
   await mint(sent);
   const bridgeTraffic = since(bridgePos);
 
@@ -851,24 +856,74 @@ test.serial('Settlement for unknown transaction (operator down)', async t => {
     bridgeTraffic.bank,
     [
       {
-        amount: '20000000',
+        amount: String(mintAmt),
         sender: 'faucet',
         type: 'VBANK_GRAB',
       },
       {
-        amount: '20000000',
+        amount: String(mintAmt),
         recipient: 'agoric1qyqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqc09z0g',
         type: 'VBANK_GIVE',
       },
     ],
     '20 USDC arrive at the settlement account',
   );
-  t.deepEqual(bridgeTraffic.local, [], 'no IBC transfers');
 
   await transmitTransferAck();
+  t.deepEqual(bridgeTraffic.local, [], 'no IBC transfers');
+
+  // activate oracles and submit evidence; expect Settler to forward (slow path)
+  // 'C12 - Contract MUST only pay back the Pool (fees) only if they started the advance before USDC is minted',
+  operators[0].setActive(true);
+  operators[1].setActive(true);
+  // set the 3rd operator to inactive so it doesn't report a 2nd time
+  operators[2].setActive(false);
+
+  // compute nonce from initial report so a new txId is not generated by `sendFast` helper
+  const nonce = Number(sent.txHash.slice(2));
+  await opDown.sendFast(t, mintAmt, EUD, false, nonce);
+
+  const [outgoingForward] = since(bridgePos).local;
+  t.like(outgoingForward, {
+    type: 'VLOCALCHAIN_EXECUTE_TX',
+    address: addresses.settlementAccount,
+    messages: [
+      {
+        '@type': '/ibc.applications.transfer.v1.MsgTransfer',
+      },
+    ],
+  });
+  const [outgoingForwardMessage] = outgoingForward.messages;
+  t.is(
+    outgoingForwardMessage.token.amount,
+    String(sent.tx.amount),
+    'full amount is transferred via `.forward()`',
+  );
+
+  const forwardInfo = JSON.parse(outgoingForwardMessage.memo).forward;
+  t.is(forwardInfo.receiver, EUD, 'receiver is osmo10tt0');
+
+  // in lieu of transmitTransferAck so we can set a nonce that matches our initial Advance
+  await E(transferBridge).fromBridge(
+    buildVTransferEvent({
+      receiver: outgoingForwardMessage.receiver,
+      sender: outgoingForwardMessage.sender,
+      target: outgoingForwardMessage.sender,
+      sourceChannel: outgoingForwardMessage.sourceChannel,
+      sequence: BigInt(nonce),
+      denom: outgoingForwardMessage.token.denom,
+      amount: BigInt(outgoingForwardMessage.token.amount),
+    }),
+  );
+  await eventLoopIteration();
+
+  t.deepEqual(storage.getDeserialized(`fun.txns.${sent.txHash}`), [
+    // { evidence: sent, status: 'OBSERVED' }, // no OBSERVED state recorded
+    { status: 'FORWARDED' },
+  ]);
 });
 
-test.serial('mint received why ADVANCING', async t => {
+test.serial('mint received while ADVANCING', async t => {
   // Settler should `disburse` on Transfer success
   const {
     bridges: { snapshot, since },

From 8b18171ff3f20ad8f839e51e3d1ba504a60535b5 Mon Sep 17 00:00:00 2001
From: 0xPatrick <patrick@0xpatrick.dev>
Date: Thu, 19 Dec 2024 18:09:50 -0500
Subject: [PATCH 9/9] chore: tx statuses in vstorage

- ensure "minted before observed" `Observe` statuses are recorded in vstorage
- ensure "minted while Advancing" `Advanced` and `AdvanceFailed` statuses are recorded in vstorage
---
 packages/fast-usdc/src/exos/advancer.js       | 40 ++++-----------
 packages/fast-usdc/src/exos/settler.js        | 38 +++++++-------
 packages/fast-usdc/src/exos/status-manager.js | 49 ++++++++++++++++---
 packages/fast-usdc/test/exos/advancer.test.ts | 19 ++++---
 packages/fast-usdc/test/exos/settler.test.ts  | 13 ++---
 .../fast-usdc/test/fast-usdc.contract.test.ts |  4 +-
 6 files changed, 87 insertions(+), 76 deletions(-)

diff --git a/packages/fast-usdc/src/exos/advancer.js b/packages/fast-usdc/src/exos/advancer.js
index 168ce7c06324..31529de56bac 100644
--- a/packages/fast-usdc/src/exos/advancer.js
+++ b/packages/fast-usdc/src/exos/advancer.js
@@ -164,25 +164,13 @@ export const prepareAdvancerKit = (
             const destination = chainHub.makeChainAddress(EUD);
 
             const fullAmount = toAmount(evidence.tx.amount);
-            const {
-              tx: { forwardingAddress },
-              txHash,
-            } = evidence;
-
             const { borrowerFacet, notifyFacet, poolAccount } = this.state;
-            if (
-              notifyFacet.forwardIfMinted(
-                destination,
-                forwardingAddress,
-                fullAmount,
-                txHash,
-              )
-            ) {
-              // settlement already received; tx will Forward.
-              // do not add to `pendingSettleTxs` by calling `.observe()`
-              log('⚠️ minted before Observed');
-              return;
-            }
+            // do not advance if we've already received a mint/settlement
+            const mintedEarly = notifyFacet.checkMintedEarly(
+              evidence,
+              destination,
+            );
+            if (mintedEarly) return;
 
             // throws if requested does not exceed fees
             const advanceAmount = feeTools.calculateAdvance(fullAmount);
@@ -206,7 +194,7 @@ export const prepareAdvancerKit = (
               forwardingAddress: evidence.tx.forwardingAddress,
               fullAmount,
               tmpSeat,
-              txHash,
+              txHash: evidence.txHash,
             });
           } catch (error) {
             log('Advancer error:', error);
@@ -225,13 +213,7 @@ export const prepareAdvancerKit = (
          */
         onFulfilled(result, ctx) {
           const { poolAccount, intermediateRecipient } = this.state;
-          const {
-            destination,
-            advanceAmount,
-            // eslint-disable-next-line no-unused-vars
-            tmpSeat,
-            ...detail
-          } = ctx;
+          const { destination, advanceAmount, tmpSeat: _, ...detail } = ctx;
           const transferV = E(poolAccount).transfer(
             destination,
             { denom: usdc.denom, value: advanceAmount.value },
@@ -296,11 +278,7 @@ export const prepareAdvancerKit = (
         onRejected(error, ctx) {
           const { notifyFacet } = this.state;
           log('Advance transfer rejected', error);
-          const {
-            // eslint-disable-next-line no-unused-vars
-            advanceAmount,
-            ...restCtx
-          } = ctx;
+          const { advanceAmount: _, ...restCtx } = ctx;
           notifyFacet.notifyAdvancingResult(restCtx, false);
         },
       },
diff --git a/packages/fast-usdc/src/exos/settler.js b/packages/fast-usdc/src/exos/settler.js
index 5ff573dfa13d..47344a17fe20 100644
--- a/packages/fast-usdc/src/exos/settler.js
+++ b/packages/fast-usdc/src/exos/settler.js
@@ -8,7 +8,11 @@ import { M } from '@endo/patterns';
 import { decodeAddressHook } from '@agoric/cosmic-proto/address-hooks.js';
 import { PendingTxStatus } from '../constants.js';
 import { makeFeeTools } from '../utils/fees.js';
-import { EvmHashShape, makeNatAmountShape } from '../type-guards.js';
+import {
+  CctpTxEvidenceShape,
+  EvmHashShape,
+  makeNatAmountShape,
+} from '../type-guards.js';
 
 /**
  * @import {FungibleTokenPacketData} from '@agoric/cosmic-proto/ibc/applications/transfer/v2/packet.js';
@@ -18,7 +22,7 @@ import { EvmHashShape, makeNatAmountShape } from '../type-guards.js';
  * @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, LogFn} from '../types.js';
+ * @import {NobleAddress, LiquidityPoolKit, FeeConfig, EvmHash, LogFn, CctpTxEvidence} from '../types.js';
  * @import {StatusManager} from './status-manager.js';
  */
 
@@ -81,8 +85,9 @@ export const prepareSettler = (
           makeAdvanceDetailsShape(USDC),
           M.boolean(),
         ).returns(),
-        forwardIfMinted: M.call(
-          ...Object.values(makeAdvanceDetailsShape(USDC)),
+        checkMintedEarly: M.call(
+          CctpTxEvidenceShape,
+          ChainAddressShape,
         ).returns(M.boolean()),
       }),
       self: M.interface('SettlerSelfI', {
@@ -216,17 +221,13 @@ export const prepareSettler = (
         ) {
           const { mintedEarly } = this.state;
           const { value: fullValue } = fullAmount;
-          // XXX i think this only contains Advancing txs - should this be a separate store?
           const key = makeMintedEarlyKey(forwardingAddress, fullValue);
           if (mintedEarly.has(key)) {
             mintedEarly.delete(key);
+            statusManager.advanceOutcomeForMintedEarly(txHash, success);
             if (success) {
-              // TODO: does not write `ADVANCED` to vstorage
-              // this is the "slow" experience, but we've already earmarked fees so disburse
               void this.facets.self.disburse(txHash, fullValue);
             } else {
-              // TODO: does not write `ADVANCE_FAILED` to vstorage
-              // if advance fails, attempt to forward (no fees)
               void this.facets.self.forward(
                 txHash,
                 fullValue,
@@ -238,26 +239,27 @@ export const prepareSettler = (
           }
         },
         /**
+         * @param {CctpTxEvidence} evidence
          * @param {ChainAddress} destination
-         * @param {NobleAddress} forwardingAddress
-         * @param {Amount<'nat'>} fullAmount
-         * @param {EvmHash} txHash
          * @returns {boolean}
          * @throws {Error} if minted early, so advancer doesn't advance
          */
-        forwardIfMinted(destination, forwardingAddress, fullAmount, txHash) {
-          const { value: fullValue } = fullAmount;
-          const key = makeMintedEarlyKey(forwardingAddress, fullValue);
+        checkMintedEarly(evidence, destination) {
+          const {
+            tx: { forwardingAddress, amount },
+            txHash,
+          } = evidence;
+          const key = makeMintedEarlyKey(forwardingAddress, amount);
           const { mintedEarly } = this.state;
           if (mintedEarly.has(key)) {
             log(
               'matched minted early key, initiating forward',
               forwardingAddress,
-              fullValue,
+              amount,
             );
             mintedEarly.delete(key);
-            // TODO: does not write `OBSERVED` to vstorage
-            void this.facets.self.forward(txHash, fullValue, destination.value);
+            statusManager.advanceOutcomeForUnknownMint(evidence);
+            void this.facets.self.forward(txHash, amount, destination.value);
             return true;
           }
           return false;
diff --git a/packages/fast-usdc/src/exos/status-manager.js b/packages/fast-usdc/src/exos/status-manager.js
index 2e4c6a2a5393..9a38e185d24b 100644
--- a/packages/fast-usdc/src/exos/status-manager.js
+++ b/packages/fast-usdc/src/exos/status-manager.js
@@ -196,12 +196,12 @@ export const prepareStatusManager = (
     'Fast USDC Status Manager',
     M.interface('StatusManagerI', {
       // TODO: naming scheme for transition events
-      advance: M.call(CctpTxEvidenceShape).returns(M.undefined()),
+      advance: M.call(CctpTxEvidenceShape).returns(),
       advanceOutcome: M.call(M.string(), M.nat(), M.boolean()).returns(),
-      skipAdvance: M.call(CctpTxEvidenceShape, M.arrayOf(M.string())).returns(
-        M.undefined(),
-      ),
-      observe: M.call(CctpTxEvidenceShape).returns(M.undefined()),
+      skipAdvance: M.call(CctpTxEvidenceShape, M.arrayOf(M.string())).returns(),
+      advanceOutcomeForMintedEarly: M.call(EvmHashShape, M.boolean()).returns(),
+      advanceOutcomeForUnknownMint: M.call(CctpTxEvidenceShape).returns(),
+      observe: M.call(CctpTxEvidenceShape).returns(),
       hasBeenObserved: M.call(CctpTxEvidenceShape).returns(M.boolean()),
       deleteCompletedTxs: M.call().returns(M.undefined()),
       dequeueStatus: M.call(M.string(), M.bigint()).returns(
@@ -216,7 +216,7 @@ export const prepareStatusManager = (
       disbursed: M.call(EvmHashShape, AmountKeywordRecordShape).returns(
         M.undefined(),
       ),
-      forwarded: M.call(EvmHashShape, M.boolean()).returns(M.undefined()),
+      forwarded: M.call(EvmHashShape, M.boolean()).returns(),
       lookupPending: M.call(M.string(), M.bigint()).returns(
         M.arrayOf(PendingTxShape),
       ),
@@ -266,6 +266,43 @@ export const prepareStatusManager = (
         );
       },
 
+      /**
+       * If minted while advancing, publish a status update for the advance
+       * to vstorage.
+       *
+       * Does not add or amend `pendingSettleTxs` as this has
+       * already settled.
+       *
+       * @param {EvmHash} txHash
+       * @param {boolean} success whether the Transfer succeeded
+       */
+      advanceOutcomeForMintedEarly(txHash, success) {
+        void publishTxnRecord(
+          txHash,
+          harden({
+            status: success
+              ? PendingTxStatus.Advanced
+              : PendingTxStatus.AdvanceFailed,
+          }),
+        );
+      },
+
+      /**
+       * If minted before observed and the evidence is eventually
+       * reported, publish the evidence without adding to `pendingSettleTxs`
+       *
+       * @param {CctpTxEvidence} evidence
+       */
+      advanceOutcomeForUnknownMint(evidence) {
+        const { txHash } = evidence;
+        // unexpected path, since `hasBeenObserved` will be called before this
+        if (seenTxs.has(txHash)) {
+          throw makeError(`Transaction already seen: ${q(txHash)}`);
+        }
+        seenTxs.add(txHash);
+        publishEvidence(txHash, evidence);
+      },
+
       /**
        * Add a new transaction with OBSERVED status
        * @param {CctpTxEvidence} evidence
diff --git a/packages/fast-usdc/test/exos/advancer.test.ts b/packages/fast-usdc/test/exos/advancer.test.ts
index ac4e652e530f..c5e53c0b70a6 100644
--- a/packages/fast-usdc/test/exos/advancer.test.ts
+++ b/packages/fast-usdc/test/exos/advancer.test.ts
@@ -6,10 +6,10 @@ import {
 } from '@agoric/cosmic-proto/address-hooks.js';
 import type { NatAmount } from '@agoric/ertp';
 import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
-import { denomHash } from '@agoric/orchestration';
+import { ChainAddressShape, denomHash } from '@agoric/orchestration';
 import fetchedChainInfo from '@agoric/orchestration/src/fetched-chain-info.js';
 import { type ZoeTools } from '@agoric/orchestration/src/utils/zoe-tools.js';
-import { Fail, q } from '@endo/errors';
+import { q } from '@endo/errors';
 import { Far } from '@endo/pass-style';
 import type { TestFn } from 'ava';
 import { makeTracer } from '@agoric/internal';
@@ -34,6 +34,7 @@ import {
   prepareMockOrchAccounts,
 } from '../mocks.js';
 import { commonSetup } from '../supports.js';
+import { CctpTxEvidenceShape } from '../../src/type-guards.js';
 
 const trace = makeTracer('AdvancerTest', false);
 
@@ -118,11 +119,9 @@ const createTestExtensions = (t, common: CommonSetup) => {
       notifyAdvancingResultCalls.push(args);
     },
     // assume this never returns true for most tests
-    forwardIfMinted: (...args) => {
-      mustMatch(
-        harden(args),
-        harden([...Object.values(makeAdvanceDetailsShape(usdc.brand))]),
-      );
+    checkMintedEarly: (evidence, destination) => {
+      mustMatch(harden(evidence), CctpTxEvidenceShape);
+      mustMatch(destination, ChainAddressShape);
       return false;
     },
   });
@@ -674,7 +673,7 @@ test('rejects advances to unknown settlementAccount', async t => {
   ]);
 });
 
-test('no status update if `forwardIfMinted` returns true', async t => {
+test('no status update if `checkMintedEarly` returns true', async t => {
   const {
     brands: { usdc },
     bootstrap: { storage },
@@ -687,7 +686,7 @@ test('no status update if `forwardIfMinted` returns true', async t => {
 
   const mockNotifyF = Far('Settler Notify Facet', {
     notifyAdvancingResult: () => {},
-    forwardIfMinted: (destination, forwardingAddress, fullAmount, txHash) => {
+    checkMintedEarly: (evidence, destination) => {
       return true;
     },
   });
@@ -712,6 +711,6 @@ test('no status update if `forwardIfMinted` returns true', async t => {
 
   t.deepEqual(inspectLogs(), [
     ['decoded EUD: dydx183dejcnmkka5dzcu9xw6mywq0p2m5peks28men'],
-    ['⚠️ minted before Observed'],
+    // no add'l logs as we return early
   ]);
 });
diff --git a/packages/fast-usdc/test/exos/settler.test.ts b/packages/fast-usdc/test/exos/settler.test.ts
index a7352e79a19c..4bed4311dae8 100644
--- a/packages/fast-usdc/test/exos/settler.test.ts
+++ b/packages/fast-usdc/test/exos/settler.test.ts
@@ -180,12 +180,7 @@ const makeTestContext = async t => {
         const cctpTxEvidence = makeEvidence(evidence);
         const { destination, forwardingAddress, fullAmount, txHash } =
           makeNotifyInfo(cctpTxEvidence);
-        notifyFacet.forwardIfMinted(
-          destination,
-          forwardingAddress,
-          fullAmount,
-          txHash,
-        );
+        notifyFacet.checkMintedEarly(cctpTxEvidence, destination);
         return cctpTxEvidence;
       },
     });
@@ -542,7 +537,7 @@ test('Settlement for unknown transaction (minted early)', async t => {
   accounts.settlement.transferVResolver.resolve(undefined);
   await eventLoopIteration();
   t.deepEqual(storage.getDeserialized(`fun.txns.${evidence.txHash}`), [
-    /// TODO with no observed / evidence, does this break reporting reqs?
+    { evidence, status: 'OBSERVED' },
     { status: 'FORWARDED' },
   ]);
 });
@@ -598,7 +593,7 @@ test('Settlement for Advancing transaction (advance succeeds)', async t => {
   t.deepEqual(storage.getDeserialized(`fun.txns.${cctpTxEvidence.txHash}`), [
     { evidence: cctpTxEvidence, status: 'OBSERVED' },
     { status: 'ADVANCING' },
-    // { status: 'ADVANCED' }, TODO: not reported by notifyAdvancingResult
+    { status: 'ADVANCED' },
     { split: expectedSplit, status: 'DISBURSED' },
   ]);
 });
@@ -664,7 +659,7 @@ test('Settlement for Advancing transaction (advance fails)', async t => {
   t.deepEqual(storage.getDeserialized(`fun.txns.${cctpTxEvidence.txHash}`), [
     { evidence: cctpTxEvidence, status: 'OBSERVED' },
     { status: 'ADVANCING' },
-    // { status: 'ADVANCE_FAILED' }, TODO: not reported by notifyAdvancingResult
+    { status: 'ADVANCE_FAILED' },
     { status: 'FORWARDED' },
   ]);
 });
diff --git a/packages/fast-usdc/test/fast-usdc.contract.test.ts b/packages/fast-usdc/test/fast-usdc.contract.test.ts
index a8b0f3c4ecec..a7e481496714 100644
--- a/packages/fast-usdc/test/fast-usdc.contract.test.ts
+++ b/packages/fast-usdc/test/fast-usdc.contract.test.ts
@@ -918,7 +918,7 @@ test.serial('Settlement for unknown transaction (operator down)', async t => {
   await eventLoopIteration();
 
   t.deepEqual(storage.getDeserialized(`fun.txns.${sent.txHash}`), [
-    // { evidence: sent, status: 'OBSERVED' }, // no OBSERVED state recorded
+    { evidence: sent, status: 'OBSERVED' },
     { status: 'FORWARDED' },
   ]);
 });
@@ -959,7 +959,7 @@ test.serial('mint received while ADVANCING', async t => {
   t.deepEqual(storage.getDeserialized(`fun.txns.${sent.txHash}`), [
     { evidence: sent, status: 'OBSERVED' },
     { status: 'ADVANCING' },
-    // { status: 'ADVANCED' }, TODO: not reported by notifyAdvancingResult
+    { status: 'ADVANCED' },
     { split, status: 'DISBURSED' },
   ]);
 });