Skip to content
This repository has been archived by the owner on Oct 19, 2024. It is now read-only.

Correctly parse null values in 0.7.0 asts #2608

Merged
merged 3 commits into from
Sep 19, 2023
Merged

Correctly parse null values in 0.7.0 asts #2608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc09e8f
pretty format to make changes readable
Sep 19, 2023
5beb434
add output patterns found in solc 0.7.0
Sep 19, 2023
87a50e3
Fix problems parsing nulls in ast
Sep 19, 2023
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: 8 additions & 8 deletions ethers-solc/src/artifacts/ast/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,9 @@ ast_node!(
linearized_base_contracts: Vec<usize>,
nodes: Vec<ContractDefinitionPart>,
scope: usize,
#[serde(default)]
#[serde(default, deserialize_with = "serde_helpers::default_for_null")]
used_errors: Vec<usize>,
#[serde(default)]
#[serde(default, deserialize_with = "serde_helpers::default_for_null")]
used_events: Vec<usize>,
#[serde(default, rename = "internalFunctionIDs")]
internal_function_ids: BTreeMap<usize, usize>,
Expand Down Expand Up @@ -607,7 +607,7 @@ ast_node!(
expr_node!(
/// A tuple expression.
struct TupleExpression {
components: Vec<Expression>,
components: Vec<Option<Expression>>,
is_inline_array: bool,
}
);
Expand Down Expand Up @@ -696,7 +696,7 @@ ast_node!(
name: String,
#[serde(default, with = "serde_helpers::display_from_str_opt")]
name_location: Option<SourceLocation>,
#[serde(default)]
#[serde(default, deserialize_with = "serde_helpers::default_for_null")]
base_functions: Vec<usize>,
body: Option<Block>,
documentation: Option<StructuredDocumentation>,
Expand Down Expand Up @@ -870,7 +870,7 @@ ast_node!(
// TODO: We need this camel case for the AST, but pascal case other places in ethers-solc
//evm_version: EvmVersion,
external_references: Vec<ExternalInlineAssemblyReference>,
#[serde(default)]
#[serde(default, deserialize_with = "serde_helpers::default_for_null")]
flags: Vec<InlineAssemblyFlag>,
}
);
Expand Down Expand Up @@ -943,7 +943,7 @@ ast_node!(
struct TryCatchClause {
block: Block,
error_name: String,
#[serde(default)]
#[serde(default, deserialize_with = "serde_helpers::default_for_null")]
parameters: Vec<ParameterList>,
}
);
Expand All @@ -966,7 +966,7 @@ stmt_node!(
ast_node!(
/// A modifier or base constructor invocation.
struct ModifierInvocation {
#[serde(default)]
#[serde(default, deserialize_with = "serde_helpers::default_for_null")]
arguments: Vec<Expression>,
kind: Option<ModifierInvocationKind>,
modifier_name: IdentifierOrIdentifierPath,
Expand Down Expand Up @@ -1028,7 +1028,7 @@ ast_node!(
ast_node!(
/// A using for directive.
struct UsingForDirective {
#[serde(default)]
#[serde(default, deserialize_with = "serde_helpers::default_for_null")]
function_list: Vec<FunctionIdentifierPath>,
#[serde(default)]
global: bool,
Expand Down
Loading