Open
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR adjusts the Solana spoke’s CCIP settlement flow to avoid immediate intent-status PDA creation during ccip_receive by persisting settlement data in SpokeState and introducing a follow-up instruction to finalize delivery.
Changes:
- Add
pending_ccip_settlementtoSpokeStateand introduce a newsettle_ccip_deliveryinstruction to create theintent_status_pdawithDeliveredstatus later. - Add a v2 spoke-state migration (
migrate_spoke_state_v2) to realloc the state PDA for the new field. - Extend error handling and exports to support the new pending-settlement workflow.
Reviewed changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated 6 comments.
Show a summary per file
| File | Description |
|---|---|
| packages/contracts/solana-spoke/programs/everclear_spoke/src/state.rs | Adds pending_ccip_settlement to global state and updates the SIZE constant. |
| packages/contracts/solana-spoke/programs/everclear_spoke/src/lib.rs | Exposes new settle_ccip_delivery and migrate_spoke_state_v2 entrypoints. |
| packages/contracts/solana-spoke/programs/everclear_spoke/src/instructions/state_migration.rs | Implements the v2 realloc migration and adds size-consistency tests. |
| packages/contracts/solana-spoke/programs/everclear_spoke/src/instructions/receive_message/mod.rs | Re-exports the new settle-delivery accounts context. |
| packages/contracts/solana-spoke/programs/everclear_spoke/src/instructions/receive_message/handle_cpi.rs | Stores CCIP settlement in state and adds settle_ccip_delivery to write the intent status PDA later, plus tests. |
| packages/contracts/solana-spoke/programs/everclear_spoke/src/error.rs | Adds errors for pending-settlement presence/absence. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
eac4744 to
aa7ed32
Compare
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
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.
🤖 Linear
Fixing evm to svm account storage issue by adjusting ccip message storage flow.