fix: merge conflicts

Author: 0xrusowsky

Cargo.lock

@@ -99,7 +99,7 @@ foundry-compilers.opt-level = 3
 serde_json.opt-level = 3
 serde.opt-level = 3
 
-solang-parser.opt-level = 3
+foundry-solang-parser.opt-level = 3
 lalrpop-util.opt-level = 3
 
 solar-ast.opt-level = 3
@@ -191,7 +191,7 @@ foundry-linking = { path = "crates/linking" }
 foundry-block-explorers = { version = "0.13.3", default-features = false }
 foundry-compilers = { version = "0.14.0", default-features = false }
 foundry-fork-db = "0.12"
-solang-parser = "=0.3.3"
+solang-parser = { version = "=0.3.7", package = "foundry-solang-parser" }
 solar-parse = { version = "=0.1.2", default-features = false }
 solar-sema = { version = "=0.1.2", default-features = false }
 

Cargo.toml

@@ -367,7 +367,7 @@ impl<P: Provider<AnyNetwork>> Cast<P> {
         let block = self
             .provider
             .get_block(block)
-            .full()
+            .kind(full.into())
             .await?
             .ok_or_else(|| eyre::eyre!("block {:?} not found", block))?;