Fix: cross-contract call swallows the inner error - #1679
Merged
Baskarayelu merged 1 commit intoJul 30, 2026
Merged
Conversation
…ilure run_remittance_fan_out collapsed every downstream failure (savings, bills, insurance) into the same generic CrossContractCallFailed, discarding whether the callee itself rejected the call or the invocation could not be made at all. Emit a cctx_err event identifying the failing step and that distinction before returning.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
run_remittance_fan_outcollapsed every downstream cross-contract failure (savings, bills, insurance) into the same genericOrchestratorError::CrossContractCallFailed, discarding whether the callee itself rejected the call (Ok(Err(_))) or the invocation could not be made at all (Err(_), e.g. bad address/interface mismatch). Callers and off-chain indexers had no way to tell which step failed or why.Change
try_*result instead of collapsing it with.is_err().(cctx_err, <step>)event carrying abool(rejected_by_contract) before returning the existing error, for each of the three downstream calls (savings, bills, insurance). Existing return values/error variants are unchanged, so this is additive.Tests
test_cross_contract_failure_emits_step_and_cause, which reproduces the swallow (a failing mock previously produced identical, undifferentiated errors) and asserts the new event carries the failing step and cause.cargo test -p orchestrator --lib: 95 passed (1 pre-existing, unrelated failure that requires wasm artifacts to be pre-built).Closes #1627