diff --git a/Cargo.lock b/Cargo.lock index 080597f55270f..8835209aed000 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1553,7 +1553,7 @@ dependencies = [ [[package]] name = "assertion-da-client" version = "0.2.0" -source = "git+https://github.com/phylaxsystems/credible-sdk.git?rev=d17125a#d17125a44eaf1ead0335fbee4a8e1117a43ab79d" +source = "git+https://github.com/phylaxsystems/credible-sdk.git?rev=a7571bb#a7571bb0cdb409aec151d028ff10d4a3d7d0a8be" dependencies = [ "alloy", "assertion-da-core", @@ -1570,7 +1570,7 @@ dependencies = [ [[package]] name = "assertion-da-core" version = "0.2.0" -source = "git+https://github.com/phylaxsystems/credible-sdk.git?rev=d17125a#d17125a44eaf1ead0335fbee4a8e1117a43ab79d" +source = "git+https://github.com/phylaxsystems/credible-sdk.git?rev=a7571bb#a7571bb0cdb409aec151d028ff10d4a3d7d0a8be" dependencies = [ "alloy", "serde", @@ -1579,7 +1579,7 @@ dependencies = [ [[package]] name = "assertion-executor" version = "0.2.0" -source = "git+https://github.com/phylaxsystems/credible-sdk.git?rev=d17125a#d17125a44eaf1ead0335fbee4a8e1117a43ab79d" +source = "git+https://github.com/phylaxsystems/credible-sdk.git?rev=a7571bb#a7571bb0cdb409aec151d028ff10d4a3d7d0a8be" dependencies = [ "alloy", "alloy-consensus", diff --git a/crates/cheatcodes/Cargo.toml b/crates/cheatcodes/Cargo.toml index b307038c5cbe8..2c54a47337c0d 100644 --- a/crates/cheatcodes/Cargo.toml +++ b/crates/cheatcodes/Cargo.toml @@ -22,7 +22,7 @@ vergen = { workspace = true, default-features = false, features = [ ] } [dependencies] -assertion-executor = { git = "https://github.com/phylaxsystems/credible-sdk.git", rev = "d17125a", features = ["phoundry"]} +assertion-executor = { git = "https://github.com/phylaxsystems/credible-sdk.git", rev = "a7571bb", features = ["phoundry"]} #assertion-executor = { path = "../../../credible-sdk/crates/assertion-executor", features = ["phoundry"]} foundry-cheatcodes-spec.workspace = true diff --git a/crates/cheatcodes/src/credible.rs b/crates/cheatcodes/src/credible.rs index 6638d74dc778d..9efb876335d09 100644 --- a/crates/cheatcodes/src/credible.rs +++ b/crates/cheatcodes/src/credible.rs @@ -1,6 +1,6 @@ use crate::{inspector::Ecx, Cheatcode, Cheatcodes, CheatcodesExecutor, CheatsCtxt, Result, Vm::*}; use alloy_primitives::{Bytes, FixedBytes, TxKind}; -use alloy_sol_types::{Revert, SolError, SolEvent, SolValue}; +use alloy_sol_types::{Revert, SolError, SolValue}; use assertion_executor::{ db::{fork_db::ForkDb, DatabaseCommit, DatabaseRef}, primitives::{ @@ -11,10 +11,7 @@ use assertion_executor::{ ExecutorConfig, }; -use foundry_evm_core::{ - abi::console::ds::Console, - backend::{DatabaseError, DatabaseExt}, -}; +use foundry_evm_core::backend::{DatabaseError, DatabaseExt}; use revm::context_interface::{ContextTr, JournalTr}; use std::{ cmp::max, @@ -207,12 +204,10 @@ pub fn execute_assertion( .first() .expect("Expected 1 assertion to be executed, but got 0"); - for log in assertion_fn_result.as_result().logs() { - if Some(&Console::log::SIGNATURE_HASH) == log.topics().first() { - let decoded_log = Console::log::decode_log(log); - if let Ok(log_data) = decoded_log { - inspector.console_log(&format!("{}", log_data.val)); - } + if !assertion_fn_result.console_logs.is_empty() { + inspector.console_log("Assertion function logs: "); + for log in assertion_fn_result.console_logs.iter() { + inspector.console_log(log); } }