Feat: allow arbitrary programs in swap transactions #582
Conversation
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
|
The latest updates on your projects. Learn more about Vercel for GitHub. 1 Skipped Deployment
|
guibescos
reviewed
Aug 12, 2025
| .await; | ||
| let program_id = instruction.program_id; | ||
| let transaction = Transaction::new_with_payer( | ||
| &[instruction.clone(), swap_instruction.clone()], |
There was a problem hiding this comment.
i don't think you need swap_instruction here and in the other tests that only call check_approved_program_instruction
guibescos
approved these changes
Aug 12, 2025
| ) -> Result<(), RestError> { | ||
| if self | ||
| .check_approved_program_instruction(program_id, ix) | ||
| .is_ok() |
There was a problem hiding this comment.
it's doesn't feel great that now we swallow the error from check_approved_program_instruction. this might make it harder to debug
There was a problem hiding this comment.
yeah i agree. i refactored this to bubble up the error from check_approved_program_instruction if the user account is invoked
guibescos
approved these changes
Aug 15, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR allows arbitrary program instructions in swap transactions.
Previously, the server maintained effectively a whitelist of program instructions that were allowed to be included in swap transactions, in order to protect users from signing transactions with unintended consequences.
In order to allow arbitrary program instructions while maintaining security, this PR changes the code to allow any of the aforesaid approved program instructions and allow an arbitrary program instruction provided that it does not invoke the user account (which is a signer of the transaction) in any of its accounts (including lookup table accounts). If this second condition is met, the user's signature on the transaction should not be actionable towards any logic in the arbitrary program instruction.
Some outstanding TODOs: