refactor: encapsulate userCallOffset logic in TxSimulationResult#21886
Closed
benesjan wants to merge 1 commit into
Closed
refactor: encapsulate userCallOffset logic in TxSimulationResult#21886benesjan wants to merge 1 commit into
benesjan wants to merge 1 commit into
Conversation
Adds `getUserPrivateReturnValues(callIndex)` to `TxSimulationResult`
so callers no longer need to branch on `userCallOffset` being defined
or not. Also moves the offset calculation into
`createTxExecutionRequestFromPayloadAndFee` so it returns
`{ txRequest, userCallOffset }` instead of `{ txRequest, feeCallCount }`,
removing the leaky abstraction.
Closes F-483
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
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
1 participant
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.
Closes https://linear.app/aztec-labs/issue/F-483/handle-simulation-with-nested-calls-and-without-account-contract
Summary
Approach (V1 — this PR): Encapsulates offset usage on
TxSimulationResult:getUserPrivateReturnValues(callIndex)toTxSimulationResult, encapsulating the branching onuserCallOffsetbeingundefined(DefaultEntrypoint / root call) vs a number (account contract / nested call after fee preamble)createTxExecutionRequestFromPayloadAndFeenow returns{ txRequest, userCallOffset }instead of{ txRequest, feeCallCount }— the conversion from fee call count to offset (including theNO_FROMcheck) now lives inside the method where the fee logic already isContractFunctionInteraction,BatchCall) replaced multi-line branching blocks with single calls togetUserPrivateReturnValuescreateTxExecutionRequestFromPayloadAndFeeand post-simulation mutation ofresult.userCallOffsetAlternative approach (V2 — #21937): Goes further by also separating concerns in the wallet layer:
createTxExecutionRequestFromPayloadAndFeereturns just aTxExecutionRequest(no compound return)computeUserCallOffsethelper derives the offset from fee optionsuserCallOffsetthreaded through constructors instead of post-construction mutationsendTx,profileTx) no longer destructure🤖 Generated with Claude Code