Skip to content
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

fix: parse selector hashes in sol macro #730

Merged
merged 7 commits into from
Sep 6, 2024
Merged
Show file tree
Hide file tree
Changes from 6 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
84 changes: 83 additions & 1 deletion crates/sol-macro-expander/src/expand/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ use proc_macro_error::{abort, emit_error};
use quote::{format_ident, quote, TokenStreamExt};
use std::{
borrow::Borrow,
collections::HashMap,
fmt,
fmt::Write,
sync::atomic::{AtomicBool, Ordering},
};
Expand Down Expand Up @@ -157,7 +159,8 @@ impl<'ast> ExpCtxt<'ast> {

if !self.all_items.0.is_empty() {
self.resolve_custom_types();
if self.mk_overloads_map().is_err() {
// Selector collisions requires resolved types.
if self.mk_overloads_map().is_err() || self.check_selector_collisions().is_err() {
abort = true;
}
}
Expand Down Expand Up @@ -254,6 +257,85 @@ impl<'ast> ExpCtxt<'ast> {
}
}

/// Checks for function and error selector collisions in the resolved items.
fn check_selector_collisions(&mut self) -> std::result::Result<(), ()> {
#[derive(Clone, Copy)]
enum SelectorKind {
Function,
Error,
// We can ignore events since their selectors are 32 bytes which are unlikely to
// collide.
// Event,
}

impl fmt::Display for SelectorKind {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self {
Self::Function => "function",
Self::Error => "error",
// Self::Event => "event",
}
.fmt(f)
}
}

let mut success = true;

let mut selectors = vec![HashMap::new(); 3];
let all_items = std::mem::take(&mut self.all_items);
for (namespace, items) in &all_items.0 {
self.with_namespace(namespace.clone(), |this| {
selectors.iter_mut().for_each(|s| s.clear());
for (_, &item) in items {
let (kind, selector) = match item {
Item::Function(function) => {
(SelectorKind::Function, this.function_selector(function))
}
Item::Error(error) => (SelectorKind::Error, this.error_selector(error)),
// Item::Event(event) => (SelectorKind::Event, this.event_selector(event)),
_ => continue,
};
// 0x00000000 or 0xffffffff are reserved for custom errors.
if matches!(kind, SelectorKind::Error)
&& (selector.array.iter().all(|&x| x == 0x00)
|| selector.array.iter().all(|&x| x == 0xff))
{
emit_error!(
selector.span(),
"{kind} selector `{}` is reserved",
hex::encode_prefixed(&selector.array),
);
success = false;
continue;
}
match selectors[kind as usize].entry(selector.array.clone()) {
std::collections::hash_map::Entry::Vacant(entry) => {
entry.insert(item);
}
std::collections::hash_map::Entry::Occupied(entry) => {
success = false;
let other = *entry.get();
emit_error!(
item.span(),
"{kind} selector `{}` collides with `{}`",
hex::encode_prefixed(&selector.array),
other.name().unwrap();

note = other.span() => "other declaration is here";
);
}
}
}
})
}
self.all_items = all_items;

match success {
true => Ok(()),
false => Err(()),
}
}

fn mk_overloads_map(&mut self) -> std::result::Result<(), ()> {
let mut overloads_map = std::mem::take(&mut self.overloads);

Expand Down
38 changes: 38 additions & 0 deletions crates/sol-types/tests/ui/collisions.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
use alloy_sol_types::sol;

// https://github.com/alloy-rs/core/issues/729

sol! {
error func_2093253501(bytes);
error transfer(address,uint256);

function func_2093253501(bytes);
function transfer(address,uint256);

error BlazingIt4490597615();

contract A {
error func_2093253501(bytes);
error transfer(address,uint256);

function func_2093253501(bytes);
function transfer(address,uint256);

error BlazingIt4490597615();
}
}

// This is OK.
mod namespaced {
use alloy_sol_types::sol;

sol! {
function func_2093253501(bytes);

contract B {
function transfer(address,uint256);
}
}
}

fn main() {}
35 changes: 35 additions & 0 deletions crates/sol-types/tests/ui/collisions.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
error: function selector `0xa9059cbb` collides with `func_2093253501`
--> tests/ui/collisions.rs:10:14
|
10 | function transfer(address,uint256);
| ^^^^^^^^
|
note: other declaration is here
--> tests/ui/collisions.rs:9:14
|
9 | function func_2093253501(bytes);
| ^^^^^^^^^^^^^^^

error: error selector `0x00000000` is reserved
--> tests/ui/collisions.rs:12:11
|
12 | error BlazingIt4490597615();
| ^^^^^^^^^^^^^^^^^^^

error: function selector `0xa9059cbb` collides with `func_2093253501`
--> tests/ui/collisions.rs:19:18
|
19 | function transfer(address,uint256);
| ^^^^^^^^
|
note: other declaration is here
--> tests/ui/collisions.rs:18:18
|
18 | function func_2093253501(bytes);
| ^^^^^^^^^^^^^^^

error: error selector `0x00000000` is reserved
--> tests/ui/collisions.rs:21:15
|
21 | error BlazingIt4490597615();
| ^^^^^^^^^^^^^^^^^^^
Loading