Resolve merge conflicts in PR #190: Fix token2022 additional_data indexing

[Copilot]

This PR resolves the merge conflicts in PR #190 that were preventing the integration of improved token2022 additional_data indexing functionality.

Background

PR #190 aimed to fix a critical gap in token2022 support where additional_data (including decimals, interest bearing config, and scaled UI amount config) was only indexed when InitializeMint2 instructions were processed through surfpool. This meant:

1. Token2022 accounts pulled from mainnet wouldn't work properly
2. Only the decimals field was being captured
3. The system relied on instruction parsing rather than account data

Changes Made

Core Functionality Improvements

Enhanced Token Account Indexing (crates/core/src/surfnet/svm.rs):

• Extended token account indexing to support both SPL Token and Token-2022 programs
• Added comprehensive Token-2022 mint account data extraction including:
  • Decimals
  • Interest bearing configuration
  • Scaled UI amount configuration
• Replaced instruction-based parsing with account-data-based indexing for more reliable coverage

RPC Layer Updates (crates/core/src/rpc/accounts_data.rs):

• Enhanced get_token_account_balance to handle both SPL Token and Token-2022 accounts
• Added proper unpacking logic for Token-2022 state with extensions
• Improved error handling with specific error messages for different token program types

Preserved Main Branch Features

Blockhash Validation (crates/core/src/rpc/full.rs):

• Maintained MAX_RECENT_BLOCKHASHES functionality for proper last_valid_block_height calculation
• Preserved enhanced test coverage for blockhash validation

Program Authority Management (crates/core/src/rpc/surfnet_cheatcodes.rs, crates/core/src/surfnet/locker.rs):

• Kept the new set_program_authority RPC method and implementation
• Maintained helper functions for program data account updates

Code Quality Improvements

• Updated logging levels from warn to error for account update failures (more appropriate severity)
• Updated test helpers to expect error events instead of warning events
• Fixed syntax errors and maintained code consistency

Technical Details

The key improvement is moving from instruction-based to account-data-based indexing:

Before (instruction-based):

// Only captured data when InitializeMint2 instruction was processed
if let TokenInstruction::InitializeMint2 { decimals, .. } = instruction {
    // Limited to decimals only
}

After (account-data-based):

// Captures data whenever any Token-2022 mint account is indexed
if account.owner == spl_token_2022::id() {
    if let Ok(mint) = StateWithExtensions::<spl_token_2022::state::Mint>::unpack(&account.data) {
        // Comprehensive data extraction including extensions
        let interest_bearing_config = mint.get_extension::<InterestBearingConfig>().ok();
        let scaled_ui_amount_config = mint.get_extension::<ScaledUiAmountConfig>().ok();
        // Store complete additional data
    }
}

Impact

This merge ensures that:

• ✅ Token2022 accounts pulled from mainnet work correctly
• ✅ All additional_data fields are properly indexed
• ✅ Existing functionality is preserved
• ✅ Both SPL Token and Token-2022 programs are fully supported
• ✅ Account indexing happens regardless of how accounts are obtained (local transactions or remote fetching)

The resolved conflicts maintain backward compatibility while significantly improving token2022 support coverage.

Warning

Firewall rules blocked me from connecting to one or more addresses

I tried to connect to the following addresses, but was blocked by firewall rules:

• https://api.github.com/repos/modelcontextprotocol/rust-sdk/commits/main
  • Triggering command: /home/REDACTED/.rustup/toolchains/1.85.0-x86_64-REDACTED-linux-gnu/bin/cargo check --quiet (http block)

If you need me to access, download, or install something from one of these locations, you can either:

• Configure Actions setup steps to set up my environment, which run before the firewall is enabled
• Add the appropriate URLs or hosts to my firewall allow list

---

💬 Share your feedback on Copilot coding agent for the chance to win a $200 gift card! Click here to start the survey.