Merge pull request #74 from khaadish/fix/creatorAddressdInitialization

fix(sweep-controller): store creator address during initialization

Author: phertyameen

contracts/reserve_contract/src/storage.rs

@@ -33,9 +33,7 @@ pub enum DataKey {
 /// * `amount` – Base reserve in stroops.  Must already be validated as
 ///              positive by the caller.
 pub fn set_base_reserve(env: &Env, amount: i128) {
-    env.storage()
-        .instance()
-        .set(&DataKey::BaseReserve, &amount);
+    env.storage().instance().set(&DataKey::BaseReserve, &amount);
 }
 
 /// Read the base reserve amount from contract storage.

contracts/sweep_controller/src/lib.rs

@@ -28,6 +28,7 @@ impl SweepController {
     /// Returns Error::AuthorizationFailed if called more than once
     pub fn initialize(
         env: Env,
+        creator: Address,
         authorized_signer: BytesN<32>,
         authorized_destination: Option<Address>,
     ) -> Result<(), Error> {
@@ -36,11 +37,9 @@ impl SweepController {
             return Err(Error::AuthorizationFailed);
         }
 
-        // Store the creator address
-        // In Soroban SDK 22.0.0, we need to pass creator as a parameter
-        // For now, we'll use the contract address as a placeholder
-        // TODO: Update to accept creator as parameter if needed
-        let creator = env.current_contract_address();
+        // Require the creator to authorize this initialization
+        creator.require_auth();
+
         storage::set_creator(&env, &creator);
 
         // Store the authorized signer public key

contracts/sweep_controller/tests/integration.rs

@@ -1,27 +1,21 @@
 #![cfg(test)]
 
-use ephemeral_account::{AccountStatus, EphemeralAccountContract, EphemeralAccountContractClient};
+use ephemeral_account::{EphemeralAccountContract, EphemeralAccountContractClient};
 use soroban_sdk::{testutils::Address as _, Address, BytesN, Env};
-use sweep_controller::Error;
 use sweep_controller::{SweepController, SweepControllerClient};
 
 /// Helper function to generate a valid Ed25519 keypair for testing
 /// In a real scenario, these would be generated by the off-chain system
-fn generate_test_keypair() -> (BytesN<32>, BytesN<64>) {
-    // For testing purposes, we use predefined test vectors
-    // Public key (32 bytes) - this is what gets stored in the contract
+fn generate_test_keypair(env: &Env) -> (BytesN<32>, BytesN<64>) {
     let public_key = BytesN::from_array(
-        &Env::default(),
+        env,
         &[
             0x30, 0xd4, 0x18, 0x9f, 0x87, 0x6e, 0xda, 0x97, 0x42, 0xa2, 0x55, 0x14, 0x87, 0x43,
             0xd9, 0x24, 0x9d, 0xf4, 0x12, 0x02, 0x7b, 0x0d, 0xb5, 0x47, 0x69, 0xe9, 0x18, 0xd3,
             0x6f, 0x25, 0x9d, 0x3c,
         ],
     );
-
-    // For testing, we'll generate test signatures using environment's crypto functions
-    let dummy_signature = BytesN::from_array(&Env::default(), &[0u8; 64]);
-
+    let dummy_signature = BytesN::from_array(env, &[0u8; 64]);
     (public_key, dummy_signature)
 }
 
@@ -31,13 +25,14 @@ fn test_initialize_sweep_controller() {
     let env = Env::default();
     env.mock_all_auths();
 
-    let controller_id = env.register_contract(None, SweepController);
+    let creator = Address::generate(&env);
+    let controller_id = env.register(SweepController, ());
     let controller_client = SweepControllerClient::new(&env, &controller_id);
 
-    let (authorized_signer, _) = generate_test_keypair();
+    let (authorized_signer, _) = generate_test_keypair(&env);
 
     // Initialize controller with authorized signer (flexible mode - no destination)
-    controller_client.initialize(&authorized_signer, &None);
+    controller_client.initialize(&creator, &authorized_signer, &None);
 }
 
 /// Test that re-initialization is prevented
@@ -46,17 +41,18 @@ fn test_initialize_prevents_double_init() {
     let env = Env::default();
     env.mock_all_auths();
 
-    let controller_id = env.register_contract(None, SweepController);
+    let creator = Address::generate(&env);
+    let controller_id = env.register(SweepController, ());
     let controller_client = SweepControllerClient::new(&env, &controller_id);
 
-    let (authorized_signer, _) = generate_test_keypair();
+    let (authorized_signer, _) = generate_test_keypair(&env);
 
     // First initialization should succeed
-    controller_client.initialize(&authorized_signer, &None);
+    controller_client.initialize(&creator, &authorized_signer, &None);
 
     // Second initialization should fail
     let result = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
-        controller_client.initialize(&authorized_signer, &None);
+        controller_client.initialize(&creator, &authorized_signer, &None);
     }));
     assert!(result.is_err());
 }
@@ -67,15 +63,16 @@ fn test_execute_sweep_with_valid_signature() {
     let env = Env::default();
     env.mock_all_auths();
 
+    let creator = Address::generate(&env);
     // Deploy and initialize controller
-    let controller_id = env.register_contract(None, SweepController);
+    let controller_id = env.register(SweepController, ());
     let controller_client = SweepControllerClient::new(&env, &controller_id);
 
-    let (authorized_signer, _) = generate_test_keypair();
-    controller_client.initialize(&authorized_signer, &None);
+    let (authorized_signer, _) = generate_test_keypair(&env);
+    controller_client.initialize(&creator, &authorized_signer, &None);
 
     // Deploy ephemeral account
-    let ephemeral_id = env.register_contract(None, EphemeralAccountContract);
+    let ephemeral_id = env.register(EphemeralAccountContract, ());
     let ephemeral_client = EphemeralAccountContractClient::new(&env, &ephemeral_id);
 
     // Setup
@@ -109,15 +106,16 @@ fn test_execute_sweep_with_valid_signature() {
 fn test_execute_sweep_with_invalid_signature() {
     let env = Env::default();
 
+    let creator = Address::generate(&env);
     // Deploy and initialize controller
-    let controller_id = env.register_contract(None, SweepController);
+    let controller_id = env.register(SweepController, ());
     let controller_client = SweepControllerClient::new(&env, &controller_id);
 
-    let (authorized_signer, _) = generate_test_keypair();
-    controller_client.initialize(&authorized_signer, &None);
+    let (authorized_signer, _) = generate_test_keypair(&env);
+    controller_client.initialize(&creator, &authorized_signer, &None);
 
     // Deploy ephemeral account
-    let ephemeral_id = env.register_contract(None, EphemeralAccountContract);
+    let ephemeral_id = env.register(EphemeralAccountContract, ());
     let ephemeral_client = EphemeralAccountContractClient::new(&env, &ephemeral_id);
 
     // Setup
@@ -155,10 +153,10 @@ fn test_sweep_without_payment() {
     let env = Env::default();
     env.mock_all_auths();
 
-    let ephemeral_id = env.register_contract(None, EphemeralAccountContract);
+    let ephemeral_id = env.register(EphemeralAccountContract, ());
     let ephemeral_client = EphemeralAccountContractClient::new(&env, &ephemeral_id);
 
-    let controller_id = env.register_contract(None, SweepController);
+    let controller_id = env.register(SweepController, ());
     let controller_client = SweepControllerClient::new(&env, &controller_id);
 
     let creator = Address::generate(&env);
@@ -180,12 +178,13 @@ fn test_nonce_increment_prevents_replay() {
     let env = Env::default();
     env.mock_all_auths();
 
+    let creator = Address::generate(&env);
     // Deploy and initialize controller
-    let controller_id = env.register_contract(None, SweepController);
+    let controller_id = env.register(SweepController, ());
     let controller_client = SweepControllerClient::new(&env, &controller_id);
 
-    let (authorized_signer, _) = generate_test_keypair();
-    controller_client.initialize(&authorized_signer, &None);
+    let (authorized_signer, _) = generate_test_keypair(&env);
+    controller_client.initialize(&creator, &authorized_signer, &None);
 
     // The nonce system is in place and will be incremented after each successful
     // authorization, making the same signature invalid for the next sweep operation
@@ -198,10 +197,10 @@ fn test_can_sweep() {
     let env = Env::default();
     env.mock_all_auths();
 
-    let ephemeral_id = env.register_contract(None, EphemeralAccountContract);
+    let ephemeral_id = env.register(EphemeralAccountContract, ());
     let ephemeral_client = EphemeralAccountContractClient::new(&env, &ephemeral_id);
 
-    let controller_id = env.register_contract(None, SweepController);
+    let controller_id = env.register(SweepController, ());
     let controller_client = SweepControllerClient::new(&env, &controller_id);
 
     let creator = Address::generate(&env);
@@ -231,12 +230,13 @@ fn test_wrong_signer_rejected() {
     let env = Env::default();
     env.mock_all_auths();
 
+    let creator = Address::generate(&env);
     // Deploy and initialize controller with authorized signer
-    let controller_id = env.register_contract(None, SweepController);
+    let controller_id = env.register(SweepController, ());
     let controller_client = SweepControllerClient::new(&env, &controller_id);
 
-    let (authorized_signer, _) = generate_test_keypair();
-    controller_client.initialize(&authorized_signer, &None);
+    let (authorized_signer, _) = generate_test_keypair(&env);
+    controller_client.initialize(&creator, &authorized_signer, &None);
 
     // Generate a different public key (wrong signer)
     let wrong_signer = BytesN::from_array(
@@ -249,7 +249,7 @@ fn test_wrong_signer_rejected() {
     );
 
     // Deploy ephemeral account
-    let ephemeral_id = env.register_contract(None, EphemeralAccountContract);
+    let ephemeral_id = env.register(EphemeralAccountContract, ());
     let ephemeral_client = EphemeralAccountContractClient::new(&env, &ephemeral_id);
 
     // Setup
@@ -280,11 +280,11 @@ fn test_unauthorized_signer_not_set() {
     env.mock_all_auths();
 
     // Deploy controller without initialization
-    let controller_id = env.register_contract(None, SweepController);
+    let controller_id = env.register(SweepController, ());
     let controller_client = SweepControllerClient::new(&env, &controller_id);
 
     // Deploy ephemeral account
-    let ephemeral_id = env.register_contract(None, EphemeralAccountContract);
+    let ephemeral_id = env.register(EphemeralAccountContract, ());
     let ephemeral_client = EphemeralAccountContractClient::new(&env, &ephemeral_id);
 
     // Setup
@@ -314,14 +314,15 @@ fn test_initialize_with_authorized_destination() {
     let env = Env::default();
     env.mock_all_auths();
 
-    let controller_id = env.register_contract(None, SweepController);
+    let controller_id = env.register(SweepController, ());
     let controller_client = SweepControllerClient::new(&env, &controller_id);
 
-    let (authorized_signer, _) = generate_test_keypair();
+    let creator = Address::generate(&env);
+    let (authorized_signer, _) = generate_test_keypair(&env);
     let authorized_dest = Address::generate(&env);
 
     // Initialize controller with authorized destination
-    controller_client.initialize(&authorized_signer, &Some(authorized_dest.clone()));
+    controller_client.initialize(&creator, &authorized_signer, &Some(authorized_dest.clone()));
 }
 
 /// Test initialization without authorized destination (flexible mode)
@@ -330,13 +331,14 @@ fn test_initialize_without_authorized_destination() {
     let env = Env::default();
     env.mock_all_auths();
 
-    let controller_id = env.register_contract(None, SweepController);
+    let creator = Address::generate(&env);
+    let controller_id = env.register(SweepController, ());
     let controller_client = SweepControllerClient::new(&env, &controller_id);
 
-    let (authorized_signer, _) = generate_test_keypair();
+    let (authorized_signer, _) = generate_test_keypair(&env);
 
     // Initialize controller without authorized destination (flexible mode)
-    controller_client.initialize(&authorized_signer, &None);
+    controller_client.initialize(&creator, &authorized_signer, &None);
 }
 
 /// Test sweep to authorized destination (success)
@@ -346,15 +348,16 @@ fn test_sweep_to_authorized_destination() {
     env.mock_all_auths();
 
     // Deploy and initialize controller
-    let controller_id = env.register_contract(None, SweepController);
+    let controller_id = env.register(SweepController, ());
     let controller_client = SweepControllerClient::new(&env, &controller_id);
 
-    let (authorized_signer, _) = generate_test_keypair();
+    let creator = Address::generate(&env);
+    let (authorized_signer, _) = generate_test_keypair(&env);
     let authorized_dest = Address::generate(&env);
-    controller_client.initialize(&authorized_signer, &Some(authorized_dest.clone()));
+    controller_client.initialize(&creator, &authorized_signer, &Some(authorized_dest.clone()));
 
     // Deploy ephemeral account
-    let ephemeral_id = env.register_contract(None, EphemeralAccountContract);
+    let ephemeral_id = env.register(EphemeralAccountContract, ());
     let ephemeral_client = EphemeralAccountContractClient::new(&env, &ephemeral_id);
 
     // Setup
@@ -385,16 +388,17 @@ fn test_sweep_to_unauthorized_destination() {
     env.mock_all_auths();
 
     // Deploy and initialize controller
-    let controller_id = env.register_contract(None, SweepController);
+    let controller_id = env.register(SweepController, ());
     let controller_client = SweepControllerClient::new(&env, &controller_id);
 
-    let (authorized_signer, _) = generate_test_keypair();
+    let creator = Address::generate(&env);
+    let (authorized_signer, _) = generate_test_keypair(&env);
     let authorized_dest = Address::generate(&env);
     let unauthorized_dest = Address::generate(&env);
-    controller_client.initialize(&authorized_signer, &Some(authorized_dest.clone()));
+    controller_client.initialize(&creator, &authorized_signer, &Some(authorized_dest.clone()));
 
     // Deploy ephemeral account
-    let ephemeral_id = env.register_contract(None, EphemeralAccountContract);
+    let ephemeral_id = env.register(EphemeralAccountContract, ());
     let ephemeral_client = EphemeralAccountContractClient::new(&env, &ephemeral_id);
 
     // Setup
@@ -425,15 +429,16 @@ fn test_update_authorized_destination_by_creator() {
     let env = Env::default();
     env.mock_all_auths();
 
-    let controller_id = env.register_contract(None, SweepController);
+    let controller_id = env.register(SweepController, ());
     let controller_client = SweepControllerClient::new(&env, &controller_id);
 
-    let (authorized_signer, _) = generate_test_keypair();
+    let creator = Address::generate(&env);
+    let (authorized_signer, _) = generate_test_keypair(&env);
     let initial_dest = Address::generate(&env);
     let new_dest = Address::generate(&env);
 
     // Initialize with authorized destination
-    controller_client.initialize(&authorized_signer, &Some(initial_dest.clone()));
+    controller_client.initialize(&creator, &authorized_signer, &Some(initial_dest.clone()));
 
     // Update destination as creator (with mocked auth) - should succeed
     controller_client.update_authorized_destination(&new_dest);
@@ -446,16 +451,17 @@ fn test_update_authorized_destination_by_non_creator() {
     let env = Env::default();
     // Don't mock auths - we want to test that non-creator fails
 
-    let controller_id = env.register_contract(None, SweepController);
+    let controller_id = env.register(SweepController, ());
     let controller_client = SweepControllerClient::new(&env, &controller_id);
 
-    let (authorized_signer, _) = generate_test_keypair();
+    let creator = Address::generate(&env);
+    let (authorized_signer, _) = generate_test_keypair(&env);
     let initial_dest = Address::generate(&env);
     let new_dest = Address::generate(&env);
 
     // Initialize with authorized destination
     // The invoker of initialize becomes the creator
-    controller_client.initialize(&authorized_signer, &Some(initial_dest.clone()));
+    controller_client.initialize(&creator, &authorized_signer, &Some(initial_dest.clone()));
 
     // Try to update destination - should fail because current invoker != creator
     // (In tests, the invoker is typically the contract itself or test framework)
@@ -473,22 +479,23 @@ fn test_update_destination_before_sweep() {
     let env = Env::default();
     env.mock_all_auths();
 
-    let controller_id = env.register_contract(None, SweepController);
+    let controller_id = env.register(SweepController, ());
     let controller_client = SweepControllerClient::new(&env, &controller_id);
 
-    let (authorized_signer, _) = generate_test_keypair();
+    let creator = Address::generate(&env);
+    let (authorized_signer, _) = generate_test_keypair(&env);
     let initial_dest = Address::generate(&env);
     let new_dest = Address::generate(&env);
 
     // Initialize with authorized destination
-    controller_client.initialize(&authorized_signer, &Some(initial_dest.clone()));
+    controller_client.initialize(&creator, &authorized_signer, &Some(initial_dest.clone()));
 
     // Update destination before any sweep - should succeed
     controller_client.update_authorized_destination(&new_dest);
 
     // Verify the destination was updated by trying to sweep to new destination
     // (The actual sweep may fail due to signature, but destination validation should pass)
-    let ephemeral_id = env.register_contract(None, EphemeralAccountContract);
+    let ephemeral_id = env.register(EphemeralAccountContract, ());
     let ephemeral_client = EphemeralAccountContractClient::new(&env, &ephemeral_id);
 
     let creator = Address::generate(&env);