[framework] Remove experimental framework

As there is no active development in this space and it conflicts a bit
with the direction we're taking the rest of the framework, let's remove
this for now. Once we have established an Aptos framework, we can
determine if it makes sense to bring back an experimental framework.

Cargo.toml

@@ -17,7 +17,6 @@ members = [
     "aptos-move/framework",
     "aptos-move/framework/DPN/releases",
     "aptos-move/framework/aptos-framework/releases",
-    "aptos-move/framework/experimental/releases",
     "aptos-move/framework/releases",
     "aptos-move/genesis-viewer",
     "aptos-move/move-examples",

aptos-move/e2e-tests/src/data_store.rs

@@ -31,9 +31,6 @@ pub static GENESIS_CHANGE_SET: Lazy<ChangeSet> =
 pub static GENESIS_CHANGE_SET_FRESH: Lazy<ChangeSet> =
     Lazy::new(|| generate_genesis_change_set_for_testing(GenesisOptions::Fresh));
 
-pub static GENESIS_CHANGE_SET_EXPERIMENTAL: Lazy<ChangeSet> =
-    Lazy::new(|| generate_genesis_change_set_for_testing(GenesisOptions::Experimental));
-
 /// An in-memory implementation of [`StateView`] and [`RemoteCache`] for the VM.
 ///
 /// Tests use this to set up state, and pass in a reference to the cache whenever a `StateView` or

aptos-move/e2e-tests/src/executor.rs

@@ -14,8 +14,7 @@ use std::{
 use crate::{
     account::{Account, AccountData},
     data_store::{
-        FakeDataStore, GENESIS_CHANGE_SET, GENESIS_CHANGE_SET_EXPERIMENTAL,
-        GENESIS_CHANGE_SET_FRESH,
+        FakeDataStore, GENESIS_CHANGE_SET, GENESIS_CHANGE_SET_FRESH,
     },
     golden_outputs::GoldenOutputs,
 };
@@ -114,11 +113,6 @@ impl FakeExecutor {
         Self::from_genesis(GENESIS_CHANGE_SET_FRESH.clone().write_set())
     }
 
-    /// Creates an executor using the experimental genesis.
-    pub fn from_experimental_genesis() -> Self {
-        Self::from_genesis(GENESIS_CHANGE_SET_EXPERIMENTAL.clone().write_set())
-    }
-
     pub fn allowlist_genesis() -> Self {
         Self::custom_genesis(
             current_module_blobs(),

aptos-move/e2e-testsuite/src/tests/mod.rs

@@ -19,7 +19,6 @@ mod crsn;
 mod data_store;
 mod emergency_admin_script;
 mod execution_strategies;
-mod experimental;
 mod failed_transaction_tests;
 mod genesis;
 mod genesis_initializations;

aptos-move/framework/aptos-framework/releases/artifacts/current/build/AptosFramework/BuildInfo.yaml

@@ -137,7 +137,7 @@ compiled_package_info:
     ? address: "00000000000000000000000000000001"
       name: Version
     : CoreFramework
-  source_digest: 83B580762EF6AE996B07C11CD90735B1DC9CE50D675851846CA698E8ECB0D6AF
+  source_digest: F524E3052EC3A7154F9CD0F89F9F655F12E0E6837437B1F8B871D965411C0DBD
   build_flags:
     dev_mode: false
     test_mode: false

aptos-move/framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/AptosAccount.md

@@ -3,7 +3,7 @@
 
 # Module `0x1::AptosAccount`
 
-The <code><a href="AptosAccount.md#0x1_AptosAccount">AptosAccount</a></code> module manages experimental accounts.
+The <code><a href="AptosAccount.md#0x1_AptosAccount">AptosAccount</a></code> module manages Aptos accounts.
 It also defines the prolog and epilog that run before and after every
 transaction in addition to the core prologue and epilogue.
 

aptos-move/framework/aptos-framework/releases/artifacts/current/build/AptosFramework/docs/TokenTransfers.md

@@ -149,6 +149,12 @@ This module provides the foundation for transferring of Tokens
         &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="TokenTransfers.md#0x1_TokenTransfers">TokenTransfers</a>&lt;TokenType&gt;&gt;(sender).pending_transfers;
     <b>let</b> pending_tokens = <a href="Table.md#0x1_Table_borrow_mut">Table::borrow_mut</a>(pending_transfers, &receiver_addr);
     <b>let</b> (_id, token) = <a href="Table.md#0x1_Table_remove">Table::remove</a>(pending_tokens, token_id);
+
+    <b>if</b> (<a href="Table.md#0x1_Table_count">Table::count</a>(pending_tokens) == 0) {
+        <b>let</b> (_id, real_pending_transfers) = <a href="Table.md#0x1_Table_remove">Table::remove</a>(pending_transfers, &receiver_addr);
+        <a href="Table.md#0x1_Table_destroy_empty">Table::destroy_empty</a>(real_pending_transfers)
+    };
+
     <a href="Token.md#0x1_Token_deposit_token">Token::deposit_token</a>(receiver, token)
 }
 </code></pre>
@@ -182,6 +188,12 @@ This module provides the foundation for transferring of Tokens
         &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="TokenTransfers.md#0x1_TokenTransfers">TokenTransfers</a>&lt;TokenType&gt;&gt;(sender_addr).pending_transfers;
     <b>let</b> pending_tokens = <a href="Table.md#0x1_Table_borrow_mut">Table::borrow_mut</a>(pending_transfers, &receiver);
     <b>let</b> (_id, token) = <a href="Table.md#0x1_Table_remove">Table::remove</a>(pending_tokens, token_id);
+
+    <b>if</b> (<a href="Table.md#0x1_Table_count">Table::count</a>(pending_tokens) == 0) {
+        <b>let</b> (_id, real_pending_transfers) = <a href="Table.md#0x1_Table_remove">Table::remove</a>(pending_transfers, &receiver);
+        <a href="Table.md#0x1_Table_destroy_empty">Table::destroy_empty</a>(real_pending_transfers)
+    };
+
     <a href="Token.md#0x1_Token_deposit_token">Token::deposit_token</a>(sender, token)
 }
 </code></pre>

aptos-move/framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/AptosAccount.move

@@ -1,4 +1,4 @@
-/// The `AptosAccount` module manages experimental accounts.
+/// The `AptosAccount` module manages Aptos accounts.
 /// It also defines the prolog and epilog that run before and after every
 /// transaction in addition to the core prologue and epilogue.
 

aptos-move/framework/aptos-framework/releases/artifacts/current/build/AptosFramework/sources/TokenTransfers.move

@@ -54,6 +54,12 @@ module AptosFramework::TokenTransfers {
             &mut borrow_global_mut<TokenTransfers<TokenType>>(sender).pending_transfers;
         let pending_tokens = Table::borrow_mut(pending_transfers, &receiver_addr);
         let (_id, token) = Table::remove(pending_tokens, token_id);
+
+        if (Table::count(pending_tokens) == 0) {
+            let (_id, real_pending_transfers) = Table::remove(pending_transfers, &receiver_addr);
+            Table::destroy_empty(real_pending_transfers)
+        };
+
         Token::deposit_token(receiver, token)
     }
 
@@ -68,6 +74,12 @@ module AptosFramework::TokenTransfers {
             &mut borrow_global_mut<TokenTransfers<TokenType>>(sender_addr).pending_transfers;
         let pending_tokens = Table::borrow_mut(pending_transfers, &receiver);
         let (_id, token) = Table::remove(pending_tokens, token_id);
+
+        if (Table::count(pending_tokens) == 0) {
+            let (_id, real_pending_transfers) = Table::remove(pending_transfers, &receiver);
+            Table::destroy_empty(real_pending_transfers)
+        };
+
         Token::deposit_token(sender, token)
     }
 
@@ -99,10 +111,16 @@ module AptosFramework::TokenTransfers {
         let owner0_addr = Signer::address_of(&owner0);
         let owner1_addr = Signer::address_of(&owner1);
 
+        assert!(Table::count(&borrow_global<TokenTransfers<u64>>(creator_addr).pending_transfers) == 0, 0);
+
         transfer_to<u64>(&creator, owner0_addr, &token_id, 1);
+        assert!(Table::count(&borrow_global<TokenTransfers<u64>>(creator_addr).pending_transfers) == 1, 1);
         transfer_to<u64>(&creator, owner1_addr, &token_id, 1);
+        assert!(Table::count(&borrow_global<TokenTransfers<u64>>(creator_addr).pending_transfers) == 2, 2);
         receive_from<u64>(&owner0, creator_addr, &token_id);
+        assert!(Table::count(&borrow_global<TokenTransfers<u64>>(creator_addr).pending_transfers) == 1, 3);
         receive_from<u64>(&owner1, creator_addr, &token_id);
+        assert!(Table::count(&borrow_global<TokenTransfers<u64>>(creator_addr).pending_transfers) == 0, 4);
 
         initialize_token_transfers<u64>(&owner0);
         transfer_to<u64>(&owner0, owner1_addr, &token_id, 1);

aptos-move/framework/aptos-framework/sources/AptosAccount.move

@@ -1,4 +1,4 @@
-/// The `AptosAccount` module manages experimental accounts.
+/// The `AptosAccount` module manages Aptos accounts.
 /// It also defines the prolog and epilog that run before and after every
 /// transaction in addition to the core prologue and epilogue.
 

aptos-move/framework/core/README.md

@@ -1,7 +1,7 @@
 This folder contains a Move package consisting of core Move modules defining functionalities needed by
 any Diem-based blockchains. To start your own Diem-based blockchain, you can create a Move package that
 depends on this core package and write your own wrapper modules for the account module as well as the
-on-chain configuration modules. [`experimental` folder](../experimental) provides an example of such
+on-chain configuration modules. [`aptos-framework` folder](../aptos-framework) provides an example of such
 Move package.
 
 Next we briefly describe how to write the wrapper modules and how Move's powerful type system can provide flexibility