diff --git a/api/src/transactions.rs b/api/src/transactions.rs index 819660892b4fc9..2599d6065ee198 100644 --- a/api/src/transactions.rs +++ b/api/src/transactions.rs @@ -1,8 +1,7 @@ +// Copyright (c) 2024 Supra. // Copyright © Aptos Foundation // Parts of the project are originally copyright © Meta Platforms, Inc. // SPDX-License-Identifier: Apache-2.0 -// -// Copyright (c) 2024 Supra. use crate::{ accept_type::AcceptType, diff --git a/aptos-move/aptos-debugger/src/aptos_debugger.rs b/aptos-move/aptos-debugger/src/aptos_debugger.rs index 60787c5ead048f..94a5836033a2ce 100644 --- a/aptos-move/aptos-debugger/src/aptos_debugger.rs +++ b/aptos-move/aptos-debugger/src/aptos_debugger.rs @@ -1,7 +1,6 @@ +// Copyright (c) 2024 Supra. // Copyright © Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -// -// Copyright (c) 2024 Supra. use anyhow::{bail, format_err, Result}; use aptos_gas_profiling::{GasProfiler, TransactionGasLog}; diff --git a/aptos-move/e2e-tests/src/executor.rs b/aptos-move/e2e-tests/src/executor.rs index 880ea03a060d6f..3fce3fa6d1e896 100644 --- a/aptos-move/e2e-tests/src/executor.rs +++ b/aptos-move/e2e-tests/src/executor.rs @@ -1,8 +1,7 @@ +// Copyright (c) 2024 Supra. // Copyright © Aptos Foundation // Parts of the project are originally copyright © Meta Platforms, Inc. // SPDX-License-Identifier: Apache-2.0 -// -// Copyright (c) 2024 Supra. //! Support for running the VM to execute and verify transactions. diff --git a/aptos-move/framework/aptos-token-objects/doc/collection.md b/aptos-move/framework/aptos-token-objects/doc/collection.md index e6098031719f94..3cb95eb99eef34 100644 --- a/aptos-move/framework/aptos-token-objects/doc/collection.md +++ b/aptos-move/framework/aptos-token-objects/doc/collection.md @@ -793,7 +793,7 @@ The collection does not have a max supply Creates a fixed-sized collection, or a collection that supports a fixed amount of tokens. This is useful to create a guaranteed, limited supply on-chain digital asset. For example, a collection 1111 vicious vipers. Note, creating restrictions such as upward limits results -in data structures that prevent Aptos from parallelizing mints of this collection type. +in data structures that prevent Supra from parallelizing mints of this collection type. Beyond that, it adds supply tracking with events. @@ -892,7 +892,7 @@ the supply of tokens. ## Function `create_untracked_collection` Creates an untracked collection, or a collection that supports an arbitrary amount of -tokens. This is useful for mass airdrops that fully leverage Aptos parallelization. +tokens. This is useful for mass airdrops that fully leverage Supra parallelization. TODO: Hide this until we bring back meaningful way to enforce burns diff --git a/aptos-move/framework/aptos-token-objects/doc/token.md b/aptos-move/framework/aptos-token-objects/doc/token.md index 6c3c30342af118..4f405dbc13d3cb 100644 --- a/aptos-move/framework/aptos-token-objects/doc/token.md +++ b/aptos-move/framework/aptos-token-objects/doc/token.md @@ -3,7 +3,7 @@ # Module `0x4::token` -This defines an object-based Token. The key differentiating features from the Aptos standard +This defines an object-based Token. The key differentiating features from the Supra standard token are: * Decoupled token ownership from token data. * Explicit data model for token metadata via adjacent resources @@ -113,7 +113,7 @@ Represents the common fields to all tokens. Was populated until concurrent_token_v2_enabled feature flag was enabled. The name of the token, which should be unique within the collection; the length of name - should be smaller than 128, characters, eg: "Aptos Animal #1234" + should be smaller than 128, characters, eg: "Supra Animal #1234"
uri: string::String @@ -163,7 +163,7 @@ Started being populated once aggregator_v2_api_enabled was enabled.
The name of the token, which should be unique within the collection; the length of name - should be smaller than 128, characters, eg: "Aptos Animal #1234" + should be smaller than 128, characters, eg: "Supra Animal #1234"
diff --git a/aptos-move/framework/aptos-token/doc/token.md b/aptos-move/framework/aptos-token/doc/token.md index c7632c39c131e9..1737c8c7df73bb 100644 --- a/aptos-move/framework/aptos-token/doc/token.md +++ b/aptos-move/framework/aptos-token/doc/token.md @@ -299,7 +299,7 @@ globally unique identifier of tokendata collection: string::String
- The name of collection; this is unique under the same account, eg: "Aptos Animal Collection" + The name of collection; this is unique under the same account, eg: "Supra Animal Collection"
name: string::String @@ -363,7 +363,7 @@ The shared TokenData by tokens with different property_version name: string::String
- The name of the token, which should be unique within the collection; the length of name should be smaller than 128, characters, eg: "Aptos Animal #1234" + The name of the token, which should be unique within the collection; the length of name should be smaller than 128, characters, eg: "Supra Animal #1234"
description: string::String @@ -652,7 +652,7 @@ Represent the collection metadata description: string::String
- A description for the token collection Eg: "Aptos Toad Overload" + A description for the token collection Eg: "Supra Toad Overload"
name: string::String @@ -677,7 +677,7 @@ Represent the collection metadata
If maximal is a non-zero value, the number of created TokenData entries should be smaller or equal to this maximum - If maximal is 0, Aptos doesn't track the supply of this collection, and there is no limit + If maximal is 0, Supra doesn't track the supply of this collection, and there is no limit
mutability_config: token::CollectionMutabilityConfig diff --git a/aptos-move/framework/supra-framework/doc/genesis.md b/aptos-move/framework/supra-framework/doc/genesis.md index 000797d28384f7..e80d9312d16a8d 100644 --- a/aptos-move/framework/supra-framework/doc/genesis.md +++ b/aptos-move/framework/supra-framework/doc/genesis.md @@ -49,6 +49,7 @@ 
use 0x1::account;
 use 0x1::aggregator_factory;
