[replay] Add tns to skip

aptos-labs · Nov 6, 2024 · 2a6d1a3 · 2a6d1a3
1 parent 0face5b
commit 2a6d1a3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/replay-verify.yaml b/.github/workflows/replay-verify.yaml
@@ -66,7 +66,7 @@ jobs:
       SUB_DIR: e1
       HISTORY_START: 862000000
       # to see historical TXNS_TO_SKIP, check out ce6158ac2764ee9d4c8738a85f3bcdc6bd0cadc1
-      TXNS_TO_SKIP: "0"
+      TXNS_TO_SKIP: 1232167272 1232167433 1235493554 1239820988 1250224262 1255724440 1354496836 1354498540 1354518687 1354538946 1354547451 1354547636 1354558872 1877277141 5431332424 5519863118 5519863551 5519864968 5519871391 5519874963 5519932878 5519937773 5519943799 5519946298 5519946983 5519948038 5521992576 5523758958 5525311310 5525344101 5526949497 5527564033 5609106498 5611465782 5611472644 5938100116 5938192908 5938204128 5938221027 6047311953 6204828501
       # 1195000000-122000000: https://github.com/aptos-labs/aptos-core/pull/13832
       RANGES_TO_SKIP: "1195000000-1220000000"
       BACKUP_CONFIG_TEMPLATE_PATH: terraform/helm/fullnode/files/backup/gcs.yaml
@@ -111,7 +111,7 @@ jobs:
       SUB_DIR: e1
       HISTORY_START: 862000000
       # to see historical TXNS_TO_SKIP, check out ce6158ac2764ee9d4c8738a85f3bcdc6bd0cadc1
-      TXNS_TO_SKIP: "0"
+      TXNS_TO_SKIP: 523296049 523298111 575378008 575383660 575455170 575457845 575461986 575470789 596888095 612286393 981890562 1011802725 1030023658 1652667187 1652669110 1652686860 1652689144 1652722847 1654190659 1654191460 1673664597 1730942524 1730944006 1730945331 1730945814 1730946863 1730952284 1730956071 1730959853 1730967212 1731006027 1759904543 1792070645 1797308520 1798657294 1806178096
       # 1195000000-1220000000: https://github.com/aptos-labs/aptos-core/pull/13832
       RANGES_TO_SKIP: "1195000000-1220000000"
       BACKUP_CONFIG_TEMPLATE_PATH: terraform/helm/fullnode/files/backup/gcs.yaml

diff --git a/aptos-move/aptos-vm-environment/src/environment.rs b/aptos-move/aptos-vm-environment/src/environment.rs
@@ -23,6 +23,7 @@ use aptos_vm_types::storage::StorageGasParameters;
 use move_vm_runtime::{config::VMConfig, RuntimeEnvironment, WithRuntimeEnvironment};
 use sha3::{Digest, Sha3_256};
 use std::sync::Arc;
+use aptos_types::on_chain_config::FeatureFlag;
 
 /// A runtime environment which can be used for VM initialization and more. Contains features
 /// used by execution, gas parameters, VM configs and global caches. Note that it is the user's
@@ -175,8 +176,9 @@ impl Environment {
     ) -> Self {
         // We compute and store a hash of configs in order to distinguish different environments.
         let mut sha3_256 = Sha3_256::new();
-        let features =
+        let mut features =
             fetch_config_and_update_hash::<Features>(&mut sha3_256, state_view).unwrap_or_default();
+        features.enable(FeatureFlag::ENABLE_LOADER_V2);
 
         // If no chain ID is in storage, we assume we are in a testing environment.
         let chain_id = fetch_config_and_update_hash::<ChainId>(&mut sha3_256, state_view)

diff --git a/types/src/on_chain_config/aptos_features.rs b/types/src/on_chain_config/aptos_features.rs
@@ -195,6 +195,7 @@ impl Default for Features {
         for feature in FeatureFlag::default_features() {
             features.enable(feature);
         }
+        features.enable(FeatureFlag::ENABLE_LOADER_V2);
         features
     }
 }