diff --git a/Cargo.lock b/Cargo.lock index 6e4f6da1..f8d7ab21 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3490,7 +3490,7 @@ dependencies = [ [[package]] name = "magic-domain-program" version = "0.0.1" -source = "git+https://github.com/magicblock-labs/magic-domain-program.git?rev=eba7644#eba76443b39047e1be1dd5a1d72fc1943e5e1fc0" +source = "git+https://github.com/magicblock-labs/magic-domain-program.git?rev=1f8b2fd#1f8b2fdadd95589860959bdda391021dd8c58af2" dependencies = [ "borsh 1.5.5", "bytemuck_derive", diff --git a/Cargo.toml b/Cargo.toml index 7043db27..198ee0da 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -65,7 +65,7 @@ isocountry = "0.3.2" crossbeam-channel = "0.5.11" enum-iterator = "1.5.0" env_logger = "0.11.2" -magic-domain-program = { git = "https://github.com/magicblock-labs/magic-domain-program.git", rev = "eba7644", default-features = false} +magic-domain-program = { git = "https://github.com/magicblock-labs/magic-domain-program.git", rev = "1f8b2fd", default-features = false} magicblock-delegation-program = { git = "https://github.com/magicblock-labs/delegation-program.git", rev = "4af7f1c" } fd-lock = "4.0.2" fs_extra = "1.3.0" diff --git a/magicblock-api/src/domain_registry_manager.rs b/magicblock-api/src/domain_registry_manager.rs index 1f82e152..163cd7f7 100644 --- a/magicblock-api/src/domain_registry_manager.rs +++ b/magicblock-api/src/domain_registry_manager.rs @@ -174,7 +174,7 @@ impl DomainRegistryManager { let recent_blockhash = self .client .get_latest_blockhash() - .map_err(anyhow::Error::from)?; + .context("Failed to get latest blockhash")?; let transaction = Transaction::new_signed_with_payer( &[instruction], Some(&payer.pubkey()), @@ -184,7 +184,7 @@ impl DomainRegistryManager { self.client .send_and_confirm_transaction(&transaction) - .map_err(anyhow::Error::from)?; + .context("Failed to send and confirm transaction")?; Ok(()) } diff --git a/magicblock-api/src/magic_validator.rs b/magicblock-api/src/magic_validator.rs index a02550dc..5d8a993d 100644 --- a/magicblock-api/src/magic_validator.rs +++ b/magicblock-api/src/magic_validator.rs @@ -604,7 +604,7 @@ impl MagicValidator { validator_info, ) .map_err(|err| { - ApiError::FailedToRegisterValidatorOnChain(err.to_string()) + ApiError::FailedToRegisterValidatorOnChain(format!("{:?}", err)) }) } @@ -617,7 +617,7 @@ impl MagicValidator { &validator_keypair, ) .map_err(|err| { - ApiError::FailedToUnregisterValidatorOnChain(err.to_string()) + ApiError::FailedToUnregisterValidatorOnChain(format!("{err:#}")) }) } diff --git a/test-integration/Cargo.lock b/test-integration/Cargo.lock index 16a8cad3..b77357cc 100644 --- a/test-integration/Cargo.lock +++ b/test-integration/Cargo.lock @@ -3423,7 +3423,7 @@ dependencies = [ [[package]] name = "magic-domain-program" version = "0.0.1" -source = "git+https://github.com/magicblock-labs/magic-domain-program.git?rev=eba7644#eba76443b39047e1be1dd5a1d72fc1943e5e1fc0" +source = "git+https://github.com/magicblock-labs/magic-domain-program.git?rev=1f8b2fd#1f8b2fdadd95589860959bdda391021dd8c58af2" dependencies = [ "borsh 1.5.7", "bytemuck_derive", diff --git a/test-integration/Cargo.toml b/test-integration/Cargo.toml index df1f0458..46a4c6d2 100644 --- a/test-integration/Cargo.toml +++ b/test-integration/Cargo.toml @@ -29,7 +29,7 @@ integration-test-tools = { path = "test-tools" } log = "0.4.20" magicblock-api = { path = "../magicblock-api" } magicblock-accounts-db = { path = "../magicblock-accounts-db", features = [ "dev-tools" ] } -magic-domain-program = { git = "https://github.com/magicblock-labs/magic-domain-program.git", rev = "eba7644", default-features = false} +magic-domain-program = { git = "https://github.com/magicblock-labs/magic-domain-program.git", rev = "1f8b2fd", default-features = false} magicblock-config = { path = "../magicblock-config" } magicblock-core = { path = "../magicblock-core" } program-flexi-counter = { path = "./programs/flexi-counter" } diff --git a/test-integration/configs/cloning-conf.devnet.toml b/test-integration/configs/cloning-conf.devnet.toml index edcb9dc7..2b21ab6a 100644 --- a/test-integration/configs/cloning-conf.devnet.toml +++ b/test-integration/configs/cloning-conf.devnet.toml @@ -38,7 +38,7 @@ id = "DELeGGvXpWV2fqJUhqcF5ZSYMS4JTLjteaAMARRSaeSh" path = "../schedulecommit/elfs/dlp.so" [[program]] -id = "42Y73BJyGCXh2XUrqyz59WCk2DsBtqrFrt38t9ogB5sD" +id = "DmnRGfyyftzacFb1XadYhWF6vWqXwtQk5tbr6XgR3BA1" path = "../schedulecommit/elfs/mdp.so" diff --git a/test-integration/configs/restore-ledger-conf.devnet.toml b/test-integration/configs/restore-ledger-conf.devnet.toml index a622df6f..ec05e6dd 100644 --- a/test-integration/configs/restore-ledger-conf.devnet.toml +++ b/test-integration/configs/restore-ledger-conf.devnet.toml @@ -33,7 +33,7 @@ id = "f1exzKGtdeVX3d6UXZ89cY7twiNJe9S5uq84RTA4Rq4" path = "../target/deploy/program_flexi_counter.so" [[program]] -id = "42Y73BJyGCXh2XUrqyz59WCk2DsBtqrFrt38t9ogB5sD" +id = "DmnRGfyyftzacFb1XadYhWF6vWqXwtQk5tbr6XgR3BA1" path = "../schedulecommit/elfs/mdp.so" [rpc] diff --git a/test-integration/configs/schedulecommit-conf.devnet.toml b/test-integration/configs/schedulecommit-conf.devnet.toml index de18df07..a541d30e 100644 --- a/test-integration/configs/schedulecommit-conf.devnet.toml +++ b/test-integration/configs/schedulecommit-conf.devnet.toml @@ -30,7 +30,7 @@ id = "DELeGGvXpWV2fqJUhqcF5ZSYMS4JTLjteaAMARRSaeSh" path = "../schedulecommit/elfs/dlp.so" [[program]] -id = "42Y73BJyGCXh2XUrqyz59WCk2DsBtqrFrt38t9ogB5sD" +id = "DmnRGfyyftzacFb1XadYhWF6vWqXwtQk5tbr6XgR3BA1" path = "../schedulecommit/elfs/mdp.so" [[program]] diff --git a/test-integration/schedulecommit/elfs/mdp.so b/test-integration/schedulecommit/elfs/mdp.so index 2f94517d..f004cd4a 100755 Binary files a/test-integration/schedulecommit/elfs/mdp.so and b/test-integration/schedulecommit/elfs/mdp.so differ