Skip to content

Commit 5512f23

Browse files
authored
Raise mdp version + update artifacts & improve error logging (#368)
<!-- greptile_comment --> ## Greptile Summary Updates the magic-domain-program dependency from `eba7644` to `1f8b2fd` and improves error logging across the codebase, with program ID changes in configuration files. - Updates `magic-domain-program` dependency to commit `1f8b2fd` in `Cargo.toml` and `test-integration/Cargo.toml` - Changes program ID for `mdp.so` to `DmnRGfyyftzacFb1XadYhWF6vWqXwtQk5tbr6XgR3BA1` across all devnet config files - Enhances error logging in `magicblock-api/src/domain_registry_manager.rs` with better context for blockhash and transaction errors - Improves error formatting in `magicblock-api/src/magic_validator.rs` using `{err:#}` for more detailed error chains <!-- /greptile_comment -->
1 parent 5da3bf9 commit 5512f23

File tree

10 files changed

+11
-11
lines changed

10 files changed

+11
-11
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ isocountry = "0.3.2"
6565
crossbeam-channel = "0.5.11"
6666
enum-iterator = "1.5.0"
6767
env_logger = "0.11.2"
68-
magic-domain-program = { git = "https://github.com/magicblock-labs/magic-domain-program.git", rev = "eba7644", default-features = false}
68+
magic-domain-program = { git = "https://github.com/magicblock-labs/magic-domain-program.git", rev = "1f8b2fd", default-features = false}
6969
magicblock-delegation-program = { git = "https://github.com/magicblock-labs/delegation-program.git", rev = "4af7f1c" }
7070
fd-lock = "4.0.2"
7171
fs_extra = "1.3.0"

magicblock-api/src/domain_registry_manager.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ impl DomainRegistryManager {
174174
let recent_blockhash = self
175175
.client
176176
.get_latest_blockhash()
177-
.map_err(anyhow::Error::from)?;
177+
.context("Failed to get latest blockhash")?;
178178
let transaction = Transaction::new_signed_with_payer(
179179
&[instruction],
180180
Some(&payer.pubkey()),
@@ -184,7 +184,7 @@ impl DomainRegistryManager {
184184

185185
self.client
186186
.send_and_confirm_transaction(&transaction)
187-
.map_err(anyhow::Error::from)?;
187+
.context("Failed to send and confirm transaction")?;
188188
Ok(())
189189
}
190190

magicblock-api/src/magic_validator.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ impl MagicValidator {
604604
validator_info,
605605
)
606606
.map_err(|err| {
607-
ApiError::FailedToRegisterValidatorOnChain(err.to_string())
607+
ApiError::FailedToRegisterValidatorOnChain(format!("{:?}", err))
608608
})
609609
}
610610

@@ -617,7 +617,7 @@ impl MagicValidator {
617617
&validator_keypair,
618618
)
619619
.map_err(|err| {
620-
ApiError::FailedToUnregisterValidatorOnChain(err.to_string())
620+
ApiError::FailedToUnregisterValidatorOnChain(format!("{err:#}"))
621621
})
622622
}
623623

test-integration/Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test-integration/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ integration-test-tools = { path = "test-tools" }
2929
log = "0.4.20"
3030
magicblock-api = { path = "../magicblock-api" }
3131
magicblock-accounts-db = { path = "../magicblock-accounts-db", features = [ "dev-tools" ] }
32-
magic-domain-program = { git = "https://github.com/magicblock-labs/magic-domain-program.git", rev = "eba7644", default-features = false}
32+
magic-domain-program = { git = "https://github.com/magicblock-labs/magic-domain-program.git", rev = "1f8b2fd", default-features = false}
3333
magicblock-config = { path = "../magicblock-config" }
3434
magicblock-core = { path = "../magicblock-core" }
3535
program-flexi-counter = { path = "./programs/flexi-counter" }

test-integration/configs/cloning-conf.devnet.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ id = "DELeGGvXpWV2fqJUhqcF5ZSYMS4JTLjteaAMARRSaeSh"
3838
path = "../schedulecommit/elfs/dlp.so"
3939

4040
[[program]]
41-
id = "42Y73BJyGCXh2XUrqyz59WCk2DsBtqrFrt38t9ogB5sD"
41+
id = "DmnRGfyyftzacFb1XadYhWF6vWqXwtQk5tbr6XgR3BA1"
4242
path = "../schedulecommit/elfs/mdp.so"
4343

4444

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ id = "f1exzKGtdeVX3d6UXZ89cY7twiNJe9S5uq84RTA4Rq4"
3333
path = "../target/deploy/program_flexi_counter.so"
3434

3535
[[program]]
36-
id = "42Y73BJyGCXh2XUrqyz59WCk2DsBtqrFrt38t9ogB5sD"
36+
id = "DmnRGfyyftzacFb1XadYhWF6vWqXwtQk5tbr6XgR3BA1"
3737
path = "../schedulecommit/elfs/mdp.so"
3838

3939
[rpc]

test-integration/configs/schedulecommit-conf.devnet.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ id = "DELeGGvXpWV2fqJUhqcF5ZSYMS4JTLjteaAMARRSaeSh"
3030
path = "../schedulecommit/elfs/dlp.so"
3131

3232
[[program]]
33-
id = "42Y73BJyGCXh2XUrqyz59WCk2DsBtqrFrt38t9ogB5sD"
33+
id = "DmnRGfyyftzacFb1XadYhWF6vWqXwtQk5tbr6XgR3BA1"
3434
path = "../schedulecommit/elfs/mdp.so"
3535

3636
[[program]]
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)