+use 0x1::automation_registry;
 use 0x1::block;
 use 0x1::chain_id;
 use 0x1::chain_status;
@@ -629,6 +630,7 @@ Genesis step 1: Initialize aptos framework account and core modules on chain.
     reconfiguration::initialize(&supra_framework_account);
     block::initialize(&supra_framework_account, epoch_interval_microsecs);
     state_storage::initialize(&supra_framework_account);
+    automation_registry::initialize(&supra_framework_account);
     timestamp::set_time_has_started(&supra_framework_account, genesis_timestamp_in_microseconds);
 }
diff --git a/aptos-move/framework/supra-framework/doc/transaction_context.md b/aptos-move/framework/supra-framework/doc/transaction_context.md index c2e2fbd7810325..8815c4cb41948d 100644 --- a/aptos-move/framework/supra-framework/doc/transaction_context.md +++ b/aptos-move/framework/supra-framework/doc/transaction_context.md @@ -30,6 +30,8 @@ - [Function `chain_id_internal`](#0x1_transaction_context_chain_id_internal) - [Function `entry_function_payload`](#0x1_transaction_context_entry_function_payload) - [Function `entry_function_payload_internal`](#0x1_transaction_context_entry_function_payload_internal) +- [Function `has_automation_payload`](#0x1_transaction_context_has_automation_payload) +- [Function `has_automation_payload_internal`](#0x1_transaction_context_has_automation_payload_internal) - [Function `txn_app_hash`](#0x1_transaction_context_txn_app_hash) - [Function `txn_app_hash_internal`](#0x1_transaction_context_txn_app_hash_internal) - [Function `account_address`](#0x1_transaction_context_account_address) @@ -734,6 +736,55 @@ This function aborts if called outside of the transaction prologue, execution, o + + + + +## Function `has_automation_payload` + +Returns true if current user transaction has automation payload type. Otherwise, return false. +This function aborts if called outside of the transaction prologue, execution, or epilogue phases. + + +
public fun has_automation_payload(): bool
+
+ + + +
+Implementation + + +
public fun has_automation_payload(): bool {
+    assert!(features::transaction_context_extension_enabled(), error::invalid_state(ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED));
+    has_automation_payload_internal()
+}
+
+ + + +
+ + + +## Function `has_automation_payload_internal` + + + +
fun has_automation_payload_internal(): bool
+
+ + + +
+Implementation + + +
native fun has_automation_payload_internal(): bool;
+
+ + +
diff --git a/consensus/src/transaction_shuffler/fairness/conflict_key/entry_fun.rs b/consensus/src/transaction_shuffler/fairness/conflict_key/entry_fun.rs index 52291dd219ea86..7091c34c521980 100644 --- a/consensus/src/transaction_shuffler/fairness/conflict_key/entry_fun.rs +++ b/consensus/src/transaction_shuffler/fairness/conflict_key/entry_fun.rs @@ -1,7 +1,6 @@ +// Copyright (c) 2024 Supra. // Copyright © Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -// -// Copyright (c) 2024 Supra. use crate::transaction_shuffler::fairness::conflict_key::ConflictKey; use aptos_types::transaction::automation::AutomationTransactionPayload; diff --git a/consensus/src/transaction_shuffler/fairness/conflict_key/entry_fun_module.rs b/consensus/src/transaction_shuffler/fairness/conflict_key/entry_fun_module.rs index 79e9a3ac267e1d..f9bf1116989ce1 100644 --- a/consensus/src/transaction_shuffler/fairness/conflict_key/entry_fun_module.rs +++ b/consensus/src/transaction_shuffler/fairness/conflict_key/entry_fun_module.rs @@ -1,7 +1,6 @@ +// Copyright (c) 2024 Supra. // Copyright © Aptos Foundation // SPDX-License-Identifier: Apache-2.0 -// -// Copyright (c) 2024 Supra. use crate::transaction_shuffler::fairness::conflict_key::ConflictKey; use aptos_types::transaction::automation::AutomationTransactionPayload;