v2.1: Update ledger-tool --deactivate-feature-gate to deactivate feat…

…ure gate in child bank (backport of #4465) (#4475) Update ledger-tool --deactivate-feature-gate to deactivate feature gate in child bank (#4465) wip: ledger-tool --deactivate-feature-gate deactivates the feature in the new child bank Co-authored-by: brooks <[email protected]> (cherry picked from commit 65aad08) Co-authored-by: Will Hickey <[email protected]>
anza-xyz · Jan 15, 2025 · fdb6acc · fdb6acc
1 parent 3ff01db
commit fdb6acc
Showing 1 changed file with 30 additions and 26 deletions.
diff --git a/ledger-tool/src/main.rs b/ledger-tool/src/main.rs
@@ -2129,6 +2129,36 @@ fn main() {
                                 _ => Some(value_t_or_exit!(arg_matches, "hashes_per_tick", u64)),
                             });
                         }
+
+                        for address in feature_gates_to_deactivate {
+                            let mut account =
+                                child_bank.get_account(&address).unwrap_or_else(|| {
+                                    eprintln!(
+                                        "Error: Feature-gate account does not exist, unable to \
+                                         deactivate it: {address}"
+                                    );
+                                    exit(1);
+                                });
+
+                            match feature::from_account(&account) {
+                                Some(feature) => {
+                                    if feature.activated_at.is_none() {
+                                        warn!("Feature gate is not yet activated: {address}");
+                                    } else {
+                                        child_bank.deactivate_feature(&address);
+                                    }
+                                }
+                                None => {
+                                    eprintln!("Error: Account is not a `Feature`: {address}");
+                                    exit(1);
+                                }
+                            }
+
+                            account.set_lamports(0);
+                            child_bank.store_account(&address, &account);
+                            debug!("Feature gate deactivated: {address}");
+                        }
+
                         bank = Arc::new(child_bank);
                     }
 
@@ -2163,32 +2193,6 @@ fn main() {
                         debug!("Account removed: {address}");
                     }
 
-                    for address in feature_gates_to_deactivate {
-                        let mut account = bank.get_account(&address).unwrap_or_else(|| {
-                            eprintln!(
-                                "Error: Feature-gate account does not exist, unable to \
-                                     deactivate it: {address}"
-                            );
-                            exit(1);
-                        });
-
-                        match feature::from_account(&account) {
-                            Some(feature) => {
-                                if feature.activated_at.is_none() {
-                                    warn!("Feature gate is not yet activated: {address}");
-                                }
-                            }
-                            None => {
-                                eprintln!("Error: Account is not a `Feature`: {address}");
-                                exit(1);
-                            }
-                        }
-
-                        account.set_lamports(0);
-                        bank.store_account(&address, &account);
-                        debug!("Feature gate deactivated: {address}");
-                    }
-
                     if !vote_accounts_to_destake.is_empty() {
                         for (address, mut account) in bank
                             .get_program_accounts(&stake::program::id(), &ScanConfig::new(false))