[License] Correct license headers in various files.

aptos-move/aptos-transaction-benchmarks/src/benchmark_runner.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::transaction_bench_state::TransactionBenchState;
 use aptos_language_e2e_tests::account_universe::{AUTransactionGen, AccountPickStyle};

aptos-move/aptos-transaction-benchmarks/src/transaction_bench_state.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{transactions, transactions::RAYON_EXEC_POOL};
 use aptos_bitvec::BitVec;

aptos-move/aptos-vm/src/sharded_block_executor/cross_shard_client.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{
     block_executor::AptosTransactionOutput,

aptos-move/aptos-vm/src/sharded_block_executor/messages.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use aptos_types::{state_store::state_key::StateKey, write_set::WriteOp};
 use serde::{Deserialize, Serialize};

aptos-move/aptos-vm/src/sharded_block_executor/sharded_executor_service.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{
     block_executor::BlockAptosVM,

aptos-move/aptos-vm/src/validator_txns/dkg.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{
     aptos_vm::get_or_vm_startup_failure,

aptos-move/aptos-vm/src/validator_txns/jwk.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{
     aptos_vm::get_or_vm_startup_failure,

aptos-move/aptos-vm/src/validator_txns/mod.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{
     move_vm_ext::{AptosMoveResolver, SessionId},

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

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{assert_success, harness::MoveHarness, BlockSplit};
 use aptos_language_e2e_tests::{

aptos-move/framework/move-stdlib/src/lib.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 // Copyright (c) The Diem Core Contributors
 // Copyright (c) The Move Contributors

aptos-move/framework/move-stdlib/src/natives/bcs.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 // Copyright (c) The Diem Core Contributors
 // Copyright (c) The Move Contributors

aptos-move/framework/move-stdlib/src/natives/hash.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 // Copyright (c) The Diem Core Contributors
 // Copyright (c) The Move Contributors

aptos-move/framework/move-stdlib/src/natives/mod.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 // Copyright (c) The Diem Core Contributors
 // Copyright (c) The Move Contributors

aptos-move/framework/move-stdlib/src/natives/signer.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 // Copyright (c) The Diem Core Contributors
 // Copyright (c) The Move Contributors

aptos-move/framework/move-stdlib/src/natives/string.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 // Copyright (c) The Diem Core Contributors
 // Copyright (c) The Move Contributors

aptos-move/framework/move-stdlib/src/natives/unit_test.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 // Copyright (c) The Diem Core Contributors
 // Copyright (c) The Move Contributors

aptos-move/framework/src/natives/cryptography/algebra/arithmetics/add.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{
     abort_unless_arithmetics_enabled_for_structure, abort_unless_feature_flag_enabled,

aptos-move/framework/src/natives/cryptography/algebra/arithmetics/div.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{
     abort_unless_arithmetics_enabled_for_structure, abort_unless_feature_flag_enabled,

aptos-move/framework/src/natives/cryptography/algebra/arithmetics/double.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{
     abort_unless_arithmetics_enabled_for_structure, abort_unless_feature_flag_enabled,

aptos-move/framework/src/natives/cryptography/algebra/arithmetics/inv.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{
     abort_unless_arithmetics_enabled_for_structure, abort_unless_feature_flag_enabled,

aptos-move/framework/src/natives/cryptography/algebra/arithmetics/mod.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 pub mod add;
 pub mod div;

aptos-move/framework/src/natives/cryptography/algebra/arithmetics/mul.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{
     abort_unless_arithmetics_enabled_for_structure, abort_unless_feature_flag_enabled,

aptos-move/framework/src/natives/cryptography/algebra/arithmetics/neg.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{
     abort_unless_arithmetics_enabled_for_structure, abort_unless_feature_flag_enabled,

aptos-move/framework/src/natives/cryptography/algebra/arithmetics/scalar_mul.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{
     abort_unless_feature_flag_enabled,

aptos-move/framework/src/natives/cryptography/algebra/arithmetics/sqr.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{
     abort_unless_arithmetics_enabled_for_structure, abort_unless_feature_flag_enabled,

aptos-move/framework/src/natives/cryptography/algebra/arithmetics/sub.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{
     abort_unless_arithmetics_enabled_for_structure, abort_unless_feature_flag_enabled,

aptos-move/framework/src/natives/cryptography/algebra/casting.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{
     abort_unless_feature_flag_enabled,

aptos-move/framework/src/natives/cryptography/algebra/constants.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{
     abort_unless_arithmetics_enabled_for_structure, abort_unless_feature_flag_enabled,

aptos-move/framework/src/natives/cryptography/algebra/eq.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{
     abort_unless_arithmetics_enabled_for_structure, abort_unless_feature_flag_enabled,

aptos-move/framework/src/natives/cryptography/algebra/hash_to_structure.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{
     abort_unless_feature_flag_enabled,

aptos-move/framework/src/natives/cryptography/algebra/mod.rs

@@ -1,6 +1,4 @@
 // Copyright © Aptos Foundation
-
-// Copyright (c) Aptos
 // SPDX-License-Identifier: Apache-2.0
 
 #[cfg(feature = "testing")]

aptos-move/framework/src/natives/cryptography/algebra/new.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{
     abort_unless_arithmetics_enabled_for_structure, abort_unless_feature_flag_enabled,

aptos-move/framework/src/natives/cryptography/algebra/pairing.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{
     abort_unless_feature_flag_enabled,

aptos-move/framework/src/natives/cryptography/algebra/rand.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 #[cfg(feature = "testing")]
 use crate::{

aptos-move/framework/src/natives/cryptography/algebra/serialization.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{
     abort_unless_feature_flag_enabled,

aptos-move/framework/src/natives/cryptography/bulletproofs.rs

@@ -1,6 +1,4 @@
 // Copyright © Aptos Foundation
-
-// Copyright (c) Aptos
 // SPDX-License-Identifier: Apache-2.0
 
 #[cfg(feature = "testing")]

aptos-move/framework/src/natives/debug.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 // Copyright (c) The Diem Core Contributors
 // Copyright (c) The Move Contributors

aptos-move/framework/table-natives/src/lib.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 // Copyright (c) The Diem Core Contributors
 // Copyright (c) The Move Contributors

aptos-utils/src/lib.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 /// An internal implementation to imitate the feature of `try` in unstable Rust.
 /// Useful to use '?' chaining on option/result without the need to wrap the expression in a

config/src/config/dag_consensus_config.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use super::{
     config_sanitizer::ConfigSanitizer, node_config_loader::NodeType, ChainHealthBackoffValues,

config/src/config/dkg_config.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use serde::{Deserialize, Serialize};
 

config/src/config/jwk_consensus_config.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use serde::{Deserialize, Serialize};
 

consensus/consensus-types/src/proposal_ext.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::common::{Author, Payload, Round};
 use aptos_types::validator_txn::ValidatorTransaction;

consensus/src/dag/bootstrap.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use super::{
     adapter::{OrderedNotifierAdapter, TLedgerInfoProvider},

consensus/src/dag/commit_signer.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::pipeline::signing_phase::CommitSignerProvider;
 use aptos_crypto::bls12381;

consensus/src/dag/dag_handler.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{
     dag::{

consensus/src/dag/dag_network.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use super::{types::DAGMessage, DAGRpcResult};
 use aptos_consensus_types::common::Author;

consensus/src/dag/dag_state_sync.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use super::{
     adapter::TLedgerInfoProvider,

consensus/src/dag/errors.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use aptos_bitvec::BitVec;
 use aptos_consensus_types::common::Round;

consensus/src/dag/tests/dag_driver_tests.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{
     dag::{

consensus/src/dag/tests/dag_network_test.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::dag::{
     dag_network::{RpcWithFallback, TDAGNetworkSender},

consensus/src/dag/tests/dag_state_sync_tests.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use super::helpers::TEST_DAG_WINDOW;
 use crate::{

consensus/src/dag/tests/fetcher_test.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use super::dag_test::MockStorage;
 use crate::dag::{

consensus/src/dag/tests/helpers.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{
     dag::{

consensus/src/dag/tests/integration_tests.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use super::dag_test;
 use crate::{

consensus/src/dag/tests/types_test.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use super::helpers::new_node;
 use crate::dag::{

consensus/src/payload_client/mixed.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 #[cfg(test)]
 use crate::payload_client::user;

consensus/src/payload_client/user/mod.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::error::QuorumStoreError;
 use aptos_consensus_types::common::{Payload, PayloadFilter};

consensus/src/payload_client/user/quorum_store_client.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{
     counters::WAIT_FOR_FULL_BLOCKS_TRIGGERED, error::QuorumStoreError, monitor,

consensus/src/payload_client/validator.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use aptos_types::validator_txn::ValidatorTransaction;
 use aptos_validator_transaction_pool as vtxn_pool;

consensus/src/state_computer_tests.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{
     error::MempoolError, payload_manager::PayloadManager, state_computer::ExecutionProxy,

crates/aptos-api-tester/src/consts.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::utils::NetworkName;
 use once_cell::sync::Lazy;

crates/aptos-api-tester/src/counters.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use once_cell::sync::Lazy;
 use prometheus::{register_histogram_vec, Histogram, HistogramVec};

crates/aptos-api-tester/src/macros.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 #[macro_export]
 macro_rules! time_fn {

crates/aptos-api-tester/src/persistent_check.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 // Persistent checking is a mechanism to increase tolerancy to eventual consistency issues. In our
 // earlier tests we have observed that parallel runs of the flows returned higher failure rates

crates/aptos-api-tester/src/strings.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 // Fail messages