Merge pull request #426 from emarc99/fix/transfer_admin_validation_bug

Fix: Admin Transfer Validation & Test Stability

Author: leojay-net

stellar-contracts/src/lib.rs

@@ -40,6 +40,7 @@ pub enum Error {
     NoPendingAdmin = 203,
     InvalidRecipient = 204,
     NotOperator = 205,
+    SameAdmin = 207,
     OperatorCapReached = 206,
 
     // --- 300 series: Constraints & Limits ---
@@ -1174,6 +1175,9 @@ impl FiatBridge {
             .get(&DataKey::Admin)
             .ok_or(Error::NotInitialized)?;
         admin.require_auth();
+        if new_admin == admin {
+            return Err(Error::SameAdmin);
+        }
         env.storage()
             .instance()
             .set(&DataKey::PendingAdmin, &new_admin);

stellar-contracts/src/test.rs

@@ -328,6 +328,21 @@ fn test_transfer_admin() {
     assert_eq!(bridge.get_admin(), new_admin);
 }
 
+#[test]
+fn test_transfer_admin_to_self_fails() {
+    let env = Env::default();
+    env.mock_all_auths();
+
+    let (_, bridge, admin, _, _, _) = setup_bridge(&env, 100);
+
+    // Attempting to transfer to self should fail with InvalidRecipient
+    let result = bridge.try_transfer_admin(&admin);
+    assert_eq!(result, Err(Ok(Error::SameAdmin)));
+    
+    // Admin should remain the same
+    assert_eq!(bridge.get_admin(), admin);
+}
+
 #[test]
 fn test_set_limit() {
     let env = Env::default();
@@ -3061,6 +3076,8 @@ fn test_withdraw_to_self_address_rejected() {
     bridge.deposit(&user, &500, &token_addr, &Bytes::new(&env), &0, &0, &None);
 
     // Attempt to withdraw to the contract's own address — should be rejected
+    // Order: caller, to, amount, token
+
     let result = bridge.try_withdraw(&admin, &contract_id, &100, &token_addr);
     assert_eq!(result, Err(Ok(Error::InvalidRecipient)));
 
@@ -3181,3 +3198,4 @@ fn test_set_min_deposit_admin_only() {
     let result = bridge.try_set_min_deposit(&0);
     assert_eq!(result, Err(Ok(Error::BelowMinimum)));
 }
+