Sync updates to escrow protection for aptos (#1428)

Author: abaltes-lz

examples/oft-adapter-aptos-move/sources/oft_implementation/oft_adapter_fa.move

@@ -9,6 +9,7 @@
 module oft::oft_adapter_fa {
     use std::coin::Coin;
     use std::fungible_asset::{Self, FungibleAsset, Metadata};
+    use std::object::ObjectCore;
     use std::object::{Self, address_to_object, ExtendRef, Object, object_exists};
     use std::option::{Self, Option};
     use std::primary_fungible_store;
@@ -298,8 +299,8 @@ module oft::oft_adapter_fa {
         let constructor_ref = &object::create_named_object(account, b"fa_escrow");
         let escrow_extend_ref = object::generate_extend_ref(constructor_ref);
 
-        // Disable the transfer of the escrow object
-        object::disable_ungated_transfer(&object::generate_transfer_ref(constructor_ref));
+        // Disown the escrow object to prevent withdrawal by transient owner
+        object::transfer(account, object::object_from_constructor_ref<ObjectCore>(constructor_ref), @0x0);
 
         // Initialize the storage and save the ExtendRef for future signer generation
         move_to(move account, OftImpl {

examples/oft-adapter-aptos-move/sources/shared_oapp/oapp_compose.move

@@ -11,7 +11,6 @@ module oft::oapp_store {
 
     friend oft::oapp_core;
     friend oft::oapp_receive;
-    friend oft::oapp_compose;
     friend oft::oft;
 
     // ************************************************* CONFIGURATION *************************************************

examples/oft-adapter-aptos-move/sources/shared_oapp/oapp_store.move

@@ -36,7 +36,6 @@ module oft::oft {
     use oft_common::oft_limit::OftLimit;
 
     friend oft::oapp_receive;
-    friend oft::oapp_compose;
 
     // ======================================== For FungibleAsset Enabled OFTs ========================================
 

examples/oft-adapter-aptos-move/sources/shared_oft/oft.move

@@ -4,11 +4,11 @@
 module oft::oft_adapter_fa_tests {
     use std::account::{create_account_for_test, create_signer_for_test};
     use std::event::was_event_emitted;
-    use std::fungible_asset::{Self, Metadata};
-    use std::fungible_asset::{mint, MintRef};
+    use std::fungible_asset::{Self, FungibleStore, Metadata, mint, MintRef};
     use std::object::address_to_object;
     use std::option;
     use std::primary_fungible_store;
+    use std::primary_fungible_store::ensure_primary_store_exists;
     use std::timestamp;
     use std::vector;
 
@@ -91,6 +91,47 @@ module oft::oft_adapter_fa_tests {
         assert!(balance == 123456700, 0);
     }
 
+    #[test]
+    #[expected_failure(abort_code = 0x50008 /*ENOT_STORE_OWNER*/, location = std::fungible_asset)]
+    fun test_transfer_escrow_fails() {
+        let mint_ref = setup();
+
+        let dst_eid = 2u32;
+        // This configuration function (debit) is not resposible for handling dust, therefore the tested amount excludes
+        // the dust amount (last two digits)
+        let amount_ld = 123456700;
+        let min_amount_ld = 0u64;
+
+        let fa = mint(&mint_ref, amount_ld);
+        let (sent, received) = oft_adapter_fa::debit_fungible_asset(
+            @444,
+            &mut fa,
+            min_amount_ld,
+            dst_eid,
+        );
+
+        // amount sent and received should reflect the amount debited
+        assert!(sent == 123456700, 0);
+        assert!(received == 123456700, 0);
+
+        // no remaining balance in debited account
+        let remaining_balance = fungible_asset::amount(&fa);
+        assert!(remaining_balance == 00, 0);
+        burn_token_for_test(fa);
+
+        // escrow balance should increase to match
+        let balance = primary_fungible_store::balance(escrow_address(), oft_adapter_fa::metadata());
+        assert!(balance == 123456700, 0);
+
+        // transfer from escrow should fail
+        fungible_asset::transfer<FungibleStore>(
+            &create_signer_for_test(@oft),
+            ensure_primary_store_exists<Metadata>(escrow_address(), oft_adapter_fa::metadata()),
+            ensure_primary_store_exists<Metadata>(@555, oft_adapter_fa::metadata()),
+            1000,
+        );
+    }
+
     #[test]
     fun test_credit() {
         let mint_ref = setup();

examples/oft-adapter-aptos-move/tests/implementations/oft_adapter_fa_tests.move

@@ -1,12 +1,10 @@
 #[test_only]
 module oft::oapp_test_helper {
-    use oft::oapp_compose;
     use oft::oapp_receive;
     use oft::oapp_store;
 
     public fun init_oapp() {
         oapp_store::init_module_for_test();
         oapp_receive::init_module_for_test();
-        oapp_compose::init_module_for_test();
     }
 }