[Cherry pick] cherry-pick execution_config changes into v1.6 (#8459 #…

…9391) (#9390)

### Description

Commands (applied cleanly):
```
git revert f313b5b
git cherry-pick 66fe8cf
```


### Test Plan
<!-- Please provide us with clear details for verifying that your changes work. -->

consensus/src/epoch_manager.rs

@@ -69,8 +69,8 @@ use aptos_types::{
     epoch_change::EpochChangeProof,
     epoch_state::EpochState,
     on_chain_config::{
-        ExecutionConfigV1, LeaderReputationType, OnChainConfigPayload, OnChainConsensusConfig,
-        OnChainExecutionConfig, ProposerElectionType, TransactionShufflerType, ValidatorSet,
+        LeaderReputationType, OnChainConfigPayload, OnChainConsensusConfig, OnChainExecutionConfig,
+        ProposerElectionType, ValidatorSet,
     },
     validator_verifier::ValidatorVerifier,
 };
@@ -812,11 +812,7 @@ impl EpochManager {
         match self.storage.start() {
             LivenessStorageData::FullRecoveryData(initial_data) => {
                 let consensus_config = onchain_consensus_config.unwrap_or_default();
-                let execution_config = onchain_execution_config.unwrap_or(
-                    OnChainExecutionConfig::V1(ExecutionConfigV1 {
-                        transaction_shuffler_type: TransactionShufflerType::NoShuffling,
-                    }),
-                );
+                let execution_config = onchain_execution_config.unwrap_or_default();
                 self.quorum_store_enabled = self.enable_quorum_store(&consensus_config);
                 self.recovery_mode = false;
                 self.start_round_manager(

types/src/on_chain_config/execution_config.rs

@@ -46,7 +46,7 @@ impl OnChainExecutionConfig {
 /// This is used when on-chain config is not initialized.
 impl Default for OnChainExecutionConfig {
     fn default() -> Self {
-        OnChainExecutionConfig::V1(ExecutionConfigV1::default())
+        OnChainExecutionConfig::V3(ExecutionConfigV3::default())
     }
 }
 
@@ -76,7 +76,7 @@ pub struct ExecutionConfigV1 {
 impl Default for ExecutionConfigV1 {
     fn default() -> Self {
         Self {
-            transaction_shuffler_type: TransactionShufflerType::SenderAwareV1(32),
+            transaction_shuffler_type: TransactionShufflerType::NoShuffling,
         }
     }
 }
@@ -108,7 +108,7 @@ impl Default for ExecutionConfigV3 {
         Self {
             transaction_shuffler_type: TransactionShufflerType::NoShuffling,
             block_gas_limit: None,
-            transaction_deduper_type: TransactionDeduperType::NoDedup,
+            transaction_deduper_type: TransactionDeduperType::TxnHashAndAuthenticatorV1,
         }
     }
 }