chore: override user inputs when swapping

Author: bishalbikram

contracts/soroban/contracts/intent/src/error.rs

@@ -13,7 +13,5 @@ pub enum ContractError {
     OrderNotFound = 7,
     OrderAlreadyFilled = 8,
     OrderMismatched = 9,
-    InvalidEmitterAddress = 10,
-    InvalidNetwork = 11,
-    NetworkIdMisconfigured = 12,
+    InvalidNetwork = 10,
 }

contracts/soroban/contracts/intent/src/swap.rs

@@ -9,18 +9,13 @@ pub fn swap_order(env: &Env, order: SwapOrder) -> Result<(), ContractError> {
 
     sender.require_auth();
 
-    if order.src_nid() != storage::nid(&env)? {
-        return Err(ContractError::NetworkIdMisconfigured);
-    }
-    if order.emitter() != contract_address.to_string() {
-        return Err(ContractError::InvalidEmitterAddress);
-    }
-
     let token = Address::from_string(&order.token());
     helpers::transfer_token(&env, &token, &sender, &contract_address, order.amount());
 
     let deposit_id = storage::increment_deposit_id(&env);
     order.set_id(deposit_id);
+    order.set_src_nid(storage::nid(&env)?);
+    order.set_emitter(contract_address.to_string());
 
     storage::store_order(&env, deposit_id, &order);
     event::swap_intent(

contracts/soroban/contracts/intent/src/test/cancel.rs

@@ -132,7 +132,7 @@ fn test_resolve_cancel_in_same_source_and_destination_chain() {
 }
 
 #[test]
-#[should_panic(expected = "HostError: Error(Contract, #11)")]
+#[should_panic(expected = "HostError: Error(Contract, #10)")]
 fn test_resolve_cancel_with_invalid_network_id() {
     let ctx = TestContext::default();
     let client = IntentClient::new(&ctx.env, &ctx.contract);

contracts/soroban/contracts/intent/src/test/fill.rs

@@ -188,7 +188,7 @@ fn test_resolve_fill() {
 }
 
 #[test]
-#[should_panic(expected = "HostError: Error(Contract, #11)")]
+#[should_panic(expected = "HostError: Error(Contract, #10)")]
 fn test_resolve_fill_with_invalid_network_id() {
     let ctx = TestContext::default();
     let client = IntentClient::new(&ctx.env, &ctx.contract);

contracts/soroban/contracts/intent/src/test/swap.rs

@@ -8,31 +8,6 @@ extern crate std;
 use super::setup::TestContext;
 use crate::{contract::IntentClient, event::SwapIntent, types::SwapOrder};
 
-#[test]
-#[should_panic(expected = "HostError: Error(Contract, #12)")]
-fn test_swap_with_misconfigured_network_id() {
-    let ctx = TestContext::default();
-    let client = IntentClient::new(&ctx.env, &ctx.contract);
-    ctx.init_context(&client);
-
-    let src_nid = String::from_str(&ctx.env, "icon");
-    let order = SwapOrder::new(
-        1,
-        ctx.contract.to_string(),
-        src_nid,
-        String::from_str(&ctx.env, "solana"),
-        ctx.admin.to_string(),
-        ctx.admin.to_string(),
-        ctx.native_token.to_string(),
-        100,
-        ctx.native_token.to_string(),
-        100,
-        bytes!(&ctx.env, 0x00),
-    );
-
-    client.swap(&order);
-}
-
 #[test]
 #[should_panic(expected = "HostError: Error(Contract, #10)")]
 fn test_swap_with_invalid_emitter_address() {

contracts/soroban/contracts/intent/src/types/swap_order.rs

@@ -65,6 +65,14 @@ impl SwapOrder {
         self.id = id
     }
 
+    pub fn set_src_nid(&mut self, nid: String) {
+        self.src_nid = nid
+    }
+
+    pub fn set_emitter(&mut self, emitter: String) {
+        self.emitter = emitter
+    }
+
     pub fn emitter(&self) -> String {
         self.emitter.clone()
     }