Fix openrpc docgen

Prevent multiple inputs for jsonrpc params.

Author: philipglazman

monad-rpc/monad-rpc-docs/monad-rpc-docs-derive/src/lib.rs

@@ -36,7 +36,7 @@ pub fn rpc(attr_args: TokenStream, decorated: TokenStream) -> TokenStream {
     let attr_args: AttributeArgs = parse_macro_input!(attr_args);
     let attr_args = extract_attrs(&attr_args);
     let method_name = attr_args.method_name.unwrap_or(fn_name.to_string());
-    let input_infos = extract_input_info(inputs, &attr_args.ignore_inputs);
+    let input_info = extract_input_info(inputs, &attr_args.ignore_inputs);
     let output = &input.sig.output;
     let output_info = extract_output_info(output.clone());
 
@@ -51,11 +51,14 @@ pub fn rpc(attr_args: TokenStream, decorated: TokenStream) -> TokenStream {
         fn_name.span(),
     );
 
-    let input_types: Vec<Type> = input_infos.iter().map(|(_, typ, _)| typ.clone()).collect();
-    let input_schemas: Vec<TokenStream2> = input_infos
-        .iter()
+    let input_type: Type = input_info
+        .as_ref()
+        .map(|(_, typ, _)| typ.clone())
+        .unwrap_or(parse_quote!([u8; 0]));
+    let input_schema: TokenStream2 = input_info
+        .as_ref()
         .map(|(_, _, schema)| schema.clone())
-        .collect();
+        .unwrap_or(parse_quote!(None));
 
     let output_type: Type = output_info
         .as_ref()
@@ -66,10 +69,6 @@ pub fn rpc(attr_args: TokenStream, decorated: TokenStream) -> TokenStream {
         .map(|(_, _, schema)| schema.clone())
         .unwrap_or(parse_quote!(None));
 
-    let default_input = parse_quote!([u8; 0]);
-    let input_type = input_types.first().unwrap_or(&default_input);
-    let default_schema = parse_quote!(None);
-    let input_schema = input_schemas.first().unwrap_or(&default_schema);
     TokenStream::from(quote! {
         #input
 
@@ -169,7 +168,10 @@ fn extract_attrs(attrs: &[NestedMeta]) -> Args {
 
             if nv.path.is_ident("ignore") {
                 if let Lit::Str(lit) = &nv.lit {
-                    args.ignore_inputs.push(lit.value());
+                    let value = lit.value();
+                    for item in value.split(',').map(|s| s.trim()).filter(|s| !s.is_empty()) {
+                        args.ignore_inputs.push(item.to_string());
+                    }
                 }
             }
         }
@@ -181,8 +183,8 @@ fn extract_attrs(attrs: &[NestedMeta]) -> Args {
 fn extract_input_info(
     inputs: &syn::punctuated::Punctuated<FnArg, syn::token::Comma>,
     ignore_inputs: &[String],
-) -> Vec<(String, Type, TokenStream2)> {
-    inputs
+) -> Option<(String, Type, TokenStream2)> {
+    let collected: Vec<(String, Type, TokenStream2)> = inputs
         .iter()
         .filter_map(|arg| {
             if let FnArg::Typed(PatType { pat, ty, .. }) = arg {
@@ -202,7 +204,13 @@ fn extract_input_info(
                 None
             }
         })
-        .collect()
+        .collect();
+
+    if collected.len() > 1 {
+        panic!("Expected at most one input, got {}", collected.len());
+    }
+
+    collected.into_iter().next()
 }
 
 fn extract_output_info(output: ReturnType) -> Option<(String, Type, TokenStream2)> {

monad-rpc/src/handlers/eth/call.rs

@@ -732,7 +732,10 @@ async fn prepare_eth_call<T: Triedb + TriedbPath>(
 
 /// Executes a new message call immediately without creating a transaction on the block chain.
 #[tracing::instrument(level = "debug")]
-#[rpc(method = "eth_call", ignore = "chain_id", ignore = "eth_call_executor")]
+#[rpc(
+    method = "eth_call",
+    ignore = "eth_call_executor,chain_id,eth_call_provider_gas_limit"
+)]
 pub async fn monad_eth_call<T: Triedb + TriedbPath>(
     triedb_env: &T,
     eth_call_executor: Arc<EthCallExecutor>,
@@ -840,7 +843,10 @@ pub struct EthCallCapacityStats {
 /// Returns statistics about eth_call capacity including inactive executors and queued requests
 #[allow(non_snake_case)]
 #[tracing::instrument(level = "debug")]
-#[monad_rpc_docs::rpc(method = "admin_ethCallStatistics")]
+#[monad_rpc_docs::rpc(
+    method = "admin_ethCallStatistics",
+    ignore = "eth_call_executor_fibers,total_permits,available_permits"
+)]
 pub async fn monad_admin_ethCallStatistics(
     eth_call_executor_fibers: usize,
     total_permits: usize,

monad-rpc/src/handlers/eth/gas.rs

@@ -223,8 +223,7 @@ pub struct MonadEthEstimateGasParams {
 
 #[rpc(
     method = "eth_estimateGas",
-    ignore = "chain_id",
-    ignore = "eth_call_executor"
+    ignore = "chain_id,provider_gas_limit,eth_call_executor"
 )]
 #[allow(non_snake_case)]
 /// Generates and returns an estimate of how much gas is necessary to allow the transaction to complete.

monad-rpc/src/handlers/eth/txn.rs

@@ -151,7 +151,10 @@ fn schema_for_filter(_: &mut schemars::gen::SchemaGenerator) -> schemars::schema
     .into()
 }
 
-#[rpc(method = "eth_getLogs", ignore = "max_block_range")]
+#[rpc(
+    method = "eth_getLogs",
+    ignore = "max_block_range,use_eth_get_logs_index,dry_run_get_logs_index,max_finalized_block_cache_len"
+)]
 #[allow(non_snake_case)]
 /// Returns an array of all logs matching filter with given id.
 #[tracing::instrument(level = "debug", skip_all)]
@@ -187,7 +190,10 @@ pub struct MonadEthSendRawTransactionParams {
 
 const MAX_CONCURRENT_SEND_RAW_TX: usize = 1_000;
 // TODO: need to support EIP-4844 transactions
-#[rpc(method = "eth_sendRawTransaction", ignore = "tx_pool", ignore = "ipc")]
+#[rpc(
+    method = "eth_sendRawTransaction",
+    ignore = "tx_pool,ipc,chain_id,allow_unprotected_txs"
+)]
 #[allow(non_snake_case)]
 #[tracing::instrument(level = "debug", skip_all)]
 /// Submits a raw transaction. For EIP-4844 transactions, the raw form must be the network form.