feat: retain pre-1.5.7 zksolc compatibility (#43)

* fix(bytecode:zk): pub `link_references` method

* feat(compiler:zk): keep `evm` deserialization

feat(compiler:zk): fallback to `evm` output

crates/artifacts/zksolc/src/contract.rs

@@ -1,5 +1,5 @@
 //! Contract related types.
-use crate::EraVM;
+use crate::{EraVM, Evm};
 use alloy_json_abi::JsonAbi;
 use foundry_compilers_artifacts_solc::{
     Bytecode, CompactBytecode, CompactContractBytecode, CompactContractBytecodeCow,
@@ -31,9 +31,12 @@ pub struct Contract {
     /// The contract factory dependencies.
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub factory_dependencies: Option<BTreeMap<String, String>>,
-    /// EVM-related outputs
+    /// EraVM-related outputs
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub eravm: Option<EraVM>,
+    /// EVM-related outputs (deprecated)
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub evm: Option<Evm>,
     /// The contract's unlinked libraries
     #[serde(default)]
     pub missing_libraries: Vec<String>,
@@ -69,11 +72,21 @@ impl Contract {
     }
 
     pub fn bytecode(&self) -> Option<Bytecode> {
-        self.eravm.as_ref().and_then(|eravm| eravm.bytecode(self.is_unlinked())).map(|object| {
-            let mut bytecode: Bytecode = object.into();
-            bytecode.link_references = self.link_references();
-            bytecode
-        })
+        self.eravm
+            .as_ref()
+            .and_then(|eravm| eravm.bytecode(self.is_unlinked()))
+            .or_else(|| {
+                self.evm
+                    .as_ref()
+                    .and_then(|evm| evm.bytecode.as_ref())
+                    .map(|bytecode| &bytecode.object)
+                    .cloned()
+            })
+            .map(|object| {
+                let mut bytecode: Bytecode = object.into();
+                bytecode.link_references = self.link_references();
+                bytecode
+            })
     }
 }
 
@@ -115,6 +128,8 @@ impl<'a> From<&'a Contract> for CompactContractRef<'a> {
     fn from(c: &'a Contract) -> Self {
         let (bin, bin_runtime) = if let Some(ref eravm) = c.eravm {
             (eravm.bytecode.as_ref(), eravm.bytecode.as_ref())
+        } else if let Some(ref evm) = c.evm {
+            (evm.bytecode.as_ref().map(|c| &c.object), evm.bytecode.as_ref().map(|c| &c.object))
         } else {
             (None, None)
         };

crates/artifacts/zksolc/src/lib.rs

@@ -1,5 +1,5 @@
 use foundry_compilers_artifacts_solc::{
-    BytecodeObject, CompactContractRef, FileToContractsMap, SourceFile, SourceFiles,
+    Bytecode, BytecodeObject, CompactContractRef, FileToContractsMap, SourceFile, SourceFiles,
 };
 
 use semver::Version;
@@ -88,6 +88,26 @@ impl CompilerOutput {
     }
 }
 
+#[derive(Clone, Debug, Serialize, Deserialize, Eq, PartialEq)]
+#[serde(rename_all = "camelCase")]
+pub struct Evm {
+    /// The contract EraVM assembly code.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub assembly: Option<String>,
+    /// The contract EVM legacy assembly code.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub legacy_assembly: Option<serde_json::Value>,
+    /// The contract bytecode.
+    /// Is reset by that of EraVM before yielding the compiled project artifacts.
+    pub bytecode: Option<Bytecode>,
+    /// The list of function hashes
+    #[serde(default, skip_serializing_if = "::std::collections::BTreeMap::is_empty")]
+    pub method_identifiers: BTreeMap<String, String>,
+    /// The extra EVMLA metadata.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub extra_metadata: Option<ExtraMetadata>,
+}
+
 #[derive(Clone, Debug, Serialize, Deserialize, Eq, PartialEq)]
 #[serde(rename_all = "camelCase")]
 pub struct EraVM {

crates/compilers/src/zksync/artifact_output/zk.rs

@@ -143,6 +143,7 @@ impl ZkArtifactOutput {
             devdoc,
             storage_layout,
             eravm,
+            evm,
             ir_optimized,
             hash,
             factory_dependencies,
@@ -151,6 +152,7 @@ impl ZkArtifactOutput {
 
         let (bytecode, assembly) = eravm
             .map(|eravm| (eravm.bytecode(is_unlinked), eravm.assembly))
+            .or_else(|| evm.map(|evm| (evm.bytecode.map(|bc| bc.object), evm.assembly)))
             .unwrap_or_else(|| (None, None));
         let bytecode = bytecode
             .map(|object| ZkArtifactBytecode::with_object(object, is_unlinked, missing_libraries));

crates/compilers/src/zksync/artifact_output/zk/bytecode.rs

@@ -30,7 +30,7 @@ impl ZkArtifactBytecode {
         Self { object, is_unlinked, missing_libraries }
     }
 
-    fn link_references(&self) -> BTreeMap<String, BTreeMap<String, Vec<Offsets>>> {
+    pub fn link_references(&self) -> BTreeMap<String, BTreeMap<String, Vec<Offsets>>> {
         Contract::missing_libs_to_link_references(self.missing_libraries.as_slice())
     }