Merge pull request #14 from blend-capital/transfer-from

fix: add option to use transfer_from

backstop/src/backstop/deposit.rs

@@ -65,6 +65,12 @@ mod tests {
         mock_pool_factory_client.set_pool(&pool_0_id);
         mock_pool_factory_client.set_pool(&pool_1_id);
 
+        backstop_token_client.approve(
+            &frodo,
+            &backstop_address,
+            &25_0000000,
+            &e.ledger().sequence(),
+        );
         // initialize pool 0 with funds + some profit
         e.as_contract(&backstop_address, || {
             execute_deposit(&e, &frodo, &pool_0_id, 25_0000000);
@@ -234,6 +240,12 @@ mod tests {
         mock_pool_factory_client.set_pool(&pool_0_id);
         mock_pool_factory_client.set_pool(&pool_1_id);
 
+        backstop_token_client.approve(
+            &frodo,
+            &backstop_address,
+            &(10_000_000 * SCALAR_7),
+            &e.ledger().sequence(),
+        );
         // initialize pool 0 with funds + some profit
         e.as_contract(&backstop_address, || {
             execute_deposit(&e, &frodo, &pool_0_id, SCALAR_7);

backstop/src/backstop/fund_management.rs

@@ -34,7 +34,12 @@ pub fn execute_donate(e: &Env, from: &Address, pool_address: &Address, amount: i
     require_is_from_pool_factory(e, pool_address, pool_balance.shares);
 
     let backstop_token = TokenClient::new(e, &storage::get_backstop_token(e));
-    backstop_token.transfer(from, &e.current_contract_address(), &amount);
+    backstop_token.transfer_from(
+        &e.current_contract_address(),
+        from,
+        &e.current_contract_address(),
+        &amount,
+    );
 
     pool_balance.deposit(amount, 0);
     storage::set_pool_balance(e, pool_address, &pool_balance);
@@ -102,6 +107,7 @@ mod tests {
             execute_deposit(&e, &frodo, &pool_0_id, 25_0000000);
         });
 
+        backstop_token_client.approve(&samwise, &backstop_id, &30_0000000, &e.ledger().sequence());
         e.as_contract(&backstop_id, || {
             execute_donate(&e, &samwise, &pool_0_id, 30_0000000);
 

backstop/src/backstop/withdrawal.rs

@@ -328,6 +328,12 @@ mod tests {
             max_entry_ttl: 3110400,
         });
 
+        backstop_token_client.approve(
+            &samwise,
+            &backstop_address,
+            &50_0000000,
+            &e.ledger().sequence(),
+        );
         // setup pool with queue for withdrawal and allow the backstop to incur a profit
         e.as_contract(&backstop_address, || {
             execute_deposit(&e, &samwise, &pool_address, 100_0000000);
@@ -395,6 +401,12 @@ mod tests {
             max_entry_ttl: 3110400,
         });
 
+        backstop_token_client.approve(
+            &samwise,
+            &backstop_address,
+            &50_0000000,
+            &e.ledger().sequence(),
+        );
         // setup pool with queue for withdrawal and allow the backstop to incur a profit
         e.as_contract(&backstop_address, || {
             execute_deposit(&e, &samwise, &pool_address, 100_0000000);

backstop/src/contract.rs

@@ -157,7 +157,7 @@ pub trait Backstop {
     /// * `amount` - The amount of BLND to add
     ///
     /// ### Errors
-    /// If the `pool_address` is not valid, or if the pool does not
+    /// If the `pool_address` is not valid, backstop does not have sufficient allowance from `from`, or if the pool does not
     /// authorize the call
     fn donate(e: Env, from: Address, pool_address: Address, amount: i128);
 

pool/src/auctions/backstop_interest_auction.rs

@@ -744,6 +744,13 @@ mod tests {
             ],
             block: 51,
         };
+
+        backstop_token_client.approve(
+            &samwise,
+            &backstop_address,
+            &75_0000000,
+            &e.ledger().sequence(),
+        );
         e.as_contract(&pool_address, || {
             e.mock_all_auths_allowing_non_root_auth();
             storage::set_auction(

pool/src/contract.rs

@@ -131,6 +131,26 @@ pub trait Pool {
         requests: Vec<Request>,
     ) -> Positions;
 
+    /// Submit a set of requests to the pool where 'from' takes on the position, 'spender' sends any
+    /// required tokens to the pool USING transfer_from and 'to' receives any tokens sent from the pool.
+    ///
+    /// Returns the new positions for 'from'
+    ///
+    /// ### Arguments
+    /// * `from` - The address of the user whose positions are being modified
+    /// * `spender` - The address of the user who is sending tokens to the pool
+    /// * `to` - The address of the user who is receiving tokens from the pool
+    /// * `requests` - A vec of requests to be processed
+    ///
+    /// ### Panics
+    /// If the request is not able to be completed for cases like insufficient funds, insufficient allowance, or invalid health factor
+    fn submit_with_allowance(
+        e: Env,
+        from: Address,
+        spender: Address,
+        to: Address,
+        requests: Vec<Request>,
+    ) -> Positions;
     /// Manage bad debt. Debt is considered "bad" if there is no longer has any collateral posted.
     ///
     /// To manage a user's bad debt, all collateralized reserves for the user must be liquidated
@@ -358,7 +378,23 @@ impl Pool for PoolContract {
             from.require_auth();
         }
 
-        pool::execute_submit(&e, &from, &spender, &to, requests)
+        pool::execute_submit(&e, &from, &spender, &to, requests, false)
+    }
+
+    fn submit_with_allowance(
+        e: Env,
+        from: Address,
+        spender: Address,
+        to: Address,
+        requests: Vec<Request>,
+    ) -> Positions {
+        storage::extend_instance(&e);
+        spender.require_auth();
+        if from != spender {
+            from.require_auth();
+        }
+
+        pool::execute_submit(&e, &from, &spender, &to, requests, true)
     }
 
     fn bad_debt(e: Env, user: Address) {