Skip to content
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
14 changes: 10 additions & 4 deletions omni-utils-derive/src/trusted_relayer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ impl Parse for MacroParam {
struct TrustedRelayerImplArgs {
bypass_roles: Option<Vec<Expr>>,
manager_roles: Vec<Expr>,
/// Optional separate roles for `set_relayer_config`. Falls back to `manager_roles` if absent.
config_roles: Option<Vec<Expr>>,
config_roles: Vec<Expr>,
custom_is_trusted_relayer: bool,
}

Expand Down Expand Up @@ -110,6 +109,13 @@ impl Parse for TrustedRelayerImplArgs {
)
})?;

let config_roles = config_roles.ok_or_else(|| {
syn::Error::new(
proc_macro2::Span::call_site(),
"`config_roles(...)` is required for `#[trusted_relayer]` on impl blocks",
)
})?;

if custom_is_trusted_relayer && bypass_roles.is_some() {
return Err(syn::Error::new(
proc_macro2::Span::call_site(),
Expand Down Expand Up @@ -389,8 +395,8 @@ fn process_impl_block(args: TokenStream, input: TokenStream) -> TokenStream {
&args.bypass_roles,
args.custom_is_trusted_relayer,
);
let config_roles = args.config_roles.as_deref().unwrap_or(&args.manager_roles);
let public_methods = gen_public_methods(self_ty, generics, &args.manager_roles, config_roles);
let public_methods =
gen_public_methods(self_ty, generics, &args.manager_roles, &args.config_roles);

let output = quote! {
#item_impl
Expand Down
6 changes: 5 additions & 1 deletion tests/test-contract-custom/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,11 @@ impl TrustedRelayer for CustomContract {
}
}

#[trusted_relayer(manager_roles(Role::Admin), custom_is_trusted_relayer)]
#[trusted_relayer(
manager_roles(Role::Admin),
config_roles(Role::Admin),
custom_is_trusted_relayer
)]
#[near]
impl CustomContract {
#[init]
Expand Down
4 changes: 2 additions & 2 deletions tests/test-contract/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ pub struct TestContract {
}

#[trusted_relayer(
manager_roles(Role::Admin, Role::RelayerManager),
config_roles(Role::Admin),
bypass_roles(Role::Relayer),
manager_roles(Role::Admin, Role::RelayerManager),
config_roles(Role::Admin)
)]
#[near]
impl TestContract {
Expand Down
Loading