feat: added atoken proper transfer functionality

Author: mpsc0x

aave-core/sources/aave-tokens/a_token_factory.move

@@ -32,6 +32,7 @@ module aave_pool::a_token_factory {
     friend aave_pool::supply_logic;
     friend aave_pool::borrow_logic;
     friend aave_pool::liquidation_logic;
+    friend aave_pool::gho_direct_minter;
 
     #[test_only]
     friend aave_pool::a_token_factory_tests;
@@ -617,6 +618,21 @@ module aave_pool::a_token_factory {
         );
     }
 
+    /// @notice Transfers out any token from an aToken's resource account to a receiver
+    /// @param token The address of the token to transfer
+    /// @param to The address of the recipient
+    /// @param amount The amount of token to transfer
+    /// @param metadata_address The address of the aToken
+    public(friend) fun transfer_atokens(
+        from: address,
+        to: address,
+        amount: u256,
+        index: u256,
+        metadata_address: address
+    ) acquires TokenMap {
+        transfer_on_liquidation(from, to, amount, index, metadata_address);
+    }
+
     /// @notice Drops the a token associated data
     /// @dev Only callable by the pool_token_logic module
     /// @param metadata_address The address of the metadata object

aave-core/sources/gho-direct-minter/gho_direct_minter.move

@@ -4,9 +4,6 @@
 module aave_pool::gho_direct_minter {
     // Std imports
     use std::signer;
-    use aptos_framework::dispatchable_fungible_asset;
-    use aptos_framework::primary_fungible_store;
-    use aptos_framework::fungible_asset::Metadata;
     use aptos_framework::object::{
         Self,
         ExtendRef as ObjExtendRef,
@@ -126,7 +123,7 @@ module aave_pool::gho_direct_minter {
         // check: gho_reserve_entity must have RISK ADMIN ROLE for the pool
         is_risk_admin(gho_reserve_entity);
 
-        // check: the gho_reserve_entity must be registered as a Facilitator with a non zero bucket capacity
+        // check: the gho_reserve_entity must be registered as a entity with a non zero limit
         let (_, _) = ensure_entity_gho_usage(gho_reserve_entity);
 
         // withdraw GHO underlying asset i.e. burn Atokens and send back the underlying to the primary store of the gho_reserve_entity
@@ -173,21 +170,17 @@ module aave_pool::gho_direct_minter {
         if (excess_level == 0) {
             return;
         };
-
-        // transfer the excess to the treasury
-        let a_token_metadata = object::address_to_object<Metadata>(a_token_address);
-        let store_from =
-            primary_fungible_store::primary_store(gho_reserve_entity, a_token_metadata);
-        let store_to =
-            primary_fungible_store::ensure_primary_store_exists(
-                gho_direct_minter_data.collector_address, a_token_metadata
-            );
-
-        dispatchable_fungible_asset::transfer(
-            &minter_signer,
-            store_from,
-            store_to,
-            (excess_level as u64)
+        // get the underlying asset index
+        let underlying_asset =
+            a_token_factory::get_underlying_asset_address(a_token_address);
+        let index = pool::get_reserve_normalized_income(underlying_asset);
+        // Transfer the excess level of atokens from the gho_reserve_entity to the collector address
+        a_token_factory::transfer_atokens(
+            gho_reserve_entity,
+            gho_direct_minter_data.collector_address,
+            excess_level,
+            index,
+            a_token_address
         );
     }
 

aave-core/tests/gho-direct-minter/gho_direct_minter.move renamed to aave-core/tests/gho-direct-minter/gho_direct_minter_tests.move

@@ -277,7 +277,7 @@ module aave_pool::gho_direct_minter_tests {
         )
     ]
     #[expected_failure(abort_code = 105, location = aave_pool::gho_direct_minter)]
-    fun test_direct_minter_supply_0_bucket_capacity(
+    fun test_direct_minter_supply_0_entity_limit(
         aave_pool: &signer,
         aave_acl: &signer,
         aave_std: &signer,
@@ -443,12 +443,12 @@ module aave_pool::gho_direct_minter_tests {
         let emitted_supply_events = emitted_events<supply_logic::Supply>();
         assert!(vector::length(&emitted_supply_events) == 1, TEST_SUCCESS);
 
-        // Check the atoken balance of the facilitator after minting
+        // Check the atoken balance of the entity after minting
         let gho_reserve_entity_atoken_balance_after =
             a_token_factory::balance_of(gho_reserve_entity, atoken_address);
         assert!(gho_reserve_entity_atoken_balance_after == supply_amount, TEST_SUCCESS);
 
-        // Check the gho balance of the facilitator after the supply (should be zero)
+        // Check the gho balance of the entity after the supply (should be zero)
         let gho_balance_after_supply = gho_token::get_balance(gho_reserve_entity);
         assert!(gho_balance_after_supply == 0, TEST_SUCCESS);
 
@@ -642,7 +642,27 @@ module aave_pool::gho_direct_minter_tests {
             TEST_SUCCESS
         );
 
+        // Check the atoken balance of the collector before the transfer is exactly zero
+        let a_token_collector_balance_before =
+            a_token_factory::balance_of(
+                gho_direct_minter::get_collector_address(), atoken_address
+            );
+        assert!(
+            a_token_collector_balance_before == 0,
+            TEST_SUCCESS
+        );
+
         // Transfer the excess to the treasury
-        // gho_direct_minter::transfer_excess_to_treasury(); // FIXME: the atoken stores are frozen
+        gho_direct_minter::transfer_excess_to_treasury();
+
+        // Check the atoken balance of the collector after the transfer is greater than zero
+        let a_token_collector_balance_after =
+            a_token_factory::balance_of(
+                gho_direct_minter::get_collector_address(), atoken_address
+            );
+        assert!(
+            a_token_collector_balance_after > 0,
+            TEST_SUCCESS
+        );
     }
 }