Skip to content

Conversation

@0xh3rman
Copy link
Collaborator

Bring back #670

This commit introduces Solana support to the Across swapper, including new models and Solana-specific logic for destination messages and fee calculation. It updates the Across contract interface to V3, adds Solana chain and asset mappings, and integrates Solana JSON-RPC methods. The commit also refactors quote building, fee calculation, and relay data handling to support both EVM and Solana chains.
@semanticdiff-com
Copy link

semanticdiff-com bot commented Dec 27, 2025

Review changes with  SemanticDiff

Changed Files
File Status
  crates/gem_evm/src/across/contracts/spoke_pool.rs  45% smaller
  crates/gem_evm/src/across/deployment.rs  15% smaller
  crates/swapper/src/across/provider.rs  13% smaller
  crates/gem_solana/src/jsonrpc.rs  1% smaller
  Cargo.lock Unsupported file format
  crates/gem_evm/src/chainlink/contract.rs  0% smaller
  crates/swapper/Cargo.toml Unsupported file format
  crates/swapper/src/across/mod.rs  0% smaller
  crates/swapper/src/across/models.rs  0% smaller
  crates/swapper/src/across/solana.rs  0% smaller
  crates/swapper/src/chainlink.rs  0% smaller

@gemini-code-assist
Copy link
Contributor

Summary of Changes

Hello @0xh3rman, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request significantly expands the capabilities of the Across swapper by integrating Solana blockchain support. The changes involve updating core contract interfaces to a more generic V3 standard, introducing Solana-specific data handling for addresses and transaction messages, and adapting gas estimation mechanisms to accommodate Solana's fee model. This allows for seamless cross-chain asset transfers where Solana can act as a destination chain.

Highlights

  • Solana Integration: Introduced comprehensive support for Solana blockchain within the Across swapper, enabling cross-chain swaps to and from Solana.
  • Across V3 Contract Updates: Updated the Across SpokePool contract interface to V3, changing address types from address to bytes32 for broader compatibility across different blockchain ecosystems, including Solana.
  • Solana-Specific Logic: Implemented new modules and functions to handle Solana-specific address encoding (bs58 to bytes32), transaction message construction, and gas estimation using Solana's getRecentPrioritizationFees.
  • Dependency and Configuration: Added the borsh serialization library for Solana data structures and updated AcrossDeployment to include Solana chain type and its unique chain ID and asset mappings.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request introduces Solana support to the Across swapper, which is a significant and welcome enhancement. The refactoring to support non-EVM chains is well-structured, particularly the introduction of QuoteContext and RelayRecipient which improves code clarity. However, I've identified several critical issues in the fee calculation logic for Solana swaps that could lead to incorrect quotes. There are also a few medium-severity concerns regarding potential data conversion overflows and indexing that should be addressed to ensure robustness.

Comment on lines +477 to +478
let fee_amount_u64: u64 = fee_amount.try_into().map_err(|_| SwapperError::InvalidAmount("Referral fee overflow".into()))?;
let user_amount_u64: u64 = user_amount.try_into().map_err(|_| SwapperError::InvalidAmount("User amount overflow".into()))?;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The conversion from U256 to u64 for fee_amount and user_amount could lead to an overflow if the token amount is large, especially for tokens with a high number of decimals (e.g., 18). While this is safe for USDC (6 decimals), it would be more robust to handle this potential overflow explicitly, perhaps by checking the amount against u64::MAX before the conversion. This is a limitation of the underlying Solana transfer_checked instruction, but adding a safeguard here would make the code more robust for future tokens.

fn compile_solana_instructions(&self, instructions: &[SolInstruction], accounts: &[SolanaPubkey]) -> Result<Vec<CompiledIx>, SwapperError> {
let mut account_index_map: HashMap<String, u8> = HashMap::new();
for (idx, account) in accounts.iter().enumerate() {
account_index_map.insert(account.to_base58(), (idx + 1) as u8);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The account indices are being generated as 1-based (idx + 1), but Solana's CompiledInstruction format typically uses 0-based indices. This is likely to cause transaction failures on-chain unless the Across handler program specifically expects 1-based indexing. It's recommended to use 0-based indexing to align with standard Solana conventions.

Suggested change
account_index_map.insert(account.to_base58(), (idx + 1) as u8);
account_index_map.insert(account.to_base58(), idx as u8);

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants