Skip to content

added factory dependencies for Resolc Compiler #39

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

Merged
merged 2 commits into from
Jul 22, 2025
Merged
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
16 changes: 15 additions & 1 deletion crates/artifacts/resolc/src/contract.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,9 @@ impl From<ResolcContract> for foundry_compilers_artifacts_solc::Contract {
_ => None,
};

Self {
let factory_deps = contract.factory_dependencies.unwrap_or_default();

let mut solc_contract = Self {
abi: contract.abi,
evm: contract.evm.map(Into::into),
metadata: meta,
Expand All @@ -83,7 +85,19 @@ impl From<ResolcContract> for foundry_compilers_artifacts_solc::Contract {
ewasm: None,
ir_optimized: contract.ir_optimized,
ir_optimized_ast: None,
extensions: foundry_compilers_artifacts_solc::Extensions::None,
};

// Populate extensions if we have resolc-specific data
if !factory_deps.is_empty() {
let resolc_extras = foundry_compilers_artifacts_solc::ResolcExtras {
factory_dependencies: factory_deps,
};
solc_contract.extensions =
foundry_compilers_artifacts_solc::Extensions::Resolc(resolc_extras);
}

solc_contract
}
}

Expand Down
7 changes: 5 additions & 2 deletions crates/artifacts/solc/src/configurable.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::{
Ast, CompactBytecode, CompactContract, CompactContractBytecode, CompactContractBytecodeCow,
CompactDeployedBytecode, DevDoc, Ewasm, FunctionDebugData, GasEstimates, GeneratedSource,
Metadata, Offsets, SourceFile, StorageLayout, UserDoc,
CompactDeployedBytecode, DevDoc, Ewasm, Extensions, FunctionDebugData, GasEstimates,
GeneratedSource, Metadata, Offsets, SourceFile, StorageLayout, UserDoc,
};
use alloy_json_abi::JsonAbi;
use serde::{Deserialize, Serialize};
Expand Down Expand Up @@ -59,6 +59,9 @@ pub struct ConfigurableContractArtifact {
/// The identifier of the source file
#[serde(default, skip_serializing_if = "Option::is_none")]
pub id: Option<u32>,
/// Extensions for additional compiler-specific information
#[serde(default, skip_serializing_if = "Extensions::is_none")]
pub extensions: Extensions,
}

impl ConfigurableContractArtifact {
Expand Down
29 changes: 29 additions & 0 deletions crates/artifacts/solc/src/contract.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,32 @@ use alloy_primitives::Bytes;
use serde::{Deserialize, Serialize};
use std::{borrow::Cow, collections::BTreeMap};

/// Extensions for Contract to provide additional compiler-specific information
#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq, Hash, Default)]
pub enum Extensions {
/// No extensions
#[default]
None,
/// Resolc-specific extensions
Resolc(ResolcExtras),
}

/// Additional Resolc-specific information for solc Contract
#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq, Default, Hash)]
pub struct ResolcExtras {
/// Factory dependencies for the contract.
#[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
pub factory_dependencies: BTreeMap<String, String>,
// Future fields can be added here like factory_dependencies_unlinked
}

impl Extensions {
/// Returns true if extensions is None
pub fn is_none(&self) -> bool {
matches!(self, Self::None)
}
}

/// Represents a compiled solidity contract
#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
Expand Down Expand Up @@ -44,6 +70,9 @@ pub struct Contract {
pub ir_optimized: Option<String>,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub ir_optimized_ast: Option<serde_json::Value>,
/// Extensions for additional compiler-specific information
#[serde(default, skip_serializing_if = "Extensions::is_none")]
pub extensions: Extensions,
}

impl<'a> From<&'a Contract> for CompactContractBytecodeCow<'a> {
Expand Down
1 change: 1 addition & 0 deletions crates/artifacts/vyper/src/output.rs
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ impl From<VyperContract> for solc_artifacts::Contract {
ewasm: None,
ir_optimized: None,
ir_optimized_ast: None,
extensions: solc_artifacts::Extensions::None,
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions crates/compilers/src/artifact_output/configurable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ impl ArtifactOutput for ConfigurableArtifacts {
ewasm,
ir_optimized,
ir_optimized_ast,
extensions,
} = contract;

if self.additional_values.metadata {
Expand Down Expand Up @@ -325,6 +326,7 @@ impl ArtifactOutput for ConfigurableArtifacts {
id: source_file.as_ref().map(|s| s.id),
ast: source_file.and_then(|s| s.ast.clone()),
generated_sources: generated_sources.unwrap_or_default(),
extensions,
}
}

Expand Down
Loading