feat(ledger): remove requirement to use the same keypair during replay

magicblock-api/src/magic_validator.rs

@@ -199,11 +199,14 @@ impl MagicValidator {
             config.validator_config.ledger.path.as_ref(),
             config.validator_config.ledger.reset,
         )?;
-        Self::sync_validator_keypair_with_ledger(
-            ledger.ledger_path(),
-            &identity_keypair,
-            config.validator_config.ledger.reset,
-        )?;
+
+        if config.validator_config.ledger.enforce_keypair_match {
+            Self::sync_validator_keypair_with_ledger(
+                ledger.ledger_path(),
+                &identity_keypair,
+                config.validator_config.ledger.reset,
+            )?;
+        }
 
         // SAFETY:
         // this code will never panic as the ledger_path always appends the

magicblock-config/src/ledger.rs

@@ -18,6 +18,13 @@ pub struct LedgerConfig {
     #[arg(help = "Whether to reset the ledger before starting the validator.")]
     #[serde(default = "bool_true")]
     pub reset: bool,
+    /// Checks that the validator keypair matches the one in the ledger.
+    #[derive_env_var]
+    #[arg(
+        help = "Whether to check that the validator keypair matches the one in the ledger."
+    )]
+    #[serde(default = "bool_true")]
+    pub enforce_keypair_match: bool,
     /// The file system path onto which the ledger should be written at
     /// If left empty it will be auto-generated to a temporary folder
     #[derive_env_var]
