Skip to content

Raise mdp version + update artifacts & improve error logging #368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions magicblock-api/src/domain_registry_manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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()),
Expand All @@ -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(())
}

Expand Down
4 changes: 2 additions & 2 deletions magicblock-api/src/magic_validator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@ impl MagicValidator {
validator_info,
)
.map_err(|err| {
ApiError::FailedToRegisterValidatorOnChain(err.to_string())
ApiError::FailedToRegisterValidatorOnChain(format!("{err:#}"))
})
}

Expand All @@ -617,7 +617,7 @@ impl MagicValidator {
&validator_keypair,
)
.map_err(|err| {
ApiError::FailedToUnregisterValidatorOnChain(err.to_string())
ApiError::FailedToUnregisterValidatorOnChain(format!("{err:#}"))
})
}

Expand Down
2 changes: 1 addition & 1 deletion test-integration/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test-integration/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion test-integration/configs/cloning-conf.devnet.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ id = "DELeGGvXpWV2fqJUhqcF5ZSYMS4JTLjteaAMARRSaeSh"
path = "../schedulecommit/elfs/dlp.so"

[[program]]
id = "42Y73BJyGCXh2XUrqyz59WCk2DsBtqrFrt38t9ogB5sD"
id = "DmnRGfyyftzacFb1XadYhWF6vWqXwtQk5tbr6XgR3BA1"
path = "../schedulecommit/elfs/mdp.so"


Expand Down
2 changes: 1 addition & 1 deletion test-integration/configs/restore-ledger-conf.devnet.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ id = "f1exzKGtdeVX3d6UXZ89cY7twiNJe9S5uq84RTA4Rq4"
path = "../target/deploy/program_flexi_counter.so"

[[program]]
id = "42Y73BJyGCXh2XUrqyz59WCk2DsBtqrFrt38t9ogB5sD"
id = "DmnRGfyyftzacFb1XadYhWF6vWqXwtQk5tbr6XgR3BA1"
path = "../schedulecommit/elfs/mdp.so"

[rpc]
Expand Down
2 changes: 1 addition & 1 deletion test-integration/configs/schedulecommit-conf.devnet.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ id = "DELeGGvXpWV2fqJUhqcF5ZSYMS4JTLjteaAMARRSaeSh"
path = "../schedulecommit/elfs/dlp.so"

[[program]]
id = "42Y73BJyGCXh2XUrqyz59WCk2DsBtqrFrt38t9ogB5sD"
id = "DmnRGfyyftzacFb1XadYhWF6vWqXwtQk5tbr6XgR3BA1"
path = "../schedulecommit/elfs/mdp.so"

[[program]]
Expand Down
Binary file modified test-integration/schedulecommit/elfs/mdp.so
Binary file not shown.
Loading