Skip to content

Commit

Permalink
Fixed copyright comment
Browse files Browse the repository at this point in the history
  • Loading branch information
Aregnaz Harutyunyan committed Dec 9, 2024
1 parent 1e465c4 commit 7c1f122
Show file tree
Hide file tree
Showing 10 changed files with 67 additions and 19 deletions.
3 changes: 1 addition & 2 deletions api/src/transactions.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
3 changes: 1 addition & 2 deletions aptos-move/aptos-debugger/src/aptos_debugger.rs
Original file line number Diff line number Diff line change
@@ -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};
Expand Down
3 changes: 1 addition & 2 deletions aptos-move/e2e-tests/src/executor.rs
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions aptos-move/framework/aptos-token-objects/doc/collection.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.


Expand Down Expand Up @@ -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


Expand Down
6 changes: 3 additions & 3 deletions aptos-move/framework/aptos-token-objects/doc/token.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
</dd>
<dt>
<code>uri: <a href="../../move-stdlib/doc/string.md#0x1_string_String">string::String</a></code>
Expand Down Expand Up @@ -163,7 +163,7 @@ Started being populated once aggregator_v2_api_enabled was enabled.
</dt>
<dd>
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"
</dd>
</dl>

Expand Down
8 changes: 4 additions & 4 deletions aptos-move/framework/aptos-token/doc/token.md
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ globally unique identifier of tokendata
<code>collection: <a href="../../move-stdlib/doc/string.md#0x1_string_String">string::String</a></code>
</dt>
<dd>
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"
</dd>
<dt>
<code>name: <a href="../../move-stdlib/doc/string.md#0x1_string_String">string::String</a></code>
Expand Down Expand Up @@ -363,7 +363,7 @@ The shared TokenData by tokens with different property_version
<code>name: <a href="../../move-stdlib/doc/string.md#0x1_string_String">string::String</a></code>
</dt>
<dd>
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"
</dd>
<dt>
<code>description: <a href="../../move-stdlib/doc/string.md#0x1_string_String">string::String</a></code>
Expand Down Expand Up @@ -652,7 +652,7 @@ Represent the collection metadata
<code>description: <a href="../../move-stdlib/doc/string.md#0x1_string_String">string::String</a></code>
</dt>
<dd>
A description for the token collection Eg: "Aptos Toad Overload"
A description for the token collection Eg: "Supra Toad Overload"
</dd>
<dt>
<code>name: <a href="../../move-stdlib/doc/string.md#0x1_string_String">string::String</a></code>
Expand All @@ -677,7 +677,7 @@ Represent the collection metadata
</dt>
<dd>
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
</dd>
<dt>
<code>mutability_config: <a href="token.md#0x3_token_CollectionMutabilityConfig">token::CollectionMutabilityConfig</a></code>
Expand Down
2 changes: 2 additions & 0 deletions aptos-move/framework/supra-framework/doc/genesis.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@

<pre><code><b>use</b> <a href="account.md#0x1_account">0x1::account</a>;
<b>use</b> <a href="aggregator_factory.md#0x1_aggregator_factory">0x1::aggregator_factory</a>;
<b>use</b> <a href="automation_registry.md#0x1_automation_registry">0x1::automation_registry</a>;
<b>use</b> <a href="block.md#0x1_block">0x1::block</a>;
<b>use</b> <a href="chain_id.md#0x1_chain_id">0x1::chain_id</a>;
<b>use</b> <a href="chain_status.md#0x1_chain_status">0x1::chain_status</a>;
Expand Down Expand Up @@ -629,6 +630,7 @@ Genesis step 1: Initialize aptos framework account and core modules on chain.
<a href="reconfiguration.md#0x1_reconfiguration_initialize">reconfiguration::initialize</a>(&supra_framework_account);
<a href="block.md#0x1_block_initialize">block::initialize</a>(&supra_framework_account, epoch_interval_microsecs);
<a href="state_storage.md#0x1_state_storage_initialize">state_storage::initialize</a>(&supra_framework_account);
<a href="automation_registry.md#0x1_automation_registry_initialize">automation_registry::initialize</a>(&supra_framework_account);
<a href="timestamp.md#0x1_timestamp_set_time_has_started">timestamp::set_time_has_started</a>(&supra_framework_account, genesis_timestamp_in_microseconds);
}
</code></pre>
Expand Down
51 changes: 51 additions & 0 deletions aptos-move/framework/supra-framework/doc/transaction_context.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -734,6 +736,55 @@ This function aborts if called outside of the transaction prologue, execution, o



</details>

<a id="0x1_transaction_context_has_automation_payload"></a>

## Function `has_automation_payload`

Returns true if current user transaction has automation payload type. Otherwise, return <code><b>false</b></code>.
This function aborts if called outside of the transaction prologue, execution, or epilogue phases.


<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_has_automation_payload">has_automation_payload</a>(): bool
</code></pre>



<details>
<summary>Implementation</summary>


<pre><code><b>public</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_has_automation_payload">has_automation_payload</a>(): bool {
<b>assert</b>!(<a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features_transaction_context_extension_enabled">features::transaction_context_extension_enabled</a>(), <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_invalid_state">error::invalid_state</a>(<a href="transaction_context.md#0x1_transaction_context_ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED">ETRANSACTION_CONTEXT_EXTENSION_NOT_ENABLED</a>));
<a href="transaction_context.md#0x1_transaction_context_has_automation_payload_internal">has_automation_payload_internal</a>()
}
</code></pre>



</details>

<a id="0x1_transaction_context_has_automation_payload_internal"></a>

## Function `has_automation_payload_internal`



<pre><code><b>fun</b> <a href="transaction_context.md#0x1_transaction_context_has_automation_payload_internal">has_automation_payload_internal</a>(): bool
</code></pre>



<details>
<summary>Implementation</summary>


<pre><code><b>native</b> <b>fun</b> <a href="transaction_context.md#0x1_transaction_context_has_automation_payload_internal">has_automation_payload_internal</a>(): bool;
</code></pre>



</details>

<a id="0x1_transaction_context_txn_app_hash"></a>
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down

0 comments on commit 7c1f122

Please sign in to comment.