difftreelog
feat implicit implementation of ERC165
in: master
2 files changed
crates/evm-coder-macros/src/solidity_interface.rsdiffbeforeafterboth--- a/crates/evm-coder-macros/src/solidity_interface.rs
+++ b/crates/evm-coder-macros/src/solidity_interface.rs
@@ -672,6 +672,7 @@
quote! {
#[derive(Debug)]
pub enum #call_name {
+ ERC165Call(::evm_coder::ERC165Call),
#(
#calls,
)*
@@ -691,6 +692,7 @@
}
pub fn supports_interface(interface_id: u32) -> bool {
interface_id != 0xffffff && (
+ interface_id == ::evm_coder::ERC165Call::INTERFACE_ID ||
interface_id == Self::interface_id()
#(
|| #supports_interface
@@ -702,7 +704,7 @@
use core::fmt::Write;
let interface = SolidityInterface {
name: #solidity_name,
- is: &["Dummy", #(
+ is: &["Dummy", "ERC165", #(
#solidity_is,
)* #(
#solidity_events_is,
@@ -712,9 +714,9 @@
)*),
};
if is_impl {
- tc.collect("// Common stubs holder\ncontract Dummy {\n\tuint8 dummy;\n\tstring stub_error = \"this contract is implemented in native\";\n}\n".into());
+ tc.collect("// Common stubs holder\ncontract Dummy {\n\tuint8 dummy;\n\tstring stub_error = \"this contract is implemented in native\";\n}\ninterface ERC165 {\n\tfunction supportsInterface(bytes4 interfaceID) external view returns (bool) {\n\t\trequire(false, stub_error);\n\t\tinterfaceID;\n\t\treturn true;\n\t}\n}\n".into());
} else {
- tc.collect("// Common stubs holder\ninterface Dummy {\n}\n".into());
+ tc.collect("// Common stubs holder\ninterface Dummy {\n}\ninterface ERC165 {\n\tfunction supportsInterface(bytes4 interfaceID) external view returns (bool);\n}\n".into());
}
#(
#solidity_generators
@@ -737,6 +739,7 @@
fn parse(method_id: u32, reader: &mut ::evm_coder::abi::AbiReader) -> ::evm_coder::execution::Result<Option<Self>> {
use ::evm_coder::abi::AbiRead;
match method_id {
+ ::evm_coder::ERC165Call::INTERFACE_ID => return Ok(::evm_coder::ERC165Call::parse(method_id, reader)?.map(Self::ERC165Call)),
#(
#parsers,
)*
@@ -757,6 +760,11 @@
#(
#call_variants,
)*
+ InternalCall::ERC165Call(::evm_coder::ERC165Call::SupportsInterface {interface_id}) => {
+ let mut writer = ::evm_coder::abi::AbiWriter::default();
+ writer.bool(&InternalCall::supports_interface(interface_id));
+ return Ok(writer);
+ }
_ => {},
}
let mut writer = ::evm_coder::abi::AbiWriter::default();
crates/evm-coder/src/lib.rsdiffbeforeafterboth2#[cfg(not(feature = "std"))]2#[cfg(not(feature = "std"))]3extern crate alloc;3extern crate alloc;445use abi::{AbiReader, AbiWriter};5use abi::{AbiRead, AbiReader, AbiWriter};6pub use evm_coder_macros::{event_topic, fn_selector, solidity_interface, solidity, ToLog};6pub use evm_coder_macros::{event_topic, fn_selector, solidity_interface, solidity, ToLog};7pub mod abi;7pub mod abi;8pub mod events;8pub mod events;61 fn call(&mut self, call: types::Msg<C>) -> execution::Result<AbiWriter>;61 fn call(&mut self, call: types::Msg<C>) -> execution::Result<AbiWriter>;62}62}6364/// Implementation is implicitly provided for all interfaces65///66/// Note: no Callable implementation is provided67#[derive(Debug)]68pub enum ERC165Call {69 SupportsInterface { interface_id: types::bytes4 },70}7172impl ERC165Call {73 pub const INTERFACE_ID: types::bytes4 = 0x01ffc9a7;74}7576impl Call for ERC165Call {77 fn parse(selector: u32, input: &mut AbiReader) -> execution::Result<Option<Self>> {78 if selector != Self::INTERFACE_ID {79 return Ok(None);80 }81 Ok(Some(Self::SupportsInterface {82 interface_id: input.abi_read()?,83 }))84 }85}638664#[macro_export]87#[macro_export]65macro_rules! generate_stubgen {88macro_rules! generate_stubgen {