Add svm bid data extraction from transaction

auction-server/Cargo.toml

@@ -46,7 +46,6 @@ serde_path_to_error = "0.1.16"
 solana-sdk = "2.0.7"
 bincode = "1.3.3"
 serde_with = "3.9.0"
-anchor-lang-idl = { version = "0.1.1", features = ["convert"] }
 anchor-lang = "0.30.1"
 express-relay = { path = "../contracts/svm/programs/express_relay" }
 

auction-server/src/auction.rs

@@ -923,30 +923,34 @@ fn extract_account_svm(
     instruction: CompiledInstruction,
     position: usize,
 ) -> Result<Pubkey, RestError> {
-    if instruction.accounts.len() <= position {
-        tracing::error!(
-            "Account position not found in instruction: {:?} - {}",
-            instruction,
-            position,
-        );
-        return Err(RestError::BadParameters(
-            "Permission account not found in submit_bid instruction".to_string(),
-        ));
-    }
-
-    let account_position = instruction.accounts[position] as usize;
-    if account_position >= accounts.len() {
-        tracing::error!(
-            "Account not found in transaction accounts: {:?} - {}",
-            accounts,
-            account_position,
-        );
-        return Err(RestError::BadParameters(
-            "Permission account not found in transaction accounts".to_string(),
-        ));
+    match instruction.accounts.get(position) {
+        None => {
+            tracing::error!(
+                "Account position not found in instruction: {:?} - {}",
+                instruction,
+                position,
+            );
+            Err(RestError::BadParameters(
+                "Account not found in submit_bid instruction".to_string(),
+            ))
+        }
+        Some(account_position) => {
+            let account_position: usize = (*account_position).into();
+            match accounts.get(position) {
+                None => {
+                    tracing::error!(
+                        "Account not found in transaction accounts: {:?} - {}",
+                        accounts,
+                        account_position,
+                    );
+                    Err(RestError::BadParameters(
+                        "Account not found in transaction accounts".to_string(),
+                    ))
+                }
+                Some(account) => Ok(*account),
+            }
+        }
     }
-
-    Ok(accounts[account_position])
 }
 
 fn extract_bid_data_svm(

auction-server/src/server.rs

@@ -33,10 +33,6 @@ use {
         },
         traced_client::TracedClient,
     },
-    anchor_lang_idl::{
-        convert::convert_idl,
-        types::Idl,
-    },
     anyhow::anyhow,
     axum_prometheus::{
         metrics_exporter_prometheus::{
@@ -69,7 +65,6 @@ use {
     },
     std::{
         collections::HashMap,
-        fs,
         sync::{
             atomic::{
                 AtomicBool,
@@ -233,12 +228,6 @@ async fn setup_chain_store(
     .collect()
 }
 
-pub fn load_express_relay_idl() -> anyhow::Result<Idl> {
-    let idl = fs::read("../contracts/svm/target/idl/express_relay.json")?;
-    convert_idl(idl.as_slice())
-        .map_err(|err| anyhow!("Failed to convert express relay idl: {:?}", err))
-}
-
 const NOTIFICATIONS_CHAN_LEN: usize = 1000;
 pub async fn start_server(run_options: RunOptions) -> anyhow::Result<()> {
     tokio::spawn(async move {
@@ -269,7 +258,6 @@ pub async fn start_server(run_options: RunOptions) -> anyhow::Result<()> {
 
     let chains_svm = setup_chain_store_svm(config_map);
     let express_relay_svm = ExpressRelaySvm {
-        idl:                         load_express_relay_idl()?,
         permission_account_position: env!("SUBMIT_BID_PERMISSION_ACCOUNT_POSITION")
             .parse::<usize>()
             .expect("Failed to parse permission account position"),

auction-server/src/state.rs

@@ -17,7 +17,6 @@ use {
         models,
         traced_client::TracedClient,
     },
-    anchor_lang_idl::types::Idl,
     axum::Json,
     axum_prometheus::metrics_exporter_prometheus::PrometheusHandle,
     base64::{
@@ -298,7 +297,6 @@ pub struct BidStatusWithId {
 
 #[derive(Clone)]
 pub struct ExpressRelaySvm {
-    pub idl:                         Idl,
     pub permission_account_position: usize,
     pub router_account_position:     usize,
 }