fix: svm dependencies

Cargo.toml

@@ -20,10 +20,10 @@ serde = "1.0"
 serde_json = "1.0"
 serde_with = "3.9.0"
 ethers = "2.0.14"
-solana-sdk = "2.0.13"
-solana-rpc-client = "2.0.13"
-solana-transaction-status = "2.0.13"
-solana-client = "2.0.13"
+solana-sdk = "2.1.0"
+solana-rpc-client = "=2.1.0"
+solana-transaction-status = "=2.1.0"
+solana-client = "=2.1.0"
 email_address = "0.2.4"
 anyhow = "1.0.75"
 strum = "0.26.3"
@@ -38,11 +38,5 @@ async-stream = "0.3.5"
 serde_yaml = "0.9.25"
 url = "2.5.4"
 rand = "0.8.5"
-
-# The curve25519-dalek crate is a dependency of solana-sdk.
-# This crate relies on a specific version of zeroize that is incompatible with many other packages.
-# You can find more details in this issue https://github.com/solana-labs/solana/issues/26688
-# Solana Labs has provided a solution for some of these package incompatibilities, which can be found here https://github.com/solana-labs/solana/blob/27eff8408b7223bb3c4ab70523f8a8dca3ca6645/Cargo.toml#L514
-[patch.crates-io.curve25519-dalek]
-git = "https://github.com/solana-labs/curve25519-dalek.git"
-rev = "b500cdc2a920cd5bff9e2dd974d7b97349d61464"
+anchor-lang = { git = "https://github.com/coral-xyz/anchor", rev = "6df05aa" }
+litesvm = { git = "https://github.com/LiteSVM/litesvm", rev = "5346e86" }

auction-server/Cargo.toml

@@ -46,10 +46,10 @@ solana-sdk = { workspace = true }
 solana-client = { workspace = true }
 bincode = { workspace = true }
 serde_with = { workspace = true, features = ["base64"] }
-anchor-lang = "0.30.1"
+anchor-lang = { workspace = true }
 express-relay = { path = "../contracts/svm/programs/express_relay" }
 solana-rpc-client ={ workspace = true }
 solana-transaction-status = { workspace = true }
 borsh = "1.5.1"
-litesvm = "0.3.0"
+litesvm = { workspace = true }
 express-relay-api-types = { path = "api-types" }

auction-server/src/auction/service/verification.rs

@@ -391,7 +391,7 @@ impl Service<Svm> {
     pub fn extract_submit_bid_data(
         instruction: &CompiledInstruction,
     ) -> Result<express_relay_svm::SubmitBidArgs, RestError> {
-        let discriminator = express_relay_svm::instruction::SubmitBid::discriminator();
+        let discriminator = express_relay_svm::instruction::SubmitBid::DISCRIMINATOR;
         express_relay_svm::SubmitBidArgs::try_from_slice(
             &instruction.data.as_slice()[discriminator.len()..],
         )
@@ -417,7 +417,7 @@ impl Service<Svm> {
 
                 instruction
                     .data
-                    .starts_with(&express_relay_svm::instruction::SubmitBid::discriminator())
+                    .starts_with(express_relay_svm::instruction::SubmitBid::DISCRIMINATOR)
             })
             .cloned()
             .collect();