aborts_if !exists<StakingRewardsConfig>(@aptos_framework);
+pragma verify_duration_estimate = 120;
+aborts_if !exists<StakingRewardsConfig>(@aptos_framework);
aborts_if !features::spec_periodical_reward_rate_decrease_enabled();
include StakingRewardsConfigRequirement;
diff --git a/aptos-move/framework/aptos-framework/doc/transaction_context.md b/aptos-move/framework/aptos-framework/doc/transaction_context.md
index 981c01a44b618..791e456e810d3 100644
--- a/aptos-move/framework/aptos-framework/doc/transaction_context.md
+++ b/aptos-move/framework/aptos-framework/doc/transaction_context.md
@@ -5,15 +5,178 @@
+- [Struct `AUID`](#0x1_transaction_context_AUID)
+- [Constants](#@Constants_0)
+- [Function `get_txn_hash`](#0x1_transaction_context_get_txn_hash)
+- [Function `get_transaction_hash`](#0x1_transaction_context_get_transaction_hash)
+- [Function `generate_unique_address`](#0x1_transaction_context_generate_unique_address)
+- [Function `generate_auid_address`](#0x1_transaction_context_generate_auid_address)
- [Function `get_script_hash`](#0x1_transaction_context_get_script_hash)
-- [Specification](#@Specification_0)
- - [Function `get_script_hash`](#@Specification_0_get_script_hash)
+- [Function `generate_auid`](#0x1_transaction_context_generate_auid)
+- [Function `auid_address`](#0x1_transaction_context_auid_address)
+- [Specification](#@Specification_1)
+ - [Function `get_txn_hash`](#@Specification_1_get_txn_hash)
+ - [Function `generate_unique_address`](#@Specification_1_generate_unique_address)
+ - [Function `get_script_hash`](#@Specification_1_get_script_hash)
-
+use 0x1::features;
+
+
+
+
+
+
+## Struct `AUID`
+
+A wrapper denoting aptos unique identifer (AUID)
+for storing an address
+
+
+struct AUID has drop, store
+
+
+
+
+
+Fields
+
+
+
+-
+
unique_address: address
+
+-
+
+
+
+
+
+
+
+
+
+## Constants
+
+
+
+
+AUID feature is not supported.
+
+
+const EAUID_NOT_SUPPORTED: u64 = 1;
+
+
+
+
+
+
+## Function `get_txn_hash`
+
+Return the transaction hash of the current transaction.
+
+
+fun get_txn_hash(): vector<u8>
+
+
+
+
+
+Implementation
+
+
+native fun get_txn_hash(): vector<u8>;
+
+
+
+
+
+
+
+
+## Function `get_transaction_hash`
+
+Return the transaction hash of the current transaction.
+Internally calls the private function get_txn_hash.
+This function is created for to feature gate the get_txn_hash function.
+
+
+public fun get_transaction_hash(): vector<u8>
+
+
+
+
+
+Implementation
+
+
+public fun get_transaction_hash(): vector<u8> {
+ assert!(features::auids_enabled(), EAUID_NOT_SUPPORTED);
+ get_txn_hash()
+}
+
+
+
+
+
+
+
+
+## Function `generate_unique_address`
+
+Return a universally unique identifier (of type address) generated
+by hashing the transaction hash of this transaction and a sequence number
+specific to this transaction. This function can be called any
+number of times inside a single transaction. Each such call increments
+the sequence number and generates a new unique address.
+Uses Scheme in types/src/transaction/authenticator.rs for domain separation
+from other ways of generating unique addresses.
+
+
+fun generate_unique_address(): address
+
+
+
+
+
+Implementation
+
+
+native fun generate_unique_address(): address;
+
+
+
+
+
+
+
+
+## Function `generate_auid_address`
+Return a aptos unique identifier. Internally calls
+the private function generate_unique_address. This function is
+created for to feature gate the generate_unique_address function.
+public fun generate_auid_address(): address
+
+
+
+
+
+Implementation
+
+
+public fun generate_auid_address(): address {
+ assert!(features::auids_enabled(), EAUID_NOT_SUPPORTED);
+ generate_unique_address()
+}
+
+
+
+
+
+
## Function `get_script_hash`
@@ -37,12 +200,108 @@ Return the script hash of the current entry function.
-
+
+
+## Function `generate_auid`
+
+This method runs generate_unique_address native function and returns
+the generated unique address wrapped in the AUID class.
+
+
+public fun generate_auid(): transaction_context::AUID
+
+
+
+
+
+Implementation
+
+
+public fun generate_auid(): AUID {
+ assert!(features::auids_enabled(), EAUID_NOT_SUPPORTED);
+ return AUID {
+ unique_address: generate_unique_address()
+ }
+}
+
+
+
+
+
+
+
+
+## Function `auid_address`
+
+
+
+public fun auid_address(auid: &transaction_context::AUID): address
+
+
+
+
+
+Implementation
+
+
+public fun auid_address(auid: &AUID): address {
+ auid.unique_address
+}
+
+
+
+
+
+
+
## Specification
-
+
+
+
+
+fun spec_get_txn_hash(): vector<u8>;
+
+
+
+
+
+
+### Function `get_txn_hash`
+
+
+fun get_txn_hash(): vector<u8>
+
+
+
+
+
+pragma opaque;
+aborts_if false;
+ensures result == spec_get_txn_hash();
+
+
+
+
+
+
+### Function `generate_unique_address`
+
+
+fun generate_unique_address(): address
+
+
+
+
+
+pragma opaque;
+
+
+
+
+
### Function `get_script_hash`
diff --git a/aptos-move/framework/aptos-framework/doc/transaction_validation.md b/aptos-move/framework/aptos-framework/doc/transaction_validation.md
index 44896c2d6c0ac..c9eb48546eebc 100644
--- a/aptos-move/framework/aptos-framework/doc/transaction_validation.md
+++ b/aptos-move/framework/aptos-framework/doc/transaction_validation.md
@@ -698,7 +698,8 @@ Aborts if length of public key hashed vector
not equal the number of singers.
-let gas_payer = if (txn_sequence_number < GAS_PAYER_FLAG_BIT) {
+pragma verify_duration_estimate = 120;
+let gas_payer = if (txn_sequence_number < GAS_PAYER_FLAG_BIT) {
signer::address_of(sender)
} else {
secondary_signer_addresses[len(secondary_signer_addresses) - 1]
diff --git a/aptos-move/framework/aptos-framework/sources/configs/staking_config.spec.move b/aptos-move/framework/aptos-framework/sources/configs/staking_config.spec.move
index f87769d4a89a9..1de8d344a2670 100644
--- a/aptos-move/framework/aptos-framework/sources/configs/staking_config.spec.move
+++ b/aptos-move/framework/aptos-framework/sources/configs/staking_config.spec.move
@@ -83,6 +83,7 @@ spec aptos_framework::staking_config {
}
spec calculate_and_save_latest_epoch_rewards_rate(): FixedPoint64 {
+ pragma verify_duration_estimate = 120;
aborts_if !exists(@aptos_framework);
aborts_if !features::spec_periodical_reward_rate_decrease_enabled();
include StakingRewardsConfigRequirement;
diff --git a/aptos-move/framework/aptos-framework/sources/object.move b/aptos-move/framework/aptos-framework/sources/object.move
index 2594feeafcc42..e8473d1ced55b 100644
--- a/aptos-move/framework/aptos-framework/sources/object.move
+++ b/aptos-move/framework/aptos-framework/sources/object.move
@@ -22,6 +22,7 @@ module aptos_framework::object {
use std::vector;
use aptos_framework::account;
+ use aptos_framework::transaction_context;
use aptos_framework::create_signer::create_signer;
use aptos_framework::event;
use aptos_framework::from_bcs;
@@ -51,6 +52,9 @@ module aptos_framework::object {
/// nesting, but any checks such as transfer will only be evaluated this deep.
const MAXIMUM_OBJECT_NESTING: u8 = 8;
+ /// generate_unique_address uses this for domain separation within its native implementation
+ const DERIVE_AUID_ADDRESS_SCHEME: u8 = 0xFB;
+
/// Scheme identifier used to generate an object's address `obj_addr` as derived from another object.
/// The object's address is generated as:
/// ```
@@ -108,8 +112,7 @@ module aptos_framework::object {
/// This is a one time ability given to the creator to configure the object as necessary
struct ConstructorRef has drop {
self: address,
- /// Set to true so long as deleting the object is possible. For example, the object was
- /// created via create_object_from_guid.
+ /// True if the object can be deleted. Named objects are not deletable.
can_delete: bool,
}
@@ -210,13 +213,34 @@ module aptos_framework::object {
create_object_internal(creator_address, obj_addr, false)
}
+ /// Create a new object by generating a random unique address based on transaction hash.
+ /// The unique address is computed sha3_256([transaction hash | auid counter | 0xFB]).
+ /// The created object is deletable as we can guarantee the same unique address can
+ /// never be regenerated with future txs.
+ public fun create_object(owner_address: address): ConstructorRef {
+ let unique_address = transaction_context::generate_auid_address();
+ create_object_internal(owner_address, unique_address, true)
+ }
+
+ #[deprecated]
+ /// Use `create_object` instead.
/// Create a new object from a GUID generated by an account.
+ /// As the GUID creation internally increments a counter, two transactions that executes
+ /// `create_object_from_account` function for the same creator run sequentially.
+ /// Therefore, using `create_object` method for creating objects is preferrable as it
+ /// doesn't have the same bottlenecks.
public fun create_object_from_account(creator: &signer): ConstructorRef {
let guid = account::create_guid(creator);
create_object_from_guid(signer::address_of(creator), guid)
}
+ #[deprecated]
+ /// Use `create_object` instead.
/// Create a new object from a GUID generated by an object.
+ /// As the GUID creation internally increments a counter, two transactions that executes
+ /// `create_object_from_object` function for the same creator run sequentially.
+ /// Therefore, using `create_object` method for creating objects is preferrable as it
+ /// doesn't have the same bottlenecks.
public fun create_object_from_object(creator: &signer): ConstructorRef acquires ObjectCore {
let guid = create_guid(creator);
create_object_from_guid(signer::address_of(creator), guid)
@@ -650,4 +674,25 @@ module aptos_framework::object {
assert!(owner(hero) == @0x456, 0);
transfer_with_ref(linear_transfer_ref_bad, @0x789);
}
+
+ #[test(fx = @std)]
+ fun test_correct_auid(fx: signer) {
+ use std::features;
+ let feature = features::get_auids();
+ features::change_feature_flags(&fx, vector[feature], vector[]);
+
+ let auid1 = aptos_framework::transaction_context::generate_auid_address();
+ let bytes = aptos_framework::transaction_context::get_transaction_hash();
+ std::vector::push_back(&mut bytes, 1);
+ std::vector::push_back(&mut bytes, 0);
+ std::vector::push_back(&mut bytes, 0);
+ std::vector::push_back(&mut bytes, 0);
+ std::vector::push_back(&mut bytes, 0);
+ std::vector::push_back(&mut bytes, 0);
+ std::vector::push_back(&mut bytes, 0);
+ std::vector::push_back(&mut bytes, 0);
+ std::vector::push_back(&mut bytes, DERIVE_AUID_ADDRESS_SCHEME);
+ let auid2 = aptos_framework::from_bcs::to_address(std::hash::sha3_256(bytes));
+ assert!(auid1 == auid2, 0);
+ }
}
diff --git a/aptos-move/framework/aptos-framework/sources/transaction_context.move b/aptos-move/framework/aptos-framework/sources/transaction_context.move
index 45a371148cae0..b515ed1e1f2fd 100644
--- a/aptos-move/framework/aptos-framework/sources/transaction_context.move
+++ b/aptos-move/framework/aptos-framework/sources/transaction_context.move
@@ -1,4 +1,83 @@
module aptos_framework::transaction_context {
+
+ use std::features;
+
+ /// AUID feature is not supported.
+ const EAUID_NOT_SUPPORTED: u64 = 1;
+
+ /// A wrapper denoting aptos unique identifer (AUID)
+ /// for storing an address
+ struct AUID has drop, store {
+ unique_address: address
+ }
+
+ /// Return the transaction hash of the current transaction.
+ native fun get_txn_hash(): vector;
+
+ /// Return the transaction hash of the current transaction.
+ /// Internally calls the private function `get_txn_hash`.
+ /// This function is created for to feature gate the `get_txn_hash` function.
+ public fun get_transaction_hash(): vector {
+ assert!(features::auids_enabled(), EAUID_NOT_SUPPORTED);
+ get_txn_hash()
+ }
+
+ /// Return a universally unique identifier (of type address) generated
+ /// by hashing the transaction hash of this transaction and a sequence number
+ /// specific to this transaction. This function can be called any
+ /// number of times inside a single transaction. Each such call increments
+ /// the sequence number and generates a new unique address.
+ /// Uses Scheme in types/src/transaction/authenticator.rs for domain separation
+ /// from other ways of generating unique addresses.
+ native fun generate_unique_address(): address;
+
+ /// Return a aptos unique identifier. Internally calls
+ /// the private function `generate_unique_address`. This function is
+ /// created for to feature gate the `generate_unique_address` function.
+ public fun generate_auid_address(): address {
+ assert!(features::auids_enabled(), EAUID_NOT_SUPPORTED);
+ generate_unique_address()
+ }
+
/// Return the script hash of the current entry function.
public native fun get_script_hash(): vector;
+
+ /// This method runs `generate_unique_address` native function and returns
+ /// the generated unique address wrapped in the AUID class.
+ public fun generate_auid(): AUID {
+ assert!(features::auids_enabled(), EAUID_NOT_SUPPORTED);
+ return AUID {
+ unique_address: generate_unique_address()
+ }
+ }
+
+ public fun auid_address(auid: &AUID): address {
+ auid.unique_address
+ }
+
+ #[test(fx = @std)]
+ fun test_auid_uniquess(fx: signer) {
+ use std::features;
+ use std::vector;
+
+ let feature = features::get_auids();
+ features::change_feature_flags(&fx, vector[feature], vector[]);
+
+ let auids: vector = vector[];
+ let i: u64 = 0;
+ let count: u64 = 50;
+ while (i < count) {
+ i = i + 1;
+ vector::push_back(&mut auids, generate_auid_address());
+ };
+ i = 0;
+ while (i < count - 1) {
+ let j: u64 = i + 1;
+ while (j < count) {
+ assert!(*vector::borrow(&auids, i) != *vector::borrow(&auids, j), 0);
+ j = j + 1;
+ };
+ i = i + 1;
+ };
+ }
}
diff --git a/aptos-move/framework/aptos-framework/sources/transaction_context.spec.move b/aptos-move/framework/aptos-framework/sources/transaction_context.spec.move
index 0b1c59ee1a897..5d520bf261e59 100644
--- a/aptos-move/framework/aptos-framework/sources/transaction_context.spec.move
+++ b/aptos-move/framework/aptos-framework/sources/transaction_context.spec.move
@@ -4,6 +4,14 @@ spec aptos_framework::transaction_context {
aborts_if false;
ensures result == spec_get_script_hash();
}
-
spec fun spec_get_script_hash(): vector;
+ spec get_txn_hash(): vector {
+ pragma opaque;
+ aborts_if false;
+ ensures result == spec_get_txn_hash();
+ }
+ spec fun spec_get_txn_hash(): vector;
+ spec generate_unique_address(): address {
+ pragma opaque;
+ }
}
diff --git a/aptos-move/framework/aptos-framework/sources/transaction_validation.spec.move b/aptos-move/framework/aptos-framework/sources/transaction_validation.spec.move
index b997af5fad0f4..a125f1d344b12 100644
--- a/aptos-move/framework/aptos-framework/sources/transaction_validation.spec.move
+++ b/aptos-move/framework/aptos-framework/sources/transaction_validation.spec.move
@@ -110,6 +110,7 @@ spec aptos_framework::transaction_validation {
txn_expiration_time: u64,
chain_id: u8,
) {
+ pragma verify_duration_estimate = 120;
let gas_payer = if (txn_sequence_number < GAS_PAYER_FLAG_BIT) {
signer::address_of(sender)
} else {
diff --git a/aptos-move/framework/aptos-token-objects/doc/aptos_token.md b/aptos-move/framework/aptos-token-objects/doc/aptos_token.md
index 54c8cc83e58fc..8414f43ddfb13 100644
--- a/aptos-move/framework/aptos-token-objects/doc/aptos_token.md
+++ b/aptos-move/framework/aptos-token-objects/doc/aptos_token.md
@@ -58,6 +58,7 @@ The key features are:
use 0x1::error;
+use 0x1::features;
use 0x1::object;
use 0x1::option;
use 0x1::signer;
@@ -471,14 +472,25 @@ With an existing collection, directly mint a soul bound token into the recipient
property_types: vector<String>,
property_values: vector<vector<u8>>,
): ConstructorRef acquires AptosCollection {
- let constructor_ref = token::create_from_account(
- creator,
- collection,
- description,
- name,
- option::none(),
- uri,
- );
+ let constructor_ref = if (features::auids_enabled()) {
+ token::create(
+ creator,
+ collection,
+ description,
+ name,
+ option::none(),
+ uri,
+ )
+ } else {
+ token::create_from_account(
+ creator,
+ collection,
+ description,
+ name,
+ option::none(),
+ uri,
+ )
+ };
let object_signer = object::generate_signer(&constructor_ref);
diff --git a/aptos-move/framework/aptos-token-objects/doc/token.md b/aptos-move/framework/aptos-token-objects/doc/token.md
index 0b23237681a04..391ae97000cbd 100644
--- a/aptos-move/framework/aptos-token-objects/doc/token.md
+++ b/aptos-move/framework/aptos-token-objects/doc/token.md
@@ -16,6 +16,7 @@ token are:
- [Struct `MutationEvent`](#0x4_token_MutationEvent)
- [Constants](#@Constants_0)
- [Function `create_common`](#0x4_token_create_common)
+- [Function `create`](#0x4_token_create)
- [Function `create_named_token`](#0x4_token_create_named_token)
- [Function `create_from_account`](#0x4_token_create_from_account)
- [Function `create_token_address`](#0x4_token_create_token_address)
@@ -361,6 +362,42 @@ The token name is over the maximum length
+
+
+
+
+## Function `create`
+
+Creates a new token object with a unique address and returns the ConstructorRef
+for additional specialization.
+
+
+public fun create(creator: &signer, collection_name: string::String, description: string::String, name: string::String, royalty: option::Option<royalty::Royalty>, uri: string::String): object::ConstructorRef
+
+
+
+
+
+Implementation
+
+
+public fun create(
+ creator: &signer,
+ collection_name: String,
+ description: String,
+ name: String,
+ royalty: Option<Royalty>,
+ uri: String,
+): ConstructorRef {
+ let creator_address = signer::address_of(creator);
+ let constructor_ref = object::create_object(creator_address);
+ create_common(&constructor_ref, creator_address, collection_name, description, name, royalty, uri);
+ constructor_ref
+}
+
+
+
+
@@ -409,7 +446,8 @@ Creates a new token object from an account GUID and returns the ConstructorRef f
additional specialization.
-public fun create_from_account(creator: &signer, collection_name: string::String, description: string::String, name: string::String, royalty: option::Option<royalty::Royalty>, uri: string::String): object::ConstructorRef
+#[deprecated]
+public fun create_from_account(creator: &signer, collection_name: string::String, description: string::String, name: string::String, royalty: option::Option<royalty::Royalty>, uri: string::String): object::ConstructorRef
diff --git a/aptos-move/framework/aptos-token-objects/sources/aptos_token.move b/aptos-move/framework/aptos-token-objects/sources/aptos_token.move
index 17c77fa3fe3b4..f20cd7b600025 100644
--- a/aptos-move/framework/aptos-token-objects/sources/aptos_token.move
+++ b/aptos-move/framework/aptos-token-objects/sources/aptos_token.move
@@ -8,6 +8,7 @@
/// * Metadata property type
module aptos_token_objects::aptos_token {
use std::error;
+ use std::features;
use std::option::{Self, Option};
use std::string::String;
use std::signer;
@@ -199,14 +200,25 @@ module aptos_token_objects::aptos_token {
property_types: vector,
property_values: vector>,
): ConstructorRef acquires AptosCollection {
- let constructor_ref = token::create_from_account(
- creator,
- collection,
- description,
- name,
- option::none(),
- uri,
- );
+ let constructor_ref = if (features::auids_enabled()) {
+ token::create(
+ creator,
+ collection,
+ description,
+ name,
+ option::none(),
+ uri,
+ )
+ } else {
+ token::create_from_account(
+ creator,
+ collection,
+ description,
+ name,
+ option::none(),
+ uri,
+ )
+ };
let object_signer = object::generate_signer(&constructor_ref);
diff --git a/aptos-move/framework/aptos-token-objects/sources/token.move b/aptos-move/framework/aptos-token-objects/sources/token.move
index 2867bc18c2822..06e9bdfe529f4 100644
--- a/aptos-move/framework/aptos-token-objects/sources/token.move
+++ b/aptos-move/framework/aptos-token-objects/sources/token.move
@@ -106,6 +106,22 @@ module aptos_token_objects::token {
};
}
+ /// Creates a new token object with a unique address and returns the ConstructorRef
+ /// for additional specialization.
+ public fun create(
+ creator: &signer,
+ collection_name: String,
+ description: String,
+ name: String,
+ royalty: Option,
+ uri: String,
+ ): ConstructorRef {
+ let creator_address = signer::address_of(creator);
+ let constructor_ref = object::create_object(creator_address);
+ create_common(&constructor_ref, creator_address, collection_name, description, name, royalty, uri);
+ constructor_ref
+ }
+
/// Creates a new token object from a token name and returns the ConstructorRef for
/// additional specialization.
public fun create_named_token(
@@ -124,6 +140,7 @@ module aptos_token_objects::token {
constructor_ref
}
+ #[deprecated]
/// Creates a new token object from an account GUID and returns the ConstructorRef for
/// additional specialization.
public fun create_from_account(
@@ -514,7 +531,7 @@ module aptos_token_objects::token {
}
#[test(creator = @0x123)]
- fun test_burn_and_delete(creator: &signer) acquires Token {
+ fun test_create_from_account_burn_and_delete(creator: &signer) acquires Token {
use aptos_framework::account;
let collection_name = string::utf8(b"collection name");
@@ -538,6 +555,35 @@ module aptos_token_objects::token {
assert!(!object::is_object(token_addr), 2);
}
+ #[test(creator = @0x123,fx = @std)]
+ fun test_create_burn_and_delete(creator: &signer, fx: signer) acquires Token {
+ use aptos_framework::account;
+ use std::features;
+
+ let feature = features::get_auids();
+ features::change_feature_flags(&fx, vector[feature], vector[]);
+
+ let collection_name = string::utf8(b"collection name");
+ let token_name = string::utf8(b"token name");
+
+ create_collection_helper(creator, collection_name, 1);
+ account::create_account_for_test(signer::address_of(creator));
+ let constructor_ref = create(
+ creator,
+ collection_name,
+ string::utf8(b"token description"),
+ token_name,
+ option::none(),
+ string::utf8(b"token uri"),
+ );
+ let burn_ref = generate_burn_ref(&constructor_ref);
+ let token_addr = object::address_from_constructor_ref(&constructor_ref);
+ assert!(exists(token_addr), 0);
+ burn(burn_ref);
+ assert!(!exists(token_addr), 1);
+ assert!(!object::is_object(token_addr), 2);
+ }
+
#[test_only]
fun create_collection_helper(creator: &signer, collection_name: String, max_supply: u64) {
collection::create_fixed_collection(
diff --git a/aptos-move/framework/move-stdlib/doc/features.md b/aptos-move/framework/move-stdlib/doc/features.md
index d1c4ce9535541..a237205951252 100644
--- a/aptos-move/framework/move-stdlib/doc/features.md
+++ b/aptos-move/framework/move-stdlib/doc/features.md
@@ -62,6 +62,8 @@ return true.
- [Function `get_delegation_pool_partial_governance_voting`](#0x1_features_get_delegation_pool_partial_governance_voting)
- [Function `delegation_pool_partial_governance_voting_enabled`](#0x1_features_delegation_pool_partial_governance_voting_enabled)
- [Function `gas_payer_enabled`](#0x1_features_gas_payer_enabled)
+- [Function `get_auids`](#0x1_features_get_auids)
+- [Function `auids_enabled`](#0x1_features_auids_enabled)
- [Function `change_feature_flags`](#0x1_features_change_feature_flags)
- [Function `is_enabled`](#0x1_features_is_enabled)
- [Function `set`](#0x1_features_set)
@@ -127,6 +129,17 @@ Lifetime: transient
+
+
+Whether enable MOVE functions to call create_auid method to create AUIDs.
+Lifetime: transient
+
+
+const APTOS_UNIQUE_IDENTIFIERS: u64 = 23;
+
+
+
+
Whether the new BLAKE2B-256 hash function native is enabled.
@@ -1067,6 +1080,52 @@ Lifetime: transient
+
+
+
+
+## Function `get_auids`
+
+
+
+public fun get_auids(): u64
+
+
+
+
+
+Implementation
+
+
+public fun get_auids(): u64 { APTOS_UNIQUE_IDENTIFIERS }
+
+
+
+
+
+
+
+
+## Function `auids_enabled`
+
+
+
+public fun auids_enabled(): bool
+
+
+
+
+
+Implementation
+
+
+public fun auids_enabled(): bool acquires Features {
+ is_enabled(APTOS_UNIQUE_IDENTIFIERS)
+}
+
+
+
+
diff --git a/aptos-move/framework/move-stdlib/sources/configs/features.move b/aptos-move/framework/move-stdlib/sources/configs/features.move
index 1e96cfb53cd21..9f64c9ee8be45 100644
--- a/aptos-move/framework/move-stdlib/sources/configs/features.move
+++ b/aptos-move/framework/move-stdlib/sources/configs/features.move
@@ -201,6 +201,14 @@ module std::features {
is_enabled(GAS_PAYER_ENABLED)
}
+ /// Whether enable MOVE functions to call create_auid method to create AUIDs.
+ /// Lifetime: transient
+ const APTOS_UNIQUE_IDENTIFIERS: u64 = 23;
+ public fun get_auids(): u64 { APTOS_UNIQUE_IDENTIFIERS }
+ public fun auids_enabled(): bool acquires Features {
+ is_enabled(APTOS_UNIQUE_IDENTIFIERS)
+ }
+
// ============================================================================================
// Feature Flag Implementation
diff --git a/aptos-move/framework/src/natives/mod.rs b/aptos-move/framework/src/natives/mod.rs
index 2089364b927ca..177b1c0416870 100644
--- a/aptos-move/framework/src/natives/mod.rs
+++ b/aptos-move/framework/src/natives/mod.rs
@@ -226,7 +226,11 @@ impl GasParameters {
},
},
transaction_context: transaction_context::GasParameters {
+ get_txn_hash: transaction_context::GetTxnHashGasParameters { base: 0.into() },
get_script_hash: transaction_context::GetScriptHashGasParameters { base: 0.into() },
+ generate_unique_address: transaction_context::GenerateUniqueAddressGasParameters {
+ base: 0.into(),
+ },
},
code: code::GasParameters {
request_publish: code::RequestPublishGasParameters {
diff --git a/aptos-move/framework/src/natives/transaction_context.rs b/aptos-move/framework/src/natives/transaction_context.rs
index ca6f2d970e727..44afefa15e33d 100644
--- a/aptos-move/framework/src/natives/transaction_context.rs
+++ b/aptos-move/framework/src/natives/transaction_context.rs
@@ -2,9 +2,12 @@
// SPDX-License-Identifier: Apache-2.0
use crate::natives::helpers::{make_safe_native, SafeNativeContext, SafeNativeResult};
-use aptos_types::on_chain_config::{Features, TimedFeatures};
+use aptos_types::{
+ on_chain_config::{Features, TimedFeatures},
+ transaction::authenticator::{AuthenticationKey, AuthenticationKeyPreimage},
+};
use better_any::{Tid, TidAble};
-use move_core_types::gas_algebra::InternalGas;
+use move_core_types::{account_address::AccountAddress, gas_algebra::InternalGas};
use move_vm_runtime::native_functions::NativeFunction;
use move_vm_types::{loaded_data::runtime_types::Type, values::Value};
use smallvec::{smallvec, SmallVec};
@@ -15,6 +18,9 @@ use std::{collections::VecDeque, fmt::Debug, sync::Arc};
/// natives of this extension.
#[derive(Tid)]
pub struct NativeTransactionContext {
+ txn_hash: Vec,
+ /// This is the number of AUIDs (Aptos unique identifiers) issued during the execution of this transaction
+ auid_counter: u64,
script_hash: Vec,
chain_id: u8,
}
@@ -22,8 +28,10 @@ pub struct NativeTransactionContext {
impl NativeTransactionContext {
/// Create a new instance of a native transaction context. This must be passed in via an
/// extension into VM session functions.
- pub fn new(script_hash: Vec, chain_id: u8) -> Self {
+ pub fn new(txn_hash: Vec, script_hash: Vec, chain_id: u8) -> Self {
Self {
+ txn_hash,
+ auid_counter: 0,
script_hash,
chain_id,
}
@@ -34,6 +42,68 @@ impl NativeTransactionContext {
}
}
+/***************************************************************************************************
+ * native fun get_txn_hash
+ *
+ * gas cost: base_cost
+ *
+ **************************************************************************************************/
+#[derive(Clone, Debug)]
+pub struct GetTxnHashGasParameters {
+ pub base: InternalGas,
+}
+
+fn native_get_txn_hash(
+ gas_params: &GetTxnHashGasParameters,
+ context: &mut SafeNativeContext,
+ mut _ty_args: Vec,
+ _args: VecDeque,
+) -> SafeNativeResult> {
+ context.charge(gas_params.base)?;
+
+ let transaction_context = context.extensions().get::();
+
+ Ok(smallvec![Value::vector_u8(
+ transaction_context.txn_hash.clone()
+ )])
+}
+
+/***************************************************************************************************
+ * native fun generate_unique_address
+ *
+ * gas cost: base_cost
+ *
+ **************************************************************************************************/
+#[derive(Clone, Debug)]
+pub struct GenerateUniqueAddressGasParameters {
+ pub base: InternalGas,
+}
+
+fn native_generate_unique_address(
+ gas_params: &GenerateUniqueAddressGasParameters,
+ context: &mut SafeNativeContext,
+ mut _ty_args: Vec,
+ _args: VecDeque,
+) -> SafeNativeResult> {
+ context.charge(gas_params.base)?;
+
+ let mut transaction_context = context
+ .extensions_mut()
+ .get_mut::();
+ transaction_context.auid_counter += 1;
+
+ let hash_vec = AuthenticationKey::from_preimage(&AuthenticationKeyPreimage::auid(
+ transaction_context.txn_hash.clone(),
+ transaction_context.auid_counter,
+ ));
+ Ok(smallvec![Value::address(AccountAddress::new(
+ hash_vec
+ .to_vec()
+ .try_into()
+ .expect("Unable to convert hash vector into [u8]")
+ ))])
+}
+
/***************************************************************************************************
* native fun get_script_hash
*
@@ -66,7 +136,9 @@ fn native_get_script_hash(
**************************************************************************************************/
#[derive(Debug, Clone)]
pub struct GasParameters {
+ pub get_txn_hash: GetTxnHashGasParameters,
pub get_script_hash: GetScriptHashGasParameters,
+ pub generate_unique_address: GenerateUniqueAddressGasParameters,
}
pub fn make_all(
@@ -74,15 +146,35 @@ pub fn make_all(
timed_features: TimedFeatures,
features: Arc,
) -> impl Iterator- {
- let natives = [(
- "get_script_hash",
- make_safe_native(
- gas_params.get_script_hash,
- timed_features,
- features,
- native_get_script_hash,
+ let natives = [
+ (
+ "get_script_hash",
+ make_safe_native(
+ gas_params.get_script_hash,
+ timed_features.clone(),
+ features.clone(),
+ native_get_script_hash,
+ ),
+ ),
+ (
+ "generate_unique_address",
+ make_safe_native(
+ gas_params.generate_unique_address,
+ timed_features.clone(),
+ features.clone(),
+ native_generate_unique_address,
+ ),
+ ),
+ (
+ "get_txn_hash",
+ make_safe_native(
+ gas_params.get_txn_hash,
+ timed_features,
+ features,
+ native_get_txn_hash,
+ ),
),
- )];
+ ];
crate::natives::helpers::make_module_natives(natives)
}
diff --git a/types/src/transaction/authenticator.rs b/types/src/transaction/authenticator.rs
index b65343501eeb7..82203a9fe1ded 100644
--- a/types/src/transaction/authenticator.rs
+++ b/types/src/transaction/authenticator.rs
@@ -246,6 +246,7 @@ pub enum Scheme {
/// resources accounts. This application serves to domain separate hashes. Without such
/// separation, an adversary could create (and get a signer for) a these accounts
/// when a their address matches matches an existing address of a MultiEd25519 wallet.
+ DeriveAuid = 251,
DeriveObjectAddressFromObject = 252,
DeriveObjectAddressFromGuid = 253,
DeriveObjectAddressFromSeed = 254,
@@ -257,6 +258,7 @@ impl fmt::Display for Scheme {
let display = match self {
Scheme::Ed25519 => "Ed25519",
Scheme::MultiEd25519 => "MultiEd25519",
+ Scheme::DeriveAuid => "DeriveAuid",
Scheme::DeriveObjectAddressFromObject => "DeriveObjectAddressFromObject",
Scheme::DeriveObjectAddressFromGuid => "DeriveObjectAddressFromGuid",
Scheme::DeriveObjectAddressFromSeed => "DeriveObjectAddressFromSeed",
@@ -461,6 +463,15 @@ impl AuthenticationKeyPreimage {
Self::new(public_key.to_bytes(), Scheme::MultiEd25519)
}
+ /// Construct a preimage from a transaction-derived AUID as (txn_hash || auid_scheme_id)
+ pub fn auid(txn_hash: Vec, auid_counter: u64) -> AuthenticationKeyPreimage {
+ let mut hash_arg = Vec::new();
+ hash_arg.extend(txn_hash);
+ hash_arg.extend(auid_counter.to_le_bytes().to_vec());
+ hash_arg.push(Scheme::DeriveAuid as u8);
+ Self(hash_arg)
+ }
+
/// Construct a vector from this authentication key
pub fn into_vec(self) -> Vec {
self.0