Skip to content

Conversation

@gibson042
Copy link
Member

@gibson042 gibson042 commented Dec 17, 2025

Ref #12274
Ref #12235 (comment)

Description

  • Don't treat successful rejectPlan as an error
  • Include log output for rejectPlan
  • Consolidate startFlow log output
  • Don't update portfolio state snapshots when handlePortfolio fails

Security Considerations

None known.

Scaling Considerations

n/a

Documentation Considerations

n/a

Testing Considerations

Covered.

Upgrade Considerations

This affects only happy-path output that AFAIK nothing specifically looks for, so should be safe to deploy immediately.

@gibson042 gibson042 requested review from dckc and turadg December 17, 2025 23:35
@gibson042 gibson042 force-pushed the gibson-12274-followup branch from b76fe72 to 7bcbf10 Compare December 17, 2025 23:37
@gibson042 gibson042 added the automerge:rebase Automatically rebase updates, then merge label Dec 18, 2025
@gibson042 gibson042 force-pushed the gibson-12274-followup branch from de779c4 to 251decc Compare December 18, 2025 00:29
@mergify
Copy link
Contributor

mergify bot commented Dec 18, 2025

Merge Queue Status

✅ The pull request has been merged at 251decc

This pull request spent 2 minutes 7 seconds in the queue, including 2 minutes 2 seconds running CI.
The checks were run in-place.

