-
Notifications
You must be signed in to change notification settings - Fork 182
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
20 changed files
with
79 additions
and
79 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,57 +1,49 @@ | ||
| use crate::names; | ||
| use crate::names::abi as abi_names; | ||
| use crate::operations::abi as abi_operations; | ||
| use crate::types::{to_abi_selector_names, AbiType}; | ||
| use crate::types::{to_abi_selector_names, AbiType, to_abi_types}; | ||
| use fe_analyzer::namespace::types::Struct; | ||
| use yultsur::*; | ||
|
|
||
| /// Generate a YUL function to revert with the `Error` signature and the | ||
| /// given set of params. | ||
| /// NOTE: This is currently used for `assert False, "message"` statements which are | ||
| /// encoded as `Error(msg="message")`. This will be removed in the future. | ||
| pub fn generate_revert_fn_for_assert(params: &[AbiType]) -> yul::Statement { | ||
| generate_revert_fn("Error", params) | ||
| } | ||
|
|
||
| /// Generate a YUL function to revert with a specific struct used as error data | ||
| pub fn generate_struct_revert(val: &Struct) -> yul::Statement { | ||
| let typ = AbiType::from(val); | ||
| generate_revert_fn(&val.name, &[typ]) | ||
| pub fn error_revert(typ: &AbiType) -> yul::Statement { | ||
| revert("Error", typ) | ||
| } | ||
|
|
||
| /// Generate a YUL function to revert with panic codes | ||
| pub fn generate_revert_fn_for_panic() -> yul::Statement { | ||
| let selector = fe_abi::utils::func_selector("Panic", &["uint256".to_string()]); | ||
| let selector = literal_expression! { (selector) }; | ||
|
|
||
| function_definition! { | ||
| function revert_with_panic(error_code) { | ||
| (let ptr := alloc_mstoren([selector], 4)) | ||
| (pop((alloc_mstoren(error_code, 32)))) | ||
| (revert(ptr, (add(4, 32)))) | ||
| } | ||
| } | ||
| pub fn panic_revert() -> yul::Statement { | ||
| revert("Panic", &AbiType::Uint { size: 32 }) | ||
| } | ||
|
|
||
| /// Generate a YUL function to revert with data | ||
| pub fn generate_revert_fn(name: &str, params: &[AbiType]) -> yul::Statement { | ||
| let function_name = names::revert_name(name, params); | ||
| let (param_idents, param_exprs) = abi_names::vals("params", params.len()); | ||
| let selector = fe_abi::utils::func_selector(name, &to_abi_selector_names(params)); | ||
| let selector = literal_expression! { (selector) }; | ||
| let encode_params = abi_operations::encode(params, param_exprs.clone()); | ||
| let encoding_size = abi_operations::encoding_size(params, param_exprs); | ||
| pub fn revert(name: &str, typ: &AbiType) -> yul::Statement { | ||
| let function_name = names::revert_name(name, typ); | ||
| // the selector parens around a tuple are removed for the selector preimage | ||
| // e.g. we use `MyError(bool, address)` instead of `MyError(bool, address)` | ||
| let selector = { | ||
| let selector_params = match typ.clone() { | ||
| AbiType::Tuple { components } => components, | ||
| typ => vec![typ] | ||
| }; | ||
| let selector = fe_abi::utils::func_selector(name, &to_abi_selector_names(&selector_params)); | ||
| literal_expression! { (selector) } | ||
| }; | ||
| let encode_val = abi_operations::encode(&[typ.to_owned()], vec![expression! { val }]); | ||
| let encoding_size = abi_operations::encoding_size(&[typ.to_owned()], vec![expression! { val }]); | ||
|
|
||
| function_definition! { | ||
| function [function_name]([param_idents...]) { | ||
| function [function_name](val) { | ||
| (let ptr := alloc_mstoren([selector], 4)) | ||
| (pop([encode_params])) | ||
| (pop([encode_val])) | ||
| (revert(ptr, (add(4, [encoding_size])))) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /// Return all revert runtime functions | ||
| pub fn all() -> Vec<yul::Statement> { | ||
| vec![generate_revert_fn_for_panic()] | ||
| vec![panic_revert()] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
crates/yulgen/tests/snapshots/yulgen__abi_decode_data_address_bool_mem_function.snap
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,16 @@ | ||
| --- | ||
| source: crates/yulgen/tests/yulgen.rs | ||
| expression: "abi_functions::decode_data(&[Base::Bool, Base::Address],\n AbiDecodeLocation::Memory)" | ||
| expression: "abi_functions::decode_data(&[AbiType::Bool, AbiType::Address],\n AbiDecodeLocation::Memory)" | ||
|
|
||
| --- | ||
| function abi_decode_data_bool_address_mem(head_start, data_end) -> return_val_0, return_val_1 { | ||
| let encoding_size := sub(data_end, head_start) | ||
| if iszero(eq(encoding_size, 64)) { revert_with_panic(153) } | ||
| if iszero(eq(encoding_size, 64)) { revert_with_Panic_uint256(153) } | ||
| let head_offset_0 := 0 | ||
| let head_offset_1 := 32 | ||
| let decoded_val_0 := abi_decode_component_bool_mem(head_start, head_offset_0) | ||
| let decoded_val_1 := abi_decode_component_address_mem(head_start, head_offset_1) | ||
| if iszero(eq(encoding_size, 64)) { revert_with_panic(153) } | ||
| if iszero(eq(encoding_size, 64)) { revert_with_Panic_uint256(153) } | ||
| return_val_0 := decoded_val_0 | ||
| return_val_1 := decoded_val_1 | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
crates/yulgen/tests/snapshots/yulgen__revert_string_error.snap
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| --- | ||
| source: crates/yulgen/tests/yulgen.rs | ||
| expression: "revert_functions::generate_revert_fn_for_assert(&[AbiType::String{max_size:\n 3,}])" | ||
| expression: "revert_functions::error_revert(&AbiType::String{max_size: 3,})" | ||
|
|
||
| --- | ||
| function revert_with_Error_string_3(params_val_0) { | ||
| function revert_with_Error_string_3(val) { | ||
| let ptr := alloc_mstoren(0x08c379a0, 4) | ||
| pop(abi_encode_string_3(params_val_0)) | ||
| revert(ptr, add(4, add(64, ceil32(mload(params_val_0))))) | ||
| pop(abi_encode_string_3(val)) | ||
| revert(ptr, add(4, add(64, ceil32(mload(val))))) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters