refactor(svm): collapse deposit and fill execution to V5

AGENTS.md

@@ -57,8 +57,9 @@ Located in `contracts/periphery/mintburn/`. A modular framework for executing cr
 
 ### SVM Across V5 Gateway integration
 
-`svm_spoke` is a direct Gateway adapter for V5 source deposits and destination fills. External fills transfer tokens;
-in-place fills check the shared vault, leaving downstream delivery to the committed Gateway path. See the
+`svm_spoke` is a direct Gateway adapter for V5 source deposits and destination fills. All fills use the token program
+with sufficient fill-delegate approval; self-transfers validate the shared vault without debiting it, leaving
+downstream delivery to the committed Gateway path. See the
 [adapter spec](programs/svm-spoke/V5_ADAPTER_SPEC.md#pda-and-token-invariants) for authoritative delivery/security rules
 and the [integration guide](test/svm-gateway/README.md) for real-Gateway test execution and coverage.
 

programs/mock-gateway/src/lib.rs

@@ -33,7 +33,7 @@ pub mod mock_gateway {
                 ApproveChecked {
                     to: ctx.accounts.gateway_vault.to_account_info(),
                     mint: ctx.accounts.mint.to_account_info(),
-                    delegate: ctx.accounts.source_delegate.to_account_info(),
+                    delegate: ctx.accounts.deposit_delegate.to_account_info(),
                     authority: ctx.accounts.vault_authority.to_account_info(),
                 },
                 &[vault_seeds],
@@ -57,7 +57,7 @@ pub mod mock_gateway {
             ctx.accounts.spoke_vault.to_account_info(),
             ctx.accounts.mint.to_account_info(),
             ctx.accounts.token_program.to_account_info(),
-            ctx.accounts.source_delegate.to_account_info(),
+            ctx.accounts.deposit_delegate.to_account_info(),
         ];
         invoke_signed(
             &Instruction {
@@ -71,7 +71,7 @@ pub mod mock_gateway {
                     AccountMeta::new(ctx.accounts.spoke_vault.key(), false),
                     AccountMeta::new_readonly(ctx.accounts.mint.key(), false),
                     AccountMeta::new_readonly(ctx.accounts.token_program.key(), false),
-                    AccountMeta::new_readonly(ctx.accounts.source_delegate.key(), false),
+                    AccountMeta::new_readonly(ctx.accounts.deposit_delegate.key(), false),
                 ],
                 data: svm_spoke::instruction::AdapterExecuteAcrossV5 {
                     ctx_values: svm_spoke::v5::codec::GatewayContextV1 {
@@ -222,8 +222,8 @@ pub struct ExecuteAdapter<'info> {
     #[account(mint::token_program = token_program)]
     pub mint: InterfaceAccount<'info, Mint>,
 
-    /// CHECK: The svm-spoke adapter authenticates the static source-delegate key.
-    pub source_delegate: UncheckedAccount<'info>,
+    /// CHECK: The svm-spoke adapter authenticates the static V5 deposit-delegate key.
+    pub deposit_delegate: UncheckedAccount<'info>,
 
     /// CHECK: Validated by the svm-spoke CPI account constraints.
     pub state: UncheckedAccount<'info>,
@@ -262,7 +262,7 @@ pub struct ExecuteFillAdapter<'info> {
     #[account(mint::token_program = token_program)]
     pub mint: InterfaceAccount<'info, Mint>,
 
-    /// CHECK: The svm-spoke adapter authenticates the static fill-delegate key for external delivery.
+    /// CHECK: The svm-spoke adapter authenticates the static fill-delegate key for all fills.
     pub fill_delegate: UncheckedAccount<'info>,
 
     /// CHECK: Validated by svm-spoke against the context submitter.

programs/svm-spoke/ERROR_CODES.md

@@ -2,7 +2,7 @@
 
 This release assigns distinct runtime error ranges to `svm_spoke`. **Existing `CommonError` codes are unchanged.**
 `SvmError` moves from 6000–6018 to 7000–7016 after unused variants are removed; `CallDataError` moves from
-6000–6006 to 8000–8006.
+6000–6006 to 9000–9006.
 The compatibility baseline is the deployed release
 [`v5.0.12-beta.1` (`d8da3000`)](https://github.com/across-protocol/contracts/blob/d8da3000f1aba2593e712a9942a3249bf8e8205b/programs/svm-spoke/src/error.rs),
 not intermediate PRs in this undeployed stack. V5 errors are new relative to that baseline. A dash means the
@@ -17,7 +17,8 @@ Enum membership does not imply reachability: the old `CommonError` slow-fill slo
 Use the mapping for the program version being queried. Historical transaction errors retain the old codes;
 do not relabel them using the new table. Legacy
 numbers overlap across enums, so a number alone cannot identify a historical error. Runtime log names distinguish
-the enums. Anchor 0.31.1's generated IDL error table remains incomplete despite the distinct runtime ranges.
+the enums. Anchor 0.31.1's generated IDL error table remains incomplete and does not reflect the explicit runtime
+offsets; use the runtime mappings below.
 
 Before upgrading, inspect off-chain numeric-code maps and update affected consumers; stale maps can silently
 mislabel errors. See [deployment sequencing](V5_ADAPTER_SPEC.md#deployment-sequencing).
@@ -79,38 +80,37 @@ relayer refund leaves that return tokens to the HubPool. V4 entrypoint retiremen
 and `InconsistentOptionalParameters`; neither has a remaining construction site. The final 7000–7016 mapping
 includes these removals. Intermediate stack assignments were never deployed and are not compatibility constraints.
 
-## CallDataError
-
-| Error                 | Before release | This release |
-| --------------------- | -------------- | ------------ |
-| `InvalidSelector`     | 6000           | 8000         |
-| `InvalidArgument`     | 6001           | 8001         |
-| `InvalidBool`         | 6002           | 8002         |
-| `InvalidAddress`      | 6003           | 8003         |
-| `InvalidUint32`       | 6004           | 8004         |
-| `InvalidUint64`       | 6005           | 8005         |
-| `UnsupportedSelector` | 6006           | 8006         |
-
 ## V5Error
 
 | Error                               | Before release | This release |
 | ----------------------------------- | -------------- | ------------ |
-| `InvalidWireFormat`                 | —              | 9000         |
-| `InvalidParamModificationSignature` | —              | 9001         |
-| `MissingAccount`                    | —              | 9002         |
-| `InvalidDispatchAuthority`          | —              | 9003         |
-| `InvalidAccountMutability`          | —              | 9004         |
-| `ResolvedInputAmountBelowCommitted` | —              | 9005         |
-| `ParamModificationNotAnImprovement` | —              | 9006         |
-| `InvalidAmountBips`                 | —              | 9007         |
-| `UnsupportedMode`                   | —              | 9008         |
-| `InvalidTokenAccount`               | —              | 9009         |
-| `UnsupportedTokenExtension`         | —              | 9010         |
-| `InvalidFillPayer`                  | —              | 9011         |
-| `InvalidFillStatusAccount`          | —              | 9012         |
-| `FillCommitmentMismatch`            | —              | 9013         |
-| `FillOutputAmountTooLow`            | —              | 9014         |
-| `InsufficientVaultBalance`          | —              | 9015         |
+| `InvalidWireFormat`                 | —              | 8000         |
+| `InvalidParamModificationSignature` | —              | 8001         |
+| `MissingAccount`                    | —              | 8002         |
+| `InvalidDispatchAuthority`          | —              | 8003         |
+| `InvalidAccountMutability`          | —              | 8004         |
+| `ResolvedInputAmountBelowCommitted` | —              | 8005         |
+| `ParamModificationNotAnImprovement` | —              | 8006         |
+| `InvalidAmountBips`                 | —              | 8007         |
+| `UnsupportedMode`                   | —              | 8008         |
+| `InvalidTokenAccount`               | —              | 8009         |
+| `UnsupportedTokenExtension`         | —              | 8010         |
+| `InvalidFillPayer`                  | —              | 8011         |
+| `InvalidFillStatusAccount`          | —              | 8012         |
+| `FillCommitmentMismatch`            | —              | 8013         |
+| `FillOutputAmountTooLow`            | —              | 8014         |
+
+## CallDataError
+
+| Error                 | Before release | This release |
+| --------------------- | -------------- | ------------ |
+| `InvalidSelector`     | 6000           | 9000         |
+| `InvalidArgument`     | 6001           | 9001         |
+| `InvalidBool`         | 6002           | 9002         |
+| `InvalidAddress`      | 6003           | 9003         |
+| `InvalidUint32`       | 6004           | 9004         |
+| `InvalidUint64`       | 6005           | 9005         |
+| `UnsupportedSelector` | 6006           | 9006         |
 
 ## Removed (AcrossPlusError)