Required conditions to merge
  • #approved-reviews-by >= 1 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]
  • base=master
  • branch-protection-review-decision = APPROVED [🛡 GitHub branch protection]
  • any of:
  • any of:
  • any of [🛡 GitHub branch protection]:
    • check-success = gotest
    • check-neutral = gotest
    • check-skipped = gotest
  • any of [🛡 GitHub branch protection]:
    • check-success = lint
    • check-neutral = lint
    • check-skipped = lint
  • any of [🛡 GitHub branch protection]:
    • check-success = test-quick (xs)
    • check-neutral = test-quick (xs)
    • check-skipped = test-quick (xs)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-quick2 (xs)
    • check-neutral = test-quick2 (xs)
    • check-skipped = test-quick2 (xs)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-cosmic-swingset (xs)
    • check-neutral = test-cosmic-swingset (xs)
    • check-skipped = test-cosmic-swingset (xs)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-zoe-swingset (xs)
    • check-neutral = test-zoe-swingset (xs)
    • check-skipped = test-zoe-swingset (xs)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-zoe-unit (xs)
    • check-neutral = test-zoe-unit (xs)
    • check-skipped = test-zoe-unit (xs)
  • any of [🛡 GitHub branch protection]:
    • check-success = lint-primary
    • check-neutral = lint-primary
    • check-skipped = lint-primary
  • any of [🛡 GitHub branch protection]:
    • check-success = lint-rest
    • check-neutral = lint-rest
    • check-skipped = lint-rest
  • any of [🛡 GitHub branch protection]:
    • check-skipped = linear-history
    • check-neutral = linear-history
    • check-success = linear-history
  • any of [🛡 GitHub branch protection]:
    • check-success = merge-strategy (chosen)
    • check-neutral = merge-strategy (chosen)
    • check-skipped = merge-strategy (chosen)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-boot (xs, 0, 4)
    • check-neutral = test-boot (xs, 0, 4)
    • check-skipped = test-boot (xs, 0, 4)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-boot (xs, 1, 4)
    • check-neutral = test-boot (xs, 1, 4)
    • check-skipped = test-boot (xs, 1, 4)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-boot (xs, 2, 4)
    • check-neutral = test-boot (xs, 2, 4)
    • check-skipped = test-boot (xs, 2, 4)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-boot (xs, 3, 4)
    • check-neutral = test-boot (xs, 3, 4)
    • check-skipped = test-boot (xs, 3, 4)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-swingset (xs, 0, 5)
    • check-neutral = test-swingset (xs, 0, 5)
    • check-skipped = test-swingset (xs, 0, 5)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-swingset (xs, 1, 5)
    • check-neutral = test-swingset (xs, 1, 5)
    • check-skipped = test-swingset (xs, 1, 5)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-swingset (xs, 2, 5)
    • check-neutral = test-swingset (xs, 2, 5)
    • check-skipped = test-swingset (xs, 2, 5)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-swingset (xs, 3, 5)
    • check-neutral = test-swingset (xs, 3, 5)
    • check-skipped = test-swingset (xs, 3, 5)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-swingset (xs, 4, 5)
    • check-neutral = test-swingset (xs, 4, 5)
    • check-skipped = test-swingset (xs, 4, 5)
  • any of [🛡 GitHub branch protection]:
    • check-success = dependency-graph
    • check-neutral = dependency-graph
    • check-skipped = dependency-graph
  • any of [🛡 GitHub branch protection]:
    • check-success = flake-check
    • check-neutral = flake-check
    • check-skipped = flake-check
  • any of [🛡 GitHub branch protection]:
    • check-success = up-to-date
    • check-neutral = up-to-date
    • check-skipped = up-to-date
  • any of [🛡 GitHub branch protection]:
    • check-success = build (node-old)
    • check-neutral = build (node-old)
    • check-skipped = build (node-old)
  • any of [🛡 GitHub branch protection]:
    • check-success = build (node-new)
    • check-neutral = build (node-new)
    • check-skipped = build (node-new)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-zoe-swingset (node-old)
    • check-neutral = test-zoe-swingset (node-old)
    • check-skipped = test-zoe-swingset (node-old)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-zoe-swingset (node-new)
    • check-neutral = test-zoe-swingset (node-new)
    • check-skipped = test-zoe-swingset (node-new)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-zoe-unit (node-new)
    • check-neutral = test-zoe-unit (node-new)
    • check-skipped = test-zoe-unit (node-new)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-zoe-unit (node-old)
    • check-neutral = test-zoe-unit (node-old)
    • check-skipped = test-zoe-unit (node-old)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-boot (node-new, 0, 4)
    • check-neutral = test-boot (node-new, 0, 4)
    • check-skipped = test-boot (node-new, 0, 4)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-boot (node-new, 1, 4)
    • check-neutral = test-boot (node-new, 1, 4)
    • check-skipped = test-boot (node-new, 1, 4)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-boot (node-new, 2, 4)
    • check-neutral = test-boot (node-new, 2, 4)
    • check-skipped = test-boot (node-new, 2, 4)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-boot (node-new, 3, 4)
    • check-neutral = test-boot (node-new, 3, 4)
    • check-skipped = test-boot (node-new, 3, 4)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-boot (node-old, 0, 4)
    • check-neutral = test-boot (node-old, 0, 4)
    • check-skipped = test-boot (node-old, 0, 4)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-boot (node-old, 1, 4)
    • check-neutral = test-boot (node-old, 1, 4)
    • check-skipped = test-boot (node-old, 1, 4)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-boot (node-old, 2, 4)
    • check-neutral = test-boot (node-old, 2, 4)
    • check-skipped = test-boot (node-old, 2, 4)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-boot (node-old, 3, 4)
    • check-neutral = test-boot (node-old, 3, 4)
    • check-skipped = test-boot (node-old, 3, 4)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-cosmic-swingset (node-old)
    • check-neutral = test-cosmic-swingset (node-old)
    • check-skipped = test-cosmic-swingset (node-old)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-cosmic-swingset (node-new)
    • check-neutral = test-cosmic-swingset (node-new)
    • check-skipped = test-cosmic-swingset (node-new)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-governance (node-new)
    • check-neutral = test-governance (node-new)
    • check-skipped = test-governance (node-new)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-governance (node-old)
    • check-neutral = test-governance (node-old)
    • check-skipped = test-governance (node-old)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-inter-protocol (node-new)
    • check-neutral = test-inter-protocol (node-new)
    • check-skipped = test-inter-protocol (node-new)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-inter-protocol (node-old)
    • check-neutral = test-inter-protocol (node-old)
    • check-skipped = test-inter-protocol (node-old)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-quick (node-new)
    • check-neutral = test-quick (node-new)
    • check-skipped = test-quick (node-new)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-quick (node-old)
    • check-neutral = test-quick (node-old)
    • check-skipped = test-quick (node-old)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-quick2 (node-old)
    • check-neutral = test-quick2 (node-old)
    • check-skipped = test-quick2 (node-old)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-quick2 (node-new)
    • check-neutral = test-quick2 (node-new)
    • check-skipped = test-quick2 (node-new)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-solo (node-new)
    • check-neutral = test-solo (node-new)
    • check-skipped = test-solo (node-new)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-solo (node-old)
    • check-neutral = test-solo (node-old)
    • check-skipped = test-solo (node-old)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-swingset (node-new, 0, 5)
    • check-neutral = test-swingset (node-new, 0, 5)
    • check-skipped = test-swingset (node-new, 0, 5)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-swingset (node-new, 1, 5)
    • check-neutral = test-swingset (node-new, 1, 5)
    • check-skipped = test-swingset (node-new, 1, 5)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-swingset (node-new, 2, 5)
    • check-neutral = test-swingset (node-new, 2, 5)
    • check-skipped = test-swingset (node-new, 2, 5)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-swingset (node-new, 3, 5)
    • check-neutral = test-swingset (node-new, 3, 5)
    • check-skipped = test-swingset (node-new, 3, 5)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-swingset (node-new, 4, 5)
    • check-neutral = test-swingset (node-new, 4, 5)
    • check-skipped = test-swingset (node-new, 4, 5)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-swingset (node-old, 0, 5)
    • check-neutral = test-swingset (node-old, 0, 5)
    • check-skipped = test-swingset (node-old, 0, 5)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-swingset (node-old, 1, 5)
    • check-neutral = test-swingset (node-old, 1, 5)
    • check-skipped = test-swingset (node-old, 1, 5)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-swingset (node-old, 2, 5)
    • check-neutral = test-swingset (node-old, 2, 5)
    • check-skipped = test-swingset (node-old, 2, 5)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-swingset (node-old, 3, 5)
    • check-neutral = test-swingset (node-old, 3, 5)
    • check-skipped = test-swingset (node-old, 3, 5)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-swingset (node-old, 4, 5)
    • check-neutral = test-swingset (node-old, 4, 5)
    • check-skipped = test-swingset (node-old, 4, 5)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-fast-usdc-deploy (node-new)
    • check-neutral = test-fast-usdc-deploy (node-new)
    • check-skipped = test-fast-usdc-deploy (node-new)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-fast-usdc-deploy (node-old)
    • check-neutral = test-fast-usdc-deploy (node-old)
    • check-skipped = test-fast-usdc-deploy (node-old)

@mergify mergify bot merged commit 62acc02 into master Dec 18, 2025
96 checks passed
@mergify mergify bot deleted the gibson-12274-followup branch December 18, 2025 01:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automerge:rebase Automatically rebase updates, then merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants