[License] Continue to correct license headers.

aptos-move/aptos-release-builder/src/components/jwk_consensus_config.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{components::get_signer_arg, utils::generate_governance_proposal};
 use aptos_types::on_chain_config::OnChainJWKConsensusConfig;

aptos-move/aptos-release-builder/src/components/oidc_providers.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{components::get_signer_arg, utils::generate_governance_proposal};
 use move_model::{code_writer::CodeWriter, emitln, model::Loc};

aptos-move/aptos-release-builder/src/components/randomness_config.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{components::get_signer_arg, utils::generate_governance_proposal};
 use aptos_types::on_chain_config::OnChainRandomnessConfig;

aptos-move/aptos-vm/src/move_vm_ext/session/view_with_change_set.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use aptos_aggregator::{
     bounded_math::{BoundedMath, SignedU128},

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

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{assert_success, build_package, tests::common, MoveHarness};
 use aptos_cached_packages::aptos_stdlib;

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

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use aptos_native_interface::{
     safely_pop_arg, RawSafeNative, SafeNativeBuilder, SafeNativeContext, SafeNativeResult,

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

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use aptos_native_interface::{
     RawSafeNative, SafeNativeBuilder, SafeNativeContext, SafeNativeError, SafeNativeResult,

consensus/src/dag/health/backoff.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use super::{pipeline_health::TPipelineHealth, TChainHealth};
 use aptos_config::config::DagPayloadConfig;

consensus/src/dag/health/chain_health.rs

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

consensus/src/dag/health/mod.rs

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

consensus/src/dag/health/pipeline_health.rs

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

crates/aptos-crypto/src/poseidon_bn254.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 //! Implements the Poseidon hash function for BN-254, which hashes $\le$ 16 field elements and
 //! produces a single field element as output.

crates/aptos-dkg/src/algebra/fft.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::algebra::evaluation_domain::EvaluationDomain;
 use blstrs::Scalar;

crates/aptos-dkg/src/algebra/lagrange.rs

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

crates/aptos-dkg/src/algebra/mod.rs

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

crates/aptos-dkg/src/pvss/das/enc.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::pvss::{
     encryption_dlog::g1::{DecryptPrivKey, EncryptPubKey},

crates/aptos-dkg/src/pvss/das/input_secret.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::pvss::{
     das, dealt_pub_key::g2::DealtPubKey, dealt_secret_key::g1::DealtSecretKey,

crates/aptos-dkg/src/pvss/das/mod.rs

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

crates/aptos-dkg/src/pvss/das/public_parameters.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 //! This submodule implements the *public parameters* for this PVSS scheme.
 

crates/aptos-dkg/src/pvss/das/unweighted_protocol.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{
     algebra::polynomials::{get_nonzero_powers_of_tau, shamir_secret_share},

crates/aptos-dkg/src/pvss/das/weighted_protocol.rs

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

crates/aptos-dkg/src/pvss/insecure_field/mod.rs

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

crates/aptos-dkg/src/pvss/insecure_field/transcript.rs

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

crates/aptos-dkg/src/pvss/low_degree_test.rs

@@ -1,4 +1,6 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 /// Low-degree test from the SCRAPE paper that checks whether $n$ evaluations encode a degree $\le t-1$
 /// polynomial.
 use crate::{

crates/aptos-dkg/src/pvss/traits/mod.rs

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

crates/aptos-dkg/src/pvss/traits/transcript.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 //! # Traits for authenticated PVSS transcripts
 //!

crates/aptos-dkg/src/pvss/weighted/generic_weighting.rs

@@ -1,4 +1,6 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 /// A generic transformation from an unweighted PVSS to a weighted PVSS.
 ///
 /// WARNING: This will **NOT** necessarily be secure for any PVSS scheme, since it will reuse encryption

crates/aptos-dkg/src/pvss/weighted/mod.rs

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

crates/aptos-dkg/src/pvss/weighted/weighted_config.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{
     algebra::evaluation_domain::{BatchEvaluationDomain, EvaluationDomain},

crates/aptos-dkg/src/utils/random.rs

@@ -1,4 +1,6 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 /// TODO(Security): This file is a workaround for the `rand_core_hell` issue, briefly described below.
 ///
 /// Ideally, we would write the following sane code:

crates/aptos-dkg/src/weighted_vuf/bls/mod.rs

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

crates/aptos-dkg/src/weighted_vuf/mod.rs

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

crates/aptos-dkg/src/weighted_vuf/pinkas/mod.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{
     algebra::{lagrange::lagrange_coefficients, polynomials::get_powers_of_tau},

crates/aptos-dkg/src/weighted_vuf/traits.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 //! Notes: Unlike PVSS, we do NOT want to use a generic unweighted-to-weighted VUF transformation,
 //! since we have a more optimized transformation for some VRF schemes (e.g., BLS and [GJM+21e]).

crates/aptos-enum-conversion-derive/tests/cases/multiple_fields.stderr

@@ -1,7 +1,7 @@
 error: enum variant must have exactly one field
- --> tests/cases/multiple_fields.rs:6:1
+ --> tests/cases/multiple_fields.rs:7:1
   |
-6 | / enum Messages {
-7 | |     Test(String, String)
-8 | | }
+7 | / enum Messages {
+8 | |     Test(String, String)
+9 | | }
   | |_^

crates/aptos-enum-conversion-derive/tests/cases/no_fields.stderr

@@ -1,7 +1,7 @@
 error: enum variant must have exactly one field
- --> tests/cases/no_fields.rs:6:1
+ --> tests/cases/no_fields.rs:7:1
   |
-6 | / enum Messages {
-7 | |     Test
-8 | | }
+7 | / enum Messages {
+8 | |     Test
+9 | | }
   | |_^

crates/aptos-jwk-consensus/src/counters.rs

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

crates/aptos-jwk-consensus/src/epoch_manager.rs

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

crates/aptos-jwk-consensus/src/jwk_manager/mod.rs

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

crates/aptos-jwk-consensus/src/jwk_manager/tests.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{
     jwk_manager::{ConsensusState, JWKManager, PerProviderState, QuorumCertProcessGuard},

crates/aptos-jwk-consensus/src/jwk_observer.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::counters::OBSERVATION_SECONDS;
 use anyhow::Result;

crates/aptos-jwk-consensus/src/lib.rs

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

crates/aptos-jwk-consensus/src/network.rs

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

crates/aptos-jwk-consensus/src/network_interface.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::types::JWKConsensusMsg;
 use aptos_config::network_id::{NetworkId, PeerNetworkId};

crates/aptos-jwk-consensus/src/observation_aggregation/mod.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::types::{
     JWKConsensusMsg, ObservedUpdate, ObservedUpdateRequest, ObservedUpdateResponse,

crates/aptos-jwk-consensus/src/observation_aggregation/tests.rs

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

crates/aptos-jwk-consensus/src/types.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use aptos_crypto::bls12381::Signature;
 use aptos_enum_conversion_derive::EnumConversion;

crates/aptos-jwk-consensus/src/update_certifier.rs

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

crates/bounded-executor/src/concurrent_stream.rs

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

crates/bounded-executor/src/executor.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 //! A bounded tokio [`Handle`]. Only a bounded number of tasks can run
 //! concurrently when spawned through this executor, defined by the initial

devtools/aptos-cargo-cli/src/bin/cargo-x.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use aptos_cargo_cli::{AptosCargoCommand, SelectedPackageArgs};
 use clap::Parser;

devtools/aptos-cargo-cli/src/lib.rs

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

devtools/aptos-cargo-cli/src/main.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 #![forbid(unsafe_code)]
 

dkg/src/dkg_manager/mod.rs

@@ -1,4 +1,6 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 use crate::{
     agg_trx_producer::TAggTranscriptProducer, counters::DKG_STAGE_SECONDS,
     network::IncomingRpcRequest, DKGMessage,

ecosystem/indexer-grpc/indexer-grpc-data-access/src/in_memory_storage/mod.rs

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

ecosystem/indexer-grpc/indexer-grpc-data-access/src/local_file.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{
     access_trait::{AccessMetadata, StorageReadError, StorageReadStatus, StorageTransactionRead},

ecosystem/indexer-grpc/indexer-grpc-data-access/src/redis.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{
     access_trait::{AccessMetadata, StorageReadError, StorageReadStatus, StorageTransactionRead},

ecosystem/indexer-grpc/indexer-grpc-data-service/src/grpc_response_stream.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::response_dispatcher::{GrpcResponseDispatcher, ResponseDispatcher};
 use aptos_indexer_grpc_data_access::StorageClient;

ecosystem/indexer-grpc/indexer-grpc-data-service/src/response_dispatcher/grpc_response_dispatcher.rs

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

ecosystem/indexer-grpc/indexer-grpc-data-service/src/response_dispatcher/mod.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use aptos_indexer_grpc_data_access::StorageClient;
 use aptos_protos::indexer::v1::TransactionsResponse;

ecosystem/indexer-grpc/indexer-grpc-fullnode/src/fullnode_data_service.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::{counters::CHANNEL_SIZE, stream_coordinator::IndexerStreamCoordinator, ServiceContext};
 use aptos_indexer_grpc_utils::counters::{log_grpc_step_fullnode, IndexerGrpcStep};

ecosystem/indexer-grpc/indexer-grpc-utils/src/compression_util.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::default_file_storage_format;
 use aptos_protos::{indexer::v1::TransactionsInStorage, transaction::v1::Transaction};

ecosystem/indexer-grpc/indexer-grpc-utils/src/in_memory_cache.rs

@@ -1,4 +1,5 @@
 // Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
 
 use crate::compression_util::{CacheEntry, StorageFormat};
 use anyhow::Context;

ecosystem/nft-metadata-crawler-parser/src/config.rs

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