address comments

pyth-network · Jan 7, 2025 · 9be3f91 · 9be3f91
1 parent e15e583
commit 9be3f91
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/auction-server/api-types/Cargo.toml b/auction-server/api-types/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "express-relay-api-types"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 description = "Pyth Express Relay api types"
 repository = "https://github.com/pyth-network/per"

diff --git a/auction-server/src/auction/service/verification.rs b/auction-server/src/auction/service/verification.rs
@@ -418,9 +418,7 @@ impl Service<Svm> {
         express_relay_svm::SwapArgs::try_from_slice(
             &instruction.data.as_slice()[discriminator.len()..],
         )
-        .map_err(|e| {
-            RestError::BadParameters(format!("Invalid submit_bid instruction data: {}", e))
-        })
+        .map_err(|e| RestError::BadParameters(format!("Invalid swap instruction data: {}", e)))
     }
 
     pub fn extract_express_relay_bid_instruction(
@@ -558,7 +556,6 @@ impl Service<Svm> {
                             .router_account_position_swap,
                     )
                     .await?;
-                // TODO*: should work to remove this
                 if router != self.config.chain_config.wallet_program_router_account {
                     return Err(RestError::BadParameters(
                         "Must use approved router for swap instruction".to_string(),

diff --git a/auction-server/src/opportunity/service/get_quote.rs b/auction-server/src/opportunity/service/get_quote.rs
@@ -97,6 +97,10 @@ impl Service<ChainTypeSvm> {
         program: &ProgramSvm,
     ) -> Result<entities::OpportunityCreateSvm, RestError> {
         let router = quote_create.router;
+        let chain_config = self.get_config(&quote_create.chain_id)?;
+        if router != chain_config.wallet_program_router_account {
+            return Err(RestError::Forbidden);
+        }
         let permission_account =
             get_quote_permission_key(&quote_create.tokens, &quote_create.user_wallet_address);
 

diff --git a/auction-server/src/opportunity/service/mod.rs b/auction-server/src/opportunity/service/mod.rs
@@ -31,6 +31,7 @@ use {
         types::Address,
     },
     futures::future::try_join_all,
+    solana_sdk::pubkey::Pubkey,
     std::{
         collections::HashMap,
         sync::Arc,
@@ -81,7 +82,8 @@ impl ConfigEvm {
 
 // NOTE: Do not implement debug here. it has a circular reference to auction_service
 pub struct ConfigSvm {
-    pub auction_service: RwLock<Option<auction_service::Service<Svm>>>,
+    pub auction_service:               RwLock<Option<auction_service::Service<Svm>>>,
+    pub wallet_program_router_account: Pubkey,
 }
 
 impl ConfigSvm {
@@ -194,11 +196,12 @@ impl ConfigSvm {
     ) -> anyhow::Result<HashMap<ChainId, Self>> {
         Ok(chains
             .iter()
-            .map(|(chain_id, _)| {
+            .map(|(chain_id, config)| {
                 (
                     chain_id.clone(),
                     Self {
-                        auction_service: RwLock::new(None),
+                        auction_service:               RwLock::new(None),
+                        wallet_program_router_account: config.wallet_program_router_account,
                     },
                 )
             })

diff --git a/auction-server/src/state.rs b/auction-server/src/state.rs
@@ -31,6 +31,7 @@ use {
         Response,
         RpcLogsResponse,
     },
+    solana_sdk::pubkey::Pubkey,
     std::{
         collections::HashMap,
         sync::Arc,
@@ -103,10 +104,11 @@ impl ChainStoreEvm {
 }
 
 pub struct ChainStoreSvm {
-    pub log_sender:          Sender<Response<RpcLogsResponse>>,
+    pub log_sender:                    Sender<Response<RpcLogsResponse>>,
     // only to avoid closing the channel
-    pub _dummy_log_receiver: Receiver<Response<RpcLogsResponse>>,
-    pub config:              ConfigSvm,
+    pub _dummy_log_receiver:           Receiver<Response<RpcLogsResponse>>,
+    pub config:                        ConfigSvm,
+    pub wallet_program_router_account: Pubkey,
 }
 
 impl ChainStoreSvm {
@@ -116,6 +118,7 @@ impl ChainStoreSvm {
         Self {
             log_sender: tx,
             _dummy_log_receiver: rx,
+            wallet_program_router_account: config.wallet_program_router_account,
             config,
         }
     }

diff --git a/sdk/rust/Cargo.toml b/sdk/rust/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "express-relay-client"
-version = "0.2.1"
+version = "0.3.0"
 edition = "2021"
 description = "Pyth Express Relay client"
 repository = "https://github.com/pyth-network/per"
 license = "Apache-2.0"
 
 [dependencies]
-express-relay-api-types = { version = "0.1.0", path = "../../auction-server/api-types" }
+express-relay-api-types = { version = "0.2.0", path = "../../auction-server/api-types" }
 reqwest = { version = "0.12.9", features = ["json"] }
 url = { workspace = true}
 serde = { workspace = true }