deserialise chain_id as both string or number

Author: d4mr

core/src/execution_options/mod.rs

@@ -1,7 +1,7 @@
 use schemars::JsonSchema;
 use serde::de::{Error, IntoDeserializer};
 use serde::{Deserialize, Deserializer, Serialize};
-use serde_with::serde_as;
+use serde_with::{DisplayFromStr, PickFirst, serde_as};
 use std::collections::HashMap;
 
 use crate::transaction::InnerTransaction;
@@ -14,6 +14,7 @@ pub mod auto;
 #[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
 #[serde(rename_all = "camelCase")]
 pub struct BaseExecutionOptions {
+    #[serde_as(as = "PickFirst<(_, DisplayFromStr)>")]
     pub chain_id: u64,
     #[serde(default = "default_idempotency_key")]
     pub idempotency_key: String,

core/src/signer.rs

@@ -4,7 +4,7 @@ use alloy::{
 };
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use serde_with::serde_as;
+use serde_with::{DisplayFromStr, PickFirst, serde_as};
 use vault_sdk::VaultClient;
 use vault_types::enclave::encrypted::eoa::MessageFormat;
 
@@ -86,7 +86,7 @@ pub struct Erc4337SigningOptions {
     pub account_salt: String,
 
     /// Chain ID for smart account operations
-    // #[serde_as(as = "DisplayFromStr")]
+    #[serde_as(as = "PickFirst<(_, DisplayFromStr)>")]
     pub chain_id: ChainId,
 }