@@ -39,6 +46,11 @@ impl LedgerConfig {
         if self.reset == bool_true() && other.reset != bool_true() {
             self.reset = other.reset;
         }
+        if self.enforce_keypair_match == bool_true()
+            && other.enforce_keypair_match != bool_true()
+        {
+            self.enforce_keypair_match = other.enforce_keypair_match;
+        }
         if self.path == Default::default() && other.path != Default::default() {
             self.path = other.path;
         }
@@ -54,6 +66,7 @@ impl Default for LedgerConfig {
     fn default() -> Self {
         Self {
             reset: bool_true(),
+            enforce_keypair_match: bool_true(),
             path: Default::default(),
             size: DEFAULT_LEDGER_SIZE_BYTES,
         }
@@ -72,6 +85,7 @@ mod tests {
     fn test_merge_with_default() {
         let mut config = LedgerConfig {
             reset: false,
+            enforce_keypair_match: false,
             path: Some("ledger.example.com".to_string()),
             size: 1000000000,
         };
@@ -88,6 +102,7 @@ mod tests {
         let mut config = LedgerConfig::default();
         let other = LedgerConfig {
             reset: false,
+            enforce_keypair_match: false,
             path: Some("ledger.example.com".to_string()),
             size: 1000000000,
         };
@@ -101,12 +116,14 @@ mod tests {
     fn test_merge_non_default() {
         let mut config = LedgerConfig {
             reset: false,
+            enforce_keypair_match: false,
             path: Some("ledger.example.com".to_string()),
             size: 1000000000,
         };
         let original_config = config.clone();
         let other = LedgerConfig {
             reset: true,
+            enforce_keypair_match: true,
             path: Some("ledger2.example.com".to_string()),
             size: 10000,
         };

magicblock-config/src/lib.rs

@@ -247,6 +247,7 @@ mod tests {
             },
             ledger: LedgerConfig {
                 reset: false,
+                enforce_keypair_match: false,
                 path: Some("ledger.example.com".to_string()),
                 size: 1000000000,
             },
@@ -325,6 +326,7 @@ mod tests {
             },
             ledger: LedgerConfig {
                 reset: false,
+                enforce_keypair_match: false,
                 path: Some("ledger.example.com".to_string()),
                 size: 1000000000,
             },
@@ -400,6 +402,7 @@ mod tests {
             },
             ledger: LedgerConfig {
                 reset: false,
+                enforce_keypair_match: false,
                 path: Some("ledger2.example.com".to_string()),
                 size: 100000,
             },
@@ -468,6 +471,7 @@ mod tests {
             },
             ledger: LedgerConfig {
                 reset: false,
+                enforce_keypair_match: false,
                 path: Some("ledger.example.com".to_string()),
                 size: 1000000000,
             },

magicblock-config/tests/read_config.rs

@@ -117,6 +117,7 @@ fn test_load_local_dev_with_programs_toml_envs_override() {
     env::set_var("VALIDATOR_COUNTRY_CODE", "CY");
     env::set_var("VALIDATOR_FQDN", "magicblock.er.com");
     env::set_var("LEDGER_RESET", "false");
+    env::set_var("LEDGER_ENFORCE_KEYPAIR_MATCH", "false");
     env::set_var("LEDGER_PATH", "/hello/world");
     env::set_var("METRICS_ENABLED", "false");
     env::set_var("METRICS_PORT", "1234");
@@ -165,6 +166,7 @@ fn test_load_local_dev_with_programs_toml_envs_override() {
             },
             ledger: LedgerConfig {
                 reset: false,
+                enforce_keypair_match: false,
                 path: Some("/hello/world".to_string()),
                 size: 123123
             },

test-integration/configs/restore-ledger-conf.devnet.toml

@@ -36,6 +36,10 @@ path = "../target/deploy/program_flexi_counter.so"
 id = "DmnRGfyyftzacFb1XadYhWF6vWqXwtQk5tbr6XgR3BA1"
 path = "../schedulecommit/elfs/mdp.so"
 
+[[program]]
+id = "MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr"
+path = "../programs/memo/memo.so"
+
 [rpc]
 port = 7799
 

test-integration/test-ledger-restore/src/lib.rs

@@ -122,6 +122,7 @@ pub fn setup_offline_validator(
             reset,
             path: Some(ledger_path.display().to_string()),
             size: DEFAULT_LEDGER_SIZE_BYTES,
+            ..Default::default()
         },
         accounts: accounts_config.clone(),
         programs,
@@ -146,6 +147,8 @@ pub fn setup_validator_with_local_remote(
     ledger_path: &Path,
     programs: Option<Vec<ProgramConfig>>,
     reset: bool,
+    enforce_keypair_match: bool,
+    loaded_accounts: &LoadedAccounts,
 ) -> (TempDir, Child, IntegrationTestContext) {
     let mut accounts_config = AccountsConfig {
         lifecycle: LifecycleMode::Ephemeral,
@@ -163,19 +166,18 @@ pub fn setup_validator_with_local_remote(
     let config = EphemeralConfig {
         ledger: LedgerConfig {
             reset,
+            enforce_keypair_match,
             path: Some(ledger_path.display().to_string()),
             size: DEFAULT_LEDGER_SIZE_BYTES,
+            ..Default::default()
         },
         accounts: accounts_config.clone(),
         programs,
         ..Default::default()
     };
 
     let (default_tmpdir_config, Some(mut validator)) =
-        start_validator_with_config(
-            config,
-            &LoadedAccounts::with_delegation_program_test_authority(),
-        )
+        start_validator_with_config(config, &loaded_accounts)
     else {
         panic!("validator should set up correctly");
     };

test-integration/test-ledger-restore/tests/00_empty_validator.rs

@@ -1,6 +1,8 @@
 use std::{path::Path, process::Child};
 
-use integration_test_tools::tmpdir::resolve_tmp_dir;
+use integration_test_tools::{
+    loaded_accounts::LoadedAccounts, tmpdir::resolve_tmp_dir,
+};
 use test_ledger_restore::{
     setup_validator_with_local_remote, wait_for_ledger_persist, TMP_DIR_LEDGER,
 };
@@ -22,8 +24,13 @@ fn restore_ledger_empty_validator() {
 
 fn write(ledger_path: &Path) -> (Child, u64) {
     // Launch a validator and airdrop to an account
-    let (_, mut validator, _) =
-        setup_validator_with_local_remote(ledger_path, None, true);
+    let (_, mut validator, _) = setup_validator_with_local_remote(
+        ledger_path,
+        None,
+        true,
+        true,
+        &LoadedAccounts::with_delegation_program_test_authority(),
+    );
 
     let slot = wait_for_ledger_persist(&mut validator);
 
@@ -33,8 +40,13 @@ fn write(ledger_path: &Path) -> (Child, u64) {
 
 fn read(ledger_path: &Path) -> Child {
     // Launch another validator reusing ledger
-    let (_, validator, _) =
-        setup_validator_with_local_remote(ledger_path, None, false);
+    let (_, validator, _) = setup_validator_with_local_remote(
+        ledger_path,
+        None,
+        false,
+        true,
+        &LoadedAccounts::with_delegation_program_test_authority(),
+    );
 
     validator
 }

test-integration/test-ledger-restore/tests/06_delegated_account.rs

@@ -1,4 +1,5 @@
 use cleanass::assert_eq;
+use integration_test_tools::loaded_accounts::LoadedAccounts;
 use std::{path::Path, process::Child};
 
 use integration_test_tools::{expect, tmpdir::resolve_tmp_dir};
@@ -49,8 +50,13 @@ fn write(ledger_path: &Path, payer: &Keypair) -> (Child, u64) {
 
     // NOTE: in this test we preload the counter program in the ephemeral instead
     // of relying on it being cloned from the remote
-    let (_, mut validator, ctx) =
-        setup_validator_with_local_remote(ledger_path, Some(programs), true);
+    let (_, mut validator, ctx) = setup_validator_with_local_remote(
+        ledger_path,
+        Some(programs),
+        true,
+        true,
+        &LoadedAccounts::with_delegation_program_test_authority(),
+    );
 
     // Airdrop to payer on chain
     expect!(
@@ -104,8 +110,13 @@ fn write(ledger_path: &Path, payer: &Keypair) -> (Child, u64) {
 fn read(ledger_path: &Path, payer: &Pubkey) -> Child {
     let programs = get_programs();
 
-    let (_, mut validator, _) =
-        setup_validator_with_local_remote(ledger_path, Some(programs), false);
+    let (_, mut validator, _) = setup_validator_with_local_remote(
+        ledger_path,
+        Some(programs),
+        false,
+        true,
+        &LoadedAccounts::with_delegation_program_test_authority(),
+    );
 
     wait_for_cloned_accounts_hydration();
 

test-integration/test-ledger-restore/tests/07_commit_delegated_account.rs

@@ -1,4 +1,5 @@
 use cleanass::assert_eq;
+use integration_test_tools::loaded_accounts::LoadedAccounts;
 use std::{path::Path, process::Child};
 
 use integration_test_tools::{expect, tmpdir::resolve_tmp_dir};
@@ -46,8 +47,13 @@ fn restore_ledger_containing_delegated_and_committed_account() {
 fn write(ledger_path: &Path, payer: &Keypair) -> (Child, u64) {
     let programs = get_programs_with_flexi_counter();
 
-    let (_, mut validator, ctx) =
-        setup_validator_with_local_remote(ledger_path, Some(programs), true);
+    let (_, mut validator, ctx) = setup_validator_with_local_remote(
+        ledger_path,
+        Some(programs),
+        true,
+        true,
+        &LoadedAccounts::with_delegation_program_test_authority(),
+    );
 
     // Airdrop to payer on chain
     expect!(
@@ -167,8 +173,13 @@ fn write(ledger_path: &Path, payer: &Keypair) -> (Child, u64) {
 fn read(ledger_path: &Path, payer: &Pubkey) -> Child {
     let programs = get_programs_with_flexi_counter();
 
-    let (_, mut validator, ctx) =
-        setup_validator_with_local_remote(ledger_path, Some(programs), false);
+    let (_, mut validator, ctx) = setup_validator_with_local_remote(
+        ledger_path,
+        Some(programs),
+        false,
+        true,
+        &LoadedAccounts::with_delegation_program_test_authority(),
+    );
 
     wait_for_cloned_accounts_hydration();
 

test-integration/test-ledger-restore/tests/08_commit_update.rs

@@ -1,4 +1,5 @@
 use cleanass::assert_eq;
+use integration_test_tools::loaded_accounts::LoadedAccounts;
 use std::{path::Path, process::Child};
 
 use integration_test_tools::{expect, tmpdir::resolve_tmp_dir};
@@ -49,8 +50,13 @@ fn restore_ledger_committed_and_updated_account() {
 fn write(ledger_path: &Path, payer: &Keypair) -> (Child, u64) {
     let programs = get_programs_with_flexi_counter();
 
-    let (_, mut validator, ctx) =
-        setup_validator_with_local_remote(ledger_path, Some(programs), true);
+    let (_, mut validator, ctx) = setup_validator_with_local_remote(
+        ledger_path,
+        Some(programs),
+        true,
+        true,
+        &LoadedAccounts::with_delegation_program_test_authority(),
+    );
 
     // Airdrop to payer on chain
     expect!(
@@ -158,8 +164,13 @@ fn read(ledger_path: &Path, payer_kp: &Keypair) -> Child {
     let payer = &payer_kp.pubkey();
     let programs = get_programs_with_flexi_counter();
 
-    let (_, mut validator, ctx) =
-        setup_validator_with_local_remote(ledger_path, Some(programs), false);
+    let (_, mut validator, ctx) = setup_validator_with_local_remote(
+        ledger_path,
+        Some(programs),
+        false,
+        true,
+        &LoadedAccounts::with_delegation_program_test_authority(),
+    );
 
     wait_for_cloned_accounts_hydration();
 

test-integration/test-ledger-restore/tests/09_restore_different_accounts_multiple_times.rs

@@ -1,4 +1,5 @@
 use cleanass::assert_eq;
+use integration_test_tools::loaded_accounts::LoadedAccounts;
 use std::{path::Path, process::Child};
 
 use integration_test_tools::{expect, tmpdir::resolve_tmp_dir};
@@ -63,8 +64,13 @@ fn write(
 ) -> (Child, u64, u64) {
     let programs = get_programs_with_flexi_counter();
 
-    let (_, mut validator, ctx) =
-        setup_validator_with_local_remote(ledger_path, Some(programs), true);
+    let (_, mut validator, ctx) = setup_validator_with_local_remote(
+        ledger_path,
+        Some(programs),
+        true,
+        true,
+        &LoadedAccounts::with_delegation_program_test_authority(),
+    );
 
     // Airdrop to payers on chain
     expect!(
@@ -169,8 +175,13 @@ fn read(
     let payer_readonly = &payer_readonly_kp.pubkey();
     let programs = get_programs_with_flexi_counter();
 
-    let (_, mut validator, ctx) =
-        setup_validator_with_local_remote(ledger_path, Some(programs), false);
+    let (_, mut validator, ctx) = setup_validator_with_local_remote(
+        ledger_path,
+        Some(programs),
+        false,
+        true,
+        &LoadedAccounts::with_delegation_program_test_authority(),
+    );
 
     wait_for_cloned_accounts_hydration();