chore(sol_macro_gen): remove unlinked bytecode workaround (#11613)

Author: mablr

Cargo.lock

@@ -0,0 +1,27 @@
+// <https://github.com/foundry-rs/foundry/issues/9482>
+forgetest_init!(bind_unlinked_bytecode, |prj, cmd| {
+    prj.wipe();
+    prj.add_source(
+        "SomeLibContract.sol",
+        r#"
+library SomeLib {
+    function add(uint256 a, uint256 b) external pure returns (uint256) {
+        return a + b;
+    }
+}
+
+contract SomeLibContract {
+    function add(uint256 a, uint256 b) public pure returns (uint256) {
+        return SomeLib.add(a, b);
+    }
+}
+   "#,
+    );
+    cmd.args(["bind", "--select", "SomeLibContract"]).assert_success().stdout_eq(str![[r#"
+[COMPILING_FILES] with [SOLC_VERSION]
+[SOLC_VERSION] [ELAPSED]
+Compiler run successful!
+Generating bindings for 1 contracts
+Bindings have been generated to [..]
+"#]]);
+});

crates/forge/tests/cli/bind.rs

@@ -4,6 +4,7 @@ extern crate foundry_test_utils;
 pub mod constants;
 pub mod utils;
 
+mod bind;
 mod bind_json;
 mod build;
 mod cache;

crates/forge/tests/cli/main.rs

@@ -23,7 +23,6 @@ proc-macro2.workspace = true
 quote.workspace = true
 syn.workspace = true
 prettyplease.workspace = true
-serde_json.workspace = true
 
 eyre.workspace = true
 

crates/sol-macro-gen/Cargo.toml

@@ -15,7 +15,6 @@ use eyre::{Context, OptionExt, Result};
 use foundry_common::fs;
 use proc_macro2::{Span, TokenStream};
 use std::{
-    env::temp_dir,
     fmt::Write,
     path::{Path, PathBuf},
     str::FromStr,
@@ -38,6 +37,7 @@ impl SolMacroGen {
         let path = self.path.to_string_lossy().into_owned();
         let name = proc_macro2::Ident::new(&self.name, Span::call_site());
         let tokens = quote::quote! {
+            #[sol(ignore_unlinked)]
             #name,
             #path
         };
@@ -85,38 +85,7 @@ impl MultiSolMacroGen {
     }
 
     fn generate_binding(instance: &mut SolMacroGen, all_derives: bool) -> Result<()> {
-        // TODO: in `get_sol_input` we currently can't handle unlinked bytecode: <https://github.com/alloy-rs/core/issues/926>
-        let input = match instance.get_sol_input() {
-            Ok(input) => input.normalize_json()?,
-            Err(error) => {
-                // TODO(mattsse): remove after <https://github.com/alloy-rs/core/issues/926>
-                if error.to_string().contains("expected bytecode, found unlinked bytecode") {
-                    // we attempt to do a little hack here until we have this properly supported by
-                    // removing the bytecode objects from the json file and using a tmpfile (very
-                    // hacky)
-                    let content = std::fs::read_to_string(&instance.path)?;
-                    let mut value = serde_json::from_str::<serde_json::Value>(&content)?;
-                    let obj = value.as_object_mut().expect("valid abi");
-
-                    // clear unlinked bytecode
-                    obj.remove("bytecode");
-                    obj.remove("deployedBytecode");
-
-                    let tmpdir = temp_dir();
-                    let mut tmp_file = tmpdir.join(instance.path.file_name().unwrap());
-                    std::fs::write(&tmp_file, serde_json::to_string(&value)?)?;
-
-                    // try again
-                    std::mem::swap(&mut tmp_file, &mut instance.path);
-                    let input = instance.get_sol_input()?.normalize_json()?;
-                    std::mem::swap(&mut tmp_file, &mut instance.path);
-                    input.normalize_json()?
-                } else {
-                    return Err(error);
-                }
-            }
-        };
-
+        let input = instance.get_sol_input()?.normalize_json()?;
         let SolInput { attrs: _, path: _, kind } = input;
 
         let tokens = match kind {