Merge branch 'main' into calin/vm-abort-message-2

Author: calintat

api/test-context/src/test_context.rs

@@ -176,6 +176,7 @@ pub fn new_test_context_inner(
             BUFFERED_STATE_TARGET_ITEMS_FOR_TEST,
             DEFAULT_MAX_NUM_NODES_PER_LRU_CACHE_SHARD,
             None,
+            /* reset_hot_state = */ true,
         )
         .unwrap();
         if node_config

aptos-move/aptos-validator-interface/src/storage_interface.rs

@@ -25,13 +25,14 @@ impl DBDebuggerInterface {
         Ok(Self(Arc::new(
             AptosDB::open(
                 StorageDirPaths::from_path(db_root_path),
-                true,
+                /* readonly = */ true,
                 NO_OP_STORAGE_PRUNER_CONFIG,
                 RocksdbConfigs::default(),
-                false, /* indexer */
+                /* enable_indexer = */ false,
                 BUFFERED_STATE_TARGET_ITEMS,
                 DEFAULT_MAX_NUM_NODES_PER_LRU_CACHE_SHARD,
-                None,
+                /* internal_indexer_db = */ None,
+                /* reset_hot_state = */ false,
             )
             .map_err(anyhow::Error::from)?,
         )))

aptos-move/e2e-move-tests/src/tests/code_publishing.data/pack_stdlib/sources/string.move

@@ -34,6 +34,12 @@ module std::string {
         &s.bytes
     }
 
+    /// Returns the underlying byte vector.
+    public fun into_bytes(self: String): vector<u8> {
+        let String { bytes } = self;
+        bytes
+    }
+
     /// Checks whether this string is empty.
     public fun is_empty(s: &String): bool {
         vector::is_empty(&s.bytes)

aptos-move/e2e-move-tests/src/tests/code_publishing.data/pack_stdlib_incompat/sources/string.move

@@ -34,6 +34,12 @@ module std::string {
         &s.bytes
     }
 
+    /// Returns the underlying byte vector.
+    public fun into_bytes(self: String): vector<u8> {
+        let String { bytes } = self;
+        bytes
+    }
+
     /// Checks whether this string is empty.
     public fun is_empty(s: &String): bool {
         vector::is_empty(&s.bytes)

aptos-move/framework/aptos-experimental/doc/single_order_book.md

@@ -1255,12 +1255,21 @@ Removes and returns the orders that are ready to be executed based on the time c
     self: &<b>mut</b> <a href="single_order_book.md#0x7_single_order_book_SingleOrderBook">SingleOrderBook</a>&lt;M&gt;, order_limit: u64
 ): <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;SingleOrder&lt;M&gt;&gt; {
     <b>let</b> self_orders = &<b>mut</b> self.orders;
+    <b>let</b> self_client_order_ids = &<b>mut</b> self.client_order_ids;
     <b>let</b> order_ids = self.pending_orders.<a href="single_order_book.md#0x7_single_order_book_take_ready_time_based_orders">take_ready_time_based_orders</a>(order_limit);
     <b>let</b> orders = <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector_empty">vector::empty</a>();
 
     order_ids.for_each(|order_id| {
         <b>let</b> order_with_state = self_orders.remove(&order_id);
         <b>let</b> (order, _) = order_with_state.destroy_order_from_state();
+        <b>let</b> client_order_id = order.get_client_order_id();
+        <b>if</b> (client_order_id.is_some()) {
+            self_client_order_ids.remove(
+                &new_account_client_order_id(
+                    order.get_account(), client_order_id.destroy_some()
+                )
+            );
+        };
         orders.push_back(order);
     });
     orders

aptos-move/framework/aptos-experimental/sources/trading/order_book/single_order_book.move

@@ -537,12 +537,21 @@ module aptos_experimental::single_order_book {
         self: &mut SingleOrderBook<M>, order_limit: u64
     ): vector<SingleOrder<M>> {
         let self_orders = &mut self.orders;
+        let self_client_order_ids = &mut self.client_order_ids;
         let order_ids = self.pending_orders.take_ready_time_based_orders(order_limit);
         let orders = vector::empty();
 
         order_ids.for_each(|order_id| {
             let order_with_state = self_orders.remove(&order_id);
             let (order, _) = order_with_state.destroy_order_from_state();
+            let client_order_id = order.get_client_order_id();
+            if (client_order_id.is_some()) {
+                self_client_order_ids.remove(
+                    &new_account_client_order_id(
+                        order.get_account(), client_order_id.destroy_some()
+                    )
+                );
+            };
             orders.push_back(order);
         });
         orders

aptos-move/framework/aptos-experimental/sources/trading/tests/order_book/order_book_client_order_id.move

@@ -2,7 +2,8 @@
 module aptos_experimental::order_book_client_order_id {
     use std::option;
     use std::signer;
-    use aptos_experimental::order_book_types::{new_order_id_type, price_move_up_condition};
+    use aptos_framework::timestamp;
+    use aptos_experimental::order_book_types::{new_order_id_type, price_move_up_condition, new_time_based_trigger_condition};
     use aptos_experimental::order_book_types::good_till_cancelled;
     use aptos_experimental::order_book::{new_single_order_request, destroy_order_book, set_up_test_with_id};
 
@@ -535,4 +536,51 @@ module aptos_experimental::order_book_client_order_id {
         order_book.destroy_order_book();
     }
 
+    #[test(user1 = @0x456, aptos = @0x1)]
+    public fun test_client_order_id_cleanup_for_time_based_pending_order(
+        user1: &signer,
+        aptos: &signer
+    ) {
+        // Setup timestamp for time-based triggers
+        timestamp::set_time_has_started_for_testing(aptos);
+        timestamp::update_global_time_for_test_secs(1000);
+
+        // Setup a basic order book
+        let order_book = set_up_test_with_id();
+        let user1_addr = signer::address_of(user1);
+        let client_order_id = std::string::utf8(b"time_order_1");
+        let order_id = new_order_id_type(1);
+
+        // Create an order request with client order ID and time-based trigger
+        let order_req =
+            new_single_order_request(
+                user1_addr,
+                order_id,
+                option::some(client_order_id),
+                1000, // price
+                100, // orig_size
+                100, // remaining_size
+                true, // is_bid
+                option::some(new_time_based_trigger_condition(1500)), // trigger_condition - time-based
+                good_till_cancelled(),
+                42 // metadata
+            );
+
+        // Place the maker order
+        order_book.place_maker_order(order_req);
+
+        // Advance time to trigger the condition
+        timestamp::update_global_time_for_test_secs(1600);
+
+        // This should remove the pending order from the pending orders map
+        order_book.take_ready_time_based_orders(1);
+
+        // Try cancelling the order - should return none since it was already removed from pending orders
+        let cancel_result =
+            order_book.try_cancel_single_order_with_client_order_id(user1_addr, client_order_id);
+        assert!(cancel_result.is_none());
+
+        order_book.destroy_order_book();
+    }
+
 }

aptos-move/framework/aptos-framework/doc/auth_data.md

@@ -209,7 +209,7 @@
 
 
 <pre><code><b>public</b> <b>fun</b> <a href="auth_data.md#0x1_auth_data_derivable_abstract_signature">derivable_abstract_signature</a>(self: &<a href="auth_data.md#0x1_auth_data_AbstractionAuthData">AbstractionAuthData</a>): &<a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;u8&gt; {
-    <b>assert</b>!(self is DerivableV1, <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="auth_data.md#0x1_auth_data_ENOT_REGULAR_AUTH_DATA">ENOT_REGULAR_AUTH_DATA</a>));
+    <b>assert</b>!(self is DerivableV1, <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_invalid_argument">error::invalid_argument</a>(<a href="auth_data.md#0x1_auth_data_ENOT_DERIVABLE_AUTH_DATA">ENOT_DERIVABLE_AUTH_DATA</a>));
     &self.abstract_signature
 }
 </code></pre>

aptos-move/framework/aptos-framework/doc/sui_derivable_account.md

@@ -37,10 +37,12 @@ Nonce: <digest>
 -  [Function `split_signature_bytes`](#0x1_sui_derivable_account_split_signature_bytes)
 -  [Function `derive_account_address_from_public_key`](#0x1_sui_derivable_account_derive_account_address_from_public_key)
 -  [Function `authenticate_auth_data`](#0x1_sui_derivable_account_authenticate_auth_data)
+-  [Function `authenticate_auth_data_internal`](#0x1_sui_derivable_account_authenticate_auth_data_internal)
 -  [Function `authenticate`](#0x1_sui_derivable_account_authenticate)
 -  [Specification](#@Specification_1)
     -  [Function `derive_account_address_from_public_key`](#@Specification_1_derive_account_address_from_public_key)
     -  [Function `authenticate_auth_data`](#@Specification_1_authenticate_auth_data)
+    -  [Function `authenticate_auth_data_internal`](#@Specification_1_authenticate_auth_data_internal)
     -  [Function `authenticate`](#@Specification_1_authenticate)
 
 
@@ -398,6 +400,16 @@ https://github.com/MystenLabs/sui/blob/main/crates/shared-crypto/src/intent.rs#L
 ## Constants
 
 
+<a id="0x1_sui_derivable_account_EMALFORMED_DATA"></a>
+
+Malformed data with trailing bytes.
+
+
+<pre><code><b>const</b> <a href="sui_derivable_account.md#0x1_sui_derivable_account_EMALFORMED_DATA">EMALFORMED_DATA</a>: u64 = 8;
+</code></pre>
+
+
+
 <a id="0x1_sui_derivable_account_EINVALID_PUBLIC_KEY"></a>
 
 Invalid public key.
@@ -408,6 +420,16 @@ Invalid public key.
 
 
 
+<a id="0x1_sui_derivable_account_EDEPRECATED"></a>
+
+Function is deprecated and should not be called.
+
+
+<pre><code><b>const</b> <a href="sui_derivable_account.md#0x1_sui_derivable_account_EDEPRECATED">EDEPRECATED</a>: u64 = 9;
+</code></pre>
+
+
+
 <a id="0x1_sui_derivable_account_EMISSING_ENTRY_FUNCTION_PAYLOAD"></a>
 
 Entry function payload is missing.
@@ -515,6 +537,7 @@ serialized <code><a href="sui_derivable_account.md#0x1_sui_derivable_account_Sui
     <b>let</b> stream = <a href="../../aptos-stdlib/doc/bcs_stream.md#0x1_bcs_stream_new">bcs_stream::new</a>(*abstract_public_key);
     <b>let</b> sui_account_address = <a href="../../aptos-stdlib/doc/bcs_stream.md#0x1_bcs_stream_deserialize_vector">bcs_stream::deserialize_vector</a>&lt;u8&gt;(&<b>mut</b> stream, |x| deserialize_u8(x));
     <b>let</b> domain = <a href="../../aptos-stdlib/doc/bcs_stream.md#0x1_bcs_stream_deserialize_vector">bcs_stream::deserialize_vector</a>&lt;u8&gt;(&<b>mut</b> stream, |x| deserialize_u8(x));
+    <b>assert</b>!(!<a href="../../aptos-stdlib/doc/bcs_stream.md#0x1_bcs_stream_has_remaining">bcs_stream::has_remaining</a>(&<b>mut</b> stream), <a href="sui_derivable_account.md#0x1_sui_derivable_account_EMALFORMED_DATA">EMALFORMED_DATA</a>);
     <a href="sui_derivable_account.md#0x1_sui_derivable_account_SuiAbstractPublicKey">SuiAbstractPublicKey</a> { sui_account_address, domain }
 }
 </code></pre>
@@ -544,6 +567,7 @@ Returns a tuple of the signature.
     <b>let</b> signature_type = <a href="../../aptos-stdlib/doc/bcs_stream.md#0x1_bcs_stream_deserialize_u8">bcs_stream::deserialize_u8</a>(&<b>mut</b> stream);
     <b>if</b> (signature_type == 0x00) {
         <b>let</b> signature = <a href="../../aptos-stdlib/doc/bcs_stream.md#0x1_bcs_stream_deserialize_vector">bcs_stream::deserialize_vector</a>&lt;u8&gt;(&<b>mut</b> stream, |x| deserialize_u8(x));
+        <b>assert</b>!(!<a href="../../aptos-stdlib/doc/bcs_stream.md#0x1_bcs_stream_has_remaining">bcs_stream::has_remaining</a>(&<b>mut</b> stream), <a href="sui_derivable_account.md#0x1_sui_derivable_account_EMALFORMED_DATA">EMALFORMED_DATA</a>);
         SuiAbstractSignature::MessageV1 { signature }
     } <b>else</b> {
         <b>abort</b>(<a href="sui_derivable_account.md#0x1_sui_derivable_account_EINVALID_SIGNATURE_TYPE">EINVALID_SIGNATURE_TYPE</a>)
@@ -652,9 +676,10 @@ Derives the account address from the public key and returns it is a hex string w
 
 ## Function `authenticate_auth_data`
 
+@deprecated This function is deprecated and will always abort.
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="sui_derivable_account.md#0x1_sui_derivable_account_authenticate_auth_data">authenticate_auth_data</a>(aa_auth_data: <a href="auth_data.md#0x1_auth_data_AbstractionAuthData">auth_data::AbstractionAuthData</a>, entry_function_name: &<a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+<pre><code><b>public</b> <b>fun</b> <a href="sui_derivable_account.md#0x1_sui_derivable_account_authenticate_auth_data">authenticate_auth_data</a>(_aa_auth_data: <a href="auth_data.md#0x1_auth_data_AbstractionAuthData">auth_data::AbstractionAuthData</a>, _entry_function_name: &<a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
 </code></pre>
 
 
@@ -664,6 +689,33 @@ Derives the account address from the public key and returns it is a hex string w
 
 
 <pre><code><b>public</b> <b>fun</b> <a href="sui_derivable_account.md#0x1_sui_derivable_account_authenticate_auth_data">authenticate_auth_data</a>(
+    _aa_auth_data: AbstractionAuthData,
+    _entry_function_name: &<a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
+) {
+    <b>abort</b>(<a href="sui_derivable_account.md#0x1_sui_derivable_account_EDEPRECATED">EDEPRECATED</a>)
+}
+</code></pre>
+
+
+
+</details>
+
+<a id="0x1_sui_derivable_account_authenticate_auth_data_internal"></a>
+
+## Function `authenticate_auth_data_internal`
+
+
+
+<pre><code><b>fun</b> <a href="sui_derivable_account.md#0x1_sui_derivable_account_authenticate_auth_data_internal">authenticate_auth_data_internal</a>(aa_auth_data: <a href="auth_data.md#0x1_auth_data_AbstractionAuthData">auth_data::AbstractionAuthData</a>, entry_function_name: &<a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="sui_derivable_account.md#0x1_sui_derivable_account_authenticate_auth_data_internal">authenticate_auth_data_internal</a>(
     aa_auth_data: AbstractionAuthData,
     entry_function_name: &<a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;
 ) {
@@ -739,7 +791,7 @@ Authorization function for domain account abstraction.
 
 
 <pre><code><b>public</b> <b>fun</b> <a href="sui_derivable_account.md#0x1_sui_derivable_account_authenticate">authenticate</a>(<a href="account.md#0x1_account">account</a>: <a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>, aa_auth_data: AbstractionAuthData): <a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a> {
-    daa_authenticate(<a href="account.md#0x1_account">account</a>, aa_auth_data, |<a href="auth_data.md#0x1_auth_data">auth_data</a>, entry_name| <a href="sui_derivable_account.md#0x1_sui_derivable_account_authenticate_auth_data">authenticate_auth_data</a>(<a href="auth_data.md#0x1_auth_data">auth_data</a>, entry_name))
+    daa_authenticate(<a href="account.md#0x1_account">account</a>, aa_auth_data, |<a href="auth_data.md#0x1_auth_data">auth_data</a>, entry_name| <a href="sui_derivable_account.md#0x1_sui_derivable_account_authenticate_auth_data_internal">authenticate_auth_data_internal</a>(<a href="auth_data.md#0x1_auth_data">auth_data</a>, entry_name))
 }
 </code></pre>
 
@@ -773,7 +825,23 @@ Authorization function for domain account abstraction.
 ### Function `authenticate_auth_data`
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="sui_derivable_account.md#0x1_sui_derivable_account_authenticate_auth_data">authenticate_auth_data</a>(aa_auth_data: <a href="auth_data.md#0x1_auth_data_AbstractionAuthData">auth_data::AbstractionAuthData</a>, entry_function_name: &<a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+<pre><code><b>public</b> <b>fun</b> <a href="sui_derivable_account.md#0x1_sui_derivable_account_authenticate_auth_data">authenticate_auth_data</a>(_aa_auth_data: <a href="auth_data.md#0x1_auth_data_AbstractionAuthData">auth_data::AbstractionAuthData</a>, _entry_function_name: &<a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+
+<pre><code><b>pragma</b> verify = <b>false</b>;
+</code></pre>
+
+
+
+<a id="@Specification_1_authenticate_auth_data_internal"></a>
+
+### Function `authenticate_auth_data_internal`
+
+
+<pre><code><b>fun</b> <a href="sui_derivable_account.md#0x1_sui_derivable_account_authenticate_auth_data_internal">authenticate_auth_data_internal</a>(aa_auth_data: <a href="auth_data.md#0x1_auth_data_AbstractionAuthData">auth_data::AbstractionAuthData</a>, entry_function_name: &<a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;)
 </code></pre>
 
 

aptos-move/framework/aptos-framework/sources/account/auth_data.move

@@ -47,7 +47,7 @@ module aptos_framework::auth_data {
     }
 
     public fun derivable_abstract_signature(self: &AbstractionAuthData): &vector<u8> {
-        assert!(self is DerivableV1, error::invalid_argument(ENOT_REGULAR_AUTH_DATA));
+        assert!(self is DerivableV1, error::invalid_argument(ENOT_DERIVABLE_AUTH_DATA));
         &self.abstract_signature
     }